Services
@@ -9,7 +9,7 @@
-
+
| {{service.service_service_description}}
| {{service.service_acknowledged ? "Yes" : "No"}} |
diff --git a/app/components/custom_directive/tile/host_services_list/host_services_list.js b/app/components/custom_directive/tile/host_services_list/host_services_list.js
new file mode 100644
index 0000000..d661fd7
--- /dev/null
+++ b/app/components/custom_directive/tile/host_services_list/host_services_list.js
@@ -0,0 +1,21 @@
+'use strict';
+
+angular.module('bansho.tile')
+ .directive('banshoTileHostServicesList', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'components/custom_directive/tile/host_services_list/host_services_list.html',
+ controller: ['$scope', 'sharedData', 'templateManager', 'iframeUrl', function ($scope, sharedData, templateManager, iframeUrl) {
+ sharedData.getDataFromInputSource('statusServices', false,
+ templateManager.getAllPageParams(), false, function (services) {
+ $scope.services = [];
+ angular.forEach(services, function (service) {
+ if (service.service_service_description !== 'load' &&
+ service.service_service_description !== 'cpu') {
+ $scope.services.push(service);
+ }
+ });
+ });
+ }]
+ };
+ });
diff --git a/app/components/custom_directive/tile/info/info.html b/app/components/custom_directive/tile/info/info.html
new file mode 100644
index 0000000..0646b04
--- /dev/null
+++ b/app/components/custom_directive/tile/info/info.html
@@ -0,0 +1,11 @@
+
+ {{title}}
+
+
+
+ | {{key}} |
+ {{value}} |
+
+
+
+ |
| Last check |
- {{param.service.service_last_check|timeElapsed}} |
+ {{service[0].service_last_check|timeElapsed}} |
| Last state change |
- {{param.service.service_last_state_change|timeElapsed}} |
+ {{service[0].service_last_state_change|timeElapsed}} |
| Acknowledged |
- {{param.service.service_acknowledged ? "Yes" : "No"}} |
+ {{service[0].service_acknowledged ? "Yes" : "No"}} |
diff --git a/app/components/custom_directive/tile/service_info/service_info.js b/app/components/custom_directive/tile/service_info/service_info.js
new file mode 100644
index 0000000..09d9f57
--- /dev/null
+++ b/app/components/custom_directive/tile/service_info/service_info.js
@@ -0,0 +1,15 @@
+'use strict';
+
+angular.module('bansho.tile')
+ .directive('banshoTileServiceInfo', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'components/custom_directive/tile/service_info/service_info.html',
+ controller: ['$scope', 'sharedData', 'templateManager', function ($scope, sharedData, templateManager, iframeUrl) {
+ sharedData.getDataFromInputSource('statusServices', false,
+ templateManager.getAllPageParams(), false, function (service) {
+ $scope.service = service;
+ });
+ }]
+ };
+ });
diff --git a/app/components/custom_directive/container/service_live/service_live.html b/app/components/custom_directive/tile/service_live/service_live.html
similarity index 54%
rename from app/components/custom_directive/container/service_live/service_live.html
rename to app/components/custom_directive/tile/service_live/service_live.html
index 990a7b2..dc6e0d6 100644
--- a/app/components/custom_directive/container/service_live/service_live.html
+++ b/app/components/custom_directive/tile/service_live/service_live.html
@@ -4,13 +4,13 @@
| State |
-
- {{param.service.service_state}}
+ |
+ {{service[0].service_state}}
|
| Output |
- {{param.service.service_plugin_output}} |
+ {{service[0].service_plugin_output}} |
diff --git a/app/components/custom_directive/tile/service_live/service_live.js b/app/components/custom_directive/tile/service_live/service_live.js
new file mode 100644
index 0000000..a56b8a2
--- /dev/null
+++ b/app/components/custom_directive/tile/service_live/service_live.js
@@ -0,0 +1,15 @@
+'use strict';
+
+angular.module('bansho.tile')
+ .directive('banshoTileServiceLive', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'components/custom_directive/tile/service_live/service_live.html',
+ controller: ['$scope', 'sharedData', 'templateManager', function ($scope, sharedData, templateManager, iframeUrl) {
+ sharedData.getDataFromInputSource('statusServices', false,
+ templateManager.getAllPageParams(), false, function (service) {
+ $scope.service = service;
+ });
+ }]
+ };
+ });
diff --git a/app/components/custom_directive/container/service_main/service_main.html b/app/components/custom_directive/tile/service_main/service_main.html
similarity index 57%
rename from app/components/custom_directive/container/service_main/service_main.html
rename to app/components/custom_directive/tile/service_main/service_main.html
index a8ccc74..77922b9 100644
--- a/app/components/custom_directive/container/service_main/service_main.html
+++ b/app/components/custom_directive/tile/service_main/service_main.html
@@ -1,7 +1,7 @@
diff --git a/app/components/custom_directive/tile/service_main/service_main.js b/app/components/custom_directive/tile/service_main/service_main.js
new file mode 100644
index 0000000..ac463a9
--- /dev/null
+++ b/app/components/custom_directive/tile/service_main/service_main.js
@@ -0,0 +1,15 @@
+'use strict';
+
+angular.module('bansho.tile')
+ .directive('banshoTileServiceMain', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'components/custom_directive/tile/service_main/service_main.html',
+ controller: ['$scope', 'sharedData', 'templateManager', function ($scope, sharedData, templateManager, iframeUrl) {
+ sharedData.getDataFromInputSource('statusServices', false,
+ templateManager.getAllPageParams(), false, function (service) {
+ $scope.service = service;
+ });
+ }]
+ };
+ });
diff --git a/app/components/custom_directive/tile/service_metrics/service_metrics.html b/app/components/custom_directive/tile/service_metrics/service_metrics.html
new file mode 100644
index 0000000..8b81940
--- /dev/null
+++ b/app/components/custom_directive/tile/service_metrics/service_metrics.html
@@ -0,0 +1,4 @@
+
+
Graph - {{metric.title}}
+
+
diff --git a/app/components/custom_directive/tile/service_metrics/service_metrics.js b/app/components/custom_directive/tile/service_metrics/service_metrics.js
new file mode 100644
index 0000000..b9ecb31
--- /dev/null
+++ b/app/components/custom_directive/tile/service_metrics/service_metrics.js
@@ -0,0 +1,29 @@
+'use strict';
+
+angular.module('bansho.tile')
+ .directive('banshoTileServiceMetrics', function () {
+ return {
+ restrict: 'E',
+ templateUrl: 'components/custom_directive/tile/service_metrics/service_metrics.html',
+ controller: ['$scope', 'templateManager', 'surveilStatus', 'iframeUrl',
+ function ($scope, templateManager, surveilStatus, iframeUrl) {
+ var hostname = templateManager.getPageParam('host_name'),
+ serviceDescription = templateManager.getPageParam('service_description');
+
+ $scope.metrics = [];
+ surveilStatus.getServiceMetricNames(hostname, serviceDescription).then(function (metricNames) {
+ angular.forEach(metricNames, function (metricName) {
+ $scope.metrics.push({
+ title: metricName,
+ iframeUrl: iframeUrl.getIFrameUrl("metric_" + metricName, hostname, serviceDescription)
+ });
+
+ surveilStatus.getServiceMetric(hostname, serviceDescription, metricName).then(function (data) {
+ // TODO: waiting for ORBER BY DESC support in InfluxDB
+ });
+ });
+ });
+
+ }]
+ };
+ });
diff --git a/app/components/custom_directive/tile/tile.js b/app/components/custom_directive/tile/tile.js
new file mode 100644
index 0000000..3ab82df
--- /dev/null
+++ b/app/components/custom_directive/tile/tile.js
@@ -0,0 +1 @@
+angular.module('bansho.tile', []);
diff --git a/app/components/custom_directive/title/title.js b/app/components/custom_directive/title/title.js
index 7587a4b..3c00789 100644
--- a/app/components/custom_directive/title/title.js
+++ b/app/components/custom_directive/title/title.js
@@ -11,7 +11,8 @@ angular.module('bansho.title', [])
link: function (scope) {
if (scope.options.attributes.item) {
scope.item = scope.options.attributes.item;
- scope.data = sharedData.getData(scope.options.attributes.provider, function (data) {
+
+ scope.data = sharedData.getDataFromInputSource(scope.options.attributes.inputSource, true, null, false, function (data) {
scope.data = data;
});
diff --git a/app/components/datasource/datasource.js b/app/components/datasource/datasource.js
index fa6f20d..b71d9d1 100644
--- a/app/components/datasource/datasource.js
+++ b/app/components/datasource/datasource.js
@@ -35,7 +35,7 @@ angular.module('bansho.datasource', ['bansho.surveil'])
filter = componentsConfig.mergeFilters([config[datasourceId].queryFilter, filter]);
}
- promise = providerServices[inputSource.provider].getData([], filter, inputSource.endpoint, conf.queryPaging);
+ promise = providerServices[inputSource.provider].getDataFromInputSource([], inputSource, null, {count: false}, conf.queryPaging);
promise.then(function (newData) {
data[datasourceId] = newData;
@@ -132,112 +132,59 @@ angular.module('bansho.datasource', ['bansho.surveil'])
};
}])
- .service('sharedData', ['templateManager', 'surveilStatus', 'componentsConfig',
- function (templateManager, surveilStatus, componentsConfig) {
- var providerServices = {
- status: surveilStatus
+ .service('sharedData', ['templateManager', 'surveilStatus', 'surveilConfig', 'componentsConfig',
+ function (templateManager, surveilStatus, surveilConfig, componentsConfig) {
+ var providers = {
+ status: surveilStatus,
+ config: surveilConfig
},
- sharedData = {},
- listeners = {},
- providers = {
- 'nbServicesHostsProblems': function () {
- surveilStatus.getNbHostsProblems().then(function (nbHosts) {
- surveilStatus.getNbServicesProblems().then(function (nbServices) {
- sharedData.nbServicesHostsProblems = nbHosts + nbServices;
- notifyListeners('nbServicesHostsProblems');
- });
- });
- },
- 'nbHostsOpenProblems': function () {
- surveilStatus.getNbHostOpenProblems().then(function (nbHostProblems) {
- sharedData.nbHostsOpenProblems = nbHostProblems;
- notifyListeners('nbHostsOpenProblems');
- });
- },
- 'nbServicesOpenProblems': function () {
- surveilStatus.getNbServiceOpenProblems().then(function (nbServiceProblems) {
- sharedData.nbServicesOpenProblems = nbServiceProblems;
- notifyListeners('nbServicesOpenProblems');
- });
- },
- 'nbHosts': function () {
- surveilStatus.getNbHosts().then(function (nbHosts) {
- sharedData.nbHosts = nbHosts;
- notifyListeners('nbHosts');
- });
-
- },
- 'nbServices': function () {
- surveilStatus.getNbServices().then(function (nbServices) {
- sharedData.nbServices = nbServices;
- notifyListeners('nbServices');
- });
- },
- 'nbServicesOpenProblemsOnly': function () {
- surveilStatus.getNbServiceOpenProblemsOnly().then(function (nbServices) {
- sharedData.nbServicesOpenProblemsOnly = nbServices;
- notifyListeners('nbServicesOpenProblemsOnly');
- });
- },
- 'nbServicesHostsOpenProblems': function () {
- surveilStatus.getNbHostsProblems().then(function (nbHosts) {
- surveilStatus.getNbServiceOpenProblemsOnly().then(function (nbServices) {
- sharedData.nbServicesHostsOpenProblems = nbHosts + nbServices;
- notifyListeners('nbServicesHostsOpenProblems');
- });
- });
- },
- 'nbServicesHostsOpenProblemsDoubleCount': function () {
- surveilStatus.getNbHostsProblems().then(function (nbHosts) {
- surveilStatus.getNbServiceOpenProblems().then(function (nbServices) {
- sharedData.nbServicesHostsOpenProblemsDoubleCount = nbHosts + nbServices;
- notifyListeners('nbServicesHostsOpenProblemsDoubleCount');
- });
- });
- }
- };
+ data = {};
var notifyListeners = function (key) {
- angular.forEach(listeners[key], function (onChange) {
- onChange(sharedData[key]);
+ angular.forEach(data[key].onChange, function (onChange) {
+ onChange(data[key].value);
});
};
return {
- getData: function (key, onChange) {
- if (listeners[key] === undefined) {
- listeners[key] = [onChange];
- templateManager.addInterval(providers[key]);
- providers[key]();
- } else {
- listeners[key].push(onChange);
- }
-
- return sharedData[key];
+ clear: function (isGlobalCleared) {
+ angular.forEach(data, function (datasource, key) {
+ if (!isGlobalCleared && !datasource.isGlobal || isGlobalCleared) {
+ delete data[key];
+ }
+ });
},
- getDataFromInputSource: function (source, onChange) {
- if (listeners[source] === undefined) {
- listeners[source] = [onChange];
+ getDataFromInputSource: function (source, isCount, keys, isGlobal, onChange) {
+ var listenerKey = source + isCount + JSON.stringify(keys);
+ if (data[listenerKey] === undefined) {
+ data[listenerKey] = {
+ onChange: [onChange],
+ isGlobal: isGlobal,
+ value: null
+ };
var inputSource = componentsConfig.getInputSource(source);
- providers[source] = function () {
- providerServices[inputSource.provider].getData([], componentsConfig.getFilter(inputSource.filter).filter, inputSource.endpoint)
+ var update = function () {
+ providers[inputSource.provider].getDataFromInputSource([], inputSource, keys, {count: isCount})
.then(function (newData) {
- sharedData[source] = newData;
- notifyListeners(source);
+ data[listenerKey].value = newData;
+ notifyListeners(listenerKey);
}, function (error) {
throw new Error('getTableData : Query failed' + error);
});
};
-
- templateManager.addInterval(providers[source]);
- providers[source]();
+ update();
+ templateManager.addInterval(isGlobal, update);
} else {
- listeners[source].push(onChange);
+ if (isGlobal) {
+ data[listenerKey].isGlobal = true;
+ }
+ data[listenerKey].onChange.push(onChange);
+ notifyListeners(listenerKey);
}
- return sharedData[source];
+ return data[listenerKey].value;
}
};
}]);
diff --git a/app/components/surveil/config.js b/app/components/surveil/config.js
index f069b6c..7055111 100644
--- a/app/components/surveil/config.js
+++ b/app/components/surveil/config.js
@@ -29,21 +29,21 @@ angular.module('bansho.surveil')
return promise.promise;
};
+ // All the valid endpoint with their
var validEndpoint = {
- "businessimpactmodulations": true,
- "checkmodulations": true,
- "commands": true,
- "contacts": true,
- "contactgroups": true,
- "hosts": true,
- "hostgroups": true,
- "macromodulations": true,
- "notificationways": true,
- "realms": true,
- "services": true,
- "servicegroups": true,
- "timeperiods": true
-
+ "businessimpactmodulations": "business_impact_modulation_name",
+ "checkmodulations": "checkmodulation_name",
+ "commands": "command_name",
+ "contacts": "contact_name",
+ "contactgroups": "contact_group_name",
+ "hosts": "host_name",
+ "hostgroups": "hostgroup_name",
+ "macromodulations": "macromodulations_name",
+ "notificationways": "notificationway_name",
+ "realms": "realm_name",
+ "services": "service_description",
+ "servicegroups": "servicegroup_name",
+ "timeperiods": "timeperiods_name"
};
var queryEndpoint = function (endpoint, fields, filters, paging, callback) {
@@ -65,113 +65,39 @@ angular.module('bansho.surveil')
return {
getData: getData,
- getBusinessImpactModulation: function (businessimpactmodulationName) {
- var promise = $q.defer(), query = {"businessimpactmodulations": {"is": {"business_impact_modulation_name": [ businessimpactmodulationName ] } } };
- getData([], query, "businessimpactmodulations")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getCheckModulation: function (checkmodulationName) {
- var promise = $q.defer(), query = {"checkmodulations": {"is": {"checkmodulation_name": [ checkmodulationName ] } } };
- getData([], query, "checkmodulations")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getCommand: function (commandName) {
- var promise = $q.defer(), query = {"commands": {"is": {"command_name": [ commandName ] } } };
- getData([], query, "commands")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getContactGroup: function (contactgroupName) {
- var promise = $q.defer(), query = {"contactgroups": {"is": {"contactgroup_name": [ contactgroupName ] } } };
- getData([], query, "contactgroups")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getContact: function (contactName) {
- var promise = $q.defer(), query = {"contacts": {"is": {"contact_name": [ contactName ] } } };
- getData([], query, "contacts")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getHost: function (hostName) {
- var promise = $q.defer(), query = {"hosts": {"is": {"host_name": [ hostName ] } } };
- getData([], query, "hosts")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getHostGroup: function (hostgroupName) {
- var promise = $q.defer(), query = {"hostgroups": {"is": {"hostgroup_name": [ hostgroupName ] } } };
- getData([], query, "hostgroups")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getMacroModulationName: function (macromodulationName) {
- var promise = $q.defer(), query = {"macromodulations": {"is": {"macromodulation_name": [ macromodulationName ] } } };
- getData([], query, "macromodulations")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getNotificationWay: function (notificationwayName) {
- var promise = $q.defer(), query = {"notificationways": {"is": {"notificationway_name": [notificationwayName] } } };
- getData([], query, "notificationways")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getRealm: function (realmName) {
- var promise = $q.defer(), query = {"realms": {"is": {"realm_name": [realmName] } } };
- getData([], query, "realms")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getServiceGroup: function (servicegroupName) {
- var promise = $q.defer(), query = {"servicegroups": {"is": {"servicegroup_name": [servicegroupName] } } };
- getData([], query, "servicegroups")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getService: function (hostname, serviceDescription) {
- var promise = $q.defer(), query = { "hosts": { "is": { "host_name": [hostname] } }, "services": {"is": {"host_name": [hostname] } } };
+ getDataFromInputSource: function (fields, inputSource, keys, operations, paging) {
+ // Todo merge filter function
+ var promise = $q.defer(),
+ filter = componentsConfig.getFilter(inputSource.filter).filter,
+ endpoint = inputSource.endpoint;
- if (serviceDescription) {
- query.services = { "is": { "service_description": [ serviceDescription ] } };
+ if (endpoint === "services" &&
+ keys && keys.host_name) {
+ filter = {
+ "hosts": {"is": {"host_name": [keys.host_name]}},
+ "services": {"is": {"host_name": [keys.host_name]}}
+ };
+
+ if (keys.service_description) {
+ filter.services.is.service_description = [keys.service_description];
+ }
+ } else if (keys && keys[validEndpoint[endpoint]]) {
+ var key = validEndpoint[endpoint],
+ value = keys[key];
+
+ filter = {};
+ filter[endpoint] = {"is": {}};
+ filter[endpoint].is[key] = [value];
}
- getData([], query, "services")
- .then(function (data) {
+ queryEndpoint(endpoint, fields, filter, paging, function (data) {
+ if (operations && operations.count) {
+ promise.resolve(data.length);
+ } else {
promise.resolve(data);
- });
- return promise.promise;
- },
- getTimePeriod: function (timeperiodName) {
- var promise = $q.defer(), query = {"timeperiods": {"is": {"timeperiod_name": [timeperiodName] } } };
- getData([], query, "timeperiods")
- .then(function (data) {
- promise.resolve(data);
- });
+ }
+ });
+
return promise.promise;
}
};
diff --git a/app/components/surveil/status.js b/app/components/surveil/status.js
index d7ae25d..d48a909 100644
--- a/app/components/surveil/status.js
+++ b/app/components/surveil/status.js
@@ -58,20 +58,6 @@ angular.module('bansho.surveil')
});
};
- var getData = function (fields, filters, endpoint, paging) {
- var promise = $q.defer();
-
- if (!queryEndpoint[endpoint]) {
- throw new Error('getData in surveilStatus : Invalid endpoint ' + endpoint);
- }
-
- queryEndpoint[endpoint](fields, filters, paging, function (data) {
- promise.resolve(data);
- });
-
- return promise.promise;
- };
-
var queryHostsServices = function (fields, filters, paging, callback) {
var hostQuery = surveilQuery(fields, filters.hosts, paging),
serviceQuery = surveilQuery(fields, filters.services, paging);
@@ -158,83 +144,50 @@ angular.module('bansho.surveil')
}
};
- return {
- getData: getData,
- getHost: function (hostname) {
- var promise = $q.defer(), query = {"hosts": {"is": {"host_name": [ hostname ] } } };
- getData([], query, "hosts")
- .then(function (data) {
- promise.resolve(data);
- });
- return promise.promise;
- },
- getNbHosts: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("all").filter, "hosts")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getNbHostOpenProblems: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allHostOpenProblems").filter, "hosts")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getNbHostsProblems: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allHostsProblems").filter, "hosts")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getService: function (hostname, serviceDescription) {
- var promise = $q.defer(), query = { "hosts": { "is": { "host_name": [hostname] } }, "services": {"is": {"host_name": [hostname] } } };
+ var validEndpoint = {
+ "events": "event_name",
+ "hosts": "host_name",
+ "services": "service_description"
+ };
- if (serviceDescription) {
- query.services = { "is": { "service_description": [ serviceDescription ] } };
+ return {
+ getDataFromInputSource: function (fields, inputSource, keys, operations, paging) {
+ // Todo merge filter function
+ var promise = $q.defer(),
+ filter = componentsConfig.getFilter(inputSource.filter).filter,
+ endpoint = inputSource.endpoint;
+
+ if (endpoint === "services" &&
+ keys && keys.host_name) {
+ filter = {
+ "hosts": {"is": {"host_name": [keys.host_name]}},
+ "services": {"is": {"host_name": [keys.host_name]}}
+ };
+
+ if (keys.service_description) {
+ filter.services.is.service_description = [keys.service_description];
+ }
+ } else if (keys && keys[validEndpoint[endpoint]]) {
+ var key = validEndpoint[endpoint],
+ value = keys[key];
+
+ filter = {};
+ filter[endpoint] = {"is": {}};
+ filter[endpoint].is[key] = [value];
}
- getData([], query, "services")
- .then(function (data) {
+ if (!queryEndpoint[endpoint]) {
+ throw new Error('getData in surveilStatus : Invalid endpoint ' + endpoint);
+ }
+
+ queryEndpoint[endpoint](fields, filter, paging, function (data) {
+ if (operations && operations.count) {
+ promise.resolve(data.length);
+ } else {
promise.resolve(data);
- });
- return promise.promise;
- },
- getNbServices: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allServices").filter, "services")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getNbServiceOpenProblems: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allServiceOpenProblems").filter, "services")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getNbServiceOpenProblemsOnly: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allServiceOpenProblemsOnly").filter, "services")
- .then(function (data) {
- promise.resolve(data.length);
- });
- return promise.promise;
- },
- getNbServicesProblems: function () {
- var promise = $q.defer();
- getData([], componentsConfig.getFilter("allServicesProblems").filter, "services")
- .then(function (data) {
- promise.resolve(data.length);
- });
+ }
+ });
+
return promise.promise;
},
getHostMetric: function (host, metric) {
diff --git a/app/components/topbar/topbar.html b/app/components/topbar/topbar.html
index 5cae0e9..ea3b96c 100644
--- a/app/components/topbar/topbar.html
+++ b/app/components/topbar/topbar.html
@@ -20,7 +20,7 @@
aria-expanded="true"
aria-controls="notificationsPanel">
Voir les notifications
-
+
diff --git a/app/components/topbar/topbar.js b/app/components/topbar/topbar.js
index a986b7a..f734ab6 100644
--- a/app/components/topbar/topbar.js
+++ b/app/components/topbar/topbar.js
@@ -21,8 +21,14 @@ angular.module('bansho.topbar', ['bansho.surveil'])
};
authService.registerOnLogin(function () {
- $scope.allProblems = sharedData.getData('nbServicesHostsOpenProblems', function (data) {
- $scope.allProblems = data;
+ $scope.nbHosts = sharedData.getDataFromInputSource('statusHostsOpenProblems', true, null, true, function (nbHosts) {
+ $scope.nbHosts = nbHosts;
+ $scope.allProblems = $scope.nbServices + $scope.nbHosts;
+ });
+
+ sharedData.getDataFromInputSource('statusServicesOpenProblems', true, null, true, function (nbServices) {
+ $scope.nbServices = nbServices;
+ $scope.allProblems = $scope.nbServices + $scope.nbHosts;
});
$scope.components = configManager.getConfigData('topbar').components;
diff --git a/app/index.html b/app/index.html
index 4f9e7bb..1f5ea5d 100644
--- a/app/index.html
+++ b/app/index.html
@@ -5,7 +5,7 @@
-
+
@@ -95,18 +95,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/templates/template.js b/app/templates/template.js
index 68f8fd7..bf1a1df 100644
--- a/app/templates/template.js
+++ b/app/templates/template.js
@@ -18,19 +18,24 @@ angular.module('bansho.view')
getLayoutComponents: function () {
return layout.components;
},
- addInterval: function (callback) {
+ addInterval: function (isGlobal, callback) {
if (refreshInterval !== NO_REFRESH) {
- intervals.push($interval(callback, refreshInterval * 1000));
+ intervals.push({isGlobal: isGlobal, interval: $interval(callback, refreshInterval * 1000)});
}
},
- clearIntervals: function () {
+ clearIntervals: function (isGlobalCleared) {
angular.forEach(intervals, function (i) {
- $interval.cancel(i);
+ if (!isGlobalCleared && !i.isGlobal || isGlobalCleared) {
+ $interval.cancel(i.interval);
+ }
});
},
setPageParam: function (key, value) {
pageParam[key] = value;
},
+ getAllPageParams: function () {
+ return pageParam;
+ },
getPageParam: function (key) {
if (pageParam[key] === undefined) {
throw new Error("ERROR :'" + key + "' GET parameter must be set in url");