From 10481e865be233a734eef57499d915694a1e4ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 5 Nov 2018 09:26:48 +0100 Subject: [PATCH 1/3] Applying coloring to units of graphed values --- src/ServicePulse.Host/app/css/particular.css | 16 +++++++++++++ .../monitoring/views/endpoint_details.html | 24 ++++++++++++------- .../monitoring/views/monitored_endpoints.html | 8 +++---- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index 7db3451921..ecf7be1505 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -1739,6 +1739,22 @@ hr.top-separator { font-size: 11px; } +.sparkline-value.sec span { + color: #007AFF; +} + +.sparkline-value.min span { + color: #AE00FF; +} + +.sparkline-value.h span { + color: #FF7DFD; +} + +.sparkline-value.d span { + color: #FF0004; +} + .graph-area { width: 33%; box-sizing: border-box; diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html index a14931f1e1..24a54953ab 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -309,10 +309,12 @@
-
+
{{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.processingTime.displayValue.value}} ? - {{instance.metrics.processingTime.displayValue.unit}} + + {{instance.metrics.processingTime.displayValue.unit}} +
@@ -321,10 +323,12 @@
-
+
{{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.criticalTime.displayValue.value}} ? - {{instance.metrics.criticalTime.displayValue.unit}} + + {{instance.metrics.criticalTime.displayValue.unit}} +
@@ -442,10 +446,12 @@
-
+
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.processingTime.displayValue.value}} ? - {{messageType.metrics.processingTime.displayValue.unit}} + + {{messageType.metrics.processingTime.displayValue.unit}} +
@@ -454,10 +460,12 @@
-
+
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.criticalTime.displayValue.value}} ? - {{messageType.metrics.criticalTime.displayValue.unit}} + + {{messageType.metrics.criticalTime.displayValue.unit}} +
diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html b/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html index 48ef1efbd9..70763b43cd 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html @@ -125,10 +125,10 @@

Endpoints overview

-
+
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.processingTime.displayValue.value}} ? - {{endpoint.metrics.processingTime.displayValue.unit}} + {{endpoint.metrics.processingTime.displayValue.unit}}
@@ -137,10 +137,10 @@

Endpoints overview

-
+
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.criticalTime.displayValue.value}} ? - {{endpoint.metrics.criticalTime.displayValue.unit}} + {{endpoint.metrics.criticalTime.displayValue.unit}}
From f085d7003b223a5c1a92d7de89be7a898f142804 Mon Sep 17 00:00:00 2001 From: Sergio Date: Tue, 6 Nov 2018 09:05:24 +0100 Subject: [PATCH 2/3] Adjust value and unit colors --- src/ServicePulse.Host/app/css/particular.css | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index ab02335877..2fa8c158d8 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -1747,16 +1747,33 @@ hr.top-separator { font-size: 11px; } + +.sparkline-value.sec { + color: #0000FF; +} + .sparkline-value.sec span { color: #007AFF; } +.sparkline-value.min { + color: #8B00D0; +} + .sparkline-value.min span { - color: #AE00FF; + color: #B14AE4; +} + +.sparkline-value.h { + color: #D601DA; } .sparkline-value.h span { - color: #FF7DFD; + color: #D764D9; +} + +.sparkline-value.d { + color: #AD0017; } .sparkline-value.d span { From d87eba70e529fa51e758a35e7af3e520d6b93132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Tue, 6 Nov 2018 11:33:20 +0100 Subject: [PATCH 3/3] Change hour abbreviation to hr --- src/ServicePulse.Host/app/css/particular.css | 4 ++-- src/ServicePulse.Host/app/js/services/service.formatter.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index 2fa8c158d8..36fef08841 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -1764,11 +1764,11 @@ hr.top-separator { color: #B14AE4; } -.sparkline-value.h { +.sparkline-value.hr { color: #D601DA; } -.sparkline-value.h span { +.sparkline-value.hr span { color: #D764D9; } diff --git a/src/ServicePulse.Host/app/js/services/service.formatter.js b/src/ServicePulse.Host/app/js/services/service.formatter.js index 699ffcd408..105cac4d63 100644 --- a/src/ServicePulse.Host/app/js/services/service.formatter.js +++ b/src/ServicePulse.Host/app/js/services/service.formatter.js @@ -12,11 +12,11 @@ var time = { value: 0, unit: '' }; if (duration >= dayDuration) { - time.value = duration.format('D [d] h [h]'); + time.value = duration.format('D [d] h [hr]'); return time; } else if (duration >= hourDuration) { time.value = moment(duration._data).format('HH:mm'); - time.unit = 'h'; + time.unit = 'hr'; return time; } else if (duration >= minuteDuration) { time.value = duration.format('mm:ss');