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":"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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 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