This commit is contained in:
Frédéric Vachon 2015-04-01 15:35:32 -04:00
parent 12b95ad253
commit 032af96cff
6 changed files with 13 additions and 11 deletions

View File

@ -3,10 +3,10 @@
angular.module('adagios.host.info', []) angular.module('adagios.host.info', [])
.controller('HostInfoCtrl', ['$scope', function ($scope) { .controller('HostInfoCtrl', ['$scope', function ($scope) {
$scope.active_checks = ($scope.data.live.active_checks_enabled === '1') ? 'Enabled': 'Disabled'; $scope.active_checks = ($scope.data.live.active_checks_enabled === '1') ? 'Enabled' : 'Disabled';
$scope.notifications_enabled = ($scope.data.config.notifications_enabled === '1') ? 'Enabled': 'Disabled'; $scope.notifications_enabled = ($scope.data.config.notifications_enabled === '1') ? 'Enabled' : 'Disabled';
$scope.event_handler_enabled = ($scope.data.config.event_handler_enabled === '1') ? 'Enabled': 'Disabled'; $scope.event_handler_enabled = ($scope.data.config.event_handler_enabled === '1') ? 'Enabled' : 'Disabled';
$scope.flap_detection_enabled = ($scope.data.config.flap_detection_enabled === '1') ? 'Enabled': 'Disabled'; $scope.flap_detection_enabled = ($scope.data.config.flap_detection_enabled === '1') ? 'Enabled' : 'Disabled';
}]) }])
.directive('adgHostInfo', function () { .directive('adgHostInfo', function () {

View File

@ -9,8 +9,7 @@ angular.module('adagios.service', ['adagios.live',
.controller('ServiceCtrl', ['$scope', 'serviceConfig', 'getService', .controller('ServiceCtrl', ['$scope', 'serviceConfig', 'getService',
function ($scope, serviceConfig, getService) { function ($scope, serviceConfig, getService) {
var objectType = 'service', var hostName = serviceConfig.hostName,
hostName = serviceConfig.hostName,
description = serviceConfig.description; description = serviceConfig.description;
getService(hostName, description).success(function (data) { getService(hostName, description).success(function (data) {

View File

@ -3,7 +3,7 @@
angular.module('adagios.service.info', []) angular.module('adagios.service.info', [])
.controller('ServiceInfoCtrl', ['$scope', function ($scope) { .controller('ServiceInfoCtrl', ['$scope', function ($scope) {
$scope.acknowledged = $scope.data[0].acknowledged === "1" ? "Yes": "No"; $scope.acknowledged = $scope.data[0].acknowledged === "1" ? "Yes" : "No";
}]) }])
.directive('adgServiceInfo', function () { .directive('adgServiceInfo', function () {

View File

@ -3,6 +3,7 @@
angular.module('adagios.service.metrics', []) angular.module('adagios.service.metrics', [])
.controller('ServiceMetricsCtrl', ['$scope', function ($scope) { .controller('ServiceMetricsCtrl', ['$scope', function ($scope) {
angular.noop();
}]) }])
.directive('adgServiceMetrics', function () { .directive('adgServiceMetrics', function () {

View File

@ -18,7 +18,9 @@ angular.module('adagios.tactical', ['adagios.live',
.controller('TacticalCtrl', ['$scope', '$interval', 'tacticalConfig', 'getHostProblems', 'getServiceProblems', .controller('TacticalCtrl', ['$scope', '$interval', 'tacticalConfig', 'getHostProblems', 'getServiceProblems',
'getTotalHosts', 'getTotalServices', 'addAjaxPromise', 'getTotalHosts', 'getTotalServices', 'addAjaxPromise',
function ($scope, $interval, tacticalConfig, getHostProblems, getServiceProblems, getTotalHosts, getTotalServices, addAjaxPromise) { function ($scope, $interval, tacticalConfig, getHostProblems, getServiceProblems, getTotalHosts,
getTotalServices, addAjaxPromise) {
var getData; var getData;
$scope.statusOverview = tacticalConfig.statusOverview; $scope.statusOverview = tacticalConfig.statusOverview;
@ -32,7 +34,7 @@ angular.module('adagios.tactical', ['adagios.live',
$scope.serviceProblems = 0; $scope.serviceProblems = 0;
$scope.totalServices = 0; $scope.totalServices = 0;
getData= function () { getData = function () {
getHostProblems().success(function (data) { getHostProblems().success(function (data) {
$scope.hostProblems = data.length; $scope.hostProblems = data.length;
getTotalHosts().success(function (data) { getTotalHosts().success(function (data) {
@ -48,7 +50,7 @@ angular.module('adagios.tactical', ['adagios.live',
$scope.servicesRatio = ($scope.totalServices - $scope.serviceProblems) / $scope.totalServices * 100; $scope.servicesRatio = ($scope.totalServices - $scope.serviceProblems) / $scope.totalServices * 100;
}); });
}); });
} };
if (tacticalConfig.refreshInterval !== 0) { if (tacticalConfig.refreshInterval !== 0) {
addAjaxPromise( addAjaxPromise(

View File

@ -3,7 +3,7 @@
angular.module("adagios.view.service", [ "adagios.live" ]) angular.module("adagios.view.service", [ "adagios.live" ])
.controller("ServiceViewCtrl", [ "$scope", "$routeParams", .controller("ServiceViewCtrl", [ "$scope", "$routeParams",
function($scope, $routeParams) { function ($scope, $routeParams) {
if (!$routeParams.host_name || !$routeParams.description) { if (!$routeParams.host_name || !$routeParams.description) {
throw new Error("ERROR :'host_name' and 'description' GET parameters must be set"); throw new Error("ERROR :'host_name' and 'description' GET parameters must be set");