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

Fix setting alerting state when panel is in fullscreen mode.

Browse Source
This commit is contained in:
Alexander Zobnin
2017-03-08 16:05:40 +03:00
parent 56782494fd
commit c43bd8bf33
4 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/datasource-zabbix/zabbixAlerting.service.js vendored
View File

@@ -48,16 +48,28 @@ System.register(['lodash', 'jquery', 'angular'], function (_export, _context) {
} }
_createClass(ZabbixAlertingService, [{ _createClass(ZabbixAlertingService, [{
key: 'isFullScreen',
value: function isFullScreen() {
return this.dashboardSrv.dash.meta.fullscreen;
}
}, {
key: 'setPanelAlertState', key: 'setPanelAlertState',
value: function setPanelAlertState(panelId, alertState) { value: function setPanelAlertState(panelId, alertState) {
var panelIndex = void 0;
var panelContainers = _.filter($('.panel-container'), function (elem) { var panelContainers = _.filter($('.panel-container'), function (elem) {
return elem.clientHeight && elem.clientWidth; return elem.clientHeight && elem.clientWidth;
}); });
var panelModels = this.getPanelModels(); var panelModels = this.getPanelModels();
var panelIndex = _.findIndex(panelModels, function (panel) {
if (this.isFullScreen()) {
panelIndex = 0;
} else {
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"; var alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";

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

File diff suppressed because one or more lines are too long

14
dist/test/datasource-zabbix/zabbixAlerting.service.js vendored
View File

@@ -28,16 +28,28 @@ var ZabbixAlertingService = function () {
} }
_createClass(ZabbixAlertingService, [{ _createClass(ZabbixAlertingService, [{
key: 'isFullScreen',
value: function isFullScreen() {
return this.dashboardSrv.dash.meta.fullscreen;
}
}, {
key: 'setPanelAlertState', key: 'setPanelAlertState',
value: function setPanelAlertState(panelId, alertState) { value: function setPanelAlertState(panelId, alertState) {
var panelIndex = void 0;
var panelContainers = _lodash2.default.filter((0, _jquery2.default)('.panel-container'), function (elem) { var panelContainers = _lodash2.default.filter((0, _jquery2.default)('.panel-container'), function (elem) {
return elem.clientHeight && elem.clientWidth; return elem.clientHeight && elem.clientWidth;
}); });
var panelModels = this.getPanelModels(); var panelModels = this.getPanelModels();
var panelIndex = _lodash2.default.findIndex(panelModels, function (panel) {
if (this.isFullScreen()) {
panelIndex = 0;
} else {
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"; var alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";

13
src/datasource-zabbix/zabbixAlerting.service.js
View File

@@ -9,15 +9,26 @@ class ZabbixAlertingService {
this.dashboardSrv = dashboardSrv; this.dashboardSrv = dashboardSrv;
} }
isFullScreen() {
return this.dashboardSrv.dash.meta.fullscreen;
}
setPanelAlertState(panelId, alertState) { setPanelAlertState(panelId, alertState) {
let panelIndex;
let panelContainers = _.filter($('.panel-container'), elem => { let panelContainers = _.filter($('.panel-container'), elem => {
return elem.clientHeight && elem.clientWidth; return elem.clientHeight && elem.clientWidth;
}); });
let panelModels = this.getPanelModels(); let panelModels = this.getPanelModels();
let panelIndex = _.findIndex(panelModels, panel => {
if (this.isFullScreen()) {
panelIndex = 0;
} else {
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"; let alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";