Skip to content
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.

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

Healthcheck notifications #1031

Merged
merged 24 commits into from
May 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions src/ServicePulse.Host/app/css/particular.css
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,11 @@ p.endpoint-metadata {
padding-top: 0;
}

.endpoint-metadata button i {
color: #00a3c4;
margin-right: 4px;
}


.fa-stack-2x {
font-size: 24px;
Expand Down Expand Up @@ -1252,6 +1257,10 @@ input#immediatelyRetry {
visibility: visible;
}

input#enableTLS {
visibility: visible;
}

.checkbox {
margin-top: 1px;
margin-left: 1px;
Expand Down Expand Up @@ -2755,6 +2764,7 @@ span.connection-test {
left: 10px;
text-transform: uppercase;
font-weight: bold;
color: black;
}

span.failed-validation {
Expand Down Expand Up @@ -3228,3 +3238,16 @@ button[ng-click="vm.toggleSort()"] div {
font-weight: bold;
margin: 20px 0 10px 15px;
}

.notifications .btn-sm {
padding: 0px;
}

.notifications .connection-test
{
top: 2px;
}

.screen-intro {
margin: 30px 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

require('./connections/connections.module');

require('./notifications/notifications.module');

angular.module('configuration', [
'ui.bootstrap',
'configuration.route',
Expand All @@ -23,6 +25,7 @@
'configuration.redirect',
'configuration.license',
'configuration.connections',
'configuration.notifications'
]);

} (window, window.angular));
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
<div class="row">
<div class="col-sm-12">
<div class="tabs">
<h5
ng-class="{ active: isActive('/configuration/license'), disabled: (!connectionsStatus.isSCConnected && !connectionsStatus.scConnectedAtLeastOnce) }">
<h5 ng-class="{ active: isActive('/configuration/license'), disabled: (!connectionsStatus.isSCConnected && !connectionsStatus.scConnectedAtLeastOnce) }">
<a href="#/configuration/license">License</a>
<exclamation type="{{licensewarning}}" />
</h5>
<h5 ng-class="{ active: isActive('/configuration/notifications'), disabled: (!connectionsStatus.isSCConnected && !connectionsStatus.scConnectedAtLeastOnce) }"
ng-show="!isExpired">
<a href="#/configuration/notifications">Health check Notifications</a>
</h5>
<h5 ng-class="{ active: isActive('/configuration/redirects'), disabled: (!connectionsStatus.isSCConnected && !connectionsStatus.scConnectedAtLeastOnce) }"
ng-show="!isExpired"><a href="#/configuration/redirects">Retry redirects
({{counters.redirects | number}})</a></h5>
<h5 ng-class="{ active: isActive('/configuration/connections') }" ng-show="!isExpired"><a
href="#/configuration/connections">Connections
<span ng-show="unableToConnectToServiceControl || unableToConnectToMonitoring"> <i
class="fa fa-exclamation-triangle"></i></span></a>
ng-show="!isExpired">
<a href="#/configuration/redirects">
Retry redirects
({{counters.redirects | number}})
</a>
</h5>
<h5 ng-class="{ active: isActive('/configuration/connections') }" ng-show="!isExpired">
<a href="#/configuration/connections">
Connections
<span ng-show="unableToConnectToServiceControl || unableToConnectToMonitoring">
<i class="fa fa-exclamation-triangle"></i>
</span>
</a>
</h5>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
(function (window, angular) {
'use strict';

function controller(
$scope,
$uibModalInstance,
notificationsService,
toastService
) {
function refreshData() {
notificationsService.getSettings().then((notifications) => {
$scope.settings = notifications;
});
}

$scope.save = (notificationsForm) => {
if (notificationsForm.$valid) {
notificationsService.updateSettings($scope.settings).then(
() => {
toastService.showInfo('Email settings updated.');
$uibModalInstance.dismiss('saved');
},
() => toastService.showError('Failed to update the email settings.'));
}
};

$scope.cancel = function() {
$uibModalInstance.dismiss('cancel');
};

refreshData();
}

controller.$inject = [
'$scope',
'$uibModalInstance',
'notificationsService',
'toastService',
'notifyService'
];

angular.module('configuration.notifications')
.controller('editEmailController', controller);

})(window, window.angular);
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
(function (window, angular) {
'use strict';

function controller(
$scope,
notificationsService,
notifyService,
toastService,
$uibModal) {

var vm = this;
var notifier = notifyService();

vm.notifications = {};

notifier.subscribe($scope, (event, response) => {
vm.notifications = response.notifications;
}, 'NotificationsConfigurationUpdated');

function refreshData() {
notificationsService.getSettings().then((notifications) => {
vm.notifications = notifications;
});
}

vm.toogleEmailNotifications = () => {
var emailNotificationsOn = !vm.notifications.enabled;

notificationsService.toogleEmailNotifications(emailNotificationsOn).then(
() => vm.notifications.enabled = emailNotificationsOn,
() => toastService.showError('Failed to update settings.')
);
};

vm.editEmailNotifications = () => {
const template = require('../../views/notificationsemailmodal.html');

$uibModal.open({
template: template,
controller: 'editEmailController',
resolve: {
data: () => {
return {};
}
}
});
};

vm.testEmailNotifications = () => {
vm.emailTestInProgress = true;
vm.emailTestSuccessful = false;
vm.emailTestFailure = false;

notificationsService.testEmailNotifications().then(
() => {
vm.emailTestInProgress = false;
vm.emailTestSuccessful = true;
},
(error) => {
toastService.showError(error.data);
vm.emailTestInProgress = false;
vm.emailTestFailure = true;
}
);
};

refreshData();
}

controller.$inject = [
'$scope',
'notificationsService',
'notifyService',
'toastService',
'$uibModal'
];

angular.module('configuration.notifications')
.controller('notificationsController', controller);

})(window, window.angular);
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(function (window, angular) {
'use strict';

angular.module('configuration.notifications', []);

require('./notifications.route');
require('./notifications.controller');
require('./notifications.service');
require('./emailnotifications.controller');

}(window, window.angular));
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(function (window, angular) {
'use strict';

function routeProvider($routeProvider) {
const template = require('../../views/notifications.html');

$routeProvider.when('/notifications', {
redirectTo: "/configuration/notifications"
}).when('/configuration/notifications', {
data: {
pageTitle: 'Health check Notifications - Configuration'
},
template: template,
controller: 'notificationsController',
controllerAs: 'vm'
});
}

routeProvider.$inject = [
'$routeProvider'
];

angular.module('configuration.notifications', [])
.config(routeProvider);

}(window, window.angular));
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
(function (window, angular) {
'use strict';

function service($http, $timeout, $q, $rootScope, $interval, moment, connectionsManager, uri, notifications, notifyService) {
var notifier = notifyService();
var scu = connectionsManager.getServiceControlUrl();

var notifications = {};

function getData() {
var url = uri.join(scu, 'notifications/email');
return $http.get(url).then(function (response) {
notifications = response.data;

notifier.notify('NotificationsConfigurationUpdated', { notifications });
});
}

function sendPromise(url, method, data, success, error) {

var defer = $q.defer();

success = success || 'success';
error = error || 'error';

$http({
url: url,
data: data,
method: method
})
.then(function(response) {
defer.resolve({ message: success, status: response.status });
}, function(response) {
defer.reject({ message: error + ':' + response.statusText, status: response.status, statusText: response.statusText, data: response.data });
}
);

return defer.promise;
}

getData();

return {
updateSettings: function(settings, success, error) {
var url = uri.join(scu, 'notifications/email');
var promise = sendPromise(url, 'POST', settings,
() => {notifications = settings},
error);

return promise;
},
testEmailNotifications: function(success, error) {
var url = uri.join(scu, 'notifications/email/test');
var promise = sendPromise(url, 'POST', {}, success, error);

return promise;
},
toogleEmailNotifications: function(enabled, success, error) {
var url = uri.join(scu, 'notifications/email/toggle');

var promise = sendPromise(url, 'POST', {'enabled': enabled}, success, error);

return promise;
},
getSettings: function() {
return $q.when(notifications);
}
};
}

service.$inject = ['$http', '$timeout', '$q', '$rootScope', '$interval', 'moment', 'connectionsManager', 'uri', 'notifications', 'notifyService'];

angular.module('configuration.notifications')
.service('notificationsService', service);

})(window, window.angular);
Loading