From 0b8cb0b23c376dae5797f1a19b2df2e6a0d88379 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 4 Jul 2017 10:16:03 +0300 Subject: [PATCH] functions: rename moving avg to graphite-like --- dist/datasource-zabbix/dataProcessor.js | 5 +++-- dist/datasource-zabbix/dataProcessor.js.map | 2 +- dist/datasource-zabbix/metricFunctions.js | 8 ++++---- dist/datasource-zabbix/metricFunctions.js.map | 2 +- dist/test/datasource-zabbix/dataProcessor.js | 5 +++-- dist/test/datasource-zabbix/metricFunctions.js | 8 ++++---- src/datasource-zabbix/dataProcessor.js | 5 +++-- src/datasource-zabbix/metricFunctions.js | 8 ++++---- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dist/datasource-zabbix/dataProcessor.js b/dist/datasource-zabbix/dataProcessor.js index 372f28f..c881e8b 100644 --- a/dist/datasource-zabbix/dataProcessor.js +++ b/dist/datasource-zabbix/dataProcessor.js @@ -125,9 +125,10 @@ System.register(['lodash', './utils', './timeseries'], function (_export, _conte scale: scale, delta: delta, rate: rate, - simpleMovingAverage: simpleMovingAverage, - expMovingAverage: expMovingAverage, + movingAverage: simpleMovingAverage, + exponentialMovingAverage: expMovingAverage, aggregateBy: aggregateByWrapper, + // Predefined aggs average: _.partial(aggregateWrapper, AVERAGE), min: _.partial(aggregateWrapper, MIN), max: _.partial(aggregateWrapper, MAX), diff --git a/dist/datasource-zabbix/dataProcessor.js.map b/dist/datasource-zabbix/dataProcessor.js.map index f860114..6c00012 100644 --- a/dist/datasource-zabbix/dataProcessor.js.map +++ b/dist/datasource-zabbix/dataProcessor.js.map @@ -1 +1 @@ -{"version":3,"sources":["../../src/datasource-zabbix/dataProcessor.js"],"names":["limit","order","n","orderByFunc","timeseries","orderByCallback","aggregationFunctions","sortByIteratee","ts","values","_","map","datapoints","point","sortedTimeseries","sortBy","slice","setAlias","alias","target","replaceAlias","regexp","newAlias","pattern","utils","isRegex","buildRegex","replace","setAliasByRegex","extractText","str","extractPattern","RegExp","extractedValue","exec","groupByWrapper","interval","groupFunc","groupByCallback","groupBy","aggregateByWrapper","aggregateFunc","flattenedPoints","flatten","aggregateWrapper","timeShift","range","shift","parseTimeShiftInterval","time","unShiftTimeSeries","unshift","dp","downsampleSeries","downsample","groupBy_perf","groupBy_exported","sumSeries","delta","rate","scale","factor","scale_perf","simpleMovingAverage","expMovingAverage","a","SUM","COUNT","AVERAGE","MIN","MAX","MEDIAN","metricFunctions","aggregateBy","average","partial","min","max","median","sum","count","top","bottom","avg"],"mappings":"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","file":"dataProcessor.js","sourcesContent":["import _ from 'lodash';\nimport * as utils from './utils';\nimport ts from './timeseries';\n\nlet downsampleSeries = ts.downsample;\nlet groupBy = ts.groupBy_perf;\nlet groupBy_exported = (interval, groupFunc, datapoints) => groupBy(datapoints, interval, groupFunc);\nlet sumSeries = ts.sumSeries;\nlet delta = ts.delta;\nlet rate = ts.rate;\nlet scale = (factor, datapoints) => ts.scale_perf(datapoints, factor);\nlet simpleMovingAverage = (n, datapoints) => ts.simpleMovingAverage(datapoints, n);\nlet expMovingAverage = (a, datapoints) => ts.expMovingAverage(datapoints, a);\n\nlet SUM = ts.SUM;\nlet COUNT = ts.COUNT;\nlet AVERAGE = ts.AVERAGE;\nlet MIN = ts.MIN;\nlet MAX = ts.MAX;\nlet MEDIAN = ts.MEDIAN;\n\nfunction limit(order, n, orderByFunc, timeseries) {\n let orderByCallback = aggregationFunctions[orderByFunc];\n let sortByIteratee = (ts) => {\n let values = _.map(ts.datapoints, (point) => {\n return point[0];\n });\n return orderByCallback(values);\n };\n let sortedTimeseries = _.sortBy(timeseries, sortByIteratee);\n if (order === 'bottom') {\n return sortedTimeseries.slice(0, n);\n } else {\n return sortedTimeseries.slice(-n);\n }\n}\n\nfunction setAlias(alias, timeseries) {\n timeseries.target = alias;\n return timeseries;\n}\n\nfunction replaceAlias(regexp, newAlias, timeseries) {\n let pattern;\n if (utils.isRegex(regexp)) {\n pattern = utils.buildRegex(regexp);\n } else {\n pattern = regexp;\n }\n\n let alias = timeseries.target.replace(pattern, newAlias);\n timeseries.target = alias;\n return timeseries;\n}\n\nfunction setAliasByRegex(alias, timeseries) {\n timeseries.target = extractText(timeseries.target, alias);\n return timeseries;\n}\n\nfunction extractText(str, pattern) {\n var extractPattern = new RegExp(pattern);\n var extractedValue = extractPattern.exec(str);\n extractedValue = extractedValue[0];\n return extractedValue;\n}\n\nfunction groupByWrapper(interval, groupFunc, datapoints) {\n var groupByCallback = aggregationFunctions[groupFunc];\n return groupBy(datapoints, interval, groupByCallback);\n}\n\nfunction aggregateByWrapper(interval, aggregateFunc, datapoints) {\n // Flatten all points in frame and then just use groupBy()\n var flattenedPoints = _.flatten(datapoints, true);\n var groupByCallback = aggregationFunctions[aggregateFunc];\n return groupBy(flattenedPoints, interval, groupByCallback);\n}\n\nfunction aggregateWrapper(groupByCallback, interval, datapoints) {\n var flattenedPoints = _.flatten(datapoints, true);\n return groupBy(flattenedPoints, interval, groupByCallback);\n}\n\nfunction timeShift(interval, range) {\n let shift = utils.parseTimeShiftInterval(interval) / 1000;\n return _.map(range, time => {\n return time - shift;\n });\n}\n\nfunction unShiftTimeSeries(interval, datapoints) {\n let unshift = utils.parseTimeShiftInterval(interval);\n return _.map(datapoints, dp => {\n return [\n dp[0],\n dp[1] + unshift\n ];\n });\n}\n\nlet metricFunctions = {\n groupBy: groupByWrapper,\n scale: scale,\n delta: delta,\n rate: rate,\n simpleMovingAverage: simpleMovingAverage,\n expMovingAverage: expMovingAverage,\n aggregateBy: aggregateByWrapper,\n average: _.partial(aggregateWrapper, AVERAGE),\n min: _.partial(aggregateWrapper, MIN),\n max: _.partial(aggregateWrapper, MAX),\n median: _.partial(aggregateWrapper, MEDIAN),\n sum: _.partial(aggregateWrapper, SUM),\n count: _.partial(aggregateWrapper, COUNT),\n sumSeries: sumSeries,\n top: _.partial(limit, 'top'),\n bottom: _.partial(limit, 'bottom'),\n timeShift: timeShift,\n setAlias: setAlias,\n setAliasByRegex: setAliasByRegex,\n replaceAlias: replaceAlias\n};\n\nlet aggregationFunctions = {\n avg: AVERAGE,\n min: MIN,\n max: MAX,\n median: MEDIAN,\n sum: SUM,\n count: COUNT\n};\n\nexport default {\n downsampleSeries: downsampleSeries,\n groupBy: groupBy_exported,\n AVERAGE: AVERAGE,\n MIN: MIN,\n MAX: MAX,\n MEDIAN: MEDIAN,\n SUM: SUM,\n COUNT: COUNT,\n unShiftTimeSeries: unShiftTimeSeries,\n\n get aggregationFunctions() {\n return aggregationFunctions;\n },\n\n get metricFunctions() {\n return metricFunctions;\n }\n};\n"]} \ No newline at end of file +{"version":3,"sources":["../../src/datasource-zabbix/dataProcessor.js"],"names":["limit","order","n","orderByFunc","timeseries","orderByCallback","aggregationFunctions","sortByIteratee","ts","values","_","map","datapoints","point","sortedTimeseries","sortBy","slice","setAlias","alias","target","replaceAlias","regexp","newAlias","pattern","utils","isRegex","buildRegex","replace","setAliasByRegex","extractText","str","extractPattern","RegExp","extractedValue","exec","groupByWrapper","interval","groupFunc","groupByCallback","groupBy","aggregateByWrapper","aggregateFunc","flattenedPoints","flatten","aggregateWrapper","timeShift","range","shift","parseTimeShiftInterval","time","unShiftTimeSeries","unshift","dp","downsampleSeries","downsample","groupBy_perf","groupBy_exported","sumSeries","delta","rate","scale","factor","scale_perf","simpleMovingAverage","expMovingAverage","a","SUM","COUNT","AVERAGE","MIN","MAX","MEDIAN","metricFunctions","movingAverage","exponentialMovingAverage","aggregateBy","average","partial","min","max","median","sum","count","top","bottom","avg"],"mappings":"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","file":"dataProcessor.js","sourcesContent":["import _ from 'lodash';\nimport * as utils from './utils';\nimport ts from './timeseries';\n\nlet downsampleSeries = ts.downsample;\nlet groupBy = ts.groupBy_perf;\nlet groupBy_exported = (interval, groupFunc, datapoints) => groupBy(datapoints, interval, groupFunc);\nlet sumSeries = ts.sumSeries;\nlet delta = ts.delta;\nlet rate = ts.rate;\nlet scale = (factor, datapoints) => ts.scale_perf(datapoints, factor);\nlet simpleMovingAverage = (n, datapoints) => ts.simpleMovingAverage(datapoints, n);\nlet expMovingAverage = (a, datapoints) => ts.expMovingAverage(datapoints, a);\n\nlet SUM = ts.SUM;\nlet COUNT = ts.COUNT;\nlet AVERAGE = ts.AVERAGE;\nlet MIN = ts.MIN;\nlet MAX = ts.MAX;\nlet MEDIAN = ts.MEDIAN;\n\nfunction limit(order, n, orderByFunc, timeseries) {\n let orderByCallback = aggregationFunctions[orderByFunc];\n let sortByIteratee = (ts) => {\n let values = _.map(ts.datapoints, (point) => {\n return point[0];\n });\n return orderByCallback(values);\n };\n let sortedTimeseries = _.sortBy(timeseries, sortByIteratee);\n if (order === 'bottom') {\n return sortedTimeseries.slice(0, n);\n } else {\n return sortedTimeseries.slice(-n);\n }\n}\n\nfunction setAlias(alias, timeseries) {\n timeseries.target = alias;\n return timeseries;\n}\n\nfunction replaceAlias(regexp, newAlias, timeseries) {\n let pattern;\n if (utils.isRegex(regexp)) {\n pattern = utils.buildRegex(regexp);\n } else {\n pattern = regexp;\n }\n\n let alias = timeseries.target.replace(pattern, newAlias);\n timeseries.target = alias;\n return timeseries;\n}\n\nfunction setAliasByRegex(alias, timeseries) {\n timeseries.target = extractText(timeseries.target, alias);\n return timeseries;\n}\n\nfunction extractText(str, pattern) {\n var extractPattern = new RegExp(pattern);\n var extractedValue = extractPattern.exec(str);\n extractedValue = extractedValue[0];\n return extractedValue;\n}\n\nfunction groupByWrapper(interval, groupFunc, datapoints) {\n var groupByCallback = aggregationFunctions[groupFunc];\n return groupBy(datapoints, interval, groupByCallback);\n}\n\nfunction aggregateByWrapper(interval, aggregateFunc, datapoints) {\n // Flatten all points in frame and then just use groupBy()\n var flattenedPoints = _.flatten(datapoints, true);\n var groupByCallback = aggregationFunctions[aggregateFunc];\n return groupBy(flattenedPoints, interval, groupByCallback);\n}\n\nfunction aggregateWrapper(groupByCallback, interval, datapoints) {\n var flattenedPoints = _.flatten(datapoints, true);\n return groupBy(flattenedPoints, interval, groupByCallback);\n}\n\nfunction timeShift(interval, range) {\n let shift = utils.parseTimeShiftInterval(interval) / 1000;\n return _.map(range, time => {\n return time - shift;\n });\n}\n\nfunction unShiftTimeSeries(interval, datapoints) {\n let unshift = utils.parseTimeShiftInterval(interval);\n return _.map(datapoints, dp => {\n return [\n dp[0],\n dp[1] + unshift\n ];\n });\n}\n\nlet metricFunctions = {\n groupBy: groupByWrapper,\n scale: scale,\n delta: delta,\n rate: rate,\n movingAverage: simpleMovingAverage,\n exponentialMovingAverage: expMovingAverage,\n aggregateBy: aggregateByWrapper,\n // Predefined aggs\n average: _.partial(aggregateWrapper, AVERAGE),\n min: _.partial(aggregateWrapper, MIN),\n max: _.partial(aggregateWrapper, MAX),\n median: _.partial(aggregateWrapper, MEDIAN),\n sum: _.partial(aggregateWrapper, SUM),\n count: _.partial(aggregateWrapper, COUNT),\n sumSeries: sumSeries,\n top: _.partial(limit, 'top'),\n bottom: _.partial(limit, 'bottom'),\n timeShift: timeShift,\n setAlias: setAlias,\n setAliasByRegex: setAliasByRegex,\n replaceAlias: replaceAlias\n};\n\nlet aggregationFunctions = {\n avg: AVERAGE,\n min: MIN,\n max: MAX,\n median: MEDIAN,\n sum: SUM,\n count: COUNT\n};\n\nexport default {\n downsampleSeries: downsampleSeries,\n groupBy: groupBy_exported,\n AVERAGE: AVERAGE,\n MIN: MIN,\n MAX: MAX,\n MEDIAN: MEDIAN,\n SUM: SUM,\n COUNT: COUNT,\n unShiftTimeSeries: unShiftTimeSeries,\n\n get aggregationFunctions() {\n return aggregationFunctions;\n },\n\n get metricFunctions() {\n return metricFunctions;\n }\n};\n"]} \ No newline at end of file diff --git a/dist/datasource-zabbix/metricFunctions.js b/dist/datasource-zabbix/metricFunctions.js index 4d1e53b..dd4fe26 100644 --- a/dist/datasource-zabbix/metricFunctions.js +++ b/dist/datasource-zabbix/metricFunctions.js @@ -111,16 +111,16 @@ System.register(['lodash', 'jquery'], function (_export, _context) { }); addFuncDef({ - name: 'simpleMovingAverage', + name: 'movingAverage', category: 'Transform', - params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 600] }], + params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }], defaultParams: [10] }); addFuncDef({ - name: 'expMovingAverage', + name: 'exponentialMovingAverage', category: 'Transform', - params: [{ name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] }], + params: [{ name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }], defaultParams: [0.2] }); diff --git a/dist/datasource-zabbix/metricFunctions.js.map b/dist/datasource-zabbix/metricFunctions.js.map index e7cfb96..4b16468 100644 --- a/dist/datasource-zabbix/metricFunctions.js.map +++ b/dist/datasource-zabbix/metricFunctions.js.map @@ -1 +1 @@ -{"version":3,"sources":["../../src/datasource-zabbix/metricFunctions.js"],"names":["addFuncDef","funcDef","params","defaultParams","category","categories","push","index","name","shortName","createFuncInstance","_","isString","message","FuncInstance","getFuncDef","getCategories","$","Transform","Aggregate","Filter","Trends","Time","Alias","type","options","each","funcList","catName","sortBy","def","slice","updateText","metricFunctions","func","bindedFunc","param","i","length","Number","partial","metricExp","str","parameters","map","value","paramType","isNumeric","unshift","join","strValue","indexOf","optional","_hasMultipleParamsInString","split","partVal","idx","updateParam","trim","splice","text"],"mappings":"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","file":"metricFunctions.js","sourcesContent":["import _ from 'lodash';\nimport $ from 'jquery';\n\nvar index = [];\nvar categories = {\n Transform: [],\n Aggregate: [],\n Filter: [],\n Trends: [],\n Time: [],\n Alias: []\n};\n\nfunction addFuncDef(funcDef) {\n funcDef.params = funcDef.params || [];\n funcDef.defaultParams = funcDef.defaultParams || [];\n\n if (funcDef.category) {\n categories[funcDef.category].push(funcDef);\n }\n index[funcDef.name] = funcDef;\n index[funcDef.shortName || funcDef.name] = funcDef;\n}\n\n// Transform\n\naddFuncDef({\n name: 'groupBy',\n category: 'Transform',\n params: [\n { name: 'interval', type: 'string'},\n { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: ['1m', 'avg'],\n});\n\naddFuncDef({\n name: 'scale',\n category: 'Transform',\n params: [\n { name: 'factor', type: 'float', options: [100, 0.01, 10, -1]}\n ],\n defaultParams: [100],\n});\n\naddFuncDef({\n name: 'delta',\n category: 'Transform',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'rate',\n category: 'Transform',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'simpleMovingAverage',\n category: 'Transform',\n params: [\n { name: 'factor', type: 'int', options: [6, 10, 60, 600] }\n ],\n defaultParams: [10],\n});\n\naddFuncDef({\n name: 'expMovingAverage',\n category: 'Transform',\n params: [\n { name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] }\n ],\n defaultParams: [0.2],\n});\n\n// Aggregate\n\naddFuncDef({\n name: 'sumSeries',\n category: 'Aggregate',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'median',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string'}\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'average',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'min',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'max',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'sum',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'count',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'aggregateBy',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' },\n { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: ['1m', 'avg'],\n});\n\n// Filter\n\naddFuncDef({\n name: 'top',\n category: 'Filter',\n params: [\n { name: 'number', type: 'int' },\n { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: [5, 'avg'],\n});\n\naddFuncDef({\n name: 'bottom',\n category: 'Filter',\n params: [\n { name: 'number', type: 'int' },\n { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: [5, 'avg'],\n});\n\n// Trends\n\naddFuncDef({\n name: 'trendValue',\n category: 'Trends',\n params: [\n { name: 'type', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count'] }\n ],\n defaultParams: ['avg'],\n});\n\n// Time\n\naddFuncDef({\n name: 'timeShift',\n category: 'Time',\n params: [\n { name: 'interval', type: 'string', options: ['24h', '7d', '1M', '+24h', '-24h']}\n ],\n defaultParams: ['24h'],\n});\n\n//Alias\n\naddFuncDef({\n name: 'setAlias',\n category: 'Alias',\n params: [\n { name: 'alias', type: 'string' }\n ],\n defaultParams: []\n});\n\naddFuncDef({\n name: 'setAliasByRegex',\n category: 'Alias',\n params: [\n { name: 'aliasByRegex', type: 'string' }\n ],\n defaultParams: []\n});\n\naddFuncDef({\n name: 'replaceAlias',\n category: 'Alias',\n params: [\n { name: 'regexp', type: 'string' },\n { name: 'newAlias', type: 'string' }\n ],\n defaultParams: ['/(.*)/', '$1']\n});\n\n_.each(categories, function(funcList, catName) {\n categories[catName] = _.sortBy(funcList, 'name');\n});\n\nclass FuncInstance {\n constructor(funcDef, params) {\n this.def = funcDef;\n\n if (params) {\n this.params = params;\n } else {\n // Create with default params\n this.params = [];\n this.params = funcDef.defaultParams.slice(0);\n }\n\n this.updateText();\n }\n\n bindFunction(metricFunctions) {\n var func = metricFunctions[this.def.name];\n if (func) {\n\n // Bind function arguments\n var bindedFunc = func;\n var param;\n for (var i = 0; i < this.params.length; i++) {\n param = this.params[i];\n\n // Convert numeric params\n if (this.def.params[i].type === 'int' ||\n this.def.params[i].type === 'float') {\n param = Number(param);\n }\n bindedFunc = _.partial(bindedFunc, param);\n }\n return bindedFunc;\n } else {\n throw { message: 'Method not found ' + this.def.name };\n }\n }\n\n render(metricExp) {\n var str = this.def.name + '(';\n var parameters = _.map(this.params, function(value, index) {\n\n var paramType = this.def.params[index].type;\n if (paramType === 'int' ||\n paramType === 'float' ||\n paramType === 'value_or_series' ||\n paramType === 'boolean') {\n return value;\n }\n else if (paramType === 'int_or_interval' && $.isNumeric(value)) {\n return value;\n }\n\n return \"'\" + value + \"'\";\n\n }, this);\n\n if (metricExp) {\n parameters.unshift(metricExp);\n }\n\n return str + parameters.join(', ') + ')';\n }\n\n _hasMultipleParamsInString(strValue, index) {\n if (strValue.indexOf(',') === -1) {\n return false;\n }\n\n return this.def.params[index + 1] && this.def.params[index + 1].optional;\n }\n\n updateParam(strValue, index) {\n // handle optional parameters\n // if string contains ',' and next param is optional, split and update both\n if (this._hasMultipleParamsInString(strValue, index)) {\n _.each(strValue.split(','), function(partVal, idx) {\n this.updateParam(partVal.trim(), idx);\n }, this);\n return;\n }\n\n if (strValue === '' && this.def.params[index].optional) {\n this.params.splice(index, 1);\n }\n else {\n this.params[index] = strValue;\n }\n\n this.updateText();\n }\n\n updateText() {\n if (this.params.length === 0) {\n this.text = this.def.name + '()';\n return;\n }\n\n var text = this.def.name + '(';\n text += this.params.join(', ');\n text += ')';\n this.text = text;\n }\n}\n\nexport function createFuncInstance(funcDef, params) {\n if (_.isString(funcDef)) {\n if (!index[funcDef]) {\n throw { message: 'Method not found ' + name };\n }\n funcDef = index[funcDef];\n }\n return new FuncInstance(funcDef, params);\n}\n\nexport function getFuncDef(name) {\n return index[name];\n}\n\nexport function getCategories() {\n return categories;\n}\n"]} \ No newline at end of file +{"version":3,"sources":["../../src/datasource-zabbix/metricFunctions.js"],"names":["addFuncDef","funcDef","params","defaultParams","category","categories","push","index","name","shortName","createFuncInstance","_","isString","message","FuncInstance","getFuncDef","getCategories","$","Transform","Aggregate","Filter","Trends","Time","Alias","type","options","each","funcList","catName","sortBy","def","slice","updateText","metricFunctions","func","bindedFunc","param","i","length","Number","partial","metricExp","str","parameters","map","value","paramType","isNumeric","unshift","join","strValue","indexOf","optional","_hasMultipleParamsInString","split","partVal","idx","updateParam","trim","splice","text"],"mappings":"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","file":"metricFunctions.js","sourcesContent":["import _ from 'lodash';\nimport $ from 'jquery';\n\nvar index = [];\nvar categories = {\n Transform: [],\n Aggregate: [],\n Filter: [],\n Trends: [],\n Time: [],\n Alias: []\n};\n\nfunction addFuncDef(funcDef) {\n funcDef.params = funcDef.params || [];\n funcDef.defaultParams = funcDef.defaultParams || [];\n\n if (funcDef.category) {\n categories[funcDef.category].push(funcDef);\n }\n index[funcDef.name] = funcDef;\n index[funcDef.shortName || funcDef.name] = funcDef;\n}\n\n// Transform\n\naddFuncDef({\n name: 'groupBy',\n category: 'Transform',\n params: [\n { name: 'interval', type: 'string'},\n { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: ['1m', 'avg'],\n});\n\naddFuncDef({\n name: 'scale',\n category: 'Transform',\n params: [\n { name: 'factor', type: 'float', options: [100, 0.01, 10, -1]}\n ],\n defaultParams: [100],\n});\n\naddFuncDef({\n name: 'delta',\n category: 'Transform',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'rate',\n category: 'Transform',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'movingAverage',\n category: 'Transform',\n params: [\n { name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }\n ],\n defaultParams: [10],\n});\n\naddFuncDef({\n name: 'exponentialMovingAverage',\n category: 'Transform',\n params: [\n { name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }\n ],\n defaultParams: [0.2],\n});\n\n// Aggregate\n\naddFuncDef({\n name: 'sumSeries',\n category: 'Aggregate',\n params: [],\n defaultParams: [],\n});\n\naddFuncDef({\n name: 'median',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string'}\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'average',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'min',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'max',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'sum',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'count',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' }\n ],\n defaultParams: ['1m'],\n});\n\naddFuncDef({\n name: 'aggregateBy',\n category: 'Aggregate',\n params: [\n { name: 'interval', type: 'string' },\n { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: ['1m', 'avg'],\n});\n\n// Filter\n\naddFuncDef({\n name: 'top',\n category: 'Filter',\n params: [\n { name: 'number', type: 'int' },\n { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: [5, 'avg'],\n});\n\naddFuncDef({\n name: 'bottom',\n category: 'Filter',\n params: [\n { name: 'number', type: 'int' },\n { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }\n ],\n defaultParams: [5, 'avg'],\n});\n\n// Trends\n\naddFuncDef({\n name: 'trendValue',\n category: 'Trends',\n params: [\n { name: 'type', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count'] }\n ],\n defaultParams: ['avg'],\n});\n\n// Time\n\naddFuncDef({\n name: 'timeShift',\n category: 'Time',\n params: [\n { name: 'interval', type: 'string', options: ['24h', '7d', '1M', '+24h', '-24h']}\n ],\n defaultParams: ['24h'],\n});\n\n//Alias\n\naddFuncDef({\n name: 'setAlias',\n category: 'Alias',\n params: [\n { name: 'alias', type: 'string' }\n ],\n defaultParams: []\n});\n\naddFuncDef({\n name: 'setAliasByRegex',\n category: 'Alias',\n params: [\n { name: 'aliasByRegex', type: 'string' }\n ],\n defaultParams: []\n});\n\naddFuncDef({\n name: 'replaceAlias',\n category: 'Alias',\n params: [\n { name: 'regexp', type: 'string' },\n { name: 'newAlias', type: 'string' }\n ],\n defaultParams: ['/(.*)/', '$1']\n});\n\n_.each(categories, function(funcList, catName) {\n categories[catName] = _.sortBy(funcList, 'name');\n});\n\nclass FuncInstance {\n constructor(funcDef, params) {\n this.def = funcDef;\n\n if (params) {\n this.params = params;\n } else {\n // Create with default params\n this.params = [];\n this.params = funcDef.defaultParams.slice(0);\n }\n\n this.updateText();\n }\n\n bindFunction(metricFunctions) {\n var func = metricFunctions[this.def.name];\n if (func) {\n\n // Bind function arguments\n var bindedFunc = func;\n var param;\n for (var i = 0; i < this.params.length; i++) {\n param = this.params[i];\n\n // Convert numeric params\n if (this.def.params[i].type === 'int' ||\n this.def.params[i].type === 'float') {\n param = Number(param);\n }\n bindedFunc = _.partial(bindedFunc, param);\n }\n return bindedFunc;\n } else {\n throw { message: 'Method not found ' + this.def.name };\n }\n }\n\n render(metricExp) {\n var str = this.def.name + '(';\n var parameters = _.map(this.params, function(value, index) {\n\n var paramType = this.def.params[index].type;\n if (paramType === 'int' ||\n paramType === 'float' ||\n paramType === 'value_or_series' ||\n paramType === 'boolean') {\n return value;\n }\n else if (paramType === 'int_or_interval' && $.isNumeric(value)) {\n return value;\n }\n\n return \"'\" + value + \"'\";\n\n }, this);\n\n if (metricExp) {\n parameters.unshift(metricExp);\n }\n\n return str + parameters.join(', ') + ')';\n }\n\n _hasMultipleParamsInString(strValue, index) {\n if (strValue.indexOf(',') === -1) {\n return false;\n }\n\n return this.def.params[index + 1] && this.def.params[index + 1].optional;\n }\n\n updateParam(strValue, index) {\n // handle optional parameters\n // if string contains ',' and next param is optional, split and update both\n if (this._hasMultipleParamsInString(strValue, index)) {\n _.each(strValue.split(','), function(partVal, idx) {\n this.updateParam(partVal.trim(), idx);\n }, this);\n return;\n }\n\n if (strValue === '' && this.def.params[index].optional) {\n this.params.splice(index, 1);\n }\n else {\n this.params[index] = strValue;\n }\n\n this.updateText();\n }\n\n updateText() {\n if (this.params.length === 0) {\n this.text = this.def.name + '()';\n return;\n }\n\n var text = this.def.name + '(';\n text += this.params.join(', ');\n text += ')';\n this.text = text;\n }\n}\n\nexport function createFuncInstance(funcDef, params) {\n if (_.isString(funcDef)) {\n if (!index[funcDef]) {\n throw { message: 'Method not found ' + name };\n }\n funcDef = index[funcDef];\n }\n return new FuncInstance(funcDef, params);\n}\n\nexport function getFuncDef(name) {\n return index[name];\n}\n\nexport function getCategories() {\n return categories;\n}\n"]} \ No newline at end of file diff --git a/dist/test/datasource-zabbix/dataProcessor.js b/dist/test/datasource-zabbix/dataProcessor.js index 94de58a..29acc41 100644 --- a/dist/test/datasource-zabbix/dataProcessor.js +++ b/dist/test/datasource-zabbix/dataProcessor.js @@ -127,9 +127,10 @@ var metricFunctions = { scale: scale, delta: delta, rate: rate, - simpleMovingAverage: simpleMovingAverage, - expMovingAverage: expMovingAverage, + movingAverage: simpleMovingAverage, + exponentialMovingAverage: expMovingAverage, aggregateBy: aggregateByWrapper, + // Predefined aggs average: _lodash2.default.partial(aggregateWrapper, AVERAGE), min: _lodash2.default.partial(aggregateWrapper, MIN), max: _lodash2.default.partial(aggregateWrapper, MAX), diff --git a/dist/test/datasource-zabbix/metricFunctions.js b/dist/test/datasource-zabbix/metricFunctions.js index 2fcdd2d..a536e8a 100644 --- a/dist/test/datasource-zabbix/metricFunctions.js +++ b/dist/test/datasource-zabbix/metricFunctions.js @@ -74,16 +74,16 @@ addFuncDef({ }); addFuncDef({ - name: 'simpleMovingAverage', + name: 'movingAverage', category: 'Transform', - params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 600] }], + params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }], defaultParams: [10] }); addFuncDef({ - name: 'expMovingAverage', + name: 'exponentialMovingAverage', category: 'Transform', - params: [{ name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] }], + params: [{ name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }], defaultParams: [0.2] }); diff --git a/src/datasource-zabbix/dataProcessor.js b/src/datasource-zabbix/dataProcessor.js index e6e4fb5..456829a 100644 --- a/src/datasource-zabbix/dataProcessor.js +++ b/src/datasource-zabbix/dataProcessor.js @@ -104,9 +104,10 @@ let metricFunctions = { scale: scale, delta: delta, rate: rate, - simpleMovingAverage: simpleMovingAverage, - expMovingAverage: expMovingAverage, + movingAverage: simpleMovingAverage, + exponentialMovingAverage: expMovingAverage, aggregateBy: aggregateByWrapper, + // Predefined aggs average: _.partial(aggregateWrapper, AVERAGE), min: _.partial(aggregateWrapper, MIN), max: _.partial(aggregateWrapper, MAX), diff --git a/src/datasource-zabbix/metricFunctions.js b/src/datasource-zabbix/metricFunctions.js index 06a0b5f..e167f3a 100644 --- a/src/datasource-zabbix/metricFunctions.js +++ b/src/datasource-zabbix/metricFunctions.js @@ -58,19 +58,19 @@ addFuncDef({ }); addFuncDef({ - name: 'simpleMovingAverage', + name: 'movingAverage', category: 'Transform', params: [ - { name: 'factor', type: 'int', options: [6, 10, 60, 600] } + { name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] } ], defaultParams: [10], }); addFuncDef({ - name: 'expMovingAverage', + name: 'exponentialMovingAverage', category: 'Transform', params: [ - { name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] } + { name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] } ], defaultParams: [0.2], });