Skip to content

Filtering out system messages #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2018
Merged

Filtering out system messages #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10481e8
Applying coloring to units of graphed values
WojcikMike Nov 5, 2018
d873d51
Merge branch 'improve-ux-feature' of https://github.com/Particular/Se…
WojcikMike Nov 5, 2018
a0eb4da
Filtering out system messages
WojcikMike Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/ServicePulse.Host/app/css/particular.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,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;
Expand Down
8 changes: 8 additions & 0 deletions src/ServicePulse.Host/app/modules/monitoring/js/services/services.monitoring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,20 @@
function loadEndpointDetailsFromMonitoringService(endpointName, sourceIndex, historyPeriod) {
return $http.get(uri.join(scConfig.monitoring_urls[sourceIndex], 'monitored-endpoints', endpointName) + "?history=" + historyPeriod)
.then(function (result) {
filterOutSystemMessage(result.data);
return result.data;
}, function (error) {
return { error: error };
});
}

function filterOutSystemMessage(data)
{
data.messageTypes = data.messageTypes.filter(mt => {
return mt.id;
});
}

function createEndpointDetailsSource(endpointName, sourceIndex, historyPeriod, refreshInterval) {
return Rx.Observable.interval(refreshInterval).startWith(0)
.flatMap(function (i) {
Expand Down
24 changes: 16 additions & 8 deletions src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,12 @@ <h5 ng-class="{active: showInstancesBreakdown}">
<div class="no-side-padding">
<graph plot-data="instance.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="instance.metrics.processingTime.displayValue.unit">
{{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.processingTime.displayValue.value}}
<strong ng-if="instance.isStale || instance.isScMonitoringDisconnected">?</strong>
<span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false">{{instance.metrics.processingTime.displayValue.unit}}</span>
<span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false" class="unit">
{{instance.metrics.processingTime.displayValue.unit}}
</span>
</div>
</div>
</div>
Expand All @@ -321,10 +323,12 @@ <h5 ng-class="{active: showInstancesBreakdown}">
<div class="no-side-padding">
<graph plot-data="instance.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="instance.metrics.criticalTime.displayValue.unit">
{{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.criticalTime.displayValue.value}}
<strong ng-if="instance.isStale || instance.isScMonitoringDisconnected">?</strong>
<span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false">{{instance.metrics.criticalTime.displayValue.unit}}</span>
<span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false" class="unit">
{{instance.metrics.criticalTime.displayValue.unit}}
</span>
</div>
</div>
</div>
Expand Down Expand Up @@ -442,10 +446,12 @@ <h5 ng-class="{active: showInstancesBreakdown}">
<div class="no-side-padding">
<graph plot-data="messageType.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="messageType.metrics.processingTime.displayValue.unit">
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.processingTime.displayValue.value}}
<strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false">{{messageType.metrics.processingTime.displayValue.unit}}</span>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit">
{{messageType.metrics.processingTime.displayValue.unit}}
</span>
</div>
</div>
</div>
Expand All @@ -454,10 +460,12 @@ <h5 ng-class="{active: showInstancesBreakdown}">
<div class="no-side-padding">
<graph plot-data="messageType.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="messageType.metrics.criticalTime.displayValue.unit">
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.criticalTime.displayValue.value}}
<strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false">{{messageType.metrics.criticalTime.displayValue.unit}}</span>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit">
{{messageType.metrics.criticalTime.displayValue.unit}}
</span>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ <h1>Endpoints overview</h1>
<div class="no-side-padding">
<graph plot-data="endpoint.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="endpoint.metrics.processingTime.displayValue.unit">
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.processingTime.displayValue.value}}
<strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false"> {{endpoint.metrics.processingTime.displayValue.unit}}</span>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit"> {{endpoint.metrics.processingTime.displayValue.unit}}</span>
</div>
</div>
</div>
Expand All @@ -137,10 +137,10 @@ <h1>Endpoints overview</h1>
<div class="no-side-padding">
<graph plot-data="endpoint.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
</div>
<div class="no-side-padding sparkline-value">
<div class="no-side-padding sparkline-value" ng-class="endpoint.metrics.criticalTime.displayValue.unit">
{{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.criticalTime.displayValue.value}}
<strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false"> {{endpoint.metrics.criticalTime.displayValue.unit}}</span>
<span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit"> {{endpoint.metrics.criticalTime.displayValue.unit}}</span>
</div>
</div>
</div>
Expand Down