From a7f57e41a2456f18d0c00375ea518b7a026fd087 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 11:52:31 +0300 Subject: [PATCH 1/7] Move styles to plugin-wide dir src/sass --- Gruntfile.js | 3 +- .../grafana-zabbix.dark.css} | 2 +- .../grafana-zabbix.dark.css.map} | 8 +- dist/css/grafana-zabbix.light.css | 96 +++++++++++++++++++ dist/css/grafana-zabbix.light.css.map | 11 +++ dist/module.js | 12 ++- dist/module.js.map | 2 +- dist/panel-triggers/module.js | 29 +++++- dist/panel-triggers/module.js.map | 2 +- dist/plugin.json | 5 - dist/test/module.js | 7 ++ dist/test/panel-triggers/module.js | 11 ++- src/module.js | 6 ++ src/panel-triggers/module.js | 7 +- src/plugin.json | 5 - src/sass/grafana-zabbix.dark.scss | 2 + src/sass/grafana-zabbix.light.scss | 2 + .../panel-triggers.scss} | 0 src/sass/variables.dark.scss | 0 src/sass/variables.light.scss | 0 20 files changed, 181 insertions(+), 29 deletions(-) rename dist/{panel-triggers/css/panel_triggers.css => css/grafana-zabbix.dark.css} (97%) rename dist/{panel-triggers/css/panel_triggers.css.map => css/grafana-zabbix.dark.css.map} (91%) create mode 100644 dist/css/grafana-zabbix.light.css create mode 100644 dist/css/grafana-zabbix.light.css.map create mode 100644 src/sass/grafana-zabbix.dark.scss create mode 100644 src/sass/grafana-zabbix.light.scss rename src/{panel-triggers/sass/panel_triggers.scss => sass/panel-triggers.scss} (100%) create mode 100644 src/sass/variables.dark.scss create mode 100644 src/sass/variables.light.scss diff --git a/Gruntfile.js b/Gruntfile.js index b9a0460..589a161 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -95,7 +95,8 @@ module.exports = function(grunt) { }, dist: { files: { - 'dist/panel-triggers/css/panel_triggers.css' : 'src/panel-triggers/sass/panel_triggers.scss', + 'dist/css/grafana-zabbix.light.css': 'src/sass/grafana-zabbix.light.scss', + 'dist/css/grafana-zabbix.dark.css': 'src/sass/grafana-zabbix.dark.scss' } } }, diff --git a/dist/panel-triggers/css/panel_triggers.css b/dist/css/grafana-zabbix.dark.css similarity index 97% rename from dist/panel-triggers/css/panel_triggers.css rename to dist/css/grafana-zabbix.dark.css index c705db7..7c55f5f 100644 --- a/dist/panel-triggers/css/panel_triggers.css +++ b/dist/css/grafana-zabbix.dark.css @@ -93,4 +93,4 @@ .ack-tooltip .ack-input-group button { margin-left: 1rem; } -/*# sourceMappingURL=panel_triggers.css.map */ \ No newline at end of file +/*# sourceMappingURL=grafana-zabbix.dark.css.map */ \ No newline at end of file diff --git a/dist/panel-triggers/css/panel_triggers.css.map b/dist/css/grafana-zabbix.dark.css.map similarity index 91% rename from dist/panel-triggers/css/panel_triggers.css.map rename to dist/css/grafana-zabbix.dark.css.map index b4ec92b..d5e44bc 100644 --- a/dist/panel-triggers/css/panel_triggers.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -1,9 +1,11 @@ { "version": 3, - "file": "panel_triggers.css", + "file": "grafana-zabbix.dark.css", "sources": [ - "../../../src/panel-triggers/sass/panel_triggers.scss" + "../../src/sass/grafana-zabbix.dark.scss", + "../../src/sass/variables.dark.scss", + "../../src/sass/panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css new file mode 100644 index 0000000..2101b06 --- /dev/null +++ b/dist/css/grafana-zabbix.light.css @@ -0,0 +1,96 @@ +.triggers-panel-wrapper .panel-content { + padding: 0; } + +.triggers-panel-wrapper .panel-title-container { + padding-bottom: 4px; } + +.triggers-panel-scroll { + overflow: auto; } + +.triggers-panel-container { + padding-top: 2.2em; + position: relative; } + +.triggers-panel-footer { + text-align: center; + font-size: 90%; + line-height: 2px; } + .triggers-panel-footer ul { + position: relative; + display: inline-block; + margin-left: 0; + margin-bottom: 0; } + .triggers-panel-footer ul > li { + display: inline; } + .triggers-panel-footer ul > li > a { + float: left; + padding: 4px 12px; + text-decoration: none; + border-left-width: 0; } + .triggers-panel-footer ul > li > a:hover { + background-color: #333; } + .triggers-panel-footer ul > li > a.active { + font-weight: bold; + color: #33B5E5; } + +.triggers-panel-table { + width: 100%; + border-collapse: collapse; } + .triggers-panel-table th { + padding: 0; } + .triggers-panel-table th:first-child .triggers-panel-table-header-inner { + padding-left: 15px; } + .triggers-panel-table td { + padding: 0.45em 0 0.45em 1.1em; + border-bottom: 2px solid #141414; + border-right: 2px solid #141414; } + .triggers-panel-table td:first-child { + padding-left: 15px; } + .triggers-panel-table td:last-child { + border-right: none; } + +.triggers-panel-header-bg { + background: #242222; + border-top: 2px solid #141414; + border-bottom: 2px solid #141414; + height: 2.0em; + position: absolute; + top: 0; + right: 0; + left: 0; } + +.triggers-panel-table-header-inner { + padding: 0.45em 0 0.45em 1.1em; + text-align: left; + color: #33B5E5; + position: absolute; + top: 0; } + +.triggers-panel-width-hack { + visibility: hidden; + height: 0px; + line-height: 0px; } + +.ack-tooltip .drop-content { + max-width: 70rem !important; + min-width: 30rem !important; } + +.ack-tooltip .ack-comments { + width: 60%; } + +.ack-tooltip .ack-add-button { + padding-top: 1rem; } + +.ack-tooltip table td, .ack-tooltip th { + padding-right: 1rem; } + +.ack-tooltip .ack-input-group { + padding-top: 1rem; } + .ack-tooltip .ack-input-group input { + border: 1px solid; + border-radius: 2px; + width: 50%; } + .ack-tooltip .ack-input-group button { + margin-left: 1rem; } + +/*# sourceMappingURL=grafana-zabbix.light.css.map */ \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map new file mode 100644 index 0000000..e8c4de3 --- /dev/null +++ b/dist/css/grafana-zabbix.light.css.map @@ -0,0 +1,11 @@ +{ + "version": 3, + "file": "grafana-zabbix.light.css", + "sources": [ + "../../src/sass/grafana-zabbix.light.scss", + "../../src/sass/variables.light.scss", + "../../src/sass/panel-triggers.scss" + ], + "mappings": "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", + "names": [] +} \ No newline at end of file diff --git a/dist/module.js b/dist/module.js index ac2080f..90880e5 100644 --- a/dist/module.js +++ b/dist/module.js @@ -1,14 +1,22 @@ 'use strict'; -System.register(['./components/config'], function (_export, _context) { +System.register(['./components/config', 'app/plugins/sdk'], function (_export, _context) { "use strict"; - var ZabbixAppConfigCtrl; + var ZabbixAppConfigCtrl, loadPluginCss; return { setters: [function (_componentsConfig) { ZabbixAppConfigCtrl = _componentsConfig.ZabbixAppConfigCtrl; + }, function (_appPluginsSdk) { + loadPluginCss = _appPluginsSdk.loadPluginCss; }], execute: function () { + + loadPluginCss({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' + }); + _export('ConfigCtrl', ZabbixAppConfigCtrl); } }; diff --git a/dist/module.js.map b/dist/module.js.map index aad765d..372f38f 100644 --- a/dist/module.js.map +++ b/dist/module.js.map @@ -1 +1 @@ -{"version":3,"sources":["../src/module.js"],"names":["ZabbixAppConfigCtrl"],"mappings":";;;;;;;;AAAQA,yB,qBAAAA,mB;;;4BAGNA,mB","file":"module.js","sourcesContent":["import {ZabbixAppConfigCtrl} from './components/config';\n\nexport {\n ZabbixAppConfigCtrl as ConfigCtrl\n};\n"]} \ No newline at end of file +{"version":3,"sources":["../src/module.js"],"names":["ZabbixAppConfigCtrl","loadPluginCss","dark","light"],"mappings":";;;;;;;;AAAQA,yB,qBAAAA,mB;;AACAC,mB,kBAAAA,a;;;;AAERA,oBAAc;AACZC,cAAM,gEADM;AAEZC,eAAO;AAFK,OAAd;;4BAMEH,mB","file":"module.js","sourcesContent":["import {ZabbixAppConfigCtrl} from './components/config';\nimport {loadPluginCss} from 'app/plugins/sdk';\n\nloadPluginCss({\n dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css',\n light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css'\n});\n\nexport {\n ZabbixAppConfigCtrl as ConfigCtrl\n};\n"]} \ No newline at end of file diff --git a/dist/panel-triggers/module.js b/dist/panel-triggers/module.js index 8ebc4b2..bf5d433 100644 --- a/dist/panel-triggers/module.js +++ b/dist/panel-triggers/module.js @@ -1,9 +1,9 @@ 'use strict'; -System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'app/plugins/sdk', './editor', './ack-tooltip.directive', './css/panel_triggers.css!'], function (_export, _context) { +System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource-zabbix/utils', './editor', './ack-tooltip.directive'], function (_export, _context) { "use strict"; - var _, $, moment, utils, PanelCtrl, triggerPanelEditor, _createClass, defaultSeverity, panelDefaults, triggerStatusMap, defaultTimeFormat, TriggerPanelCtrl; + var _, $, moment, loadPluginCss, utils, PanelCtrl, triggerPanelEditor, _createClass, defaultSeverity, panelDefaults, triggerStatusMap, defaultTimeFormat, TriggerPanelCtrl; function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { @@ -54,13 +54,14 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap $ = _jquery.default; }, function (_moment) { moment = _moment.default; + }, function (_appPluginsSdk) { + loadPluginCss = _appPluginsSdk.loadPluginCss; + PanelCtrl = _appPluginsSdk.PanelCtrl; }, function (_datasourceZabbixUtils) { utils = _datasourceZabbixUtils; - }, function (_appPluginsSdk) { - PanelCtrl = _appPluginsSdk.PanelCtrl; }, function (_editor) { triggerPanelEditor = _editor.triggerPanelEditor; - }, function (_ackTooltipDirective) {}, function (_cssPanel_triggersCss) {}], + }, function (_ackTooltipDirective) {}], execute: function () { _createClass = function () { function defineProperties(target, props) { @@ -80,6 +81,24 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap }; }(); + /** + * Grafana-Zabbix + * Zabbix plugin for Grafana. + * http://github.com/alexanderzobnin/grafana-zabbix + * + * Trigger panel. + * This feature sponsored by CORE IT + * http://www.coreit.fr + * + * Copyright 2015 Alexander Zobnin alexanderzobnin@gmail.com + * Licensed under the Apache License, Version 2.0 + */ + + loadPluginCss({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' + }); + defaultSeverity = [{ priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true }, { priority: 1, severity: 'Information', color: '#82B5D8', show: true }, { priority: 2, severity: 'Warning', color: '#E5AC0E', show: true }, { priority: 3, severity: 'Average', color: '#C15C17', show: true }, { priority: 4, severity: 'High', color: '#BF1B00', show: true }, { priority: 5, severity: 'Disaster', color: '#890F02', show: true }]; panelDefaults = { datasource: null, diff --git a/dist/panel-triggers/module.js.map b/dist/panel-triggers/module.js.map index 0905043..9c568ee 100644 --- a/dist/panel-triggers/module.js.map +++ b/dist/panel-triggers/module.js.map @@ -1 +1 @@ -{"version":3,"sources":["../../src/panel-triggers/module.js"],"names":["filterTriggers","triggers","triggerFilter","utils","isRegex","_","filter","trigger","buildRegex","test","description","$","moment","PanelCtrl","triggerPanelEditor","defaultSeverity","priority","severity","color","show","panelDefaults","datasource","group","host","application","hostField","statusField","severityField","lastChangeField","ageField","infoField","limit","showTriggers","hideHostsInMaintenance","sortTriggersBy","text","value","showEvents","triggerSeverity","okEventColor","ackEventColor","scroll","pageSize","fontSize","triggerStatusMap","defaultTimeFormat","TriggerPanelCtrl","$scope","$injector","$element","datasourceSrv","templateSrv","contextSrv","dashboardSrv","pageIndex","triggerList","currentTriggersPage","defaults","panel","cloneDeep","events","on","onInitEditMode","bind","onRefresh","addEditorTab","otherPanelInFullscreenMode","error","loading","refreshData","then","slice","getCurrentTriggersPage","render","getTriggers","getAcknowledges","get","zabbix","groupFilter","replaceTemplateVars","hostFilter","appFilter","triggersOptions","map","formatTrigger","eventids","lastEvent","eventid","each","event","find","acknowledges","timestamp","unix","ack","clock","customLastChangeFormat","time","format","lastChangeFormat","user","alias","name","surname","markAckEvents","length","sortBy","reverse","triggerObj","lastchangeUnix","Number","lastchange","age","fromNow","hosts","hostTechName","showComment","message","grafana_user","ack_message","zabbixAPI","acknowledgeEvent","startPos","endPos","Math","min","scope","elem","attrs","ctrl","data","pageCount","getTableHeight","panelHeight","height","switchPage","e","el","currentTarget","parseInt","$apply","renderPanel","appendPaginationControls","footerElem","empty","ceil","startPage","max","endPage","paginationList","i","activeClass","pageLinkElem","append","panelElem","parents","rootElem","css","addClass","unbindDestroy","$on","off","renderData","renderingCompleted","templateUrl"],"mappings":"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","file":"module.js","sourcesContent":["/**\n * Grafana-Zabbix\n * Zabbix plugin for Grafana.\n * http://github.com/alexanderzobnin/grafana-zabbix\n *\n * Trigger panel.\n * This feature sponsored by CORE IT\n * http://www.coreit.fr\n *\n * Copyright 2015 Alexander Zobnin alexanderzobnin@gmail.com\n * Licensed under the Apache License, Version 2.0\n */\n\nimport _ from 'lodash';\nimport $ from 'jquery';\nimport moment from 'moment';\nimport * as utils from '../datasource-zabbix/utils';\nimport {PanelCtrl} from 'app/plugins/sdk';\nimport {triggerPanelEditor} from './editor';\nimport './ack-tooltip.directive';\nimport './css/panel_triggers.css!';\n\nvar defaultSeverity = [\n { priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true },\n { priority: 1, severity: 'Information', color: '#82B5D8', show: true },\n { priority: 2, severity: 'Warning', color: '#E5AC0E', show: true },\n { priority: 3, severity: 'Average', color: '#C15C17', show: true },\n { priority: 4, severity: 'High', color: '#BF1B00', show: true },\n { priority: 5, severity: 'Disaster', color: '#890F02', show: true }\n];\n\nvar panelDefaults = {\n datasource: null,\n triggers: {\n group: {filter: \"\"},\n host: {filter: \"\"},\n application: {filter: \"\"},\n trigger: {filter: \"\"}\n },\n hostField: true,\n statusField: false,\n severityField: false,\n lastChangeField: true,\n ageField: true,\n infoField: true,\n limit: 10,\n showTriggers: 'all triggers',\n hideHostsInMaintenance: false,\n sortTriggersBy: { text: 'last change', value: 'lastchange' },\n showEvents: { text: 'Problems', value: '1' },\n triggerSeverity: defaultSeverity,\n okEventColor: 'rgba(0, 245, 153, 0.45)',\n ackEventColor: 'rgba(0, 0, 0, 0)',\n scroll: true,\n pageSize: 10,\n fontSize: '100%',\n};\n\nvar triggerStatusMap = {\n '0': 'OK',\n '1': 'Problem'\n};\n\nvar defaultTimeFormat = \"DD MMM YYYY HH:mm:ss\";\n\nclass TriggerPanelCtrl extends PanelCtrl {\n\n /** @ngInject */\n constructor($scope, $injector, $element, datasourceSrv, templateSrv, contextSrv, dashboardSrv) {\n super($scope, $injector);\n this.datasourceSrv = datasourceSrv;\n this.templateSrv = templateSrv;\n this.contextSrv = contextSrv;\n this.dashboardSrv = dashboardSrv;\n\n this.triggerStatusMap = triggerStatusMap;\n this.defaultTimeFormat = defaultTimeFormat;\n this.pageIndex = 0;\n this.triggerList = [];\n this.currentTriggersPage = [];\n\n // Load panel defaults\n // _.cloneDeep() need for prevent changing shared defaultSeverity.\n // Load object \"by value\" istead \"by reference\".\n _.defaults(this.panel, _.cloneDeep(panelDefaults));\n\n this.events.on('init-edit-mode', this.onInitEditMode.bind(this));\n this.events.on('refresh', this.onRefresh.bind(this));\n }\n\n onInitEditMode() {\n this.addEditorTab('Options', triggerPanelEditor, 2);\n }\n\n onRefresh() {\n // ignore fetching data if another panel is in fullscreen\n if (this.otherPanelInFullscreenMode()) { return; }\n\n // clear loading/error state\n delete this.error;\n this.loading = true;\n\n return this.refreshData()\n .then(triggerList => {\n // Limit triggers number\n this.triggerList = triggerList.slice(0, this.panel.limit);\n\n this.getCurrentTriggersPage();\n\n // Notify panel that request is finished\n this.loading = false;\n\n this.render(this.triggerList);\n });\n }\n\n refreshData() {\n return this.getTriggers()\n .then(this.getAcknowledges.bind(this))\n .then(this.filterTriggers.bind(this));\n }\n\n getTriggers() {\n return this.datasourceSrv.get(this.panel.datasource)\n .then(datasource => {\n var zabbix = datasource.zabbix;\n this.zabbix = zabbix;\n var showEvents = this.panel.showEvents.value;\n var triggerFilter = this.panel.triggers;\n var hideHostsInMaintenance = this.panel.hideHostsInMaintenance;\n\n // Replace template variables\n var groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter);\n var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter);\n var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter);\n\n let triggersOptions = {\n showTriggers: showEvents,\n hideHostsInMaintenance: hideHostsInMaintenance\n };\n let getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);\n return getTriggers.then(triggers => {\n return _.map(triggers, this.formatTrigger.bind(this));\n });\n });\n }\n\n getAcknowledges(triggerList) {\n // Request acknowledges for trigger\n var eventids = _.map(triggerList, trigger => {\n return trigger.lastEvent.eventid;\n });\n\n return this.zabbix.getAcknowledges(eventids)\n .then(events => {\n\n // Map events to triggers\n _.each(triggerList, trigger => {\n var event = _.find(events, event => {\n return event.eventid === trigger.lastEvent.eventid;\n });\n\n if (event) {\n trigger.acknowledges = _.map(event.acknowledges, ack => {\n let timestamp = moment.unix(ack.clock);\n if (this.panel.customLastChangeFormat) {\n ack.time = timestamp.format(this.panel.lastChangeFormat);\n } else {\n ack.time = timestamp.format(this.defaultTimeFormat);\n }\n ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';\n return ack;\n });\n\n // Mark acknowledged triggers with different color\n if (this.panel.markAckEvents && trigger.acknowledges.length) {\n trigger.color = this.panel.ackEventColor;\n }\n }\n });\n\n return triggerList;\n });\n }\n\n filterTriggers(triggerList) {\n // Filter triggers by description\n var triggerFilter = this.panel.triggers.trigger.filter;\n if (triggerFilter) {\n triggerList = filterTriggers(triggerList, triggerFilter);\n }\n\n // Filter acknowledged triggers\n if (this.panel.showTriggers === 'unacknowledged') {\n triggerList = _.filter(triggerList, trigger => {\n return !trigger.acknowledges;\n });\n } else if (this.panel.showTriggers === 'acknowledged') {\n triggerList = _.filter(triggerList, 'acknowledges');\n } else {\n triggerList = triggerList;\n }\n\n // Filter triggers by severity\n triggerList = _.filter(triggerList, trigger => {\n return this.panel.triggerSeverity[trigger.priority].show;\n });\n\n // Sort triggers\n if (this.panel.sortTriggersBy.value === 'priority') {\n triggerList = _.sortBy(triggerList, 'priority').reverse();\n } else {\n triggerList = _.sortBy(triggerList, 'lastchangeUnix').reverse();\n }\n\n return triggerList;\n }\n\n formatTrigger(trigger) {\n let triggerObj = trigger;\n\n // Format last change and age\n trigger.lastchangeUnix = Number(trigger.lastchange);\n let timestamp = moment.unix(trigger.lastchangeUnix);\n if (this.panel.customLastChangeFormat) {\n // User defined format\n triggerObj.lastchange = timestamp.format(this.panel.lastChangeFormat);\n } else {\n triggerObj.lastchange = timestamp.format(this.defaultTimeFormat);\n }\n triggerObj.age = timestamp.fromNow(true);\n\n // Set host that the trigger belongs\n if (trigger.hosts.length) {\n triggerObj.host = trigger.hosts[0].name;\n triggerObj.hostTechName = trigger.hosts[0].host;\n }\n\n // Set color\n if (trigger.value === '1') {\n // Problem state\n triggerObj.color = this.panel.triggerSeverity[trigger.priority].color;\n } else {\n // OK state\n triggerObj.color = this.panel.okEventColor;\n }\n\n triggerObj.severity = this.panel.triggerSeverity[trigger.priority].severity;\n return triggerObj;\n }\n\n switchComment(trigger) {\n trigger.showComment = !trigger.showComment;\n }\n\n acknowledgeTrigger(trigger, message) {\n let eventid = trigger.lastEvent.eventid;\n let grafana_user = this.contextSrv.user.name;\n let ack_message = grafana_user + ' (Grafana): ' + message;\n return this.datasourceSrv.get(this.panel.datasource)\n .then(datasource => {\n let zabbixAPI = datasource.zabbix.zabbixAPI;\n return zabbixAPI.acknowledgeEvent(eventid, ack_message);\n })\n .then(this.onRefresh.bind(this));\n }\n\n getCurrentTriggersPage() {\n let pageSize = this.panel.pageSize || 10;\n let startPos = this.pageIndex * pageSize;\n let endPos = Math.min(startPos + pageSize, this.triggerList.length);\n this.currentTriggersPage = this.triggerList.slice(startPos, endPos);\n return this.currentTriggersPage;\n }\n\n link(scope, elem, attrs, ctrl) {\n var data;\n var panel = ctrl.panel;\n var pageCount = 0;\n data = ctrl.triggerList;\n\n function getTableHeight() {\n var panelHeight = ctrl.height;\n\n if (pageCount > 1) {\n panelHeight -= 26;\n }\n\n return (panelHeight - 31) + 'px';\n }\n\n function switchPage(e) {\n let el = $(e.currentTarget);\n ctrl.pageIndex = (parseInt(el.text(), 10)-1);\n\n let pageSize = ctrl.panel.pageSize || 10;\n let startPos = ctrl.pageIndex * pageSize;\n let endPos = Math.min(startPos + pageSize, ctrl.triggerList.length);\n ctrl.currentTriggersPage = ctrl.triggerList.slice(startPos, endPos);\n\n scope.$apply();\n renderPanel();\n }\n\n function appendPaginationControls(footerElem) {\n footerElem.empty();\n\n var pageSize = ctrl.panel.pageSize || 5;\n pageCount = Math.ceil(data.length / pageSize);\n if (pageCount === 1) {\n return;\n }\n\n var startPage = Math.max(ctrl.pageIndex - 3, 0);\n var endPage = Math.min(pageCount, startPage + 9);\n\n var paginationList = $('');\n\n for (var i = startPage; i < endPage; i++) {\n var activeClass = i === ctrl.pageIndex ? 'active' : '';\n var pageLinkElem = $('
  • ' + (i+1) + '
    • ');\n paginationList.append(pageLinkElem);\n }\n\n footerElem.append(paginationList);\n }\n\n function renderPanel() {\n var panelElem = elem.parents('.panel');\n var rootElem = elem.find('.triggers-panel-scroll');\n var footerElem = elem.find('.triggers-panel-footer');\n\n elem.css({'font-size': panel.fontSize});\n panelElem.addClass('triggers-panel-wrapper');\n appendPaginationControls(footerElem);\n\n rootElem.css({'max-height': panel.scroll ? getTableHeight() : '' });\n }\n\n elem.on('click', '.triggers-panel-page-link', switchPage);\n\n var unbindDestroy = scope.$on('$destroy', function() {\n elem.off('click', '.triggers-panel-page-link');\n unbindDestroy();\n });\n\n ctrl.events.on('render', (renderData) => {\n data = renderData || data;\n if (data) {\n renderPanel();\n }\n ctrl.renderingCompleted();\n });\n }\n}\n\nTriggerPanelCtrl.templateUrl = 'panel-triggers/module.html';\n\nfunction filterTriggers(triggers, triggerFilter) {\n if (utils.isRegex(triggerFilter)) {\n return _.filter(triggers, function(trigger) {\n return utils.buildRegex(triggerFilter).test(trigger.description);\n });\n } else {\n return _.filter(triggers, function(trigger) {\n return trigger.description === triggerFilter;\n });\n }\n}\n\nexport {\n TriggerPanelCtrl,\n TriggerPanelCtrl as PanelCtrl\n};\n"]} \ No newline at end of file +{"version":3,"sources":["../../src/panel-triggers/module.js"],"names":["filterTriggers","triggers","triggerFilter","utils","isRegex","_","filter","trigger","buildRegex","test","description","$","moment","loadPluginCss","PanelCtrl","triggerPanelEditor","dark","light","defaultSeverity","priority","severity","color","show","panelDefaults","datasource","group","host","application","hostField","statusField","severityField","lastChangeField","ageField","infoField","limit","showTriggers","hideHostsInMaintenance","sortTriggersBy","text","value","showEvents","triggerSeverity","okEventColor","ackEventColor","scroll","pageSize","fontSize","triggerStatusMap","defaultTimeFormat","TriggerPanelCtrl","$scope","$injector","$element","datasourceSrv","templateSrv","contextSrv","dashboardSrv","pageIndex","triggerList","currentTriggersPage","defaults","panel","cloneDeep","events","on","onInitEditMode","bind","onRefresh","addEditorTab","otherPanelInFullscreenMode","error","loading","refreshData","then","slice","getCurrentTriggersPage","render","getTriggers","getAcknowledges","get","zabbix","groupFilter","replaceTemplateVars","hostFilter","appFilter","triggersOptions","map","formatTrigger","eventids","lastEvent","eventid","each","event","find","acknowledges","timestamp","unix","ack","clock","customLastChangeFormat","time","format","lastChangeFormat","user","alias","name","surname","markAckEvents","length","sortBy","reverse","triggerObj","lastchangeUnix","Number","lastchange","age","fromNow","hosts","hostTechName","showComment","message","grafana_user","ack_message","zabbixAPI","acknowledgeEvent","startPos","endPos","Math","min","scope","elem","attrs","ctrl","data","pageCount","getTableHeight","panelHeight","height","switchPage","e","el","currentTarget","parseInt","$apply","renderPanel","appendPaginationControls","footerElem","empty","ceil","startPage","max","endPage","paginationList","i","activeClass","pageLinkElem","append","panelElem","parents","rootElem","css","addClass","unbindDestroy","$on","off","renderData","renderingCompleted","templateUrl"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2WA,WAASA,eAAT,CAAwBC,QAAxB,EAAkCC,aAAlC,EAAiD;AAC/C,QAAIC,MAAMC,OAAN,CAAcF,aAAd,CAAJ,EAAkC;AAChC,aAAOG,EAAEC,MAAF,CAASL,QAAT,EAAmB,UAASM,OAAT,EAAkB;AAC1C,eAAOJ,MAAMK,UAAN,CAAiBN,aAAjB,EAAgCO,IAAhC,CAAqCF,QAAQG,WAA7C,CAAP;AACD,OAFM,CAAP;AAGD,KAJD,MAIO;AACL,aAAOL,EAAEC,MAAF,CAASL,QAAT,EAAmB,UAASM,OAAT,EAAkB;AAC1C,eAAOA,QAAQG,WAAR,KAAwBR,aAA/B;AACD,OAFM,CAAP;AAGD;AACF;;;;AAxWMG,O;;AACAM,O;;AACAC,Y;;AACCC,mB,kBAAAA,a;AAEAC,e,kBAAAA,S;;AADIX,W;;AAEJY,wB,WAAAA,kB;;;;;;;;;;;;;;;;;;;;;AAnBR;;;;;;;;;;;;;AAsBAF,oBAAc;AACZG,cAAM,gEADM;AAEZC,eAAO;AAFK,OAAd;;AAKIC,qB,GAAkB,CACpB,EAAEC,UAAU,CAAZ,EAAeC,UAAU,gBAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EADoB,EAEpB,EAAEH,UAAU,CAAZ,EAAeC,UAAU,aAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EAFoB,EAGpB,EAAEH,UAAU,CAAZ,EAAeC,UAAU,SAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EAHoB,EAIpB,EAAEH,UAAU,CAAZ,EAAeC,UAAU,SAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EAJoB,EAKpB,EAAEH,UAAU,CAAZ,EAAeC,UAAU,MAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EALoB,EAMpB,EAAEH,UAAU,CAAZ,EAAeC,UAAU,UAAzB,EAA4CC,OAAO,SAAnD,EAA8DC,MAAM,IAApE,EANoB,C;AASlBC,mB,GAAgB;AAClBC,oBAAY,IADM;AAElBvB,kBAAU;AACRwB,iBAAO,EAACnB,QAAQ,EAAT,EADC;AAERoB,gBAAM,EAACpB,QAAQ,EAAT,EAFE;AAGRqB,uBAAa,EAACrB,QAAQ,EAAT,EAHL;AAIRC,mBAAS,EAACD,QAAQ,EAAT;AAJD,SAFQ;AAQlBsB,mBAAW,IARO;AASlBC,qBAAa,KATK;AAUlBC,uBAAe,KAVG;AAWlBC,yBAAiB,IAXC;AAYlBC,kBAAU,IAZQ;AAalBC,mBAAW,IAbO;AAclBC,eAAO,EAdW;AAelBC,sBAAc,cAfI;AAgBlBC,gCAAwB,KAhBN;AAiBlBC,wBAAgB,EAAEC,MAAM,aAAR,EAAuBC,OAAO,YAA9B,EAjBE;AAkBlBC,oBAAY,EAAEF,MAAM,UAAR,EAAoBC,OAAO,GAA3B,EAlBM;AAmBlBE,yBAAiBvB,eAnBC;AAoBlBwB,sBAAc,yBApBI;AAqBlBC,uBAAe,kBArBG;AAsBlBC,gBAAQ,IAtBU;AAuBlBC,kBAAU,EAvBQ;AAwBlBC,kBAAU;AAxBQ,O;AA2BhBC,sB,GAAmB;AACrB,aAAK,IADgB;AAErB,aAAK;AAFgB,O;AAKnBC,uB,GAAoB,sB;;uDAElBC,gB;;;AAEJ;AACA,kCAAYC,MAAZ,EAAoBC,SAApB,EAA+BC,QAA/B,EAAyCC,aAAzC,EAAwDC,WAAxD,EAAqEC,UAArE,EAAiFC,YAAjF,EAA+F;AAAA;;AAAA,0IACvFN,MADuF,EAC/EC,SAD+E;;AAE7F,gBAAKE,aAAL,GAAqBA,aAArB;AACA,gBAAKC,WAAL,GAAmBA,WAAnB;AACA,gBAAKC,UAAL,GAAkBA,UAAlB;AACA,gBAAKC,YAAL,GAAoBA,YAApB;;AAEA,gBAAKT,gBAAL,GAAwBA,gBAAxB;AACA,gBAAKC,iBAAL,GAAyBA,iBAAzB;AACA,gBAAKS,SAAL,GAAiB,CAAjB;AACA,gBAAKC,WAAL,GAAmB,EAAnB;AACA,gBAAKC,mBAAL,GAA2B,EAA3B;;AAEA;AACA;AACA;AACAtD,YAAEuD,QAAF,CAAW,MAAKC,KAAhB,EAAuBxD,EAAEyD,SAAF,CAAYvC,aAAZ,CAAvB;;AAEA,gBAAKwC,MAAL,CAAYC,EAAZ,CAAe,gBAAf,EAAiC,MAAKC,cAAL,CAAoBC,IAApB,OAAjC;AACA,gBAAKH,MAAL,CAAYC,EAAZ,CAAe,SAAf,EAA0B,MAAKG,SAAL,CAAeD,IAAf,OAA1B;AAnB6F;AAoB9F;;;;2CAEgB;AACf,iBAAKE,YAAL,CAAkB,SAAlB,EAA6BrD,kBAA7B,EAAiD,CAAjD;AACD;;;sCAEW;AAAA;;AACV;AACA,gBAAI,KAAKsD,0BAAL,EAAJ,EAAuC;AAAE;AAAS;;AAElD;AACA,mBAAO,KAAKC,KAAZ;AACA,iBAAKC,OAAL,GAAe,IAAf;;AAEA,mBAAO,KAAKC,WAAL,GACNC,IADM,CACD,uBAAe;AACnB;AACA,qBAAKf,WAAL,GAAoBA,YAAYgB,KAAZ,CAAkB,CAAlB,EAAqB,OAAKb,KAAL,CAAW3B,KAAhC,CAApB;;AAEA,qBAAKyC,sBAAL;;AAEA;AACA,qBAAKJ,OAAL,GAAe,KAAf;;AAEA,qBAAKK,MAAL,CAAY,OAAKlB,WAAjB;AACD,aAXM,CAAP;AAYD;;;wCAEa;AACZ,mBAAO,KAAKmB,WAAL,GACNJ,IADM,CACD,KAAKK,eAAL,CAAqBZ,IAArB,CAA0B,IAA1B,CADC,EAENO,IAFM,CAED,KAAKzE,cAAL,CAAoBkE,IAApB,CAAyB,IAAzB,CAFC,CAAP;AAGD;;;wCAEa;AAAA;;AACZ,mBAAO,KAAKb,aAAL,CAAmB0B,GAAnB,CAAuB,KAAKlB,KAAL,CAAWrC,UAAlC,EACNiD,IADM,CACD,sBAAc;AAClB,kBAAIO,SAASxD,WAAWwD,MAAxB;AACA,qBAAKA,MAAL,GAAcA,MAAd;AACA,kBAAIxC,aAAa,OAAKqB,KAAL,CAAWrB,UAAX,CAAsBD,KAAvC;AACA,kBAAIrC,gBAAgB,OAAK2D,KAAL,CAAW5D,QAA/B;AACA,kBAAImC,yBAAyB,OAAKyB,KAAL,CAAWzB,sBAAxC;;AAEA;AACA,kBAAI6C,cAAczD,WAAW0D,mBAAX,CAA+BhF,cAAcuB,KAAd,CAAoBnB,MAAnD,CAAlB;AACA,kBAAI6E,aAAa3D,WAAW0D,mBAAX,CAA+BhF,cAAcwB,IAAd,CAAmBpB,MAAlD,CAAjB;AACA,kBAAI8E,YAAY5D,WAAW0D,mBAAX,CAA+BhF,cAAcyB,WAAd,CAA0BrB,MAAzD,CAAhB;;AAEA,kBAAI+E,kBAAkB;AACpBlD,8BAAcK,UADM;AAEpBJ,wCAAwBA;AAFJ,eAAtB;AAIA,kBAAIyC,cAAcG,OAAOH,WAAP,CAAmBI,WAAnB,EAAgCE,UAAhC,EAA4CC,SAA5C,EAAuDC,eAAvD,CAAlB;AACA,qBAAOR,YAAYJ,IAAZ,CAAiB,oBAAY;AAClC,uBAAOpE,EAAEiF,GAAF,CAAMrF,QAAN,EAAgB,OAAKsF,aAAL,CAAmBrB,IAAnB,QAAhB,CAAP;AACD,eAFM,CAAP;AAGD,aArBM,CAAP;AAsBD;;;0CAEeR,W,EAAa;AAAA;;AAC3B;AACA,gBAAI8B,WAAWnF,EAAEiF,GAAF,CAAM5B,WAAN,EAAmB,mBAAW;AAC3C,qBAAOnD,QAAQkF,SAAR,CAAkBC,OAAzB;AACD,aAFc,CAAf;;AAIA,mBAAO,KAAKV,MAAL,CAAYF,eAAZ,CAA4BU,QAA5B,EACNf,IADM,CACD,kBAAU;;AAEd;AACApE,gBAAEsF,IAAF,CAAOjC,WAAP,EAAoB,mBAAW;AAC7B,oBAAIkC,QAAQvF,EAAEwF,IAAF,CAAO9B,MAAP,EAAe,iBAAS;AAClC,yBAAO6B,MAAMF,OAAN,KAAkBnF,QAAQkF,SAAR,CAAkBC,OAA3C;AACD,iBAFW,CAAZ;;AAIA,oBAAIE,KAAJ,EAAW;AACTrF,0BAAQuF,YAAR,GAAuBzF,EAAEiF,GAAF,CAAMM,MAAME,YAAZ,EAA0B,eAAO;AACtD,wBAAIC,YAAYnF,OAAOoF,IAAP,CAAYC,IAAIC,KAAhB,CAAhB;AACA,wBAAI,OAAKrC,KAAL,CAAWsC,sBAAf,EAAuC;AACrCF,0BAAIG,IAAJ,GAAWL,UAAUM,MAAV,CAAiB,OAAKxC,KAAL,CAAWyC,gBAA5B,CAAX;AACD,qBAFD,MAEO;AACLL,0BAAIG,IAAJ,GAAWL,UAAUM,MAAV,CAAiB,OAAKrD,iBAAtB,CAAX;AACD;AACDiD,wBAAIM,IAAJ,GAAWN,IAAIO,KAAJ,GAAY,IAAZ,GAAmBP,IAAIQ,IAAvB,GAA8B,GAA9B,GAAoCR,IAAIS,OAAxC,GAAkD,GAA7D;AACA,2BAAOT,GAAP;AACD,mBATsB,CAAvB;;AAWA;AACA,sBAAI,OAAKpC,KAAL,CAAW8C,aAAX,IAA4BpG,QAAQuF,YAAR,CAAqBc,MAArD,EAA6D;AAC3DrG,4BAAQc,KAAR,GAAgB,OAAKwC,KAAL,CAAWlB,aAA3B;AACD;AACF;AACF,eAtBD;;AAwBA,qBAAOe,WAAP;AACD,aA7BM,CAAP;AA8BD;;;yCAEcA,W,EAAa;AAAA;;AAC1B;AACA,gBAAIxD,gBAAgB,KAAK2D,KAAL,CAAW5D,QAAX,CAAoBM,OAApB,CAA4BD,MAAhD;AACA,gBAAIJ,aAAJ,EAAmB;AACjBwD,4BAAc1D,gBAAe0D,WAAf,EAA4BxD,aAA5B,CAAd;AACD;;AAED;AACA,gBAAI,KAAK2D,KAAL,CAAW1B,YAAX,KAA4B,gBAAhC,EAAkD;AAChDuB,4BAAcrD,EAAEC,MAAF,CAASoD,WAAT,EAAsB,mBAAW;AAC7C,uBAAO,CAACnD,QAAQuF,YAAhB;AACD,eAFa,CAAd;AAGD,aAJD,MAIO,IAAI,KAAKjC,KAAL,CAAW1B,YAAX,KAA4B,cAAhC,EAAgD;AACrDuB,4BAAcrD,EAAEC,MAAF,CAASoD,WAAT,EAAsB,cAAtB,CAAd;AACD,aAFM,MAEA;AACLA,4BAAcA,WAAd;AACD;;AAED;AACAA,0BAAcrD,EAAEC,MAAF,CAASoD,WAAT,EAAsB,mBAAW;AAC7C,qBAAO,OAAKG,KAAL,CAAWpB,eAAX,CAA2BlC,QAAQY,QAAnC,EAA6CG,IAApD;AACD,aAFa,CAAd;;AAIA;AACA,gBAAI,KAAKuC,KAAL,CAAWxB,cAAX,CAA0BE,KAA1B,KAAoC,UAAxC,EAAoD;AAClDmB,4BAAcrD,EAAEwG,MAAF,CAASnD,WAAT,EAAsB,UAAtB,EAAkCoD,OAAlC,EAAd;AACD,aAFD,MAEO;AACLpD,4BAAcrD,EAAEwG,MAAF,CAASnD,WAAT,EAAsB,gBAAtB,EAAwCoD,OAAxC,EAAd;AACD;;AAED,mBAAOpD,WAAP;AACD;;;wCAEanD,O,EAAS;AACrB,gBAAIwG,aAAaxG,OAAjB;;AAEA;AACAA,oBAAQyG,cAAR,GAAyBC,OAAO1G,QAAQ2G,UAAf,CAAzB;AACA,gBAAInB,YAAYnF,OAAOoF,IAAP,CAAYzF,QAAQyG,cAApB,CAAhB;AACA,gBAAI,KAAKnD,KAAL,CAAWsC,sBAAf,EAAuC;AACrC;AACAY,yBAAWG,UAAX,GAAwBnB,UAAUM,MAAV,CAAiB,KAAKxC,KAAL,CAAWyC,gBAA5B,CAAxB;AACD,aAHD,MAGO;AACLS,yBAAWG,UAAX,GAAwBnB,UAAUM,MAAV,CAAiB,KAAKrD,iBAAtB,CAAxB;AACD;AACD+D,uBAAWI,GAAX,GAAiBpB,UAAUqB,OAAV,CAAkB,IAAlB,CAAjB;;AAEA;AACA,gBAAI7G,QAAQ8G,KAAR,CAAcT,MAAlB,EAA0B;AACxBG,yBAAWrF,IAAX,GAAkBnB,QAAQ8G,KAAR,CAAc,CAAd,EAAiBZ,IAAnC;AACAM,yBAAWO,YAAX,GAA0B/G,QAAQ8G,KAAR,CAAc,CAAd,EAAiB3F,IAA3C;AACD;;AAED;AACA,gBAAInB,QAAQgC,KAAR,KAAkB,GAAtB,EAA2B;AACzB;AACAwE,yBAAW1F,KAAX,GAAmB,KAAKwC,KAAL,CAAWpB,eAAX,CAA2BlC,QAAQY,QAAnC,EAA6CE,KAAhE;AACD,aAHD,MAGO;AACL;AACA0F,yBAAW1F,KAAX,GAAmB,KAAKwC,KAAL,CAAWnB,YAA9B;AACD;;AAEDqE,uBAAW3F,QAAX,GAAsB,KAAKyC,KAAL,CAAWpB,eAAX,CAA2BlC,QAAQY,QAAnC,EAA6CC,QAAnE;AACA,mBAAO2F,UAAP;AACD;;;wCAEaxG,O,EAAS;AACrBA,oBAAQgH,WAAR,GAAsB,CAAChH,QAAQgH,WAA/B;AACD;;;6CAEkBhH,O,EAASiH,O,EAAS;AACnC,gBAAI9B,UAAUnF,QAAQkF,SAAR,CAAkBC,OAAhC;AACA,gBAAI+B,eAAe,KAAKlE,UAAL,CAAgBgD,IAAhB,CAAqBE,IAAxC;AACA,gBAAIiB,cAAcD,eAAe,cAAf,GAAgCD,OAAlD;AACA,mBAAO,KAAKnE,aAAL,CAAmB0B,GAAnB,CAAuB,KAAKlB,KAAL,CAAWrC,UAAlC,EACNiD,IADM,CACD,sBAAc;AAClB,kBAAIkD,YAAYnG,WAAWwD,MAAX,CAAkB2C,SAAlC;AACA,qBAAOA,UAAUC,gBAAV,CAA2BlC,OAA3B,EAAoCgC,WAApC,CAAP;AACD,aAJM,EAKNjD,IALM,CAKD,KAAKN,SAAL,CAAeD,IAAf,CAAoB,IAApB,CALC,CAAP;AAMD;;;mDAEwB;AACvB,gBAAIrB,WAAW,KAAKgB,KAAL,CAAWhB,QAAX,IAAuB,EAAtC;AACA,gBAAIgF,WAAW,KAAKpE,SAAL,GAAiBZ,QAAhC;AACA,gBAAIiF,SAASC,KAAKC,GAAL,CAASH,WAAWhF,QAApB,EAA8B,KAAKa,WAAL,CAAiBkD,MAA/C,CAAb;AACA,iBAAKjD,mBAAL,GAA2B,KAAKD,WAAL,CAAiBgB,KAAjB,CAAuBmD,QAAvB,EAAiCC,MAAjC,CAA3B;AACA,mBAAO,KAAKnE,mBAAZ;AACD;;;+BAEIsE,K,EAAOC,I,EAAMC,K,EAAOC,I,EAAM;AAC7B,gBAAIC,IAAJ;AACA,gBAAIxE,QAAQuE,KAAKvE,KAAjB;AACA,gBAAIyE,YAAY,CAAhB;AACAD,mBAAOD,KAAK1E,WAAZ;;AAEA,qBAAS6E,cAAT,GAA0B;AACxB,kBAAIC,cAAcJ,KAAKK,MAAvB;;AAEA,kBAAIH,YAAY,CAAhB,EAAmB;AACjBE,+BAAe,EAAf;AACD;;AAED,qBAAQA,cAAc,EAAf,GAAqB,IAA5B;AACD;;AAED,qBAASE,UAAT,CAAoBC,CAApB,EAAuB;AACrB,kBAAIC,KAAKjI,EAAEgI,EAAEE,aAAJ,CAAT;AACAT,mBAAK3E,SAAL,GAAkBqF,SAASF,GAAGtG,IAAH,EAAT,EAAoB,EAApB,IAAwB,CAA1C;;AAEA,kBAAIO,WAAWuF,KAAKvE,KAAL,CAAWhB,QAAX,IAAuB,EAAtC;AACA,kBAAIgF,WAAWO,KAAK3E,SAAL,GAAiBZ,QAAhC;AACA,kBAAIiF,SAASC,KAAKC,GAAL,CAASH,WAAWhF,QAApB,EAA8BuF,KAAK1E,WAAL,CAAiBkD,MAA/C,CAAb;AACAwB,mBAAKzE,mBAAL,GAA2ByE,KAAK1E,WAAL,CAAiBgB,KAAjB,CAAuBmD,QAAvB,EAAiCC,MAAjC,CAA3B;;AAEAG,oBAAMc,MAAN;AACAC;AACD;;AAED,qBAASC,wBAAT,CAAkCC,UAAlC,EAA8C;AAC5CA,yBAAWC,KAAX;;AAEA,kBAAItG,WAAWuF,KAAKvE,KAAL,CAAWhB,QAAX,IAAuB,CAAtC;AACAyF,0BAAYP,KAAKqB,IAAL,CAAUf,KAAKzB,MAAL,GAAc/D,QAAxB,CAAZ;AACA,kBAAIyF,cAAc,CAAlB,EAAqB;AACnB;AACD;;AAED,kBAAIe,YAAYtB,KAAKuB,GAAL,CAASlB,KAAK3E,SAAL,GAAiB,CAA1B,EAA6B,CAA7B,CAAhB;AACA,kBAAI8F,UAAUxB,KAAKC,GAAL,CAASM,SAAT,EAAoBe,YAAY,CAAhC,CAAd;;AAEA,kBAAIG,iBAAiB7I,EAAE,WAAF,CAArB;;AAEA,mBAAK,IAAI8I,IAAIJ,SAAb,EAAwBI,IAAIF,OAA5B,EAAqCE,GAArC,EAA0C;AACxC,oBAAIC,cAAcD,MAAMrB,KAAK3E,SAAX,GAAuB,QAAvB,GAAkC,EAApD;AACA,oBAAIkG,eAAehJ,EAAE,oDAAoD+I,WAApD,GAAkE,IAAlE,IAA0ED,IAAE,CAA5E,IAAiF,WAAnF,CAAnB;AACAD,+BAAeI,MAAf,CAAsBD,YAAtB;AACD;;AAEDT,yBAAWU,MAAX,CAAkBJ,cAAlB;AACD;;AAED,qBAASR,WAAT,GAAuB;AACrB,kBAAIa,YAAY3B,KAAK4B,OAAL,CAAa,QAAb,CAAhB;AACA,kBAAIC,WAAW7B,KAAKrC,IAAL,CAAU,wBAAV,CAAf;AACA,kBAAIqD,aAAahB,KAAKrC,IAAL,CAAU,wBAAV,CAAjB;;AAEAqC,mBAAK8B,GAAL,CAAS,EAAC,aAAanG,MAAMf,QAApB,EAAT;AACA+G,wBAAUI,QAAV,CAAmB,wBAAnB;AACAhB,uCAAyBC,UAAzB;;AAEAa,uBAASC,GAAT,CAAa,EAAC,cAAcnG,MAAMjB,MAAN,GAAe2F,gBAAf,GAAkC,EAAjD,EAAb;AACD;;AAEDL,iBAAKlE,EAAL,CAAQ,OAAR,EAAiB,2BAAjB,EAA8C0E,UAA9C;;AAEA,gBAAIwB,gBAAgBjC,MAAMkC,GAAN,CAAU,UAAV,EAAsB,YAAW;AACnDjC,mBAAKkC,GAAL,CAAS,OAAT,EAAkB,2BAAlB;AACAF;AACD,aAHmB,CAApB;;AAKA9B,iBAAKrE,MAAL,CAAYC,EAAZ,CAAe,QAAf,EAAyB,UAACqG,UAAD,EAAgB;AACvChC,qBAAOgC,cAAchC,IAArB;AACA,kBAAIA,IAAJ,EAAU;AACRW;AACD;AACDZ,mBAAKkC,kBAAL;AACD,aAND;AAOD;;;;QAhS4BxJ,S;;AAmS/BmC,uBAAiBsH,WAAjB,GAA+B,4BAA/B;kCAeEtH,gB;;2BACAA,gB","file":"module.js","sourcesContent":["/**\n * Grafana-Zabbix\n * Zabbix plugin for Grafana.\n * http://github.com/alexanderzobnin/grafana-zabbix\n *\n * Trigger panel.\n * This feature sponsored by CORE IT\n * http://www.coreit.fr\n *\n * Copyright 2015 Alexander Zobnin alexanderzobnin@gmail.com\n * Licensed under the Apache License, Version 2.0\n */\n\nimport _ from 'lodash';\nimport $ from 'jquery';\nimport moment from 'moment';\nimport {loadPluginCss} from 'app/plugins/sdk';\nimport * as utils from '../datasource-zabbix/utils';\nimport {PanelCtrl} from 'app/plugins/sdk';\nimport {triggerPanelEditor} from './editor';\nimport './ack-tooltip.directive';\n\nloadPluginCss({\n dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css',\n light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css'\n});\n\nvar defaultSeverity = [\n { priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true },\n { priority: 1, severity: 'Information', color: '#82B5D8', show: true },\n { priority: 2, severity: 'Warning', color: '#E5AC0E', show: true },\n { priority: 3, severity: 'Average', color: '#C15C17', show: true },\n { priority: 4, severity: 'High', color: '#BF1B00', show: true },\n { priority: 5, severity: 'Disaster', color: '#890F02', show: true }\n];\n\nvar panelDefaults = {\n datasource: null,\n triggers: {\n group: {filter: \"\"},\n host: {filter: \"\"},\n application: {filter: \"\"},\n trigger: {filter: \"\"}\n },\n hostField: true,\n statusField: false,\n severityField: false,\n lastChangeField: true,\n ageField: true,\n infoField: true,\n limit: 10,\n showTriggers: 'all triggers',\n hideHostsInMaintenance: false,\n sortTriggersBy: { text: 'last change', value: 'lastchange' },\n showEvents: { text: 'Problems', value: '1' },\n triggerSeverity: defaultSeverity,\n okEventColor: 'rgba(0, 245, 153, 0.45)',\n ackEventColor: 'rgba(0, 0, 0, 0)',\n scroll: true,\n pageSize: 10,\n fontSize: '100%',\n};\n\nvar triggerStatusMap = {\n '0': 'OK',\n '1': 'Problem'\n};\n\nvar defaultTimeFormat = \"DD MMM YYYY HH:mm:ss\";\n\nclass TriggerPanelCtrl extends PanelCtrl {\n\n /** @ngInject */\n constructor($scope, $injector, $element, datasourceSrv, templateSrv, contextSrv, dashboardSrv) {\n super($scope, $injector);\n this.datasourceSrv = datasourceSrv;\n this.templateSrv = templateSrv;\n this.contextSrv = contextSrv;\n this.dashboardSrv = dashboardSrv;\n\n this.triggerStatusMap = triggerStatusMap;\n this.defaultTimeFormat = defaultTimeFormat;\n this.pageIndex = 0;\n this.triggerList = [];\n this.currentTriggersPage = [];\n\n // Load panel defaults\n // _.cloneDeep() need for prevent changing shared defaultSeverity.\n // Load object \"by value\" istead \"by reference\".\n _.defaults(this.panel, _.cloneDeep(panelDefaults));\n\n this.events.on('init-edit-mode', this.onInitEditMode.bind(this));\n this.events.on('refresh', this.onRefresh.bind(this));\n }\n\n onInitEditMode() {\n this.addEditorTab('Options', triggerPanelEditor, 2);\n }\n\n onRefresh() {\n // ignore fetching data if another panel is in fullscreen\n if (this.otherPanelInFullscreenMode()) { return; }\n\n // clear loading/error state\n delete this.error;\n this.loading = true;\n\n return this.refreshData()\n .then(triggerList => {\n // Limit triggers number\n this.triggerList = triggerList.slice(0, this.panel.limit);\n\n this.getCurrentTriggersPage();\n\n // Notify panel that request is finished\n this.loading = false;\n\n this.render(this.triggerList);\n });\n }\n\n refreshData() {\n return this.getTriggers()\n .then(this.getAcknowledges.bind(this))\n .then(this.filterTriggers.bind(this));\n }\n\n getTriggers() {\n return this.datasourceSrv.get(this.panel.datasource)\n .then(datasource => {\n var zabbix = datasource.zabbix;\n this.zabbix = zabbix;\n var showEvents = this.panel.showEvents.value;\n var triggerFilter = this.panel.triggers;\n var hideHostsInMaintenance = this.panel.hideHostsInMaintenance;\n\n // Replace template variables\n var groupFilter = datasource.replaceTemplateVars(triggerFilter.group.filter);\n var hostFilter = datasource.replaceTemplateVars(triggerFilter.host.filter);\n var appFilter = datasource.replaceTemplateVars(triggerFilter.application.filter);\n\n let triggersOptions = {\n showTriggers: showEvents,\n hideHostsInMaintenance: hideHostsInMaintenance\n };\n let getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);\n return getTriggers.then(triggers => {\n return _.map(triggers, this.formatTrigger.bind(this));\n });\n });\n }\n\n getAcknowledges(triggerList) {\n // Request acknowledges for trigger\n var eventids = _.map(triggerList, trigger => {\n return trigger.lastEvent.eventid;\n });\n\n return this.zabbix.getAcknowledges(eventids)\n .then(events => {\n\n // Map events to triggers\n _.each(triggerList, trigger => {\n var event = _.find(events, event => {\n return event.eventid === trigger.lastEvent.eventid;\n });\n\n if (event) {\n trigger.acknowledges = _.map(event.acknowledges, ack => {\n let timestamp = moment.unix(ack.clock);\n if (this.panel.customLastChangeFormat) {\n ack.time = timestamp.format(this.panel.lastChangeFormat);\n } else {\n ack.time = timestamp.format(this.defaultTimeFormat);\n }\n ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';\n return ack;\n });\n\n // Mark acknowledged triggers with different color\n if (this.panel.markAckEvents && trigger.acknowledges.length) {\n trigger.color = this.panel.ackEventColor;\n }\n }\n });\n\n return triggerList;\n });\n }\n\n filterTriggers(triggerList) {\n // Filter triggers by description\n var triggerFilter = this.panel.triggers.trigger.filter;\n if (triggerFilter) {\n triggerList = filterTriggers(triggerList, triggerFilter);\n }\n\n // Filter acknowledged triggers\n if (this.panel.showTriggers === 'unacknowledged') {\n triggerList = _.filter(triggerList, trigger => {\n return !trigger.acknowledges;\n });\n } else if (this.panel.showTriggers === 'acknowledged') {\n triggerList = _.filter(triggerList, 'acknowledges');\n } else {\n triggerList = triggerList;\n }\n\n // Filter triggers by severity\n triggerList = _.filter(triggerList, trigger => {\n return this.panel.triggerSeverity[trigger.priority].show;\n });\n\n // Sort triggers\n if (this.panel.sortTriggersBy.value === 'priority') {\n triggerList = _.sortBy(triggerList, 'priority').reverse();\n } else {\n triggerList = _.sortBy(triggerList, 'lastchangeUnix').reverse();\n }\n\n return triggerList;\n }\n\n formatTrigger(trigger) {\n let triggerObj = trigger;\n\n // Format last change and age\n trigger.lastchangeUnix = Number(trigger.lastchange);\n let timestamp = moment.unix(trigger.lastchangeUnix);\n if (this.panel.customLastChangeFormat) {\n // User defined format\n triggerObj.lastchange = timestamp.format(this.panel.lastChangeFormat);\n } else {\n triggerObj.lastchange = timestamp.format(this.defaultTimeFormat);\n }\n triggerObj.age = timestamp.fromNow(true);\n\n // Set host that the trigger belongs\n if (trigger.hosts.length) {\n triggerObj.host = trigger.hosts[0].name;\n triggerObj.hostTechName = trigger.hosts[0].host;\n }\n\n // Set color\n if (trigger.value === '1') {\n // Problem state\n triggerObj.color = this.panel.triggerSeverity[trigger.priority].color;\n } else {\n // OK state\n triggerObj.color = this.panel.okEventColor;\n }\n\n triggerObj.severity = this.panel.triggerSeverity[trigger.priority].severity;\n return triggerObj;\n }\n\n switchComment(trigger) {\n trigger.showComment = !trigger.showComment;\n }\n\n acknowledgeTrigger(trigger, message) {\n let eventid = trigger.lastEvent.eventid;\n let grafana_user = this.contextSrv.user.name;\n let ack_message = grafana_user + ' (Grafana): ' + message;\n return this.datasourceSrv.get(this.panel.datasource)\n .then(datasource => {\n let zabbixAPI = datasource.zabbix.zabbixAPI;\n return zabbixAPI.acknowledgeEvent(eventid, ack_message);\n })\n .then(this.onRefresh.bind(this));\n }\n\n getCurrentTriggersPage() {\n let pageSize = this.panel.pageSize || 10;\n let startPos = this.pageIndex * pageSize;\n let endPos = Math.min(startPos + pageSize, this.triggerList.length);\n this.currentTriggersPage = this.triggerList.slice(startPos, endPos);\n return this.currentTriggersPage;\n }\n\n link(scope, elem, attrs, ctrl) {\n var data;\n var panel = ctrl.panel;\n var pageCount = 0;\n data = ctrl.triggerList;\n\n function getTableHeight() {\n var panelHeight = ctrl.height;\n\n if (pageCount > 1) {\n panelHeight -= 26;\n }\n\n return (panelHeight - 31) + 'px';\n }\n\n function switchPage(e) {\n let el = $(e.currentTarget);\n ctrl.pageIndex = (parseInt(el.text(), 10)-1);\n\n let pageSize = ctrl.panel.pageSize || 10;\n let startPos = ctrl.pageIndex * pageSize;\n let endPos = Math.min(startPos + pageSize, ctrl.triggerList.length);\n ctrl.currentTriggersPage = ctrl.triggerList.slice(startPos, endPos);\n\n scope.$apply();\n renderPanel();\n }\n\n function appendPaginationControls(footerElem) {\n footerElem.empty();\n\n var pageSize = ctrl.panel.pageSize || 5;\n pageCount = Math.ceil(data.length / pageSize);\n if (pageCount === 1) {\n return;\n }\n\n var startPage = Math.max(ctrl.pageIndex - 3, 0);\n var endPage = Math.min(pageCount, startPage + 9);\n\n var paginationList = $('');\n\n for (var i = startPage; i < endPage; i++) {\n var activeClass = i === ctrl.pageIndex ? 'active' : '';\n var pageLinkElem = $('
  • ' + (i+1) + '
    • ');\n paginationList.append(pageLinkElem);\n }\n\n footerElem.append(paginationList);\n }\n\n function renderPanel() {\n var panelElem = elem.parents('.panel');\n var rootElem = elem.find('.triggers-panel-scroll');\n var footerElem = elem.find('.triggers-panel-footer');\n\n elem.css({'font-size': panel.fontSize});\n panelElem.addClass('triggers-panel-wrapper');\n appendPaginationControls(footerElem);\n\n rootElem.css({'max-height': panel.scroll ? getTableHeight() : '' });\n }\n\n elem.on('click', '.triggers-panel-page-link', switchPage);\n\n var unbindDestroy = scope.$on('$destroy', function() {\n elem.off('click', '.triggers-panel-page-link');\n unbindDestroy();\n });\n\n ctrl.events.on('render', (renderData) => {\n data = renderData || data;\n if (data) {\n renderPanel();\n }\n ctrl.renderingCompleted();\n });\n }\n}\n\nTriggerPanelCtrl.templateUrl = 'panel-triggers/module.html';\n\nfunction filterTriggers(triggers, triggerFilter) {\n if (utils.isRegex(triggerFilter)) {\n return _.filter(triggers, function(trigger) {\n return utils.buildRegex(triggerFilter).test(trigger.description);\n });\n } else {\n return _.filter(triggers, function(trigger) {\n return trigger.description === triggerFilter;\n });\n }\n}\n\nexport {\n TriggerPanelCtrl,\n TriggerPanelCtrl as PanelCtrl\n};\n"]} \ No newline at end of file diff --git a/dist/plugin.json b/dist/plugin.json index df9048f..b420c92 100644 --- a/dist/plugin.json +++ b/dist/plugin.json @@ -3,11 +3,6 @@ "name": "Zabbix", "id": "alexanderzobnin-zabbix-app", - "css": { - "dark": "css/dark.css", - "light": "css/light.css" - }, - "info": { "description": "Zabbix plugin for Grafana", "author": { diff --git a/dist/test/module.js b/dist/test/module.js index ac26ed7..ff7f441 100644 --- a/dist/test/module.js +++ b/dist/test/module.js @@ -7,4 +7,11 @@ exports.ConfigCtrl = undefined; var _config = require('./components/config'); +var _sdk = require('app/plugins/sdk'); + +(0, _sdk.loadPluginCss)({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' +}); + exports.ConfigCtrl = _config.ZabbixAppConfigCtrl; diff --git a/dist/test/panel-triggers/module.js b/dist/test/panel-triggers/module.js index 30d0e2f..e5da3c4 100644 --- a/dist/test/panel-triggers/module.js +++ b/dist/test/panel-triggers/module.js @@ -19,18 +19,16 @@ var _moment = require('moment'); var _moment2 = _interopRequireDefault(_moment); +var _sdk = require('app/plugins/sdk'); + var _utils = require('../datasource-zabbix/utils'); var utils = _interopRequireWildcard(_utils); -var _sdk = require('app/plugins/sdk'); - var _editor = require('./editor'); require('./ack-tooltip.directive'); -require('./css/panel_triggers.css!'); - function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -52,6 +50,11 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function" * Licensed under the Apache License, Version 2.0 */ +(0, _sdk.loadPluginCss)({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' +}); + var defaultSeverity = [{ priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true }, { priority: 1, severity: 'Information', color: '#82B5D8', show: true }, { priority: 2, severity: 'Warning', color: '#E5AC0E', show: true }, { priority: 3, severity: 'Average', color: '#C15C17', show: true }, { priority: 4, severity: 'High', color: '#BF1B00', show: true }, { priority: 5, severity: 'Disaster', color: '#890F02', show: true }]; var panelDefaults = { diff --git a/src/module.js b/src/module.js index 34ff163..4b522a1 100644 --- a/src/module.js +++ b/src/module.js @@ -1,4 +1,10 @@ import {ZabbixAppConfigCtrl} from './components/config'; +import {loadPluginCss} from 'app/plugins/sdk'; + +loadPluginCss({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' +}); export { ZabbixAppConfigCtrl as ConfigCtrl diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js index 1aff895..38d7293 100644 --- a/src/panel-triggers/module.js +++ b/src/panel-triggers/module.js @@ -14,11 +14,16 @@ import _ from 'lodash'; import $ from 'jquery'; import moment from 'moment'; +import {loadPluginCss} from 'app/plugins/sdk'; import * as utils from '../datasource-zabbix/utils'; import {PanelCtrl} from 'app/plugins/sdk'; import {triggerPanelEditor} from './editor'; import './ack-tooltip.directive'; -import './css/panel_triggers.css!'; + +loadPluginCss({ + dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css', + light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css' +}); var defaultSeverity = [ { priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true }, diff --git a/src/plugin.json b/src/plugin.json index df9048f..b420c92 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -3,11 +3,6 @@ "name": "Zabbix", "id": "alexanderzobnin-zabbix-app", - "css": { - "dark": "css/dark.css", - "light": "css/light.css" - }, - "info": { "description": "Zabbix plugin for Grafana", "author": { diff --git a/src/sass/grafana-zabbix.dark.scss b/src/sass/grafana-zabbix.dark.scss new file mode 100644 index 0000000..57a3566 --- /dev/null +++ b/src/sass/grafana-zabbix.dark.scss @@ -0,0 +1,2 @@ +@import 'variables.dark'; +@import 'panel-triggers'; diff --git a/src/sass/grafana-zabbix.light.scss b/src/sass/grafana-zabbix.light.scss new file mode 100644 index 0000000..f6e0080 --- /dev/null +++ b/src/sass/grafana-zabbix.light.scss @@ -0,0 +1,2 @@ +@import 'variables.light'; +@import 'panel-triggers'; diff --git a/src/panel-triggers/sass/panel_triggers.scss b/src/sass/panel-triggers.scss similarity index 100% rename from src/panel-triggers/sass/panel_triggers.scss rename to src/sass/panel-triggers.scss diff --git a/src/sass/variables.dark.scss b/src/sass/variables.dark.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/sass/variables.light.scss b/src/sass/variables.light.scss new file mode 100644 index 0000000..e69de29 From 887f8da1885c9fe7e8cdd23e0dc9153218f63dd1 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 12:26:42 +0300 Subject: [PATCH 2/7] service files refactor --- Gruntfile.js | 4 ++-- package.json | 49 ++++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 589a161..bbd9fdc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -128,20 +128,20 @@ module.exports = function(grunt) { grunt.registerTask('default', [ 'clean', + 'sass', 'copy:src_to_dist', 'copy:pluginDef', 'jshint', 'jscs', - 'sass', 'babel', 'mochaTest' ]); grunt.registerTask('watchTask', [ 'clean', + 'sass', 'copy:src_to_dist', 'copy:pluginDef', - 'sass', 'babel', 'jshint', 'jscs' diff --git a/package.json b/package.json index 8bfbbf9..93d8731 100644 --- a/package.json +++ b/package.json @@ -16,35 +16,34 @@ "url": "https://github.com/alexanderzobnin/grafana-zabbix/issues" }, "devDependencies": { - "grunt": "~0.4.5", "babel": "~6.5.1", - "grunt-babel": "~6.0.0", - "grunt-sass": "^1.1.0", - "grunt-contrib-copy": "~0.8.2", - "grunt-contrib-watch": "^0.6.1", - "grunt-contrib-uglify": "~0.11.0", - "grunt-mocha-test": "~0.12.7", - "grunt-systemjs-builder": "^0.2.5", - "load-grunt-tasks": "~3.2.0", - "grunt-execute": "~0.2.2", - "grunt-contrib-clean": "~0.6.0", - "prunk": "~1.2.1", - "jsdom": "~3.1.2", - "q": "~1.4.1", + "babel-plugin-transform-es2015-for-of": "^6.6.0", + "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0", + "babel-preset-es2015": "^6.5.0", "chai": "~3.5.0", - "sinon-chai": "~2.8.0", - "moment": "~2.14.1" + "grunt": "~0.4.5", + "grunt-babel": "~6.0.0", + "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-copy": "~0.8.2", + "grunt-contrib-jshint": "^1.0.0", + "grunt-contrib-uglify": "~0.11.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-execute": "~0.2.2", + "grunt-jscs": "^2.8.0", + "grunt-mocha-test": "~0.12.7", + "grunt-sass": "^1.1.0", + "grunt-systemjs-builder": "^0.2.5", + "jsdom": "~3.1.2", + "jshint-stylish": "^2.1.0", + "load-grunt-tasks": "~3.2.0", + "mocha": "^2.4.5", + "moment": "~2.14.1", + "prunk": "~1.2.1", + "q": "~1.4.1", + "sinon-chai": "~2.8.0" }, "dependencies": { - "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0", - "babel-plugin-transform-es2015-for-of": "^6.6.0", - "babel-preset-es2015": "^6.5.0", - "grunt-contrib-jshint": "^1.0.0", - "grunt-jscs": "^2.8.0", - "jshint-stylish": "^2.1.0", - "lodash": "~4.0.0", - "mocha": "^2.4.5", - "sinon": "~1.16.1" + "lodash": "~4.0.0" }, "homepage": "http://grafana-zabbix.org" } From 8c5f2ddfe1ac2733be4303329a0d66c28ad5d500 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 12:26:55 +0300 Subject: [PATCH 3/7] sass files refactor --- dist/css/grafana-zabbix.dark.css.map | 8 ++- dist/css/grafana-zabbix.light.css.map | 8 ++- dist/datasource-zabbix/datasource.js | 56 +++++++++---------- dist/datasource-zabbix/datasource.js.map | 2 +- dist/test/datasource-zabbix/datasource.js | 56 +++++++++---------- ...nel-triggers.scss => _panel-triggers.scss} | 7 --- src/sass/_variables.dark.scss | 6 ++ src/sass/_variables.light.scss | 6 ++ .../{variables.dark.scss => _variables.scss} | 0 src/sass/grafana-zabbix.dark.scss | 2 +- src/sass/grafana-zabbix.light.scss | 2 +- src/sass/grafana-zabbix.scss | 2 + src/sass/variables.light.scss | 0 13 files changed, 77 insertions(+), 78 deletions(-) rename src/sass/{panel-triggers.scss => _panel-triggers.scss} (91%) create mode 100644 src/sass/_variables.dark.scss create mode 100644 src/sass/_variables.light.scss rename src/sass/{variables.dark.scss => _variables.scss} (100%) create mode 100644 src/sass/grafana-zabbix.scss delete mode 100644 src/sass/variables.light.scss diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index d5e44bc..ed307cc 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -3,9 +3,11 @@ "file": "grafana-zabbix.dark.css", "sources": [ "../../src/sass/grafana-zabbix.dark.scss", - "../../src/sass/variables.dark.scss", - "../../src/sass/panel-triggers.scss" + "../../src/sass/_variables.dark.scss", + "../../src/sass/grafana-zabbix.scss", + "../../src/sass/_variables.scss", + "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index e8c4de3..63b02f6 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -3,9 +3,11 @@ "file": "grafana-zabbix.light.css", "sources": [ "../../src/sass/grafana-zabbix.light.scss", - "../../src/sass/variables.light.scss", - "../../src/sass/panel-triggers.scss" + "../../src/sass/_variables.light.scss", + "../../src/sass/grafana-zabbix.scss", + "../../src/sass/_variables.scss", + "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/datasource-zabbix/datasource.js b/dist/datasource-zabbix/datasource.js index 6863d90..854b271 100644 --- a/dist/datasource-zabbix/datasource.js +++ b/dist/datasource-zabbix/datasource.js @@ -328,21 +328,19 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations', var getHistoryPromise = void 0; if (useTrends) { - (function () { - var valueType = _this2.getTrendValueType(target); - getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) { - return responseHandler.handleTrends(history, items, valueType); - }).then(function (timeseries) { - // Sort trend data, issue #202 - _.forEach(timeseries, function (series) { - series.datapoints = _.sortBy(series.datapoints, function (point) { - return point[c.DATAPOINT_TS]; - }); + var valueType = _this2.getTrendValueType(target); + getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) { + return responseHandler.handleTrends(history, items, valueType); + }).then(function (timeseries) { + // Sort trend data, issue #202 + _.forEach(timeseries, function (series) { + series.datapoints = _.sortBy(series.datapoints, function (point) { + return point[c.DATAPOINT_TS]; }); - - return timeseries; }); - })(); + + return timeseries; + }); } else { // Use history getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) { @@ -389,20 +387,18 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations', // Apply aggregations if (aggregationFunctions.length) { - (function () { - var dp = _.map(timeseries_data, 'datapoints'); - dp = sequence(aggregationFunctions)(dp); + var dp = _.map(timeseries_data, 'datapoints'); + dp = sequence(aggregationFunctions)(dp); - var aggFuncNames = _.map(metricFunctions.getCategories()['Aggregate'], 'name'); - var lastAgg = _.findLast(target.functions, function (func) { - return _.includes(aggFuncNames, func.def.name); - }); + var aggFuncNames = _.map(metricFunctions.getCategories()['Aggregate'], 'name'); + var lastAgg = _.findLast(target.functions, function (func) { + return _.includes(aggFuncNames, func.def.name); + }); - timeseries_data = [{ - target: lastAgg.text, - datapoints: dp - }]; - })(); + timeseries_data = [{ + target: lastAgg.text, + datapoints: dp + }]; } // Apply alias functions @@ -422,12 +418,10 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations', return func.def.name === 'timeShift'; }); if (timeShiftFunc) { - (function () { - var shift = timeShiftFunc.params[0]; - _.forEach(timeseries_data, function (series) { - series.datapoints = dataProcessor.unShiftTimeSeries(shift, series.datapoints); - }); - })(); + var shift = timeShiftFunc.params[0]; + _.forEach(timeseries_data, function (series) { + series.datapoints = dataProcessor.unShiftTimeSeries(shift, series.datapoints); + }); } } }, { diff --git a/dist/datasource-zabbix/datasource.js.map b/dist/datasource-zabbix/datasource.js.map index 1fb2942..4c495f2 100644 --- a/dist/datasource-zabbix/datasource.js.map +++ b/dist/datasource-zabbix/datasource.js.map @@ -1 +1 @@ -{"version":3,"sources":["../../src/datasource-zabbix/datasource.js"],"names":["bindFunctionDefs","functionDefs","category","aggregationFunctions","_","map","metricFunctions","getCategories","aggFuncDefs","filter","func","includes","def","name","funcInstance","createFuncInstance","params","bindFunction","dataProcessor","downsampleSeries","timeseries_data","options","timeseries","datapoints","length","maxDataPoints","groupBy","interval","AVERAGE","formatMetric","metricObj","text","expandable","zabbixTemplateFormat","value","utils","escapeRegex","escapedValues","join","replaceTemplateVars","templateSrv","target","scopedVars","replacedTarget","replace","isRegex","sequence","funcsArray","result","i","call","filterEnabledTargets","targets","hide","group","host","item","getTriggerThreshold","expression","thresholdPattern","finded_thresholds","match","threshold","Number","dateMath","migrations","c","responseHandler","ZabbixAPIError","ZabbixAPIDatasource","instanceSettings","alertSrv","dashboardSrv","zabbixAlertingSrv","Zabbix","url","basicAuth","withCredentials","username","jsonData","password","trends","trendsFrom","trendsRange","ttl","cacheTTL","parseInterval","alertingEnabled","alerting","addThresholds","alertingMinSeverity","SEV_WARNING","zabbix","partial","alertQuery","then","setPanelAlertState","panelId","alert","state","removeZabbixThreshold","forEach","thresholds","setPanelThreshold","promises","timeFrom","Math","ceil","parse","range","from","timeTo","to","cloneDeep","t","replaceTargetVariables","timeFunctions","functions","time_from","time_to","timeRange","useTrends","isUseTrends","mode","MODE_ITSERVICE","migrate","MODE_METRICS","queryNumericData","MODE_TEXT","queryTextData","itservice","slaProperty","getSLA","serviceid","handleSLAResponse","slaObject","Promise","all","flatten","data","itemtype","getItemsFromTarget","getHistoryPromise","valueType","getTrendValueType","getTrend","items","handleTrends","history","series","sortBy","point","DATAPOINT_TS","getHistory","handleHistory","applyDataProcessingFunctions","catch","console","log","error","trendFunctions","trendValueFunc","find","transformFunctions","filterFunctions","aliasFunctions","dp","aggFuncNames","lastAgg","findLast","applyTimeShiftFunction","timeShiftFunc","shift","unShiftTimeSeries","handleText","resolve","zabbixVersion","getVersion","version","login","status","title","message","query","parts","each","splitTemplateQuery","part","push","template","zipObject","app","getItems","getApps","getHosts","getGroups","metrics","rangeRaw","annotation","showOkEvents","SHOW_ALL_EVENTS","SHOW_OK_EVENTS","triggersOptions","showTriggers","SHOW_ALL_TRIGGERS","hideHostsInMaintenance","getTriggers","application","trigger","triggers","buildRegex","test","description","priority","minseverity","objectids","getEvents","indexedTriggers","keyBy","hideAcknowledged","events","event","acknowledges","tags","showHostname","hosts","formatted_acknowledges","formatAcknowledges","time","clock","objectid","enabled_targets","getPanelItems","results","itemids","getAlerts","firedTriggers","p","textFilter","param","toString","useTrendsFrom","useTrendsRange","contains","indexBy"],"mappings":"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","file":"datasource.js","sourcesContent":["import _ from 'lodash';\nimport * as dateMath from 'app/core/utils/datemath';\nimport * as utils from './utils';\nimport * as migrations from './migrations';\nimport * as metricFunctions from './metricFunctions';\nimport * as c from './constants';\nimport dataProcessor from './dataProcessor';\nimport responseHandler from './responseHandler';\nimport './zabbix.js';\nimport './zabbixAlerting.service.js';\nimport {ZabbixAPIError} from './zabbixAPICore.service.js';\n\nclass ZabbixAPIDatasource {\n\n /** @ngInject */\n constructor(instanceSettings, templateSrv, alertSrv, dashboardSrv, zabbixAlertingSrv, Zabbix) {\n this.templateSrv = templateSrv;\n this.alertSrv = alertSrv;\n this.dashboardSrv = dashboardSrv;\n this.zabbixAlertingSrv = zabbixAlertingSrv;\n\n // General data source settings\n this.name = instanceSettings.name;\n this.url = instanceSettings.url;\n this.basicAuth = instanceSettings.basicAuth;\n this.withCredentials = instanceSettings.withCredentials;\n\n // Zabbix API credentials\n this.username = instanceSettings.jsonData.username;\n this.password = instanceSettings.jsonData.password;\n\n // Use trends instead history since specified time\n this.trends = instanceSettings.jsonData.trends;\n this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d';\n this.trendsRange = instanceSettings.jsonData.trendsRange || '4d';\n\n // Set cache update interval\n var ttl = instanceSettings.jsonData.cacheTTL || '1h';\n this.cacheTTL = utils.parseInterval(ttl);\n\n // Alerting options\n this.alertingEnabled = instanceSettings.jsonData.alerting;\n this.addThresholds = instanceSettings.jsonData.addThresholds;\n this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;\n\n this.zabbix = new Zabbix(this.url, this.username, this.password, this.basicAuth, this.withCredentials, this.cacheTTL);\n\n // Use custom format for template variables\n this.replaceTemplateVars = _.partial(replaceTemplateVars, this.templateSrv);\n }\n\n ////////////////////////\n // Datasource methods //\n ////////////////////////\n\n /**\n * Query panel data. Calls for each panel in dashboard.\n * @param {Object} options Contains time range, targets and other info.\n * @return {Object} Grafana metrics object with timeseries data for each target.\n */\n query(options) {\n // Get alerts for current panel\n if (this.alertingEnabled) {\n this.alertQuery(options).then(alert => {\n this.zabbixAlertingSrv.setPanelAlertState(options.panelId, alert.state);\n\n this.zabbixAlertingSrv.removeZabbixThreshold(options.panelId);\n if (this.addThresholds) {\n _.forEach(alert.thresholds, threshold => {\n this.zabbixAlertingSrv.setPanelThreshold(options.panelId, threshold);\n });\n }\n });\n }\n\n // Create request for each target\n let promises = _.map(options.targets, t => {\n let timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);\n let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);\n\n // Prevent changes of original object\n let target = _.cloneDeep(t);\n this.replaceTargetVariables(target, options);\n\n // Apply Time-related functions (timeShift(), etc)\n let timeFunctions = bindFunctionDefs(target.functions, 'Time');\n if (timeFunctions.length) {\n const [time_from, time_to] = sequence(timeFunctions)([timeFrom, timeTo]);\n timeFrom = time_from;\n timeTo = time_to;\n }\n let timeRange = [timeFrom, timeTo];\n\n let useTrends = this.isUseTrends(timeRange);\n\n // Metrics or Text query mode\n if (target.mode !== c.MODE_ITSERVICE) {\n // Migrate old targets\n target = migrations.migrate(target);\n\n // Don't request undefined and hidden targets\n if (target.hide || !target.group || !target.host || !target.item) {\n return [];\n }\n\n if (!target.mode || target.mode === c.MODE_METRICS) {\n return this.queryNumericData(target, timeRange, useTrends);\n } else if (target.mode === c.MODE_TEXT) {\n return this.queryTextData(target, timeRange);\n }\n }\n\n // IT services mode\n else if (target.mode === c.MODE_ITSERVICE) {\n // Don't show undefined and hidden targets\n if (target.hide || !target.itservice || !target.slaProperty) {\n return [];\n }\n\n return this.zabbix.getSLA(target.itservice.serviceid, timeRange)\n .then(slaObject => {\n return responseHandler.handleSLAResponse(target.itservice, target.slaProperty, slaObject);\n });\n }\n });\n\n // Data for panel (all targets)\n return Promise.all(_.flatten(promises))\n .then(_.flatten)\n .then(timeseries_data => {\n return downsampleSeries(timeseries_data, options);\n })\n .then(data => {\n return { data: data };\n });\n }\n\n queryNumericData(target, timeRange, useTrends) {\n let [timeFrom, timeTo] = timeRange;\n let options = {\n itemtype: 'num'\n };\n return this.zabbix.getItemsFromTarget(target, options)\n .then(items => {\n let getHistoryPromise;\n\n if (useTrends) {\n let valueType = this.getTrendValueType(target);\n getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleTrends(history, items, valueType);\n })\n .then(timeseries => {\n // Sort trend data, issue #202\n _.forEach(timeseries, series => {\n series.datapoints = _.sortBy(series.datapoints, point => point[c.DATAPOINT_TS]);\n });\n\n return timeseries;\n });\n } else {\n // Use history\n getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleHistory(history, items);\n });\n }\n\n return getHistoryPromise.then(timeseries_data => {\n return this.applyDataProcessingFunctions(timeseries_data, target);\n });\n })\n .catch(error => {\n console.log(error);\n return [];\n });\n }\n\n getTrendValueType(target) {\n // Find trendValue() function and get specified trend value\n var trendFunctions = _.map(metricFunctions.getCategories()['Trends'], 'name');\n var trendValueFunc = _.find(target.functions, func => {\n return _.includes(trendFunctions, func.def.name);\n });\n return trendValueFunc ? trendValueFunc.params[0] : \"avg\";\n }\n\n applyDataProcessingFunctions(timeseries_data, target) {\n let transformFunctions = bindFunctionDefs(target.functions, 'Transform');\n let aggregationFunctions = bindFunctionDefs(target.functions, 'Aggregate');\n let filterFunctions = bindFunctionDefs(target.functions, 'Filter');\n let aliasFunctions = bindFunctionDefs(target.functions, 'Alias');\n\n // Apply transformation functions\n timeseries_data = _.map(timeseries_data, timeseries => {\n timeseries.datapoints = sequence(transformFunctions)(timeseries.datapoints);\n return timeseries;\n });\n\n // Apply filter functions\n if (filterFunctions.length) {\n timeseries_data = sequence(filterFunctions)(timeseries_data);\n }\n\n // Apply aggregations\n if (aggregationFunctions.length) {\n let dp = _.map(timeseries_data, 'datapoints');\n dp = sequence(aggregationFunctions)(dp);\n\n let aggFuncNames = _.map(metricFunctions.getCategories()['Aggregate'], 'name');\n let lastAgg = _.findLast(target.functions, func => {\n return _.includes(aggFuncNames, func.def.name);\n });\n\n timeseries_data = [{\n target: lastAgg.text,\n datapoints: dp\n }];\n }\n\n // Apply alias functions\n _.forEach(timeseries_data, sequence(aliasFunctions));\n\n // Apply Time-related functions (timeShift(), etc)\n // Find timeShift() function and get specified trend value\n this.applyTimeShiftFunction(timeseries_data, target);\n\n return timeseries_data;\n }\n\n applyTimeShiftFunction(timeseries_data, target) {\n // Find timeShift() function and get specified interval\n let timeShiftFunc = _.find(target.functions, (func) => {\n return func.def.name === 'timeShift';\n });\n if (timeShiftFunc) {\n let shift = timeShiftFunc.params[0];\n _.forEach(timeseries_data, (series) => {\n series.datapoints = dataProcessor.unShiftTimeSeries(shift, series.datapoints);\n });\n }\n }\n\n queryTextData(target, timeRange) {\n let [timeFrom, timeTo] = timeRange;\n let options = {\n itemtype: 'text'\n };\n return this.zabbix.getItemsFromTarget(target, options)\n .then(items => {\n if (items.length) {\n return this.zabbix.getHistory(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleText(history, items, target);\n });\n } else {\n return Promise.resolve([]);\n }\n });\n }\n\n /**\n * Test connection to Zabbix API\n * @return {object} Connection status and Zabbix API version\n */\n testDatasource() {\n let zabbixVersion;\n return this.zabbix.getVersion()\n .then(version => {\n zabbixVersion = version;\n return this.zabbix.login();\n })\n .then(() => {\n return {\n status: \"success\",\n title: \"Success\",\n message: \"Zabbix API version: \" + zabbixVersion\n };\n })\n .catch(error => {\n if (error instanceof ZabbixAPIError) {\n return {\n status: \"error\",\n title: error.message,\n message: error.data\n };\n } else {\n return {\n status: \"error\",\n title: \"Connection failed\",\n message: \"Could not connect to given url\"\n };\n }\n });\n }\n\n ////////////////\n // Templating //\n ////////////////\n\n /**\n * Find metrics from templated request.\n *\n * @param {string} query Query from Templating\n * @return {string} Metric name - group, host, app or item or list\n * of metrics in \"{metric1,metcic2,...,metricN}\" format.\n */\n metricFindQuery(query) {\n let result;\n let parts = [];\n\n // Split query. Query structure: group.host.app.item\n _.each(utils.splitTemplateQuery(query), part => {\n part = this.replaceTemplateVars(part, {});\n\n // Replace wildcard to regex\n if (part === '*') {\n part = '/.*/';\n }\n parts.push(part);\n });\n let template = _.zipObject(['group', 'host', 'app', 'item'], parts);\n\n // Get items\n if (parts.length === 4) {\n // Search for all items, even it's not belong to any application\n if (template.app === '/.*/') {\n template.app = '';\n }\n result = this.zabbix.getItems(template.group, template.host, template.app, template.item);\n } else if (parts.length === 3) {\n // Get applications\n result = this.zabbix.getApps(template.group, template.host, template.app);\n } else if (parts.length === 2) {\n // Get hosts\n result = this.zabbix.getHosts(template.group, template.host);\n } else if (parts.length === 1) {\n // Get groups\n result = this.zabbix.getGroups(template.group);\n } else {\n result = Promise.resolve([]);\n }\n\n return result.then(metrics => {\n return _.map(metrics, formatMetric);\n });\n }\n\n /////////////////\n // Annotations //\n /////////////////\n\n annotationQuery(options) {\n var timeFrom = Math.ceil(dateMath.parse(options.rangeRaw.from) / 1000);\n var timeTo = Math.ceil(dateMath.parse(options.rangeRaw.to) / 1000);\n var annotation = options.annotation;\n var showOkEvents = annotation.showOkEvents ? c.SHOW_ALL_EVENTS : c.SHOW_OK_EVENTS;\n\n // Show all triggers\n let triggersOptions = {\n showTriggers: c.SHOW_ALL_TRIGGERS,\n hideHostsInMaintenance: false\n };\n\n var getTriggers = this.zabbix.getTriggers(this.replaceTemplateVars(annotation.group, {}),\n this.replaceTemplateVars(annotation.host, {}),\n this.replaceTemplateVars(annotation.application, {}),\n triggersOptions);\n\n return getTriggers.then(triggers => {\n\n // Filter triggers by description\n if (utils.isRegex(annotation.trigger)) {\n triggers = _.filter(triggers, trigger => {\n return utils.buildRegex(annotation.trigger).test(trigger.description);\n });\n } else if (annotation.trigger) {\n triggers = _.filter(triggers, trigger => {\n return trigger.description === annotation.trigger;\n });\n }\n\n // Remove events below the chose severity\n triggers = _.filter(triggers, trigger => {\n return Number(trigger.priority) >= Number(annotation.minseverity);\n });\n\n var objectids = _.map(triggers, 'triggerid');\n return this.zabbix\n .getEvents(objectids, timeFrom, timeTo, showOkEvents)\n .then(events => {\n var indexedTriggers = _.keyBy(triggers, 'triggerid');\n\n // Hide acknowledged events if option enabled\n if (annotation.hideAcknowledged) {\n events = _.filter(events, event => {\n return !event.acknowledges.length;\n });\n }\n\n return _.map(events, event => {\n let tags;\n if (annotation.showHostname) {\n tags = _.map(event.hosts, 'name');\n }\n\n // Show event type (OK or Problem)\n let title = Number(event.value) ? 'Problem' : 'OK';\n\n let formatted_acknowledges = utils.formatAcknowledges(event.acknowledges);\n return {\n annotation: annotation,\n time: event.clock * 1000,\n title: title,\n tags: tags,\n text: indexedTriggers[event.objectid].description + formatted_acknowledges\n };\n });\n });\n });\n }\n\n /**\n * Get triggers and its details for panel's targets\n * Returns alert state ('ok' if no fired triggers, or 'alerting' if at least 1 trigger is fired)\n * or empty object if no related triggers are finded.\n */\n alertQuery(options) {\n let enabled_targets = filterEnabledTargets(options.targets);\n let getPanelItems = _.map(enabled_targets, target => {\n return this.zabbix.getItemsFromTarget(target, {itemtype: 'num'});\n });\n\n return Promise.all(getPanelItems)\n .then(results => {\n let items = _.flatten(results);\n let itemids = _.map(items, 'itemid');\n\n return this.zabbix.getAlerts(itemids);\n })\n .then(triggers => {\n triggers = _.filter(triggers, trigger => {\n return trigger.priority >= this.alertingMinSeverity;\n });\n\n if (!triggers || triggers.length === 0) {\n return {};\n }\n\n let state = 'ok';\n\n let firedTriggers = _.filter(triggers, {value: '1'});\n if (firedTriggers.length) {\n state = 'alerting';\n }\n\n let thresholds = _.map(triggers, trigger => {\n return getTriggerThreshold(trigger.expression);\n });\n\n return {\n panelId: options.panelId,\n state: state,\n thresholds: thresholds\n };\n });\n }\n\n // Replace template variables\n replaceTargetVariables(target, options) {\n let parts = ['group', 'host', 'application', 'item'];\n _.forEach(parts, p => {\n if (target[p] && target[p].filter) {\n target[p].filter = this.replaceTemplateVars(target[p].filter, options.scopedVars);\n }\n });\n target.textFilter = this.replaceTemplateVars(target.textFilter, options.scopedVars);\n\n _.forEach(target.functions, func => {\n func.params = _.map(func.params, param => {\n if (typeof param === 'number') {\n return +this.templateSrv.replace(param.toString(), options.scopedVars);\n } else {\n return this.templateSrv.replace(param, options.scopedVars);\n }\n });\n });\n }\n\n isUseTrends(timeRange) {\n let [timeFrom, timeTo] = timeRange;\n let useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);\n let useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);\n let useTrends = this.trends && (\n (timeFrom <= useTrendsFrom) ||\n (timeTo - timeFrom >= useTrendsRange)\n );\n return useTrends;\n }\n}\n\nfunction bindFunctionDefs(functionDefs, category) {\n var aggregationFunctions = _.map(metricFunctions.getCategories()[category], 'name');\n var aggFuncDefs = _.filter(functionDefs, function(func) {\n return _.includes(aggregationFunctions, func.def.name);\n });\n\n return _.map(aggFuncDefs, function(func) {\n var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);\n return funcInstance.bindFunction(dataProcessor.metricFunctions);\n });\n}\n\nfunction downsampleSeries(timeseries_data, options) {\n return _.map(timeseries_data, timeseries => {\n if (timeseries.datapoints.length > options.maxDataPoints) {\n timeseries.datapoints = dataProcessor\n .groupBy(options.interval, dataProcessor.AVERAGE, timeseries.datapoints);\n }\n return timeseries;\n });\n}\n\nfunction formatMetric(metricObj) {\n return {\n text: metricObj.name,\n expandable: false\n };\n}\n\n/**\n * Custom formatter for template variables.\n * Default Grafana \"regex\" formatter returns\n * value1|value2\n * This formatter returns\n * (value1|value2)\n * This format needed for using in complex regex with\n * template variables, for example\n * /CPU $cpu_item.*time/ where $cpu_item is system,user,iowait\n */\nfunction zabbixTemplateFormat(value) {\n if (typeof value === 'string') {\n return utils.escapeRegex(value);\n }\n\n var escapedValues = _.map(value, utils.escapeRegex);\n return '(' + escapedValues.join('|') + ')';\n}\n\n/**\n * If template variables are used in request, replace it using regex format\n * and wrap with '/' for proper multi-value work. Example:\n * $variable selected as a, b, c\n * We use filter $variable\n * $variable -> a|b|c -> /a|b|c/\n * /$variable/ -> /a|b|c/ -> /a|b|c/\n */\nfunction replaceTemplateVars(templateSrv, target, scopedVars) {\n var replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat);\n if (target !== replacedTarget && !utils.isRegex(replacedTarget)) {\n replacedTarget = '/^' + replacedTarget + '$/';\n }\n return replacedTarget;\n}\n\n// Apply function one by one:\n// sequence([a(), b(), c()]) = c(b(a()));\nfunction sequence(funcsArray) {\n return function(result) {\n for (var i = 0; i < funcsArray.length; i++) {\n result = funcsArray[i].call(this, result);\n }\n return result;\n };\n}\n\nfunction filterEnabledTargets(targets) {\n return _.filter(targets, target => {\n return !(target.hide || !target.group || !target.host || !target.item);\n });\n}\n\nfunction getTriggerThreshold(expression) {\n let thresholdPattern = /.*[<>]([\\d\\.]+)/;\n let finded_thresholds = expression.match(thresholdPattern);\n if (finded_thresholds && finded_thresholds.length >= 2) {\n let threshold = finded_thresholds[1];\n threshold = Number(threshold);\n return threshold;\n } else {\n return null;\n }\n}\n\nexport {ZabbixAPIDatasource, zabbixTemplateFormat};\n\n// Fix for backward compatibility with lodash 2.4\nif (!_.includes) {_.includes = _.contains;}\nif (!_.keyBy) {_.keyBy = _.indexBy;}\n"]} \ No newline at end of file +{"version":3,"sources":["../../src/datasource-zabbix/datasource.js"],"names":["bindFunctionDefs","functionDefs","category","aggregationFunctions","_","map","metricFunctions","getCategories","aggFuncDefs","filter","func","includes","def","name","funcInstance","createFuncInstance","params","bindFunction","dataProcessor","downsampleSeries","timeseries_data","options","timeseries","datapoints","length","maxDataPoints","groupBy","interval","AVERAGE","formatMetric","metricObj","text","expandable","zabbixTemplateFormat","value","utils","escapeRegex","escapedValues","join","replaceTemplateVars","templateSrv","target","scopedVars","replacedTarget","replace","isRegex","sequence","funcsArray","result","i","call","filterEnabledTargets","targets","hide","group","host","item","getTriggerThreshold","expression","thresholdPattern","finded_thresholds","match","threshold","Number","dateMath","migrations","c","responseHandler","ZabbixAPIError","ZabbixAPIDatasource","instanceSettings","alertSrv","dashboardSrv","zabbixAlertingSrv","Zabbix","url","basicAuth","withCredentials","username","jsonData","password","trends","trendsFrom","trendsRange","ttl","cacheTTL","parseInterval","alertingEnabled","alerting","addThresholds","alertingMinSeverity","SEV_WARNING","zabbix","partial","alertQuery","then","setPanelAlertState","panelId","alert","state","removeZabbixThreshold","forEach","thresholds","setPanelThreshold","promises","timeFrom","Math","ceil","parse","range","from","timeTo","to","cloneDeep","t","replaceTargetVariables","timeFunctions","functions","time_from","time_to","timeRange","useTrends","isUseTrends","mode","MODE_ITSERVICE","migrate","MODE_METRICS","queryNumericData","MODE_TEXT","queryTextData","itservice","slaProperty","getSLA","serviceid","handleSLAResponse","slaObject","Promise","all","flatten","data","itemtype","getItemsFromTarget","getHistoryPromise","valueType","getTrendValueType","getTrend","items","handleTrends","history","series","sortBy","point","DATAPOINT_TS","getHistory","handleHistory","applyDataProcessingFunctions","catch","console","log","error","trendFunctions","trendValueFunc","find","transformFunctions","filterFunctions","aliasFunctions","dp","aggFuncNames","lastAgg","findLast","applyTimeShiftFunction","timeShiftFunc","shift","unShiftTimeSeries","handleText","resolve","zabbixVersion","getVersion","version","login","status","title","message","query","parts","each","splitTemplateQuery","part","push","template","zipObject","app","getItems","getApps","getHosts","getGroups","metrics","rangeRaw","annotation","showOkEvents","SHOW_ALL_EVENTS","SHOW_OK_EVENTS","triggersOptions","showTriggers","SHOW_ALL_TRIGGERS","hideHostsInMaintenance","getTriggers","application","trigger","triggers","buildRegex","test","description","priority","minseverity","objectids","getEvents","indexedTriggers","keyBy","hideAcknowledged","events","event","acknowledges","tags","showHostname","hosts","formatted_acknowledges","formatAcknowledges","time","clock","objectid","enabled_targets","getPanelItems","results","itemids","getAlerts","firedTriggers","p","textFilter","param","toString","useTrendsFrom","useTrendsRange","contains","indexBy"],"mappings":";;;;;;;;;;;;;AAqfA,WAASA,gBAAT,CAA0BC,YAA1B,EAAwCC,QAAxC,EAAkD;AAChD,QAAIC,uBAAuBC,EAAEC,GAAF,CAAMC,gBAAgBC,aAAhB,GAAgCL,QAAhC,CAAN,EAAiD,MAAjD,CAA3B;AACA,QAAIM,cAAcJ,EAAEK,MAAF,CAASR,YAAT,EAAuB,UAASS,IAAT,EAAe;AACtD,aAAON,EAAEO,QAAF,CAAWR,oBAAX,EAAiCO,KAAKE,GAAL,CAASC,IAA1C,CAAP;AACD,KAFiB,CAAlB;;AAIA,WAAOT,EAAEC,GAAF,CAAMG,WAAN,EAAmB,UAASE,IAAT,EAAe;AACvC,UAAII,eAAeR,gBAAgBS,kBAAhB,CAAmCL,KAAKE,GAAxC,EAA6CF,KAAKM,MAAlD,CAAnB;AACA,aAAOF,aAAaG,YAAb,CAA0BC,cAAcZ,eAAxC,CAAP;AACD,KAHM,CAAP;AAID;;AAED,WAASa,gBAAT,CAA0BC,eAA1B,EAA2CC,OAA3C,EAAoD;AAClD,WAAOjB,EAAEC,GAAF,CAAMe,eAAN,EAAuB,sBAAc;AAC1C,UAAIE,WAAWC,UAAX,CAAsBC,MAAtB,GAA+BH,QAAQI,aAA3C,EAA0D;AACxDH,mBAAWC,UAAX,GAAwBL,cACrBQ,OADqB,CACbL,QAAQM,QADK,EACKT,cAAcU,OADnB,EAC4BN,WAAWC,UADvC,CAAxB;AAED;AACD,aAAOD,UAAP;AACD,KANM,CAAP;AAOD;;AAED,WAASO,YAAT,CAAsBC,SAAtB,EAAiC;AAC/B,WAAO;AACLC,YAAMD,UAAUjB,IADX;AAELmB,kBAAY;AAFP,KAAP;AAID;;AAED;;;;;;;;;;AAUA,WAASC,oBAAT,CAA8BC,KAA9B,EAAqC;AACnC,QAAI,OAAOA,KAAP,KAAiB,QAArB,EAA+B;AAC7B,aAAOC,MAAMC,WAAN,CAAkBF,KAAlB,CAAP;AACD;;AAED,QAAIG,gBAAgBjC,EAAEC,GAAF,CAAM6B,KAAN,EAAaC,MAAMC,WAAnB,CAApB;AACA,WAAO,MAAMC,cAAcC,IAAd,CAAmB,GAAnB,CAAN,GAAgC,GAAvC;AACD;;AAED;;;;;;;;AAQA,WAASC,mBAAT,CAA6BC,WAA7B,EAA0CC,MAA1C,EAAkDC,UAAlD,EAA8D;AAC5D,QAAIC,iBAAiBH,YAAYI,OAAZ,CAAoBH,MAApB,EAA4BC,UAA5B,EAAwCT,oBAAxC,CAArB;AACA,QAAIQ,WAAWE,cAAX,IAA6B,CAACR,MAAMU,OAAN,CAAcF,cAAd,CAAlC,EAAiE;AAC/DA,uBAAiB,OAAOA,cAAP,GAAwB,IAAzC;AACD;AACD,WAAOA,cAAP;AACD;;AAED;AACA;AACA,WAASG,QAAT,CAAkBC,UAAlB,EAA8B;AAC5B,WAAO,UAASC,MAAT,EAAiB;AACtB,WAAK,IAAIC,IAAI,CAAb,EAAgBA,IAAIF,WAAWvB,MAA/B,EAAuCyB,GAAvC,EAA4C;AAC1CD,iBAASD,WAAWE,CAAX,EAAcC,IAAd,CAAmB,IAAnB,EAAyBF,MAAzB,CAAT;AACD;AACD,aAAOA,MAAP;AACD,KALD;AAMD;;AAED,WAASG,oBAAT,CAA8BC,OAA9B,EAAuC;AACrC,WAAOhD,EAAEK,MAAF,CAAS2C,OAAT,EAAkB,kBAAU;AACjC,aAAO,EAAEX,OAAOY,IAAP,IAAe,CAACZ,OAAOa,KAAvB,IAAgC,CAACb,OAAOc,IAAxC,IAAgD,CAACd,OAAOe,IAA1D,CAAP;AACD,KAFM,CAAP;AAGD;;AAED,WAASC,mBAAT,CAA6BC,UAA7B,EAAyC;AACvC,QAAIC,mBAAmB,iBAAvB;AACA,QAAIC,oBAAoBF,WAAWG,KAAX,CAAiBF,gBAAjB,CAAxB;AACA,QAAIC,qBAAqBA,kBAAkBpC,MAAlB,IAA4B,CAArD,EAAwD;AACtD,UAAIsC,YAAYF,kBAAkB,CAAlB,CAAhB;AACAE,kBAAYC,OAAOD,SAAP,CAAZ;AACA,aAAOA,SAAP;AACD,KAJD,MAIO;AACL,aAAO,IAAP;AACD;AACF;;;;AAhlBM1D,O;;AACK4D,c;;AACA7B,W;;AACA8B,gB;;AACA3D,qB;;AACA4D,O;;AACLhD,mB;;AACAiD,qB;;AAGCC,oB,2BAAAA,c;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAEFC,mB;;AAEJ;AACA,qCAAYC,gBAAZ,EAA8B9B,WAA9B,EAA2C+B,QAA3C,EAAqDC,YAArD,EAAmEC,iBAAnE,EAAsFC,MAAtF,EAA8F;AAAA;;AAC5F,eAAKlC,WAAL,GAAmBA,WAAnB;AACA,eAAK+B,QAAL,GAAgBA,QAAhB;AACA,eAAKC,YAAL,GAAoBA,YAApB;AACA,eAAKC,iBAAL,GAAyBA,iBAAzB;;AAEA;AACA,eAAK5D,IAAL,GAAwByD,iBAAiBzD,IAAzC;AACA,eAAK8D,GAAL,GAAwBL,iBAAiBK,GAAzC;AACA,eAAKC,SAAL,GAAwBN,iBAAiBM,SAAzC;AACA,eAAKC,eAAL,GAAwBP,iBAAiBO,eAAzC;;AAEA;AACA,eAAKC,QAAL,GAAwBR,iBAAiBS,QAAjB,CAA0BD,QAAlD;AACA,eAAKE,QAAL,GAAwBV,iBAAiBS,QAAjB,CAA0BC,QAAlD;;AAEA;AACA,eAAKC,MAAL,GAAwBX,iBAAiBS,QAAjB,CAA0BE,MAAlD;AACA,eAAKC,UAAL,GAAwBZ,iBAAiBS,QAAjB,CAA0BG,UAA1B,IAAwC,IAAhE;AACA,eAAKC,WAAL,GAAwBb,iBAAiBS,QAAjB,CAA0BI,WAA1B,IAAyC,IAAjE;;AAEA;AACA,cAAIC,MAAMd,iBAAiBS,QAAjB,CAA0BM,QAA1B,IAAsC,IAAhD;AACA,eAAKA,QAAL,GAAgBlD,MAAMmD,aAAN,CAAoBF,GAApB,CAAhB;;AAEA;AACA,eAAKG,eAAL,GAAuBjB,iBAAiBS,QAAjB,CAA0BS,QAAjD;AACA,eAAKC,aAAL,GAAqBnB,iBAAiBS,QAAjB,CAA0BU,aAA/C;AACA,eAAKC,mBAAL,GAA2BpB,iBAAiBS,QAAjB,CAA0BW,mBAA1B,IAAiDxB,EAAEyB,WAA9E;;AAEA,eAAKC,MAAL,GAAc,IAAIlB,MAAJ,CAAW,KAAKC,GAAhB,EAAqB,KAAKG,QAA1B,EAAoC,KAAKE,QAAzC,EAAmD,KAAKJ,SAAxD,EAAmE,KAAKC,eAAxE,EAAyF,KAAKQ,QAA9F,CAAd;;AAEA;AACA,eAAK9C,mBAAL,GAA2BnC,EAAEyF,OAAF,CAAUtD,mBAAV,EAA+B,KAAKC,WAApC,CAA3B;AACD;;AAED;AACA;AACA;;AAEA;;;;;;;;;gCAKMnB,O,EAAS;AAAA;;AACb;AACA,gBAAI,KAAKkE,eAAT,EAA0B;AACxB,mBAAKO,UAAL,CAAgBzE,OAAhB,EAAyB0E,IAAzB,CAA8B,iBAAS;AACrC,sBAAKtB,iBAAL,CAAuBuB,kBAAvB,CAA0C3E,QAAQ4E,OAAlD,EAA2DC,MAAMC,KAAjE;;AAEA,sBAAK1B,iBAAL,CAAuB2B,qBAAvB,CAA6C/E,QAAQ4E,OAArD;AACA,oBAAI,MAAKR,aAAT,EAAwB;AACtBrF,oBAAEiG,OAAF,CAAUH,MAAMI,UAAhB,EAA4B,qBAAa;AACvC,0BAAK7B,iBAAL,CAAuB8B,iBAAvB,CAAyClF,QAAQ4E,OAAjD,EAA0DnC,SAA1D;AACD,mBAFD;AAGD;AACF,eATD;AAUD;;AAED;AACA,gBAAI0C,WAAWpG,EAAEC,GAAF,CAAMgB,QAAQ+B,OAAd,EAAuB,aAAK;AACzC,kBAAIqD,WAAWC,KAAKC,IAAL,CAAU3C,SAAS4C,KAAT,CAAevF,QAAQwF,KAAR,CAAcC,IAA7B,IAAqC,IAA/C,CAAf;AACA,kBAAIC,SAASL,KAAKC,IAAL,CAAU3C,SAAS4C,KAAT,CAAevF,QAAQwF,KAAR,CAAcG,EAA7B,IAAmC,IAA7C,CAAb;;AAEA;AACA,kBAAIvE,SAASrC,EAAE6G,SAAF,CAAYC,CAAZ,CAAb;AACA,oBAAKC,sBAAL,CAA4B1E,MAA5B,EAAoCpB,OAApC;;AAEA;AACA,kBAAI+F,gBAAgBpH,iBAAiByC,OAAO4E,SAAxB,EAAmC,MAAnC,CAApB;AACA,kBAAID,cAAc5F,MAAlB,EAA0B;AAAA,gCACKsB,SAASsE,aAAT,EAAwB,CAACX,QAAD,EAAWM,MAAX,CAAxB,CADL;AAAA;AAAA,oBACjBO,SADiB;AAAA,oBACNC,OADM;;AAExBd,2BAAWa,SAAX;AACAP,yBAASQ,OAAT;AACD;AACD,kBAAIC,YAAY,CAACf,QAAD,EAAWM,MAAX,CAAhB;;AAEA,kBAAIU,YAAY,MAAKC,WAAL,CAAiBF,SAAjB,CAAhB;;AAEA;AACA,kBAAI/E,OAAOkF,IAAP,KAAgBzD,EAAE0D,cAAtB,EAAsC;AACpC;AACAnF,yBAASwB,WAAW4D,OAAX,CAAmBpF,MAAnB,CAAT;;AAEA;AACA,oBAAIA,OAAOY,IAAP,IAAe,CAACZ,OAAOa,KAAvB,IAAgC,CAACb,OAAOc,IAAxC,IAAgD,CAACd,OAAOe,IAA5D,EAAkE;AAChE,yBAAO,EAAP;AACD;;AAED,oBAAI,CAACf,OAAOkF,IAAR,IAAgBlF,OAAOkF,IAAP,KAAgBzD,EAAE4D,YAAtC,EAAoD;AAClD,yBAAO,MAAKC,gBAAL,CAAsBtF,MAAtB,EAA8B+E,SAA9B,EAAyCC,SAAzC,CAAP;AACD,iBAFD,MAEO,IAAIhF,OAAOkF,IAAP,KAAgBzD,EAAE8D,SAAtB,EAAiC;AACtC,yBAAO,MAAKC,aAAL,CAAmBxF,MAAnB,EAA2B+E,SAA3B,CAAP;AACD;AACF;;AAED;AAhBA,mBAiBK,IAAI/E,OAAOkF,IAAP,KAAgBzD,EAAE0D,cAAtB,EAAsC;AACzC;AACA,sBAAInF,OAAOY,IAAP,IAAe,CAACZ,OAAOyF,SAAvB,IAAoC,CAACzF,OAAO0F,WAAhD,EAA6D;AAC3D,2BAAO,EAAP;AACD;;AAED,yBAAO,MAAKvC,MAAL,CAAYwC,MAAZ,CAAmB3F,OAAOyF,SAAP,CAAiBG,SAApC,EAA+Cb,SAA/C,EACNzB,IADM,CACD,qBAAa;AACjB,2BAAO5B,gBAAgBmE,iBAAhB,CAAkC7F,OAAOyF,SAAzC,EAAoDzF,OAAO0F,WAA3D,EAAwEI,SAAxE,CAAP;AACD,mBAHM,CAAP;AAID;AACF,aAhDc,CAAf;;AAkDA;AACA,mBAAOC,QAAQC,GAAR,CAAYrI,EAAEsI,OAAF,CAAUlC,QAAV,CAAZ,EACJT,IADI,CACC3F,EAAEsI,OADH,EAEJ3C,IAFI,CAEC,2BAAmB;AACvB,qBAAO5E,iBAAiBC,eAAjB,EAAkCC,OAAlC,CAAP;AACD,aAJI,EAKJ0E,IALI,CAKC,gBAAQ;AACZ,qBAAO,EAAE4C,MAAMA,IAAR,EAAP;AACD,aAPI,CAAP;AAQD;;;2CAEgBlG,M,EAAQ+E,S,EAAWC,S,EAAW;AAAA;;AAAA,4CACpBD,SADoB;AAAA,gBACxCf,QADwC;AAAA,gBAC9BM,MAD8B;;AAE7C,gBAAI1F,UAAU;AACZuH,wBAAU;AADE,aAAd;AAGA,mBAAO,KAAKhD,MAAL,CAAYiD,kBAAZ,CAA+BpG,MAA/B,EAAuCpB,OAAvC,EACN0E,IADM,CACD,iBAAS;AACb,kBAAI+C,0BAAJ;;AAEA,kBAAIrB,SAAJ,EAAe;AACb,oBAAIsB,YAAY,OAAKC,iBAAL,CAAuBvG,MAAvB,CAAhB;AACAqG,oCAAoB,OAAKlD,MAAL,CAAYqD,QAAZ,CAAqBC,KAArB,EAA4BzC,QAA5B,EAAsCM,MAAtC,EACnBhB,IADmB,CACd,mBAAW;AACf,yBAAO5B,gBAAgBgF,YAAhB,CAA6BC,OAA7B,EAAsCF,KAAtC,EAA6CH,SAA7C,CAAP;AACD,iBAHmB,EAInBhD,IAJmB,CAId,sBAAc;AAClB;AACA3F,oBAAEiG,OAAF,CAAU/E,UAAV,EAAsB,kBAAU;AAC9B+H,2BAAO9H,UAAP,GAAoBnB,EAAEkJ,MAAF,CAASD,OAAO9H,UAAhB,EAA4B;AAAA,6BAASgI,MAAMrF,EAAEsF,YAAR,CAAT;AAAA,qBAA5B,CAApB;AACD,mBAFD;;AAIA,yBAAOlI,UAAP;AACD,iBAXmB,CAApB;AAYD,eAdD,MAcO;AACL;AACAwH,oCAAoB,OAAKlD,MAAL,CAAY6D,UAAZ,CAAuBP,KAAvB,EAA8BzC,QAA9B,EAAwCM,MAAxC,EACnBhB,IADmB,CACd,mBAAW;AACf,yBAAO5B,gBAAgBuF,aAAhB,CAA8BN,OAA9B,EAAuCF,KAAvC,CAAP;AACD,iBAHmB,CAApB;AAID;;AAED,qBAAOJ,kBAAkB/C,IAAlB,CAAuB,2BAAmB;AAC/C,uBAAO,OAAK4D,4BAAL,CAAkCvI,eAAlC,EAAmDqB,MAAnD,CAAP;AACD,eAFM,CAAP;AAGD,aA7BM,EA8BNmH,KA9BM,CA8BA,iBAAS;AACdC,sBAAQC,GAAR,CAAYC,KAAZ;AACA,qBAAO,EAAP;AACD,aAjCM,CAAP;AAkCD;;;4CAEiBtH,M,EAAQ;AACxB;AACA,gBAAIuH,iBAAiB5J,EAAEC,GAAF,CAAMC,gBAAgBC,aAAhB,GAAgC,QAAhC,CAAN,EAAiD,MAAjD,CAArB;AACA,gBAAI0J,iBAAiB7J,EAAE8J,IAAF,CAAOzH,OAAO4E,SAAd,EAAyB,gBAAQ;AACpD,qBAAOjH,EAAEO,QAAF,CAAWqJ,cAAX,EAA2BtJ,KAAKE,GAAL,CAASC,IAApC,CAAP;AACD,aAFoB,CAArB;AAGA,mBAAOoJ,iBAAiBA,eAAejJ,MAAf,CAAsB,CAAtB,CAAjB,GAA4C,KAAnD;AACD;;;uDAE4BI,e,EAAiBqB,M,EAAQ;AACpD,gBAAI0H,qBAAuBnK,iBAAiByC,OAAO4E,SAAxB,EAAmC,WAAnC,CAA3B;AACA,gBAAIlH,uBAAuBH,iBAAiByC,OAAO4E,SAAxB,EAAmC,WAAnC,CAA3B;AACA,gBAAI+C,kBAAuBpK,iBAAiByC,OAAO4E,SAAxB,EAAmC,QAAnC,CAA3B;AACA,gBAAIgD,iBAAuBrK,iBAAiByC,OAAO4E,SAAxB,EAAmC,OAAnC,CAA3B;;AAEA;AACAjG,8BAAkBhB,EAAEC,GAAF,CAAMe,eAAN,EAAuB,sBAAc;AACrDE,yBAAWC,UAAX,GAAwBuB,SAASqH,kBAAT,EAA6B7I,WAAWC,UAAxC,CAAxB;AACA,qBAAOD,UAAP;AACD,aAHiB,CAAlB;;AAKA;AACA,gBAAI8I,gBAAgB5I,MAApB,EAA4B;AAC1BJ,gCAAkB0B,SAASsH,eAAT,EAA0BhJ,eAA1B,CAAlB;AACD;;AAED;AACA,gBAAIjB,qBAAqBqB,MAAzB,EAAiC;AAC/B,kBAAI8I,KAAKlK,EAAEC,GAAF,CAAMe,eAAN,EAAuB,YAAvB,CAAT;AACAkJ,mBAAKxH,SAAS3C,oBAAT,EAA+BmK,EAA/B,CAAL;;AAEA,kBAAIC,eAAenK,EAAEC,GAAF,CAAMC,gBAAgBC,aAAhB,GAAgC,WAAhC,CAAN,EAAoD,MAApD,CAAnB;AACA,kBAAIiK,UAAUpK,EAAEqK,QAAF,CAAWhI,OAAO4E,SAAlB,EAA6B,gBAAQ;AACjD,uBAAOjH,EAAEO,QAAF,CAAW4J,YAAX,EAAyB7J,KAAKE,GAAL,CAASC,IAAlC,CAAP;AACD,eAFa,CAAd;;AAIAO,gCAAkB,CAAC;AACjBqB,wBAAQ+H,QAAQzI,IADC;AAEjBR,4BAAY+I;AAFK,eAAD,CAAlB;AAID;;AAED;AACAlK,cAAEiG,OAAF,CAAUjF,eAAV,EAA2B0B,SAASuH,cAAT,CAA3B;;AAEA;AACA;AACA,iBAAKK,sBAAL,CAA4BtJ,eAA5B,EAA6CqB,MAA7C;;AAEA,mBAAOrB,eAAP;AACD;;;iDAEsBA,e,EAAiBqB,M,EAAQ;AAC9C;AACA,gBAAIkI,gBAAgBvK,EAAE8J,IAAF,CAAOzH,OAAO4E,SAAd,EAAyB,UAAC3G,IAAD,EAAU;AACrD,qBAAOA,KAAKE,GAAL,CAASC,IAAT,KAAkB,WAAzB;AACD,aAFmB,CAApB;AAGA,gBAAI8J,aAAJ,EAAmB;AACjB,kBAAIC,QAAQD,cAAc3J,MAAd,CAAqB,CAArB,CAAZ;AACAZ,gBAAEiG,OAAF,CAAUjF,eAAV,EAA2B,UAACiI,MAAD,EAAY;AACrCA,uBAAO9H,UAAP,GAAoBL,cAAc2J,iBAAd,CAAgCD,KAAhC,EAAuCvB,OAAO9H,UAA9C,CAApB;AACD,eAFD;AAGD;AACF;;;wCAEakB,M,EAAQ+E,S,EAAW;AAAA;;AAAA,6CACNA,SADM;AAAA,gBAC1Bf,QAD0B;AAAA,gBAChBM,MADgB;;AAE/B,gBAAI1F,UAAU;AACZuH,wBAAU;AADE,aAAd;AAGA,mBAAO,KAAKhD,MAAL,CAAYiD,kBAAZ,CAA+BpG,MAA/B,EAAuCpB,OAAvC,EACJ0E,IADI,CACC,iBAAS;AACb,kBAAImD,MAAM1H,MAAV,EAAkB;AAChB,uBAAO,OAAKoE,MAAL,CAAY6D,UAAZ,CAAuBP,KAAvB,EAA8BzC,QAA9B,EAAwCM,MAAxC,EACNhB,IADM,CACD,mBAAW;AACf,yBAAO5B,gBAAgB2G,UAAhB,CAA2B1B,OAA3B,EAAoCF,KAApC,EAA2CzG,MAA3C,CAAP;AACD,iBAHM,CAAP;AAID,eALD,MAKO;AACL,uBAAO+F,QAAQuC,OAAR,CAAgB,EAAhB,CAAP;AACD;AACF,aAVI,CAAP;AAWD;;;2CAMgB;AAAA;;AACf,gBAAIC,sBAAJ;AACA,mBAAO,KAAKpF,MAAL,CAAYqF,UAAZ,GACNlF,IADM,CACD,mBAAW;AACfiF,8BAAgBE,OAAhB;AACA,qBAAO,OAAKtF,MAAL,CAAYuF,KAAZ,EAAP;AACD,aAJM,EAKNpF,IALM,CAKD,YAAM;AACV,qBAAO;AACLqF,wBAAQ,SADH;AAELC,uBAAO,SAFF;AAGLC,yBAAS,yBAAyBN;AAH7B,eAAP;AAKD,aAXM,EAYNpB,KAZM,CAYA,iBAAS;AACd,kBAAIG,iBAAiB3F,cAArB,EAAqC;AACnC,uBAAO;AACLgH,0BAAQ,OADH;AAELC,yBAAOtB,MAAMuB,OAFR;AAGLA,2BAASvB,MAAMpB;AAHV,iBAAP;AAKD,eAND,MAMO;AACL,uBAAO;AACLyC,0BAAQ,OADH;AAELC,yBAAO,mBAFF;AAGLC,2BAAS;AAHJ,iBAAP;AAKD;AACF,aA1BM,CAAP;AA2BD;;;0CAaeC,K,EAAO;AAAA;;AACrB,gBAAIvI,eAAJ;AACA,gBAAIwI,QAAQ,EAAZ;;AAEA;AACApL,cAAEqL,IAAF,CAAOtJ,MAAMuJ,kBAAN,CAAyBH,KAAzB,CAAP,EAAwC,gBAAQ;AAC9CI,qBAAO,OAAKpJ,mBAAL,CAAyBoJ,IAAzB,EAA+B,EAA/B,CAAP;;AAEA;AACA,kBAAIA,SAAS,GAAb,EAAkB;AAChBA,uBAAO,MAAP;AACD;AACDH,oBAAMI,IAAN,CAAWD,IAAX;AACD,aARD;AASA,gBAAIE,WAAWzL,EAAE0L,SAAF,CAAY,CAAC,OAAD,EAAU,MAAV,EAAkB,KAAlB,EAAyB,MAAzB,CAAZ,EAA8CN,KAA9C,CAAf;;AAEA;AACA,gBAAIA,MAAMhK,MAAN,KAAiB,CAArB,EAAwB;AACtB;AACA,kBAAIqK,SAASE,GAAT,KAAiB,MAArB,EAA6B;AAC3BF,yBAASE,GAAT,GAAe,EAAf;AACD;AACD/I,uBAAS,KAAK4C,MAAL,CAAYoG,QAAZ,CAAqBH,SAASvI,KAA9B,EAAqCuI,SAAStI,IAA9C,EAAoDsI,SAASE,GAA7D,EAAkEF,SAASrI,IAA3E,CAAT;AACD,aAND,MAMO,IAAIgI,MAAMhK,MAAN,KAAiB,CAArB,EAAwB;AAC7B;AACAwB,uBAAS,KAAK4C,MAAL,CAAYqG,OAAZ,CAAoBJ,SAASvI,KAA7B,EAAoCuI,SAAStI,IAA7C,EAAmDsI,SAASE,GAA5D,CAAT;AACD,aAHM,MAGA,IAAIP,MAAMhK,MAAN,KAAiB,CAArB,EAAwB;AAC7B;AACAwB,uBAAS,KAAK4C,MAAL,CAAYsG,QAAZ,CAAqBL,SAASvI,KAA9B,EAAqCuI,SAAStI,IAA9C,CAAT;AACD,aAHM,MAGA,IAAIiI,MAAMhK,MAAN,KAAiB,CAArB,EAAwB;AAC7B;AACAwB,uBAAS,KAAK4C,MAAL,CAAYuG,SAAZ,CAAsBN,SAASvI,KAA/B,CAAT;AACD,aAHM,MAGA;AACLN,uBAASwF,QAAQuC,OAAR,CAAgB,EAAhB,CAAT;AACD;;AAED,mBAAO/H,OAAO+C,IAAP,CAAY,mBAAW;AAC5B,qBAAO3F,EAAEC,GAAF,CAAM+L,OAAN,EAAevK,YAAf,CAAP;AACD,aAFM,CAAP;AAGD;;;0CAMeR,O,EAAS;AAAA;;AACvB,gBAAIoF,WAAWC,KAAKC,IAAL,CAAU3C,SAAS4C,KAAT,CAAevF,QAAQgL,QAAR,CAAiBvF,IAAhC,IAAwC,IAAlD,CAAf;AACA,gBAAIC,SAASL,KAAKC,IAAL,CAAU3C,SAAS4C,KAAT,CAAevF,QAAQgL,QAAR,CAAiBrF,EAAhC,IAAsC,IAAhD,CAAb;AACA,gBAAIsF,aAAajL,QAAQiL,UAAzB;AACA,gBAAIC,eAAeD,WAAWC,YAAX,GAA0BrI,EAAEsI,eAA5B,GAA8CtI,EAAEuI,cAAnE;;AAEA;AACA,gBAAIC,kBAAkB;AACpBC,4BAAczI,EAAE0I,iBADI;AAEpBC,sCAAwB;AAFJ,aAAtB;;AAKA,gBAAIC,cAAc,KAAKlH,MAAL,CAAYkH,WAAZ,CAAwB,KAAKvK,mBAAL,CAAyB+J,WAAWhJ,KAApC,EAA2C,EAA3C,CAAxB,EACwB,KAAKf,mBAAL,CAAyB+J,WAAW/I,IAApC,EAA0C,EAA1C,CADxB,EAEwB,KAAKhB,mBAAL,CAAyB+J,WAAWS,WAApC,EAAiD,EAAjD,CAFxB,EAGwBL,eAHxB,CAAlB;;AAKA,mBAAOI,YAAY/G,IAAZ,CAAiB,oBAAY;;AAElC;AACA,kBAAI5D,MAAMU,OAAN,CAAcyJ,WAAWU,OAAzB,CAAJ,EAAuC;AACrCC,2BAAW7M,EAAEK,MAAF,CAASwM,QAAT,EAAmB,mBAAW;AACvC,yBAAO9K,MAAM+K,UAAN,CAAiBZ,WAAWU,OAA5B,EAAqCG,IAArC,CAA0CH,QAAQI,WAAlD,CAAP;AACD,iBAFU,CAAX;AAGD,eAJD,MAIO,IAAId,WAAWU,OAAf,EAAwB;AAC7BC,2BAAW7M,EAAEK,MAAF,CAASwM,QAAT,EAAmB,mBAAW;AACvC,yBAAOD,QAAQI,WAAR,KAAwBd,WAAWU,OAA1C;AACD,iBAFU,CAAX;AAGD;;AAED;AACAC,yBAAW7M,EAAEK,MAAF,CAASwM,QAAT,EAAmB,mBAAW;AACvC,uBAAOlJ,OAAOiJ,QAAQK,QAAf,KAA4BtJ,OAAOuI,WAAWgB,WAAlB,CAAnC;AACD,eAFU,CAAX;;AAIA,kBAAIC,YAAYnN,EAAEC,GAAF,CAAM4M,QAAN,EAAgB,WAAhB,CAAhB;AACA,qBAAO,OAAKrH,MAAL,CACJ4H,SADI,CACMD,SADN,EACiB9G,QADjB,EAC2BM,MAD3B,EACmCwF,YADnC,EAEJxG,IAFI,CAEC,kBAAU;AACd,oBAAI0H,kBAAkBrN,EAAEsN,KAAF,CAAQT,QAAR,EAAkB,WAAlB,CAAtB;;AAEA;AACA,oBAAIX,WAAWqB,gBAAf,EAAiC;AAC/BC,2BAASxN,EAAEK,MAAF,CAASmN,MAAT,EAAiB,iBAAS;AACjC,2BAAO,CAACC,MAAMC,YAAN,CAAmBtM,MAA3B;AACD,mBAFQ,CAAT;AAGD;;AAED,uBAAOpB,EAAEC,GAAF,CAAMuN,MAAN,EAAc,iBAAS;AAC5B,sBAAIG,aAAJ;AACA,sBAAIzB,WAAW0B,YAAf,EAA6B;AAC3BD,2BAAO3N,EAAEC,GAAF,CAAMwN,MAAMI,KAAZ,EAAmB,MAAnB,CAAP;AACD;;AAED;AACA,sBAAI5C,QAAQtH,OAAO8J,MAAM3L,KAAb,IAAsB,SAAtB,GAAkC,IAA9C;;AAEA,sBAAIgM,yBAAyB/L,MAAMgM,kBAAN,CAAyBN,MAAMC,YAA/B,CAA7B;AACA,yBAAO;AACLxB,gCAAYA,UADP;AAEL8B,0BAAMP,MAAMQ,KAAN,GAAc,IAFf;AAGLhD,2BAAOA,KAHF;AAIL0C,0BAAMA,IAJD;AAKLhM,0BAAM0L,gBAAgBI,MAAMS,QAAtB,EAAgClB,WAAhC,GAA8Cc;AAL/C,mBAAP;AAOD,iBAjBM,CAAP;AAkBD,eA9BI,CAAP;AA+BD,aAlDM,CAAP;AAmDD;;;qCAOU7M,O,EAAS;AAAA;;AAClB,gBAAIkN,kBAAkBpL,qBAAqB9B,QAAQ+B,OAA7B,CAAtB;AACA,gBAAIoL,gBAAgBpO,EAAEC,GAAF,CAAMkO,eAAN,EAAuB,kBAAU;AACnD,qBAAO,OAAK3I,MAAL,CAAYiD,kBAAZ,CAA+BpG,MAA/B,EAAuC,EAACmG,UAAU,KAAX,EAAvC,CAAP;AACD,aAFmB,CAApB;;AAIA,mBAAOJ,QAAQC,GAAR,CAAY+F,aAAZ,EACNzI,IADM,CACD,mBAAW;AACf,kBAAImD,QAAQ9I,EAAEsI,OAAF,CAAU+F,OAAV,CAAZ;AACA,kBAAIC,UAAUtO,EAAEC,GAAF,CAAM6I,KAAN,EAAa,QAAb,CAAd;;AAEA,qBAAO,OAAKtD,MAAL,CAAY+I,SAAZ,CAAsBD,OAAtB,CAAP;AACD,aANM,EAON3I,IAPM,CAOD,oBAAY;AAChBkH,yBAAW7M,EAAEK,MAAF,CAASwM,QAAT,EAAmB,mBAAW;AACvC,uBAAOD,QAAQK,QAAR,IAAoB,OAAK3H,mBAAhC;AACD,eAFU,CAAX;;AAIA,kBAAI,CAACuH,QAAD,IAAaA,SAASzL,MAAT,KAAoB,CAArC,EAAwC;AACtC,uBAAO,EAAP;AACD;;AAED,kBAAI2E,QAAQ,IAAZ;;AAEA,kBAAIyI,gBAAgBxO,EAAEK,MAAF,CAASwM,QAAT,EAAmB,EAAC/K,OAAO,GAAR,EAAnB,CAApB;AACA,kBAAI0M,cAAcpN,MAAlB,EAA0B;AACxB2E,wBAAQ,UAAR;AACD;;AAED,kBAAIG,aAAalG,EAAEC,GAAF,CAAM4M,QAAN,EAAgB,mBAAW;AAC1C,uBAAOxJ,oBAAoBuJ,QAAQtJ,UAA5B,CAAP;AACD,eAFgB,CAAjB;;AAIA,qBAAO;AACLuC,yBAAS5E,QAAQ4E,OADZ;AAELE,uBAAOA,KAFF;AAGLG,4BAAYA;AAHP,eAAP;AAKD,aAhCM,CAAP;AAiCD;;;iDAGsB7D,M,EAAQpB,O,EAAS;AAAA;;AACtC,gBAAImK,QAAQ,CAAC,OAAD,EAAU,MAAV,EAAkB,aAAlB,EAAiC,MAAjC,CAAZ;AACApL,cAAEiG,OAAF,CAAUmF,KAAV,EAAiB,aAAK;AACpB,kBAAI/I,OAAOoM,CAAP,KAAapM,OAAOoM,CAAP,EAAUpO,MAA3B,EAAmC;AACjCgC,uBAAOoM,CAAP,EAAUpO,MAAV,GAAmB,OAAK8B,mBAAL,CAAyBE,OAAOoM,CAAP,EAAUpO,MAAnC,EAA2CY,QAAQqB,UAAnD,CAAnB;AACD;AACF,aAJD;AAKAD,mBAAOqM,UAAP,GAAoB,KAAKvM,mBAAL,CAAyBE,OAAOqM,UAAhC,EAA4CzN,QAAQqB,UAApD,CAApB;;AAEAtC,cAAEiG,OAAF,CAAU5D,OAAO4E,SAAjB,EAA4B,gBAAQ;AAClC3G,mBAAKM,MAAL,GAAcZ,EAAEC,GAAF,CAAMK,KAAKM,MAAX,EAAmB,iBAAS;AACxC,oBAAI,OAAO+N,KAAP,KAAiB,QAArB,EAA+B;AAC7B,yBAAO,CAAC,OAAKvM,WAAL,CAAiBI,OAAjB,CAAyBmM,MAAMC,QAAN,EAAzB,EAA2C3N,QAAQqB,UAAnD,CAAR;AACD,iBAFD,MAEO;AACL,yBAAO,OAAKF,WAAL,CAAiBI,OAAjB,CAAyBmM,KAAzB,EAAgC1N,QAAQqB,UAAxC,CAAP;AACD;AACF,eANa,CAAd;AAOD,aARD;AASD;;;sCAEW8E,S,EAAW;AAAA,6CACIA,SADJ;AAAA,gBAChBf,QADgB;AAAA,gBACNM,MADM;;AAErB,gBAAIkI,gBAAgBvI,KAAKC,IAAL,CAAU3C,SAAS4C,KAAT,CAAe,SAAS,KAAK1B,UAA7B,IAA2C,IAArD,CAApB;AACA,gBAAIgK,iBAAiBxI,KAAKC,IAAL,CAAUxE,MAAMmD,aAAN,CAAoB,KAAKH,WAAzB,IAAwC,IAAlD,CAArB;AACA,gBAAIsC,YAAY,KAAKxC,MAAL,KACbwB,YAAYwI,aAAb,IACClI,SAASN,QAAT,IAAqByI,cAFR,CAAhB;AAIA,mBAAOzH,SAAP;AACD;;;;;;qCAgGKpD,mB;;sCAAqBpC,oB;;AAE7B;AACA,UAAI,CAAC7B,EAAEO,QAAP,EAAiB;AAACP,UAAEO,QAAF,GAAaP,EAAE+O,QAAf;AAAyB;AAC3C,UAAI,CAAC/O,EAAEsN,KAAP,EAAc;AAACtN,UAAEsN,KAAF,GAAUtN,EAAEgP,OAAZ;AAAqB","file":"datasource.js","sourcesContent":["import _ from 'lodash';\nimport * as dateMath from 'app/core/utils/datemath';\nimport * as utils from './utils';\nimport * as migrations from './migrations';\nimport * as metricFunctions from './metricFunctions';\nimport * as c from './constants';\nimport dataProcessor from './dataProcessor';\nimport responseHandler from './responseHandler';\nimport './zabbix.js';\nimport './zabbixAlerting.service.js';\nimport {ZabbixAPIError} from './zabbixAPICore.service.js';\n\nclass ZabbixAPIDatasource {\n\n /** @ngInject */\n constructor(instanceSettings, templateSrv, alertSrv, dashboardSrv, zabbixAlertingSrv, Zabbix) {\n this.templateSrv = templateSrv;\n this.alertSrv = alertSrv;\n this.dashboardSrv = dashboardSrv;\n this.zabbixAlertingSrv = zabbixAlertingSrv;\n\n // General data source settings\n this.name = instanceSettings.name;\n this.url = instanceSettings.url;\n this.basicAuth = instanceSettings.basicAuth;\n this.withCredentials = instanceSettings.withCredentials;\n\n // Zabbix API credentials\n this.username = instanceSettings.jsonData.username;\n this.password = instanceSettings.jsonData.password;\n\n // Use trends instead history since specified time\n this.trends = instanceSettings.jsonData.trends;\n this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d';\n this.trendsRange = instanceSettings.jsonData.trendsRange || '4d';\n\n // Set cache update interval\n var ttl = instanceSettings.jsonData.cacheTTL || '1h';\n this.cacheTTL = utils.parseInterval(ttl);\n\n // Alerting options\n this.alertingEnabled = instanceSettings.jsonData.alerting;\n this.addThresholds = instanceSettings.jsonData.addThresholds;\n this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;\n\n this.zabbix = new Zabbix(this.url, this.username, this.password, this.basicAuth, this.withCredentials, this.cacheTTL);\n\n // Use custom format for template variables\n this.replaceTemplateVars = _.partial(replaceTemplateVars, this.templateSrv);\n }\n\n ////////////////////////\n // Datasource methods //\n ////////////////////////\n\n /**\n * Query panel data. Calls for each panel in dashboard.\n * @param {Object} options Contains time range, targets and other info.\n * @return {Object} Grafana metrics object with timeseries data for each target.\n */\n query(options) {\n // Get alerts for current panel\n if (this.alertingEnabled) {\n this.alertQuery(options).then(alert => {\n this.zabbixAlertingSrv.setPanelAlertState(options.panelId, alert.state);\n\n this.zabbixAlertingSrv.removeZabbixThreshold(options.panelId);\n if (this.addThresholds) {\n _.forEach(alert.thresholds, threshold => {\n this.zabbixAlertingSrv.setPanelThreshold(options.panelId, threshold);\n });\n }\n });\n }\n\n // Create request for each target\n let promises = _.map(options.targets, t => {\n let timeFrom = Math.ceil(dateMath.parse(options.range.from) / 1000);\n let timeTo = Math.ceil(dateMath.parse(options.range.to) / 1000);\n\n // Prevent changes of original object\n let target = _.cloneDeep(t);\n this.replaceTargetVariables(target, options);\n\n // Apply Time-related functions (timeShift(), etc)\n let timeFunctions = bindFunctionDefs(target.functions, 'Time');\n if (timeFunctions.length) {\n const [time_from, time_to] = sequence(timeFunctions)([timeFrom, timeTo]);\n timeFrom = time_from;\n timeTo = time_to;\n }\n let timeRange = [timeFrom, timeTo];\n\n let useTrends = this.isUseTrends(timeRange);\n\n // Metrics or Text query mode\n if (target.mode !== c.MODE_ITSERVICE) {\n // Migrate old targets\n target = migrations.migrate(target);\n\n // Don't request undefined and hidden targets\n if (target.hide || !target.group || !target.host || !target.item) {\n return [];\n }\n\n if (!target.mode || target.mode === c.MODE_METRICS) {\n return this.queryNumericData(target, timeRange, useTrends);\n } else if (target.mode === c.MODE_TEXT) {\n return this.queryTextData(target, timeRange);\n }\n }\n\n // IT services mode\n else if (target.mode === c.MODE_ITSERVICE) {\n // Don't show undefined and hidden targets\n if (target.hide || !target.itservice || !target.slaProperty) {\n return [];\n }\n\n return this.zabbix.getSLA(target.itservice.serviceid, timeRange)\n .then(slaObject => {\n return responseHandler.handleSLAResponse(target.itservice, target.slaProperty, slaObject);\n });\n }\n });\n\n // Data for panel (all targets)\n return Promise.all(_.flatten(promises))\n .then(_.flatten)\n .then(timeseries_data => {\n return downsampleSeries(timeseries_data, options);\n })\n .then(data => {\n return { data: data };\n });\n }\n\n queryNumericData(target, timeRange, useTrends) {\n let [timeFrom, timeTo] = timeRange;\n let options = {\n itemtype: 'num'\n };\n return this.zabbix.getItemsFromTarget(target, options)\n .then(items => {\n let getHistoryPromise;\n\n if (useTrends) {\n let valueType = this.getTrendValueType(target);\n getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleTrends(history, items, valueType);\n })\n .then(timeseries => {\n // Sort trend data, issue #202\n _.forEach(timeseries, series => {\n series.datapoints = _.sortBy(series.datapoints, point => point[c.DATAPOINT_TS]);\n });\n\n return timeseries;\n });\n } else {\n // Use history\n getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleHistory(history, items);\n });\n }\n\n return getHistoryPromise.then(timeseries_data => {\n return this.applyDataProcessingFunctions(timeseries_data, target);\n });\n })\n .catch(error => {\n console.log(error);\n return [];\n });\n }\n\n getTrendValueType(target) {\n // Find trendValue() function and get specified trend value\n var trendFunctions = _.map(metricFunctions.getCategories()['Trends'], 'name');\n var trendValueFunc = _.find(target.functions, func => {\n return _.includes(trendFunctions, func.def.name);\n });\n return trendValueFunc ? trendValueFunc.params[0] : \"avg\";\n }\n\n applyDataProcessingFunctions(timeseries_data, target) {\n let transformFunctions = bindFunctionDefs(target.functions, 'Transform');\n let aggregationFunctions = bindFunctionDefs(target.functions, 'Aggregate');\n let filterFunctions = bindFunctionDefs(target.functions, 'Filter');\n let aliasFunctions = bindFunctionDefs(target.functions, 'Alias');\n\n // Apply transformation functions\n timeseries_data = _.map(timeseries_data, timeseries => {\n timeseries.datapoints = sequence(transformFunctions)(timeseries.datapoints);\n return timeseries;\n });\n\n // Apply filter functions\n if (filterFunctions.length) {\n timeseries_data = sequence(filterFunctions)(timeseries_data);\n }\n\n // Apply aggregations\n if (aggregationFunctions.length) {\n let dp = _.map(timeseries_data, 'datapoints');\n dp = sequence(aggregationFunctions)(dp);\n\n let aggFuncNames = _.map(metricFunctions.getCategories()['Aggregate'], 'name');\n let lastAgg = _.findLast(target.functions, func => {\n return _.includes(aggFuncNames, func.def.name);\n });\n\n timeseries_data = [{\n target: lastAgg.text,\n datapoints: dp\n }];\n }\n\n // Apply alias functions\n _.forEach(timeseries_data, sequence(aliasFunctions));\n\n // Apply Time-related functions (timeShift(), etc)\n // Find timeShift() function and get specified trend value\n this.applyTimeShiftFunction(timeseries_data, target);\n\n return timeseries_data;\n }\n\n applyTimeShiftFunction(timeseries_data, target) {\n // Find timeShift() function and get specified interval\n let timeShiftFunc = _.find(target.functions, (func) => {\n return func.def.name === 'timeShift';\n });\n if (timeShiftFunc) {\n let shift = timeShiftFunc.params[0];\n _.forEach(timeseries_data, (series) => {\n series.datapoints = dataProcessor.unShiftTimeSeries(shift, series.datapoints);\n });\n }\n }\n\n queryTextData(target, timeRange) {\n let [timeFrom, timeTo] = timeRange;\n let options = {\n itemtype: 'text'\n };\n return this.zabbix.getItemsFromTarget(target, options)\n .then(items => {\n if (items.length) {\n return this.zabbix.getHistory(items, timeFrom, timeTo)\n .then(history => {\n return responseHandler.handleText(history, items, target);\n });\n } else {\n return Promise.resolve([]);\n }\n });\n }\n\n /**\n * Test connection to Zabbix API\n * @return {object} Connection status and Zabbix API version\n */\n testDatasource() {\n let zabbixVersion;\n return this.zabbix.getVersion()\n .then(version => {\n zabbixVersion = version;\n return this.zabbix.login();\n })\n .then(() => {\n return {\n status: \"success\",\n title: \"Success\",\n message: \"Zabbix API version: \" + zabbixVersion\n };\n })\n .catch(error => {\n if (error instanceof ZabbixAPIError) {\n return {\n status: \"error\",\n title: error.message,\n message: error.data\n };\n } else {\n return {\n status: \"error\",\n title: \"Connection failed\",\n message: \"Could not connect to given url\"\n };\n }\n });\n }\n\n ////////////////\n // Templating //\n ////////////////\n\n /**\n * Find metrics from templated request.\n *\n * @param {string} query Query from Templating\n * @return {string} Metric name - group, host, app or item or list\n * of metrics in \"{metric1,metcic2,...,metricN}\" format.\n */\n metricFindQuery(query) {\n let result;\n let parts = [];\n\n // Split query. Query structure: group.host.app.item\n _.each(utils.splitTemplateQuery(query), part => {\n part = this.replaceTemplateVars(part, {});\n\n // Replace wildcard to regex\n if (part === '*') {\n part = '/.*/';\n }\n parts.push(part);\n });\n let template = _.zipObject(['group', 'host', 'app', 'item'], parts);\n\n // Get items\n if (parts.length === 4) {\n // Search for all items, even it's not belong to any application\n if (template.app === '/.*/') {\n template.app = '';\n }\n result = this.zabbix.getItems(template.group, template.host, template.app, template.item);\n } else if (parts.length === 3) {\n // Get applications\n result = this.zabbix.getApps(template.group, template.host, template.app);\n } else if (parts.length === 2) {\n // Get hosts\n result = this.zabbix.getHosts(template.group, template.host);\n } else if (parts.length === 1) {\n // Get groups\n result = this.zabbix.getGroups(template.group);\n } else {\n result = Promise.resolve([]);\n }\n\n return result.then(metrics => {\n return _.map(metrics, formatMetric);\n });\n }\n\n /////////////////\n // Annotations //\n /////////////////\n\n annotationQuery(options) {\n var timeFrom = Math.ceil(dateMath.parse(options.rangeRaw.from) / 1000);\n var timeTo = Math.ceil(dateMath.parse(options.rangeRaw.to) / 1000);\n var annotation = options.annotation;\n var showOkEvents = annotation.showOkEvents ? c.SHOW_ALL_EVENTS : c.SHOW_OK_EVENTS;\n\n // Show all triggers\n let triggersOptions = {\n showTriggers: c.SHOW_ALL_TRIGGERS,\n hideHostsInMaintenance: false\n };\n\n var getTriggers = this.zabbix.getTriggers(this.replaceTemplateVars(annotation.group, {}),\n this.replaceTemplateVars(annotation.host, {}),\n this.replaceTemplateVars(annotation.application, {}),\n triggersOptions);\n\n return getTriggers.then(triggers => {\n\n // Filter triggers by description\n if (utils.isRegex(annotation.trigger)) {\n triggers = _.filter(triggers, trigger => {\n return utils.buildRegex(annotation.trigger).test(trigger.description);\n });\n } else if (annotation.trigger) {\n triggers = _.filter(triggers, trigger => {\n return trigger.description === annotation.trigger;\n });\n }\n\n // Remove events below the chose severity\n triggers = _.filter(triggers, trigger => {\n return Number(trigger.priority) >= Number(annotation.minseverity);\n });\n\n var objectids = _.map(triggers, 'triggerid');\n return this.zabbix\n .getEvents(objectids, timeFrom, timeTo, showOkEvents)\n .then(events => {\n var indexedTriggers = _.keyBy(triggers, 'triggerid');\n\n // Hide acknowledged events if option enabled\n if (annotation.hideAcknowledged) {\n events = _.filter(events, event => {\n return !event.acknowledges.length;\n });\n }\n\n return _.map(events, event => {\n let tags;\n if (annotation.showHostname) {\n tags = _.map(event.hosts, 'name');\n }\n\n // Show event type (OK or Problem)\n let title = Number(event.value) ? 'Problem' : 'OK';\n\n let formatted_acknowledges = utils.formatAcknowledges(event.acknowledges);\n return {\n annotation: annotation,\n time: event.clock * 1000,\n title: title,\n tags: tags,\n text: indexedTriggers[event.objectid].description + formatted_acknowledges\n };\n });\n });\n });\n }\n\n /**\n * Get triggers and its details for panel's targets\n * Returns alert state ('ok' if no fired triggers, or 'alerting' if at least 1 trigger is fired)\n * or empty object if no related triggers are finded.\n */\n alertQuery(options) {\n let enabled_targets = filterEnabledTargets(options.targets);\n let getPanelItems = _.map(enabled_targets, target => {\n return this.zabbix.getItemsFromTarget(target, {itemtype: 'num'});\n });\n\n return Promise.all(getPanelItems)\n .then(results => {\n let items = _.flatten(results);\n let itemids = _.map(items, 'itemid');\n\n return this.zabbix.getAlerts(itemids);\n })\n .then(triggers => {\n triggers = _.filter(triggers, trigger => {\n return trigger.priority >= this.alertingMinSeverity;\n });\n\n if (!triggers || triggers.length === 0) {\n return {};\n }\n\n let state = 'ok';\n\n let firedTriggers = _.filter(triggers, {value: '1'});\n if (firedTriggers.length) {\n state = 'alerting';\n }\n\n let thresholds = _.map(triggers, trigger => {\n return getTriggerThreshold(trigger.expression);\n });\n\n return {\n panelId: options.panelId,\n state: state,\n thresholds: thresholds\n };\n });\n }\n\n // Replace template variables\n replaceTargetVariables(target, options) {\n let parts = ['group', 'host', 'application', 'item'];\n _.forEach(parts, p => {\n if (target[p] && target[p].filter) {\n target[p].filter = this.replaceTemplateVars(target[p].filter, options.scopedVars);\n }\n });\n target.textFilter = this.replaceTemplateVars(target.textFilter, options.scopedVars);\n\n _.forEach(target.functions, func => {\n func.params = _.map(func.params, param => {\n if (typeof param === 'number') {\n return +this.templateSrv.replace(param.toString(), options.scopedVars);\n } else {\n return this.templateSrv.replace(param, options.scopedVars);\n }\n });\n });\n }\n\n isUseTrends(timeRange) {\n let [timeFrom, timeTo] = timeRange;\n let useTrendsFrom = Math.ceil(dateMath.parse('now-' + this.trendsFrom) / 1000);\n let useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);\n let useTrends = this.trends && (\n (timeFrom <= useTrendsFrom) ||\n (timeTo - timeFrom >= useTrendsRange)\n );\n return useTrends;\n }\n}\n\nfunction bindFunctionDefs(functionDefs, category) {\n var aggregationFunctions = _.map(metricFunctions.getCategories()[category], 'name');\n var aggFuncDefs = _.filter(functionDefs, function(func) {\n return _.includes(aggregationFunctions, func.def.name);\n });\n\n return _.map(aggFuncDefs, function(func) {\n var funcInstance = metricFunctions.createFuncInstance(func.def, func.params);\n return funcInstance.bindFunction(dataProcessor.metricFunctions);\n });\n}\n\nfunction downsampleSeries(timeseries_data, options) {\n return _.map(timeseries_data, timeseries => {\n if (timeseries.datapoints.length > options.maxDataPoints) {\n timeseries.datapoints = dataProcessor\n .groupBy(options.interval, dataProcessor.AVERAGE, timeseries.datapoints);\n }\n return timeseries;\n });\n}\n\nfunction formatMetric(metricObj) {\n return {\n text: metricObj.name,\n expandable: false\n };\n}\n\n/**\n * Custom formatter for template variables.\n * Default Grafana \"regex\" formatter returns\n * value1|value2\n * This formatter returns\n * (value1|value2)\n * This format needed for using in complex regex with\n * template variables, for example\n * /CPU $cpu_item.*time/ where $cpu_item is system,user,iowait\n */\nfunction zabbixTemplateFormat(value) {\n if (typeof value === 'string') {\n return utils.escapeRegex(value);\n }\n\n var escapedValues = _.map(value, utils.escapeRegex);\n return '(' + escapedValues.join('|') + ')';\n}\n\n/**\n * If template variables are used in request, replace it using regex format\n * and wrap with '/' for proper multi-value work. Example:\n * $variable selected as a, b, c\n * We use filter $variable\n * $variable -> a|b|c -> /a|b|c/\n * /$variable/ -> /a|b|c/ -> /a|b|c/\n */\nfunction replaceTemplateVars(templateSrv, target, scopedVars) {\n var replacedTarget = templateSrv.replace(target, scopedVars, zabbixTemplateFormat);\n if (target !== replacedTarget && !utils.isRegex(replacedTarget)) {\n replacedTarget = '/^' + replacedTarget + '$/';\n }\n return replacedTarget;\n}\n\n// Apply function one by one:\n// sequence([a(), b(), c()]) = c(b(a()));\nfunction sequence(funcsArray) {\n return function(result) {\n for (var i = 0; i < funcsArray.length; i++) {\n result = funcsArray[i].call(this, result);\n }\n return result;\n };\n}\n\nfunction filterEnabledTargets(targets) {\n return _.filter(targets, target => {\n return !(target.hide || !target.group || !target.host || !target.item);\n });\n}\n\nfunction getTriggerThreshold(expression) {\n let thresholdPattern = /.*[<>]([\\d\\.]+)/;\n let finded_thresholds = expression.match(thresholdPattern);\n if (finded_thresholds && finded_thresholds.length >= 2) {\n let threshold = finded_thresholds[1];\n threshold = Number(threshold);\n return threshold;\n } else {\n return null;\n }\n}\n\nexport {ZabbixAPIDatasource, zabbixTemplateFormat};\n\n// Fix for backward compatibility with lodash 2.4\nif (!_.includes) {_.includes = _.contains;}\nif (!_.keyBy) {_.keyBy = _.indexBy;}\n"]} \ No newline at end of file diff --git a/dist/test/datasource-zabbix/datasource.js b/dist/test/datasource-zabbix/datasource.js index a6055f4..5f61823 100644 --- a/dist/test/datasource-zabbix/datasource.js +++ b/dist/test/datasource-zabbix/datasource.js @@ -201,21 +201,19 @@ var ZabbixAPIDatasource = function () { var getHistoryPromise = void 0; if (useTrends) { - (function () { - var valueType = _this2.getTrendValueType(target); - getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) { - return _responseHandler2.default.handleTrends(history, items, valueType); - }).then(function (timeseries) { - // Sort trend data, issue #202 - _lodash2.default.forEach(timeseries, function (series) { - series.datapoints = _lodash2.default.sortBy(series.datapoints, function (point) { - return point[c.DATAPOINT_TS]; - }); + var valueType = _this2.getTrendValueType(target); + getHistoryPromise = _this2.zabbix.getTrend(items, timeFrom, timeTo).then(function (history) { + return _responseHandler2.default.handleTrends(history, items, valueType); + }).then(function (timeseries) { + // Sort trend data, issue #202 + _lodash2.default.forEach(timeseries, function (series) { + series.datapoints = _lodash2.default.sortBy(series.datapoints, function (point) { + return point[c.DATAPOINT_TS]; }); - - return timeseries; }); - })(); + + return timeseries; + }); } else { // Use history getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) { @@ -262,20 +260,18 @@ var ZabbixAPIDatasource = function () { // Apply aggregations if (aggregationFunctions.length) { - (function () { - var dp = _lodash2.default.map(timeseries_data, 'datapoints'); - dp = sequence(aggregationFunctions)(dp); + var dp = _lodash2.default.map(timeseries_data, 'datapoints'); + dp = sequence(aggregationFunctions)(dp); - var aggFuncNames = _lodash2.default.map(metricFunctions.getCategories()['Aggregate'], 'name'); - var lastAgg = _lodash2.default.findLast(target.functions, function (func) { - return _lodash2.default.includes(aggFuncNames, func.def.name); - }); + var aggFuncNames = _lodash2.default.map(metricFunctions.getCategories()['Aggregate'], 'name'); + var lastAgg = _lodash2.default.findLast(target.functions, function (func) { + return _lodash2.default.includes(aggFuncNames, func.def.name); + }); - timeseries_data = [{ - target: lastAgg.text, - datapoints: dp - }]; - })(); + timeseries_data = [{ + target: lastAgg.text, + datapoints: dp + }]; } // Apply alias functions @@ -295,12 +291,10 @@ var ZabbixAPIDatasource = function () { return func.def.name === 'timeShift'; }); if (timeShiftFunc) { - (function () { - var shift = timeShiftFunc.params[0]; - _lodash2.default.forEach(timeseries_data, function (series) { - series.datapoints = _dataProcessor2.default.unShiftTimeSeries(shift, series.datapoints); - }); - })(); + var shift = timeShiftFunc.params[0]; + _lodash2.default.forEach(timeseries_data, function (series) { + series.datapoints = _dataProcessor2.default.unShiftTimeSeries(shift, series.datapoints); + }); } } }, { diff --git a/src/sass/panel-triggers.scss b/src/sass/_panel-triggers.scss similarity index 91% rename from src/sass/panel-triggers.scss rename to src/sass/_panel-triggers.scss index 156c5dc..a49c2ea 100644 --- a/src/sass/panel-triggers.scss +++ b/src/sass/_panel-triggers.scss @@ -1,10 +1,3 @@ -$tight-form-func-bg: #333; -$blue: #33B5E5; -$dark-2: #1f1d1d; -$body-bg: rgb(20,20,20); - -$grafanaListAccent: lighten($dark-2, 2%); - .triggers-panel-wrapper { .panel-content { padding: 0; diff --git a/src/sass/_variables.dark.scss b/src/sass/_variables.dark.scss new file mode 100644 index 0000000..a1fdab5 --- /dev/null +++ b/src/sass/_variables.dark.scss @@ -0,0 +1,6 @@ +$tight-form-func-bg: #333; +$blue: #33B5E5; +$dark-2: #1f1d1d; +$body-bg: rgb(20,20,20); + +$grafanaListAccent: lighten($dark-2, 2%); diff --git a/src/sass/_variables.light.scss b/src/sass/_variables.light.scss new file mode 100644 index 0000000..a1fdab5 --- /dev/null +++ b/src/sass/_variables.light.scss @@ -0,0 +1,6 @@ +$tight-form-func-bg: #333; +$blue: #33B5E5; +$dark-2: #1f1d1d; +$body-bg: rgb(20,20,20); + +$grafanaListAccent: lighten($dark-2, 2%); diff --git a/src/sass/variables.dark.scss b/src/sass/_variables.scss similarity index 100% rename from src/sass/variables.dark.scss rename to src/sass/_variables.scss diff --git a/src/sass/grafana-zabbix.dark.scss b/src/sass/grafana-zabbix.dark.scss index 57a3566..56cb7bb 100644 --- a/src/sass/grafana-zabbix.dark.scss +++ b/src/sass/grafana-zabbix.dark.scss @@ -1,2 +1,2 @@ @import 'variables.dark'; -@import 'panel-triggers'; +@import 'grafana-zabbix'; diff --git a/src/sass/grafana-zabbix.light.scss b/src/sass/grafana-zabbix.light.scss index f6e0080..6adbd07 100644 --- a/src/sass/grafana-zabbix.light.scss +++ b/src/sass/grafana-zabbix.light.scss @@ -1,2 +1,2 @@ @import 'variables.light'; -@import 'panel-triggers'; +@import 'grafana-zabbix'; diff --git a/src/sass/grafana-zabbix.scss b/src/sass/grafana-zabbix.scss new file mode 100644 index 0000000..495c0ac --- /dev/null +++ b/src/sass/grafana-zabbix.scss @@ -0,0 +1,2 @@ +@import 'variables'; +@import 'panel-triggers'; diff --git a/src/sass/variables.light.scss b/src/sass/variables.light.scss deleted file mode 100644 index e69de29..0000000 From 38873fa6af01ac2d38edcc4e3c6782fbaa1c6abd Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 12:47:56 +0300 Subject: [PATCH 4/7] styles refactor and light theme fix --- dist/css/grafana-zabbix.dark.css.map | 2 +- dist/css/grafana-zabbix.light.css | 16 +++++------ dist/css/grafana-zabbix.light.css.map | 2 +- src/sass/_variables.dark.scss | 38 +++++++++++++++++++++++---- src/sass/_variables.light.scss | 37 ++++++++++++++++++++++---- 5 files changed, 75 insertions(+), 20 deletions(-) diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index ed307cc..c4fc884 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "AIAA,AACE,uBADqB,CACrB,cAAc,CAAC;EACb,OAAO,EAAE,CAAE,GACZ;;AAHH,AAIE,uBAJqB,CAIrB,sBAAsB,CAAC;EACrB,cAAc,EAAE,GAAI,GACrB;;AAGH,AAAA,sBAAsB,CAAC;EACrB,QAAQ,EAAE,IAAK,GAChB;;AAED,AAAA,yBAAyB,CAAC;EACxB,WAAW,EAAE,KAAM;EACnB,QAAQ,EAAE,QAAS,GACpB;;AAED,AAAA,sBAAsB,CAAC;EACrB,UAAU,EAAE,MAAO;EACnB,SAAS,EAAE,GAAI;EACf,WAAW,EAAE,GAAI,GA0BlB;EA7BD,AAKE,sBALoB,CAKpB,EAAE,CAAC;IACD,QAAQ,EAAE,QAAS;IACnB,OAAO,EAAE,YAAa;IACtB,WAAW,EAAE,CAAE;IACf,aAAa,EAAE,CAAE,GAClB;EAVH,AAWO,sBAXe,CAWpB,EAAE,GAAG,EAAE,CAAC;IACN,OAAO,EAAE,MAAO,GACjB;EAbH,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACV,KAAK,EAAE,IAAK;IACZ,OAAO,EAAE,QAAS;IAClB,eAAe,EAAE,IAAK;IACtB,iBAAiB,EAAE,CAAE,GAUtB;IA5BH,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,AAMR,MAAM,CAAC;MACN,gBAAgB,EHvCM,IAAI,GGwC3B;IAtBL,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,AAUR,OAAO,CAAC;MACP,WAAW,EAAE,IAAK;MAClB,KAAK,EH3Cc,OAAO,GG4C3B;;AAIL,AAAA,qBAAqB,CAAC;EACpB,KAAK,EAAE,IAAK;EACZ,eAAe,EAAE,QAAS,GAwB3B;EA1BD,AAIE,qBAJmB,CAInB,EAAE,CAAC;IACD,OAAO,EAAE,CAAE,GAOZ;IAZH,AAQM,qBARe,CAInB,EAAE,AAGC,YAAY,CACX,kCAAkC,CAAC;MACjC,YAAY,EAAE,IAAK,GACpB;EAVP,AAcE,qBAdmB,CAcnB,EAAE,CAAC;IACD,OAAO,EAAE,qBAAsB;IAC/B,aAAa,EAAE,GAAG,CAAC,KAAK,CH9DT,OAAG;IG+DlB,YAAY,EAAE,GAAG,CAAC,KAAK,CH/DR,OAAG,GGuEnB;IAzBH,AAcE,qBAdmB,CAcnB,EAAE,AAKC,YAAY,CAAC;MACZ,YAAY,EAAE,IAAK,GACpB;IArBL,AAcE,qBAdmB,CAcnB,EAAE,AAQC,WAAW,CAAC;MACX,YAAY,EAAE,IAAK,GACpB;;AAIL,AAAA,yBAAyB,CAAC;EACxB,UAAU,EHzEgB,OAAO;EG0EjC,UAAU,EAAE,GAAG,CAAC,KAAK,CH5EJ,OAAG;EG6EpB,aAAa,EAAE,GAAG,CAAC,KAAK,CH7EP,OAAG;EG8EpB,MAAM,EAAE,KAAM;EACd,QAAQ,EAAE,QAAS;EACnB,GAAG,EAAE,CAAE;EACP,KAAK,EAAE,CAAE;EACT,IAAI,EAAE,CAAE,GACT;;AAED,AAAA,kCAAkC,CAAC;EACjC,OAAO,EAAE,qBAAsB;EAC/B,UAAU,EAAE,IAAK;EACjB,KAAK,EH1FkB,OAAO;EG2F9B,QAAQ,EAAE,QAAS;EACnB,GAAG,EAAE,CAAE,GACR;;AAED,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,MAAO;EACnB,MAAM,EAAE,GAAI;EACZ,WAAW,EAAE,GAAI,GAClB;;AAED,AACE,YADU,CACV,aAAa,CAAC;EAEZ,SAAS,EAAE,gBAAiB;EAC5B,SAAS,EAAE,gBAAiB,GAC7B;;AALH,AAOE,YAPU,CAOV,aAAa,CAAC;EACZ,KAAK,EAAE,GAAI,GACZ;;AATH,AAWE,YAXU,CAWV,eAAe,CAAC;EACd,WAAW,EAAE,IAAK,GACnB;;AAbH,AAeQ,YAfI,CAeV,KAAK,CAAC,EAAE,EAfV,AAeY,YAfA,CAeA,EAAE,CAAC;EACX,aAAa,EAAE,IAAK,GACrB;;AAjBH,AAmBE,YAnBU,CAmBV,gBAAgB,CAAC;EACf,WAAW,EAAE,IAAK,GAWnB;EA/BH,AAsBI,YAtBQ,CAmBV,gBAAgB,CAGd,KAAK,CAAC;IACJ,MAAM,EAAE,SAAU;IAClB,aAAa,EAAE,GAAI;IACnB,KAAK,EAAE,GAAI,GACZ;EA1BL,AA4BI,YA5BQ,CAmBV,gBAAgB,CASd,MAAM,CAAC;IACL,WAAW,EAAE,IAAK,GACnB", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css index 2101b06..78864c0 100644 --- a/dist/css/grafana-zabbix.light.css +++ b/dist/css/grafana-zabbix.light.css @@ -28,10 +28,10 @@ text-decoration: none; border-left-width: 0; } .triggers-panel-footer ul > li > a:hover { - background-color: #333; } + background-color: #ECECEC; } .triggers-panel-footer ul > li > a.active { font-weight: bold; - color: #33B5E5; } + color: #2AB2E4; } .triggers-panel-table { width: 100%; @@ -42,17 +42,17 @@ padding-left: 15px; } .triggers-panel-table td { padding: 0.45em 0 0.45em 1.1em; - border-bottom: 2px solid #141414; - border-right: 2px solid #141414; } + border-bottom: 2px solid #fff; + border-right: 2px solid #fff; } .triggers-panel-table td:first-child { padding-left: 15px; } .triggers-panel-table td:last-child { border-right: none; } .triggers-panel-header-bg { - background: #242222; - border-top: 2px solid #141414; - border-bottom: 2px solid #141414; + background: #ECECEC; + border-top: 2px solid #fff; + border-bottom: 2px solid #fff; height: 2.0em; position: absolute; top: 0; @@ -62,7 +62,7 @@ .triggers-panel-table-header-inner { padding: 0.45em 0 0.45em 1.1em; text-align: left; - color: #33B5E5; + color: #2AB2E4; position: absolute; top: 0; } diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index 63b02f6..7c45134 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/src/sass/_variables.dark.scss b/src/sass/_variables.dark.scss index a1fdab5..89bfd38 100644 --- a/src/sass/_variables.dark.scss +++ b/src/sass/_variables.dark.scss @@ -1,6 +1,34 @@ -$tight-form-func-bg: #333; -$blue: #33B5E5; -$dark-2: #1f1d1d; -$body-bg: rgb(20,20,20); +// Grays +// ------------------------- +$black: #000; +$dark-1: #141414; +$dark-2: #1f1d1d; +$dark-3: #292929; +$dark-4: #333333; +$dark-5: #444444; +$gray-1: #555555; +$gray-2: #7B7B7B; +$gray-3: #b3b3b3; +$gray-4: #D8D9DA; +$gray-5: #ECECEC; +$gray-6: #f4f5f8; +$gray-7: #fbfbfb; + +$white: #fff; + +// Accent colors +// ------------------------- +$blue: #33B5E5; +$blue-dark: #005f81; +$green: #609000; +$red: #CC3900; +$yellow: #ECBB13; +$orange: #eb7b18; +$pink: #FF4444; +$purple: #9933CC; +$variable: #32D1DF; + +$body-bg: rgb(20,20,20); +$tight-form-func-bg: #333; +$grafanaListAccent: lighten($dark-2, 2%); -$grafanaListAccent: lighten($dark-2, 2%); diff --git a/src/sass/_variables.light.scss b/src/sass/_variables.light.scss index a1fdab5..206cb1b 100644 --- a/src/sass/_variables.light.scss +++ b/src/sass/_variables.light.scss @@ -1,6 +1,33 @@ -$tight-form-func-bg: #333; -$blue: #33B5E5; -$dark-2: #1f1d1d; -$body-bg: rgb(20,20,20); +// Grays +// ------------------------- +$black: #000; +$dark-1: #141414; +$dark-2: #1f1d1d; +$dark-3: #292929; +$dark-4: #373737; +$dark-5: #444444; +$gray-1: #555555; +$gray-2: #7B7B7B; +$gray-3: #b3b3b3; +$gray-4: #D8D9DA; +$gray-5: #ECECEC; +$gray-6: #f4f5f8; +$gray-7: #fbfbfb; -$grafanaListAccent: lighten($dark-2, 2%); +$white: #fff; + +// Accent colors +// ------------------------- +$blue: #2AB2E4; +$blue-dark: #3CAAD6; +$green: #28B62C; +$red: #FF4136; +$yellow: #FF851B; +$orange: #Ff7941; +$pink: #E671B8; +$purple: #9954BB; +$variable: #2AB2E4; + +$body-bg : $white; +$tight-form-func-bg: $gray-5; +$grafanaListAccent: $gray-5; From 077fd5a302247e3dac73910f6eb3f97b26651bc5 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 13:42:04 +0300 Subject: [PATCH 5/7] Use default flexible layout for table --- dist/css/grafana-zabbix.dark.css.map | 2 +- dist/css/grafana-zabbix.light.css.map | 2 +- dist/panel-triggers/module.html | 14 +++++++------- src/panel-triggers/module.html | 14 +++++++------- src/sass/_panel-triggers.scss | 16 ++++++++++++++++ 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index c4fc884..2382694 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index 7c45134..9827301 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/panel-triggers/module.html b/dist/panel-triggers/module.html index 7b5fefa..b37b1ad 100644 --- a/dist/panel-triggers/module.html +++ b/dist/panel-triggers/module.html @@ -4,32 +4,32 @@ - - - - - - - diff --git a/src/panel-triggers/module.html b/src/panel-triggers/module.html index 7b5fefa..b37b1ad 100644 --- a/src/panel-triggers/module.html +++ b/src/panel-triggers/module.html @@ -4,32 +4,32 @@
    +
    Host
    		+
    Technical Name
    		+
    Status
    		 +
    Severity
    Issue
    		 +
    Last change
    		 +
    Age
    		 +
    Info
    - - - - - - - diff --git a/src/sass/_panel-triggers.scss b/src/sass/_panel-triggers.scss index a49c2ea..2e1754b 100644 --- a/src/sass/_panel-triggers.scss +++ b/src/sass/_panel-triggers.scss @@ -73,6 +73,22 @@ border-right: none; } } + + // .zbx-field-host { + // width: 15%; + // } + + // .zbx-field-status { + // width: 9rem; + // } + + // .zbx-field-severity { + // width: 7%; + // } + + // .zbx-field-lastchange { + // width: 15%; + // } } .triggers-panel-header-bg { From 2e8de2e24743786ca6adee9ba07b2127f6e0271e Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 14:09:52 +0300 Subject: [PATCH 6/7] styles refactor --- dist/css/grafana-zabbix.dark.css | 5 +++++ dist/css/grafana-zabbix.dark.css.map | 2 +- dist/css/grafana-zabbix.light.css | 5 +++++ dist/css/grafana-zabbix.light.css.map | 2 +- dist/panel-triggers/module.html | 13 ++++++++----- src/panel-triggers/module.html | 13 ++++++++----- src/sass/_panel-triggers.scss | 13 +++++++++++++ src/sass/_variables.dark.scss | 2 ++ src/sass/_variables.light.scss | 2 ++ 9 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dist/css/grafana-zabbix.dark.css b/dist/css/grafana-zabbix.dark.css index 7c55f5f..343d882 100644 --- a/dist/css/grafana-zabbix.dark.css +++ b/dist/css/grafana-zabbix.dark.css @@ -48,6 +48,11 @@ padding-left: 15px; } .triggers-panel-table td:last-child { border-right: none; } + .triggers-panel-table .zbx-field-colored { + color: #f4f5f8; } + .triggers-panel-table .zbx-description-icon { + float: right; + padding-right: 8px; } .triggers-panel-header-bg { background: #242222; diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index 2382694..cf8e710 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "AIAA,AACE,uBADqB,CACrB,cAAc,CAAC;EACb,OAAO,EAAE,CAAE,GACZ;;AAHH,AAIE,uBAJqB,CAIrB,sBAAsB,CAAC;EACrB,cAAc,EAAE,GAAI,GACrB;;AAGH,AAAA,sBAAsB,CAAC;EACrB,QAAQ,EAAE,IAAK,GAChB;;AAED,AAAA,yBAAyB,CAAC;EACxB,WAAW,EAAE,KAAM;EACnB,QAAQ,EAAE,QAAS,GACpB;;AAED,AAAA,sBAAsB,CAAC;EACrB,UAAU,EAAE,MAAO;EACnB,SAAS,EAAE,GAAI;EACf,WAAW,EAAE,GAAI,GA0BlB;EA7BD,AAKE,sBALoB,CAKpB,EAAE,CAAC;IACD,QAAQ,EAAE,QAAS;IACnB,OAAO,EAAE,YAAa;IACtB,WAAW,EAAE,CAAE;IACf,aAAa,EAAE,CAAE,GAClB;EAVH,AAWO,sBAXe,CAWpB,EAAE,GAAG,EAAE,CAAC;IACN,OAAO,EAAE,MAAO,GACjB;EAbH,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACV,KAAK,EAAE,IAAK;IACZ,OAAO,EAAE,QAAS;IAClB,eAAe,EAAE,IAAK;IACtB,iBAAiB,EAAE,CAAE,GAUtB;IA5BH,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,AAMR,MAAM,CAAC;MACN,gBAAgB,EHRE,IAAI,GGSvB;IAtBL,AAcY,sBAdU,CAcpB,EAAE,GAAG,EAAE,GAAG,CAAC,AAUR,OAAO,CAAC;MACP,WAAW,EAAE,IAAK;MAClB,KAAK,EHxBa,OAAO,GGyB1B;;AAIL,AAAA,qBAAqB,CAAC;EACpB,KAAK,EAAE,IAAK;EACZ,eAAe,EAAE,QAAS,GAwC3B;EA1CD,AAIE,qBAJmB,CAInB,EAAE,CAAC;IACD,OAAO,EAAE,CAAE,GAOZ;IAZH,AAQM,qBARe,CAInB,EAAE,AAGC,YAAY,CACX,kCAAkC,CAAC;MACjC,YAAY,EAAE,IAAK,GACpB;EAVP,AAcE,qBAdmB,CAcnB,EAAE,CAAC;IACD,OAAO,EAAE,qBAAsB;IAC/B,aAAa,EAAE,GAAG,CAAC,KAAK,CHnCJ,OAAG;IGoCvB,YAAY,EAAE,GAAG,CAAC,KAAK,CHpCH,OAAG,GG4CxB;IAzBH,AAcE,qBAdmB,CAcnB,EAAE,AAKC,YAAY,CAAC;MACZ,YAAY,EAAE,IAAK,GACpB;IArBL,AAcE,qBAdmB,CAcnB,EAAE,AAQC,WAAW,CAAC;MACX,YAAY,EAAE,IAAK,GACpB;;AAoBL,AAAA,yBAAyB,CAAC;EACxB,UAAU,EH9DY,OAAO;EG+D7B,UAAU,EAAE,GAAG,CAAC,KAAK,CHjEC,OAAG;EGkEzB,aAAa,EAAE,GAAG,CAAC,KAAK,CHlEF,OAAG;EGmEzB,MAAM,EAAE,KAAM;EACd,QAAQ,EAAE,QAAS;EACnB,GAAG,EAAE,CAAE;EACP,KAAK,EAAE,CAAE;EACT,IAAI,EAAE,CAAE,GACT;;AAED,AAAA,kCAAkC,CAAC;EACjC,OAAO,EAAE,qBAAsB;EAC/B,UAAU,EAAE,IAAK;EACjB,KAAK,EHvFiB,OAAO;EGwF7B,QAAQ,EAAE,QAAS;EACnB,GAAG,EAAE,CAAE,GACR;;AAED,AAAA,0BAA0B,CAAC;EACzB,UAAU,EAAE,MAAO;EACnB,MAAM,EAAE,GAAI;EACZ,WAAW,EAAE,GAAI,GAClB;;AAED,AACE,YADU,CACV,aAAa,CAAC;EAEZ,SAAS,EAAE,gBAAiB;EAC5B,SAAS,EAAE,gBAAiB,GAC7B;;AALH,AAOE,YAPU,CAOV,aAAa,CAAC;EACZ,KAAK,EAAE,GAAI,GACZ;;AATH,AAWE,YAXU,CAWV,eAAe,CAAC;EACd,WAAW,EAAE,IAAK,GACnB;;AAbH,AAeQ,YAfI,CAeV,KAAK,CAAC,EAAE,EAfV,AAeY,YAfA,CAeA,EAAE,CAAC;EACX,aAAa,EAAE,IAAK,GACrB;;AAjBH,AAmBE,YAnBU,CAmBV,gBAAgB,CAAC;EACf,WAAW,EAAE,IAAK,GAWnB;EA/BH,AAsBI,YAtBQ,CAmBV,gBAAgB,CAGd,KAAK,CAAC;IACJ,MAAM,EAAE,SAAU;IAClB,aAAa,EAAE,GAAI;IACnB,KAAK,EAAE,GAAI,GACZ;EA1BL,AA4BI,YA5BQ,CAmBV,gBAAgB,CASd,MAAM,CAAC;IACL,WAAW,EAAE,IAAK,GACnB", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css index 78864c0..854b634 100644 --- a/dist/css/grafana-zabbix.light.css +++ b/dist/css/grafana-zabbix.light.css @@ -48,6 +48,11 @@ padding-left: 15px; } .triggers-panel-table td:last-child { border-right: none; } + .triggers-panel-table .zbx-field-colored { + color: #f4f5f8; } + .triggers-panel-table .zbx-description-icon { + float: right; + padding-right: 8px; } .triggers-panel-header-bg { background: #ECECEC; diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index 9827301..e61bbf2 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/panel-triggers/module.html b/dist/panel-triggers/module.html index b37b1ad..480fc31 100644 --- a/dist/panel-triggers/module.html +++ b/dist/panel-triggers/module.html @@ -49,26 +49,29 @@ - - - - - -
    +
    Host
    		+
    Technical Name
    		+
    Status
    		 +
    Severity
    Issue
    		 +
    Last change
    		 +
    Age
    		 +
    Info
    +
    {{ctrl.triggerStatusMap[trigger.value]}}
    		+
    {{trigger.severity}}
    		+ +
    {{ctrl.triggerStatusMap[trigger.value]}}
    		+
    {{trigger.severity}}
    		+
    {{trigger.description}} diff --git a/src/sass/_panel-triggers.scss b/src/sass/_panel-triggers.scss index 2e1754b..7b108cc 100644 --- a/src/sass/_panel-triggers.scss +++ b/src/sass/_panel-triggers.scss @@ -74,6 +74,19 @@ } } + .zbx-field-colored { + color: $gray-6; + } + + .zbx-description-icon { + float: right; + padding-right: 8px; + } + + // .zbx-field-info { + // width: 7%; + // } + // .zbx-field-host { // width: 15%; // } diff --git a/src/sass/_variables.dark.scss b/src/sass/_variables.dark.scss index 89bfd38..a9c8115 100644 --- a/src/sass/_variables.dark.scss +++ b/src/sass/_variables.dark.scss @@ -29,6 +29,8 @@ $purple: #9933CC; $variable: #32D1DF; $body-bg: rgb(20,20,20); +$body-color: $gray-4; +$text-color: $gray-4; $tight-form-func-bg: #333; $grafanaListAccent: lighten($dark-2, 2%); diff --git a/src/sass/_variables.light.scss b/src/sass/_variables.light.scss index 206cb1b..c7f1579 100644 --- a/src/sass/_variables.light.scss +++ b/src/sass/_variables.light.scss @@ -29,5 +29,7 @@ $purple: #9954BB; $variable: #2AB2E4; $body-bg : $white; +$body-color: $gray-1; +$text-color: $gray-1; $tight-form-func-bg: $gray-5; $grafanaListAccent: $gray-5; From 387f75f0184eeeaf65832ddf94d24b9ff72a2fae Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 18 Jun 2017 16:41:16 +0300 Subject: [PATCH 7/7] fix trigger description icon color --- dist/css/grafana-zabbix.dark.css | 3 ++- dist/css/grafana-zabbix.dark.css.map | 2 +- dist/css/grafana-zabbix.light.css | 3 ++- dist/css/grafana-zabbix.light.css.map | 2 +- src/sass/_panel-triggers.scss | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dist/css/grafana-zabbix.dark.css b/dist/css/grafana-zabbix.dark.css index 343d882..e1975dc 100644 --- a/dist/css/grafana-zabbix.dark.css +++ b/dist/css/grafana-zabbix.dark.css @@ -52,7 +52,8 @@ color: #f4f5f8; } .triggers-panel-table .zbx-description-icon { float: right; - padding-right: 8px; } + padding-right: 8px; + color: #f4f5f8; } .triggers-panel-header-bg { background: #242222; diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index cf8e710..a1fa8fb 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css index 854b634..a8d804b 100644 --- a/dist/css/grafana-zabbix.light.css +++ b/dist/css/grafana-zabbix.light.css @@ -52,7 +52,8 @@ color: #f4f5f8; } .triggers-panel-table .zbx-description-icon { float: right; - padding-right: 8px; } + padding-right: 8px; + color: #f4f5f8; } .triggers-panel-header-bg { background: #ECECEC; diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index e61bbf2..1f152a5 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -8,6 +8,6 @@ "../../src/sass/_variables.scss", "../../src/sass/_panel-triggers.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/src/sass/_panel-triggers.scss b/src/sass/_panel-triggers.scss index 7b108cc..df1ec03 100644 --- a/src/sass/_panel-triggers.scss +++ b/src/sass/_panel-triggers.scss @@ -81,6 +81,7 @@ .zbx-description-icon { float: right; padding-right: 8px; + color: $gray-6; } // .zbx-field-info {