ben/status-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix most severe incident status calculation for status board

Browse Source
This commit is contained in:
Ben Roberts
2011-12-22 22:07:41 +00:00
parent 75476698e9
commit fa07b536bf
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/lib/StatusBoard/Incident.class.php
View File

@@ -59,7 +59,7 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
public function statusAt($time) {
$database = StatusBoard_Main::instance()->database();
$row = $database->selectOne('SELECT `status` FROM `incidentstatus` WHERE `incident`=:incident AND ctime < :time ORDER BY ctime DESC LIMIT 1', array(
$row = $database->selectOne('SELECT `status` FROM `incidentstatus` WHERE `incident`=:incident AND `ctime` < :time ORDER BY `ctime` DESC LIMIT 1', array(
array('name' => 'incident', 'value' => $this->id, 'type' => PDO::PARAM_INT),
array('name' => 'time', 'value' => $time, 'type' => PDO::PARAM_INT),
)
@@ -68,18 +68,29 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
return $row['status'];
}
protected function statusesBetween($start, $end) {
$database = StatusBoard_Main::instance()->database();
$row = $database->selectList('SELECT `status` FROM `incidentstatus` WHERE `incident`=:incident AND `ctime` >= :start AND `ctime` < :end', array(
array('name' => 'incident', 'value' => $this->id, 'type' => PDO::PARAM_INT),
array('name' => 'start', 'value' => $start, 'type' => PDO::PARAM_INT),
array('name' => 'end', 'value' => $end, 'type' => PDO::PARAM_INT),
)
);
return array_map(function($a) {
return $a['status'];
}, $row);
}
/**
* Returns the status of the most severe incident in the given set
*
* @param array(StatusBoard_Incident) $incidents
*/
public static function highestSeverityStatus(array $incidents, $time = null) {
if ( ! $incidents) {
return StatusBoard_Status::STATUS_Resolved;
}
// Check for the highest severity incident.
$status = StatusBoard_Status::STATUS_Maintenance;
$status = StatusBoard_Status::STATUS_Resolved;
foreach ($incidents as $incident) {
$incident_status = null;
if ($time) {
@@ -96,6 +107,37 @@ class StatusBoard_Incident extends StatusBoard_DatabaseObject {
return $status;
}
/**
* Returns the status of the most severe incident in the given set
*
* @param array(StatusBoard_Incident) $incidents
*/
public static function highestSeverityStatusBetween(array $incidents, $start, $end) {
// Check for the highest severity incident.
$most_severe_status = StatusBoard_Status::STATUS_Resolved;
foreach ($incidents as $incident) {
$most_severe_incident_status = StatusBoard_Status::STATUS_Resolved;
$statuses_between = $incident->statusesBetween($start, $end);
foreach ($statuses_between as $status) {
$most_severe_incident_status = StatusBoard_Status::mostSevere($most_severe_incident_status, $status);
}
$incident_status_before = StatusBoard_Status::STATUS_Resolved;
try {
$incident_status_before = $incident->statusAt($start);
} catch (SihnonFramework_Exception_ResultCountMismatch $e) {
// Incident was opened after $start, ignore
}
$most_severe_incident_status = StatusBoard_Status::mostSevere($incident_status_before, $most_severe_incident_status);
$most_severe_status = StatusBoard_Status::mostSevere($most_severe_status, $most_severe_incident_status);
}
return $most_severe_status;
}
public function statusChanges($ignore_cache = false) {
if ($this->statuses === null || $ignore_cache) {
$this->statuses = StatusBoard_IncidentStatus::allFor('incident', $this->id);

8
source/lib/StatusBoard/Status.class.php
View File

@@ -1,6 +1,6 @@
<?php
class StatusBoard_Status {
abstract class StatusBoard_Status {
const STATUS_Resolved = 0;
const STATUS_Maintenance = 1;
@@ -24,7 +24,7 @@ class StatusBoard_Status {
self::STATUS_Major => 'The service is exeriencing a major outage affecting all customers.',
);
public function available() {
public static function available() {
return array(
self::STATUS_Resolved,
self::STATUS_Maintenance,
@@ -54,6 +54,10 @@ class StatusBoard_Status {
return ($test > $base);
}
public static function mostSevere($first, $second) {
return static::isMoreSevere($first, $second) ? $second : $first;
}
}
?>

2
source/webui/templates/home.tpl
View File

@@ -42,7 +42,7 @@
{$start=mktime(0,0,0,date("n"),date("j")-$day)}
{$end=mktime(0,0,0,date("n"),date("j")-$day+1)}
{$incidentsDuring=$site->openIncidentsDuring($start, $end)}
{$statusDuring=StatusBoard_Incident::highestSeverityStatus($incidentsDuring, $end)}
{$statusDuring=StatusBoard_Incident::highestSeverityStatusBetween($incidentsDuring, $start, $end)}
<td>
{include file="fragments/site-status.tpl" nocache start=$start end=$end status=$statusDuring incidents=$incidentsDuring}
</td>