From 2ef18bdec6de1a7bc7e37e2f693a599bf34ef961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 16 Jul 2018 10:48:30 +0200 Subject: [PATCH 01/18] Remove not needed dates in the large graph, and fix the scaleX when first series holds no values and second series does. --- .../monitoring/js/directives/ui.particular.largeGraph.js | 7 ++++--- .../app/modules/monitoring/views/endpoint_details.html | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js index eb49e674a1..2d4676441c 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js @@ -72,8 +72,7 @@ function(formatter) { return { restrict: 'E', - scope: { - dates: '=xaxisPoints', + scope: { firstDataSeries: '=firstDataSeries', secondDataSeries: '=secondDataSeries', isDurationGraph: '=isDurationGraph', @@ -111,8 +110,10 @@ var firstSeries = scope.firstDataSeries; var secondSeries = scope.secondDataSeries; + var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0); + var scaleX = d3.scaleLinear() - .domain([0, firstSeries.points.length - 1]) + .domain([0, amountOfValues - 1]) .range([leftMargin, width]); chart.append('rect') 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 f198261689..2f9cd892b1 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -41,7 +41,6 @@

Date: Tue, 23 Oct 2018 13:50:13 +0200 Subject: [PATCH 02/18] Fixing typo (#662) --- .../app/js/views/configuration/configuration.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServicePulse.Host/app/js/views/configuration/configuration.html b/src/ServicePulse.Host/app/js/views/configuration/configuration.html index a0efb90569..1a71e14afe 100644 --- a/src/ServicePulse.Host/app/js/views/configuration/configuration.html +++ b/src/ServicePulse.Host/app/js/views/configuration/configuration.html @@ -16,7 +16,7 @@

Configuration

- Warning: The list of endpoints below only contains endpoints with the hearbeats plug-in installed. Toggling heartbeat monitoring on/off won't toggle performance monitoring + Warning: The list of endpoints below only contains endpoints with the heartbeats plug-in installed. Toggling heartbeat monitoring on/off won't toggle performance monitoring
From d7e31cf31ea6ec6b47497e6002e09119f9361572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 29 Oct 2018 08:46:47 +0100 Subject: [PATCH 03/18] Add tab to url (#666) * Adding information about which tab should be open to URL --- .../monitoring/js/endpoint_details.controller.js | 12 ++++++++++-- .../modules/monitoring/views/endpoint_details.html | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js index ef585e7678..b099aa51a3 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js @@ -18,8 +18,8 @@ $scope.endpointName = $routeParams.endpointName; $scope.sourceIndex = $routeParams.sourceIndex; + $scope.showInstancesBreakdown = $routeParams.tab === 'instancesBreakdown'; $scope.loading = true; - $scope.showInstancesBreakdown = false; $scope.largeGraphsMinimumYAxis = largeGraphsMinimumYAxis; $scope.smallGraphsMinimumYAxis = smallGraphsMinimumYAxis; @@ -42,6 +42,14 @@ } } + $scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) { + return `#/endpoint_details/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`; + }; + + $scope.showInstancesBreakdownTab = function(isVisible) { + $scope.showInstancesBreakdown = isVisible; + }; + function updateUI() { if (subscription) { subscription.dispose(); @@ -142,4 +150,4 @@ angular.module('endpoint_details') .controller('endpointDetailsCtrl', controller); -}(window, window.angular)); \ No newline at end of file +}(window, window.angular)); 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 2f9cd892b1..d01b260558 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -27,7 +27,7 @@

@@ -202,10 +202,10 @@

- Message Types + Message Types
- Instances + Instances
From afb191f105eaf5d0fd590f9e18d6626a8f22b308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Mon, 29 Oct 2018 12:48:26 +0100 Subject: [PATCH 04/18] Adding no data message when there is no messages processed (#667) --- .../app/modules/monitoring/views/endpoint_details.html | 4 ++++ 1 file changed, 4 insertions(+) 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 d01b260558..fd85a64ac4 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html +++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html @@ -253,6 +253,8 @@

+ +
@@ -378,6 +380,8 @@
+ +
From 9c1bdd48fc37b4712cb18b2260ce269905be046a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=C3=B3jcik?= Date: Tue, 30 Oct 2018 09:23:38 +0100 Subject: [PATCH 05/18] Making 0 line on graph always show (#668) --- .../modules/monitoring/js/directives/ui.particular.graph.js | 3 +++ .../monitoring/js/directives/ui.particular.largeGraph.js | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js index 55a2ca7761..0fb40f8c0f 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js @@ -14,6 +14,9 @@ template: '', link: function link(scope, element, attrs) { scope.plotData = scope.plotData || { points: [], average: 0 }; + if (scope.plotData.points.length === 0) { + scope.plotData.points = new Array(10).fill(0); + } scope.$watch('plotData', function() { diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js index ffba901922..77c0ae1514 100644 --- a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js +++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js @@ -110,8 +110,10 @@ var firstSeries = scope.firstDataSeries; var secondSeries = scope.secondDataSeries; - var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0); - + var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0) || 10; + if (firstSeries.points.length === 0) { + firstSeries.points = new Array(amountOfValues).fill(0); + } var scaleX = d3.scaleLinear() .domain([0, amountOfValues - 1]) .range([leftMargin, width]); From 7ca32fc180b8de132b326ebbd44e2890ce449a06 Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 31 Oct 2018 13:42:17 +0100 Subject: [PATCH 06/18] Min width 1440px (#669) * force min-width to 1440px * remove unnecessary !important --- src/ServicePulse.Host/app/css/particular.css | 111 +++++++++++++++--- src/ServicePulse.Host/app/index.html | 2 +- .../js/views/configuration/configuration.html | 2 +- .../app/js/views/dashboard/dashboard.html | 6 +- .../event_log_items/eventLogItems.tpl.html | 4 +- .../app/js/views/failed_groups/view.html | 4 +- src/ServicePulse.Host/app/layout/footer.html | 2 +- src/ServicePulse.Host/app/layout/navbar.html | 10 -- .../monitoring/views/endpoint_details.html | 100 ++++++++-------- .../monitoring/views/monitored_endpoints.html | 46 ++++---- 10 files changed, 175 insertions(+), 112 deletions(-) diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css index 6a7fba1075..7db3451921 100644 --- a/src/ServicePulse.Host/app/css/particular.css +++ b/src/ServicePulse.Host/app/css/particular.css @@ -72,10 +72,6 @@ a { border-bottom: 5px solid #00A3C4; } - .navbar-label { - display: none; - } - .navbar-nav > li > a { padding-bottom: 15px; padding-top: 20px; @@ -1214,7 +1210,7 @@ a.btn-feedback, a.btn-feedback:visited, a.btn-feedback:focus { color: #fff !important; background-color: #00A3C4 !important; padding: 6px 16px !important; - margin: 14px 0 0 14px; + margin: 14px 0 0 0; border-radius: 3px; font-weight: bold; } @@ -1495,6 +1491,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { margin: 10px 15px 22px !important; padding-left: 20px !important; } + + .navbar-collapse.collapse.in { + padding: 0 0 0 16px !important; + } } @@ -1563,9 +1563,11 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { margin: 7.5px -15px; } - .navbar-nav > li { - float: none; - } + .navbar-nav > li { + float: none; + float: none; + .navbar-label + } .navbar-nav > li > a { padding-top: 10px; @@ -1576,9 +1578,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { float: none; margin: 15px 0; } - /* since 3.1.0 */ + .navbar-collapse.collapse.in { display: block !important; + padding: 0 32px 16px 32px; } .collapsing { @@ -1586,23 +1589,29 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger { } } -@media only screen and (min-width: 1200px) { - .container { - width: 92%; - } +.table-head-row .col-xl-7, .endpoint-row .col-xl-7 { + width: 20%; +} + +.table-head-row .col-xl-8, .endpoint-row .col-xl-8 { + width: 36%; } -@media only screen and (min-width: 1440px) { +.table-head-row .col-xl-1, .endpoint-row .col-xl-1 { + width: 16%; +} + +@media only screen and (min-width: 1730px) { .table-head-row .col-xl-7, .endpoint-row .col-xl-7 { - width: 30% !important; + width: 30%; } .table-head-row .col-xl-8, .endpoint-row .col-xl-8 { - width: 44% !important; + width: 44%; } .table-head-row .col-xl-1, .endpoint-row .col-xl-1 { - width: 14% !important; + width: 14%; } } @@ -1899,7 +1908,7 @@ h1 .endpoint-status i.fa-envelope, .endpoint-status i.fa-exclamation-triangle { } .monitoring-head .endpoint-status { - top: 0; + top: 4px; } .monitoring-head .endpoint-status a { @@ -2166,6 +2175,7 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over font-weight: bold; background-color: initial; border-bottom: 3px solid #000; + padding-bottom: 2px; } .nav-pills.period-selector > li > a:hover { @@ -2183,7 +2193,11 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over padding: 10px 6px; } -@media (min-width: 1200px) { +@media (min-width: 0px) { + .container { + width: 92%; + } + .col-lg-max-8 { max-width: 66%; float: left; @@ -2205,6 +2219,7 @@ section[name="message_groups"] .list-section { section[name="configuration"] .alert { margin: 24px 0 0; + min-width: 1440px; } div.alert.alert-warning i.fa.fa-warning { @@ -2225,3 +2240,61 @@ div.alert.alert-warning strong { color: #00729C !important; } +@media (max-width: 1439px) { + html, body, nav { + min-width: 1440px !important; + } + + nav.navbar { + width: 1440px; + position: sticky; + margin-top: -100px; + margin-bottom: 50px; + } + + div.navbar-header { + float: left; + } + + ul.navbar-nav { + margin: 0 8px 0 0; + padding-right: 16px; + display: bloc; + } + + .navbar-nav > li > a { + padding-top: 18px; + padding-bottom: 17px; + } + + .navbar-label { + display: inline !important; + } + + .navbar-collapse.collapse { + display: block !important; + } + + .navbar-nav > li, .navbar-nav { + float: left !important; + height: 59px; + } + + .navbar-nav.navbar-right:last-child { + margin-right: -15px !important; + } + + .navbar-right { + float: right !important; + } + + .navbar-nav > li.active > a { + background: transparent !important; + border-bottom: 5px solid #00A3C4 !important; + } + + .tabs h5 { + margin-bottom: 0; + padding-bottom: 10px; + } +} \ No newline at end of file diff --git a/src/ServicePulse.Host/app/index.html b/src/ServicePulse.Host/app/index.html index 0144cac6b6..668cf75814 100644 --- a/src/ServicePulse.Host/app/index.html +++ b/src/ServicePulse.Host/app/index.html @@ -15,7 +15,7 @@ - + diff --git a/src/ServicePulse.Host/app/js/views/configuration/configuration.html b/src/ServicePulse.Host/app/js/views/configuration/configuration.html index 1a71e14afe..2d70ff89ba 100644 --- a/src/ServicePulse.Host/app/js/views/configuration/configuration.html +++ b/src/ServicePulse.Host/app/js/views/configuration/configuration.html @@ -22,7 +22,7 @@

Configuration

-
+

}"> -
+

diff --git a/src/ServicePulse.Host/app/js/views/failed_groups/view.html b/src/ServicePulse.Host/app/js/views/failed_groups/view.html index 214bc445b2..d36b7b2e78 100644 --- a/src/ServicePulse.Host/app/js/views/failed_groups/view.html +++ b/src/ServicePulse.Host/app/js/views/failed_groups/view.html @@ -44,11 +44,11 @@

-
+
Failed message groups
-
+
diff --git a/src/ServicePulse.Host/app/layout/footer.html b/src/ServicePulse.Host/app/layout/footer.html index fb9901a6d3..81b663efd7 100644 --- a/src/ServicePulse.Host/app/layout/footer.html +++ b/src/ServicePulse.Host/app/layout/footer.html @@ -1,4 +1,4 @@ -