Skip to content

Change monitoring url #671

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 2 commits into from
Nov 2, 2018
Merged

Change monitoring url #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c22625
Change monitoring url from monitoring_endpoints -> monitoring
WojcikMike Nov 1, 2018
183d950
Fixing details url to /monitoring/endpoint/
WojcikMike Nov 1, 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
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/js/views/failed_messages/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="col-sm-12">
<div>
<span class="fake-link" aria-hidden="true">&#9664;</span>
<a class="back-nav" ng-if="vm.selectedExceptionGroup.parentTitle" href="#/endpoint_details/{{vm.selectedExceptionGroup.parentTitle}}/{{vm.selectedExceptionGroup.parentGroupIndex}}/">{{vm.selectedExceptionGroup.parentTitle}} endpoint</a>
<a class="back-nav" ng-if="vm.selectedExceptionGroup.parentTitle" href="#/monitoring/endpoint/{{vm.selectedExceptionGroup.parentTitle}}/{{vm.selectedExceptionGroup.parentGroupIndex}}/">{{vm.selectedExceptionGroup.parentTitle}} endpoint</a>
<a class="back-nav" ng-if="!vm.selectedExceptionGroup.parentTitle" href="#/failed-messages/groups">Failed message groups list</a>
</div>
<div ng-show="!vm.selectedExceptionGroup.id" class="active">All failed messages ({{vm.failedMessages.length}} / {{vm.selectedExceptionGroup.count}} | number)</div>
Expand Down
4 changes: 2 additions & 2 deletions src/ServicePulse.Host/app/layout/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</li>


<li ng-if="isMonitoringEnabled" ng-class="{ active: isActive('/monitored_endpoints') || isActive('/endpoint_details') }">
<a href="#/monitored_endpoints">
<li ng-if="isMonitoringEnabled" ng-class="{ active: isActive('/monitoring') || isActive('/monitoring/endpoint') }">
<a href="#/monitoring">
<i class="fa fa-heartbeat icon-white"></i>
<span class="navbar-label">Monitoring</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

$scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) {
return `#/endpoint_details/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`;
return `#/monitoring/endpoint/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`;
};

$scope.showInstancesBreakdownTab = function(isVisible) {
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function routeProvider($routeProvider) {
let template = require('./../views/endpoint_details.html');

$routeProvider.when('/endpoint_details/:endpointName/:sourceIndex', {
$routeProvider.when('/monitoring/endpoint/:endpointName/:sourceIndex', {
data: {
pageTitle: 'Endpoint Details'
},
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
};

$scope.getDetailsUrl = endpoint => {
return '#/endpoint_details/' + endpoint.name + '/' + (endpoint.sourceIndex | 0) + '?historyPeriod=' + $scope.selectedPeriod.value;
return '#/monitoring/endpoint/' + endpoint.name + '/' + (endpoint.sourceIndex | 0) + '?historyPeriod=' + $scope.selectedPeriod.value;
};

function fillDisplayValuesForEndpoint(endpoint) {
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function routeProvider($routeProvider) {
let template = require('./../views/monitored_endpoints.html');

$routeProvider.when('/monitored_endpoints', {
$routeProvider.when('/monitoring', {
data: {
pageTitle: 'Monitored Endpoints'
},
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -5,7 +5,7 @@
<div class="row monitoring-head" ng-if="!loading">
<div class="back-nav">
<span class="fake-link" aria-hidden="true">&#9664;</span>
<a href="/#/monitored_endpoints">All endpoints</a>
<a href="/#/monitoring">All endpoints</a>
</div>
<div class="col-xs-9 no-side-padding list-section ">
<h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -6,7 +6,7 @@ <h1>Endpoints overview</h1>
<div class="col-xs-3 no-side-padding toolbar-menus">
<ul class="nav nav-pills period-selector">
<li role="presentation" ng-repeat="period in periods" ng-class="(period.value == selectedPeriod.value ? 'active' : 'notselected')">
<a ng-click="selectPeriod(period)" href="#/monitored_endpoints?historyPeriod={{period.value}}">{{period.text}}</a>
<a ng-click="selectPeriod(period)" href="#/monitoring?historyPeriod={{period.value}}">{{period.text}}</a>
</li>
</ul>
</div>
Expand Down