"
+ let output = ""
+ + "
"
+ "
"
+ "
"
+ " " + serviceName + " - " + hostname + ""
@@ -280,10 +288,59 @@
+ "
"
+ "
"
+ "
";
+ // create an empty entry if this group is new
+ if (!outputByGroup[serviceStatus.group]) {
+ outputByGroup[serviceStatus.group] = "";
+ }
+ outputByGroup[serviceStatus.group] += output;
+ }
+ let output = "";
+ for (let group in outputByGroup) {
+ // Services that don't have a group should be skipped and left for last
+ if (group === 'undefined') {
+ continue
+ }
+ let key = group.replace(/[^a-zA-Z0-9]/g, '');
+ let existingGroupContentSelector = $("#service-group-" + key + "-content");
+ let isCurrentlyHidden = existingGroupContentSelector.length && existingGroupContentSelector[0].style.display === 'none';
+ let groupStatus = "
✓";
+ if (outputByGroup[group].includes("badge badge-danger")) {
+ groupStatus = "
~";
+ }
+ output += ""
+ + "
"
+ + "
"
+ + "
"
+ + " " + groupStatus + " " + group
+ + " " + (isCurrentlyHidden ? "▼" : "▲") + ""
+ + "
"
+ + " "
+ + "
"
+ + " " + outputByGroup[group]
+ + "
"
+ + "
";
+ }
+ // Add all services that don't have a group at the end
+ if (outputByGroup['undefined']) {
+ output += ""
+ + "
"
+ + " " + outputByGroup['undefined']
+ + "
"
}
$("#results").html(output);
}
+ function toggleGroup(element) {
+ let selector = $("#service-group-" + element.dataset.group + "-content");
+ selector.toggle("fast", function() {
+ if (selector.length && selector[0].style.display === 'none') {
+ $("#service-group-" + element.dataset.group + "-arrow").html("▼");
+ } else {
+ $("#service-group-" + element.dataset.group + "-arrow").html("▲");
+ }
+ });
+ }
+
function prettifyTimestamp(timestamp) {
let date = new Date(timestamp);
let YYYY = date.getFullYear();
@@ -318,15 +375,15 @@
}
function setRefreshInterval(seconds) {
- refreshResults();
+ refreshStatuses();
refreshIntervalHandler = setInterval(function() {
- refreshResults();
- }, seconds * 1000)
+ refreshStatuses();
+ }, seconds * 1000);
}
$("#refresh-rate").change(function() {
clearInterval(refreshIntervalHandler);
- setRefreshInterval($(this).val())
+ setRefreshInterval($(this).val());
});
setRefreshInterval(30);
$("#refresh-rate").val(30);
diff --git a/watchdog/watchdog.go b/watchdog/watchdog.go
index e0151675..281b534b 100644
--- a/watchdog/watchdog.go
+++ b/watchdog/watchdog.go
@@ -13,22 +13,22 @@ import (
)
var (
- serviceResults = make(map[string][]*core.Result)
+ serviceStatuses = make(map[string]*core.ServiceStatus)
- // serviceResultsMutex is used to prevent concurrent map access
- serviceResultsMutex sync.RWMutex
+ // serviceStatusesMutex is used to prevent concurrent map access
+ serviceStatusesMutex sync.RWMutex
// monitoringMutex is used to prevent multiple services from being evaluated at the same time.
// Without this, conditions using response time may become inaccurate.
monitoringMutex sync.Mutex
)
-// GetJSONEncodedServiceResults returns a list of the last 20 results for each services encoded using json.Marshal.
+// GetJSONEncodedServiceStatuses returns a list of core.ServiceStatus for each services encoded using json.Marshal.
// The reason why the encoding is done here is because we use a mutex to prevent concurrent map access.
-func GetJSONEncodedServiceResults() ([]byte, error) {
- serviceResultsMutex.RLock()
- data, err := json.Marshal(serviceResults)
- serviceResultsMutex.RUnlock()
+func GetJSONEncodedServiceStatuses() ([]byte, error) {
+ serviceStatusesMutex.RLock()
+ data, err := json.Marshal(serviceStatuses)
+ serviceStatusesMutex.RUnlock()
return data, err
}
@@ -55,12 +55,7 @@ func monitor(service *core.Service) {
}
result := service.EvaluateHealth()
metric.PublishMetricsForService(service, result)
- serviceResultsMutex.Lock()
- serviceResults[service.Name] = append(serviceResults[service.Name], result)
- if len(serviceResults[service.Name]) > 20 {
- serviceResults[service.Name] = serviceResults[service.Name][1:]
- }
- serviceResultsMutex.Unlock()
+ UpdateServiceStatuses(service, result)
var extra string
if !result.Success {
extra = fmt.Sprintf("responseBody=%s", result.Body)
@@ -83,3 +78,15 @@ func monitor(service *core.Service) {
time.Sleep(service.Interval)
}
}
+
+// UpdateServiceStatuses updates the slice of service statuses
+func UpdateServiceStatuses(service *core.Service, result *core.Result) {
+ serviceStatusesMutex.Lock()
+ serviceStatus, exists := serviceStatuses[service.Name]
+ if !exists {
+ serviceStatus = core.NewServiceStatus(service)
+ serviceStatuses[service.Name] = serviceStatus
+ }
+ serviceStatus.AddResult(result)
+ serviceStatusesMutex.Unlock()
+}