Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix panel alert state changing to OK.

Browse Source
This commit is contained in:
Alexander Zobnin
2017-03-06 09:16:52 +03:00
parent ca63fbe5a3
commit 2f385faa1b
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dist/datasource-zabbix/datasource.js vendored
View File

@@ -620,24 +620,25 @@ System.register(['lodash', 'jquery', 'app/core/utils/datemath', './utils', './mi
return row.panels; return row.panels;
} }
})); }));
var panelIndex = _.findIndex(panelModels, function (panel) { var panelIndex = _.findIndex(panelModels, function (panel) {
return panel.id === panelId; return panel.id === panelId;
}); });
if (panelIndex >= 0) { if (panelIndex >= 0) {
var alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
$(panelContainers[panelIndex]).removeClass(alertClass);
if (alertState) { if (alertState) {
if (alertState === 'alerting') { if (alertState === 'alerting') {
var alertClass = "panel-has-alert panel-alert-state--" + alertState; alertClass = "panel-has-alert panel-alert-state--" + alertState;
$(panelContainers[panelIndex]).addClass(alertClass); $(panelContainers[panelIndex]).addClass(alertClass);
} }
if (alertState === 'ok') { if (alertState === 'ok') {
var _alertClass = "panel-alert-state--" + alertState; alertClass = "panel-alert-state--" + alertState;
$(panelContainers[panelIndex]).addClass(_alertClass); $(panelContainers[panelIndex]).addClass(alertClass);
$(panelContainers[panelIndex]).removeClass("panel-has-alert"); $(panelContainers[panelIndex]).removeClass("panel-has-alert");
} }
} else {
var _alertClass2 = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
$(panelContainers[panelIndex]).removeClass(_alertClass2);
} }
} }
} }

2
dist/datasource-zabbix/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

13
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -514,24 +514,25 @@ var ZabbixAPIDatasource = function () {
return row.panels; return row.panels;
} }
})); }));
var panelIndex = _lodash2.default.findIndex(panelModels, function (panel) { var panelIndex = _lodash2.default.findIndex(panelModels, function (panel) {
return panel.id === panelId; return panel.id === panelId;
}); });
if (panelIndex >= 0) { if (panelIndex >= 0) {
var alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
(0, _jquery2.default)(panelContainers[panelIndex]).removeClass(alertClass);
if (alertState) { if (alertState) {
if (alertState === 'alerting') { if (alertState === 'alerting') {
var alertClass = "panel-has-alert panel-alert-state--" + alertState; alertClass = "panel-has-alert panel-alert-state--" + alertState;
(0, _jquery2.default)(panelContainers[panelIndex]).addClass(alertClass); (0, _jquery2.default)(panelContainers[panelIndex]).addClass(alertClass);
} }
if (alertState === 'ok') { if (alertState === 'ok') {
var _alertClass = "panel-alert-state--" + alertState; alertClass = "panel-alert-state--" + alertState;
(0, _jquery2.default)(panelContainers[panelIndex]).addClass(_alertClass); (0, _jquery2.default)(panelContainers[panelIndex]).addClass(alertClass);
(0, _jquery2.default)(panelContainers[panelIndex]).removeClass("panel-has-alert"); (0, _jquery2.default)(panelContainers[panelIndex]).removeClass("panel-has-alert");
} }
} else {
var _alertClass2 = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
(0, _jquery2.default)(panelContainers[panelIndex]).removeClass(_alertClass2);
} }
} }
} }

11
src/datasource-zabbix/datasource.js
View File

@@ -448,24 +448,25 @@ class ZabbixAPIDatasource {
return row.panels; return row.panels;
} }
})); }));
let panelIndex = _.findIndex(panelModels, panel => { let panelIndex = _.findIndex(panelModels, panel => {
return panel.id === panelId; return panel.id === panelId;
}); });
if (panelIndex >= 0) { if (panelIndex >= 0) {
let alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
$(panelContainers[panelIndex]).removeClass(alertClass);
if (alertState) { if (alertState) {
if (alertState === 'alerting') { if (alertState === 'alerting') {
let alertClass = "panel-has-alert panel-alert-state--" + alertState; alertClass = "panel-has-alert panel-alert-state--" + alertState;
$(panelContainers[panelIndex]).addClass(alertClass); $(panelContainers[panelIndex]).addClass(alertClass);
} }
if (alertState === 'ok') { if (alertState === 'ok') {
let alertClass = "panel-alert-state--" + alertState; alertClass = "panel-alert-state--" + alertState;
$(panelContainers[panelIndex]).addClass(alertClass); $(panelContainers[panelIndex]).addClass(alertClass);
$(panelContainers[panelIndex]).removeClass("panel-has-alert"); $(panelContainers[panelIndex]).removeClass("panel-has-alert");
} }
} else {
let alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
$(panelContainers[panelIndex]).removeClass(alertClass);
} }
} }
} }