diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json index 3ceb2a3970b..3404e79c298 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json @@ -17,7 +17,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1555595032099, + "iteration": 1591029577291, "links": [ { "asDropdown": true, @@ -30,6 +30,7 @@ "panels": [ { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -662,6 +663,7 @@ }, { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -2207,6 +2209,7 @@ }, { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -2221,13 +2224,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 3 }, + "hiddenSeries": false, "id": 55, "legend": { "avg": false, @@ -2242,6 +2253,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2339,13 +2353,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 3 }, + "hiddenSeries": false, "id": 34, "legend": { "avg": false, @@ -2360,6 +2382,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2457,13 +2482,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 12 }, + "hiddenSeries": false, "id": 29, "legend": { "avg": false, @@ -2478,6 +2511,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2575,13 +2611,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 12 }, + "hiddenSeries": false, "id": 56, "legend": { "avg": false, @@ -2596,6 +2640,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2693,13 +2740,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 21 }, + "hiddenSeries": false, "id": 30, "legend": { "avg": false, @@ -2714,6 +2769,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2811,13 +2869,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 21 }, + "hiddenSeries": false, "id": 35, "legend": { "avg": false, @@ -2832,6 +2898,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -2929,13 +2998,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 30 }, + "hiddenSeries": false, "id": 31, "legend": { "avg": false, @@ -2950,6 +3027,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3047,13 +3127,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 30 }, + "hiddenSeries": false, "id": 36, "legend": { "avg": false, @@ -3068,6 +3156,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3165,13 +3256,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 39 }, + "hiddenSeries": false, "id": 32, "legend": { "avg": false, @@ -3186,6 +3285,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3283,13 +3385,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 39 }, + "hiddenSeries": false, "id": 37, "legend": { "avg": false, @@ -3304,6 +3414,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3401,13 +3514,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 48 }, + "hiddenSeries": false, "id": 33, "legend": { "avg": false, @@ -3422,6 +3543,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3519,13 +3643,21 @@ "dashLength": 10, "dashes": false, "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 12, "y": 48 }, + "hiddenSeries": false, "id": 38, "legend": { "avg": false, @@ -3540,6 +3672,9 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "paceLength": 10, "percentage": false, "pointradius": 5, @@ -3637,6 +3772,7 @@ }, { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -5019,12 +5155,1564 @@ }, { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, "x": 0, "y": 4 }, + "id": 70, + "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 7 + }, + "hiddenSeries": false, + "id": 71, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:344", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:340", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "count" + }, + { + "$$hashKey": "object:341", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "count (version one) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 7 + }, + "hiddenSeries": false, + "id": 77, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:344", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:340", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "count" + }, + { + "$$hashKey": "object:341", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "count (version two) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 16 + }, + "hiddenSeries": false, + "id": 72, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:546", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:542", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "avg" + }, + { + "$$hashKey": "object:543", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "avg (version one) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 16 + }, + "hiddenSeries": false, + "id": 78, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:546", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:542", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "avg" + }, + { + "$$hashKey": "object:543", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "avg (version two) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 25 + }, + "hiddenSeries": false, + "id": 73, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:731", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:727", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "sum" + }, + { + "$$hashKey": "object:728", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "sum (version one) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 25 + }, + "hiddenSeries": false, + "id": 79, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:731", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:727", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "sum" + }, + { + "$$hashKey": "object:728", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "sum (version two) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 34 + }, + "hiddenSeries": false, + "id": 74, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:885", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:881", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "max" + }, + { + "$$hashKey": "object:882", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "max (version one) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 34 + }, + "hiddenSeries": false, + "id": 80, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:885", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:881", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "max" + }, + { + "$$hashKey": "object:882", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "max (version two) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 43 + }, + "hiddenSeries": false, + "id": 75, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:1039", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "auto", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:1035", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "min" + }, + { + "$$hashKey": "object:1036", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "min (version one) - interval auto", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 43 + }, + "hiddenSeries": false, + "id": 81, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:1039", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "auto", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:1035", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "min" + }, + { + "$$hashKey": "object:1036", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "min (version two) - interval auto", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_one", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 52 + }, + "hiddenSeries": false, + "id": 76, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:1193", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:1189", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "cardinality" + }, + { + "$$hashKey": "object:1190", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "unique count (version one) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "$version_two", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 52 + }, + "hiddenSeries": false, + "id": 82, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "paceLength": 10, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "bucketAggs": [ + { + "$$hashKey": "object:1193", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "5m", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], + "metrics": [ + { + "$$hashKey": "object:1189", + "field": "@value", + "hide": true, + "id": "1", + "meta": {}, + "settings": {}, + "type": "cardinality" + }, + { + "$$hashKey": "object:1190", + "field": "1", + "id": "3", + "meta": {}, + "pipelineAgg": "1", + "settings": {}, + "type": "cumulative_sum" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "unique count (version two) - interval 5m", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "title": "Basic date histogram with cumulative sum aggregation", + "type": "row" + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 5 + }, "id": 60, "panels": [ { @@ -5525,11 +7213,12 @@ }, { "collapsed": true, + "datasource": null, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 5 + "y": 6 }, "id": 54, "panels": [ @@ -5843,13 +7532,14 @@ } ], "refresh": false, - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { "list": [ { "current": { + "selected": false, "text": "gdev-elasticsearch-v5-metrics", "value": "gdev-elasticsearch-v5-metrics" }, @@ -5867,6 +7557,7 @@ }, { "current": { + "selected": false, "text": "gdev-elasticsearch-v6-metrics", "value": "gdev-elasticsearch-v6-metrics" }, @@ -5895,5 +7586,5 @@ "timezone": "", "title": "Datasource tests - Elasticsearch comparison", "uid": "fuFWehBmk", - "version": 2 + "version": 1 } diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json index 011c98b0b80..a7166b5a139 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1554310942895, + "iteration": 1591027568655, "links": [ { "asDropdown": true, @@ -47,7 +47,14 @@ "datasource": "gdev-elasticsearch-v2-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 7, @@ -55,6 +62,7 @@ "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 1, "legend": { "alignAsTable": true, @@ -71,6 +79,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -170,7 +181,14 @@ "datasource": "gdev-elasticsearch-v2-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -178,6 +196,7 @@ "x": 0, "y": 7 }, + "hiddenSeries": false, "id": 2, "legend": { "alignAsTable": true, @@ -194,6 +213,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -292,7 +314,14 @@ "datasource": "gdev-elasticsearch-v2-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -300,6 +329,7 @@ "x": 12, "y": 7 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": true, @@ -316,6 +346,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -427,6 +460,12 @@ "datasource": "gdev-elasticsearch-v2-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -445,11 +484,13 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" }, { + "align": "auto", "colorMode": null, "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], "dateFormat": "YYYY-MM-DD HH:mm:ss", @@ -505,7 +546,7 @@ ], "title": "ES Metrics", "transform": "table", - "type": "table" + "type": "table-old" }, { "columns": [ @@ -529,6 +570,12 @@ "datasource": "gdev-elasticsearch-v2-logs", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -547,6 +594,7 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" @@ -574,7 +622,7 @@ ], "title": "ES Log query", "transform": "json", - "type": "table" + "type": "table-old" }, { "circleMaxSize": 30, @@ -584,6 +632,12 @@ "decimals": 0, "esGeoPoint": "@location", "esMetric": "Average", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 12, "w": 24, @@ -645,7 +699,7 @@ "valueName": "total" } ], - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { @@ -678,5 +732,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v2", "uid": "RlqLq2fiz", - "version": 5 + "version": 1 } diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json index 7434c72f4d3..9814e2c1b83 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1554310560048, + "iteration": 1591027589702, "links": [ { "asDropdown": true, @@ -47,7 +47,14 @@ "datasource": "gdev-elasticsearch-v5-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 7, @@ -55,6 +62,7 @@ "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 1, "legend": { "alignAsTable": true, @@ -71,6 +79,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -170,7 +181,14 @@ "datasource": "gdev-elasticsearch-v5-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -178,6 +196,7 @@ "x": 0, "y": 7 }, + "hiddenSeries": false, "id": 2, "legend": { "alignAsTable": true, @@ -194,6 +213,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -292,7 +314,14 @@ "datasource": "gdev-elasticsearch-v5-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -300,6 +329,7 @@ "x": 12, "y": 7 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": true, @@ -316,6 +346,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -427,6 +460,12 @@ "datasource": "gdev-elasticsearch-v5-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -445,11 +484,13 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" }, { + "align": "auto", "colorMode": null, "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], "dateFormat": "YYYY-MM-DD HH:mm:ss", @@ -505,7 +546,7 @@ ], "title": "ES Metrics", "transform": "table", - "type": "table" + "type": "table-old" }, { "columns": [ @@ -529,6 +570,12 @@ "datasource": "gdev-elasticsearch-v5-logs", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -547,6 +594,7 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" @@ -574,7 +622,7 @@ ], "title": "ES Log query", "transform": "json", - "type": "table" + "type": "table-old" }, { "circleMaxSize": 30, @@ -585,6 +633,12 @@ "esGeoPoint": "@location", "esLocationName": "", "esMetric": "Average", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 12, "w": 24, @@ -646,7 +700,7 @@ "valueName": "total" } ], - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { @@ -679,5 +733,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v5", "uid": "8HjT32Bmz", - "version": 5 + "version": 1 } diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json index 7a143704cc0..dec6ed54bfc 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1554310839317, + "iteration": 1591027529668, "links": [ { "asDropdown": true, @@ -47,7 +47,14 @@ "datasource": "gdev-elasticsearch-v6-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 7, @@ -55,6 +62,7 @@ "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 1, "legend": { "alignAsTable": true, @@ -71,6 +79,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -170,7 +181,14 @@ "datasource": "gdev-elasticsearch-v6-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -178,6 +196,7 @@ "x": 0, "y": 7 }, + "hiddenSeries": false, "id": 2, "legend": { "alignAsTable": true, @@ -194,6 +213,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -292,7 +314,14 @@ "datasource": "gdev-elasticsearch-v6-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -300,6 +329,7 @@ "x": 12, "y": 7 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": true, @@ -316,6 +346,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -427,6 +460,12 @@ "datasource": "gdev-elasticsearch-v6-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -445,11 +484,13 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" }, { + "align": "auto", "colorMode": null, "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], "dateFormat": "YYYY-MM-DD HH:mm:ss", @@ -505,7 +546,7 @@ ], "title": "ES Metrics", "transform": "table", - "type": "table" + "type": "table-old" }, { "columns": [ @@ -529,6 +570,12 @@ "datasource": "gdev-elasticsearch-v6-logs", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -547,6 +594,7 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" @@ -574,7 +622,7 @@ ], "title": "ES Log query", "transform": "json", - "type": "table" + "type": "table-old" }, { "circleMaxSize": 30, @@ -584,6 +632,12 @@ "decimals": 0, "esGeoPoint": "@location", "esMetric": "Average", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 12, "w": 24, @@ -645,7 +699,8 @@ "valueName": "total" } ], - "schemaVersion": 18, + "refresh": false, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { @@ -662,7 +717,7 @@ ] }, "time": { - "from": "now-30m", + "from": "now-1h", "to": "now" }, "timepicker": { @@ -678,5 +733,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v6", "uid": "NF8Pq2Biz", - "version": 5 + "version": 1 } diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json index ca50d72c13f..b158dfde2a1 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json @@ -15,7 +15,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1554902936982, + "iteration": 1591027621672, "links": [ { "asDropdown": true, @@ -34,13 +34,21 @@ "dashLength": 10, "dashes": false, "datasource": "gdev-elasticsearch-v6-filebeat", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 24, "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 4, "legend": { "avg": false, @@ -54,6 +62,9 @@ "lines": false, "linewidth": 1, "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 2, "points": false, @@ -142,22 +153,13 @@ } }, { - "columns": [ - { - "text": "@timestamp", - "value": "@timestamp" - }, - { - "text": "fields.level", - "value": "fields.level" - }, - { - "text": "message", - "value": "message" - } - ], "datasource": "gdev-elasticsearch-v6-filebeat", - "fontSize": "100%", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 22, "w": 24, @@ -166,58 +168,35 @@ }, "id": 2, "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true + "options": { + "showLabels": false, + "showTime": true, + "sortOrder": "Descending", + "wrapLogMessage": true }, - "styles": [ - { - "alias": "Time", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "@timestamp", - "type": "date" - }, - { - "alias": "Level", - "colorMode": null, - "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "fields.level", - "thresholds": [""], - "type": "string", - "unit": "short", - "valueMaps": [] - }, - { - "alias": "Message", - "colorMode": null, - "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], - "decimals": 2, - "pattern": "message", - "preserveFormat": false, - "sanitize": false, - "thresholds": [], - "type": "string", - "unit": "short" - } - ], "targets": [ { - "bucketAggs": [], + "bucketAggs": [ + { + "$$hashKey": "object:394", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "auto", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], "metrics": [ { + "$$hashKey": "object:359", "field": "select field", "id": "1", "meta": {}, - "settings": { - "size": 500 - }, - "type": "raw_document" + "settings": {}, + "type": "logs" } ], "query": "fields.app:grafana", @@ -228,11 +207,10 @@ "timeFrom": null, "timeShift": null, "title": "Panel Title", - "transform": "json", - "type": "table" + "type": "logs" } ], - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["gdev", "elasticsearch", "datasource-test"], "templating": { @@ -249,7 +227,7 @@ ] }, "time": { - "from": "now-1h", + "from": "now-30m", "to": "now" }, "timepicker": { @@ -259,5 +237,5 @@ "timezone": "", "title": "Datasource tests - Elasticsearch v6 Filebeat", "uid": "06tPt4gZz", - "version": 8 + "version": 1 } diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json index b9f23c57bb8..02b3ced02f6 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json @@ -28,8 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 2342, - "iteration": 1555593977614, + "iteration": 1591027717495, "links": [ { "asDropdown": true, @@ -48,7 +47,14 @@ "datasource": "gdev-elasticsearch-v7-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 7, @@ -56,6 +62,7 @@ "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 1, "legend": { "alignAsTable": true, @@ -72,6 +79,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -171,7 +181,14 @@ "datasource": "gdev-elasticsearch-v7-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -179,6 +196,7 @@ "x": 0, "y": 7 }, + "hiddenSeries": false, "id": 2, "legend": { "alignAsTable": true, @@ -195,6 +213,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -293,7 +314,14 @@ "datasource": "gdev-elasticsearch-v7-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 6, @@ -301,6 +329,7 @@ "x": 12, "y": 7 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": true, @@ -317,6 +346,9 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 5, "points": false, @@ -428,6 +460,12 @@ "datasource": "gdev-elasticsearch-v7-metrics", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -446,11 +484,13 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" }, { + "align": "auto", "colorMode": null, "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], "dateFormat": "YYYY-MM-DD HH:mm:ss", @@ -506,7 +546,7 @@ ], "title": "ES Metrics", "transform": "table", - "type": "table" + "type": "table-old" }, { "columns": [ @@ -530,6 +570,12 @@ "datasource": "gdev-elasticsearch-v7-logs", "editable": true, "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fontSize": "100%", "gridPos": { "h": 7, @@ -548,6 +594,7 @@ }, "styles": [ { + "align": "auto", "dateFormat": "YYYY-MM-DD HH:mm:ss", "pattern": "@timestamp", "type": "date" @@ -575,7 +622,7 @@ ], "title": "ES Log query", "transform": "json", - "type": "table" + "type": "table-old" }, { "circleMaxSize": 30, @@ -585,6 +632,12 @@ "decimals": 0, "esGeoPoint": "@location", "esMetric": "Average", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 12, "w": 24, @@ -646,7 +699,7 @@ "valueName": "total" } ], - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { diff --git a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json index 5f2e26d87ca..a5003193b11 100644 --- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json +++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json @@ -15,8 +15,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 2341, - "iteration": 1555591591930, + "iteration": 1591027736516, "links": [ { "asDropdown": true, @@ -35,13 +34,21 @@ "dashLength": 10, "dashes": false, "datasource": "gdev-elasticsearch-v7-filebeat", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 24, "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 4, "legend": { "avg": false, @@ -55,6 +62,9 @@ "lines": false, "linewidth": 1, "nullPointMode": "null", + "options": { + "dataLinks": [] + }, "percentage": false, "pointradius": 2, "points": false, @@ -143,22 +153,13 @@ } }, { - "columns": [ - { - "text": "@timestamp", - "value": "@timestamp" - }, - { - "text": "fields.level", - "value": "fields.level" - }, - { - "text": "message", - "value": "message" - } - ], "datasource": "gdev-elasticsearch-v7-filebeat", - "fontSize": "100%", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "gridPos": { "h": 22, "w": 24, @@ -167,58 +168,35 @@ }, "id": 2, "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true + "options": { + "showLabels": false, + "showTime": true, + "sortOrder": "Descending", + "wrapLogMessage": true }, - "styles": [ - { - "alias": "Time", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "@timestamp", - "type": "date" - }, - { - "alias": "Level", - "colorMode": null, - "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "fields.level", - "thresholds": [""], - "type": "string", - "unit": "short", - "valueMaps": [] - }, - { - "alias": "Message", - "colorMode": null, - "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"], - "decimals": 2, - "pattern": "message", - "preserveFormat": false, - "sanitize": false, - "thresholds": [], - "type": "string", - "unit": "short" - } - ], "targets": [ { - "bucketAggs": [], + "bucketAggs": [ + { + "$$hashKey": "object:522", + "field": "@timestamp", + "id": "2", + "settings": { + "interval": "auto", + "min_doc_count": 0, + "trimEdges": 0 + }, + "type": "date_histogram" + } + ], "metrics": [ { + "$$hashKey": "object:484", "field": "select field", "id": "1", "meta": {}, - "settings": { - "size": 500 - }, - "type": "raw_document" + "settings": {}, + "type": "logs" } ], "query": "fields.app:grafana", @@ -229,11 +207,10 @@ "timeFrom": null, "timeShift": null, "title": "Panel Title", - "transform": "json", - "type": "table" + "type": "logs" } ], - "schemaVersion": 18, + "schemaVersion": 25, "style": "dark", "tags": ["elasticsearch", "gdev", "datasource-test"], "templating": { diff --git a/pkg/tsdb/elasticsearch/models.go b/pkg/tsdb/elasticsearch/models.go index d38e21c3ebc..fd5a958fdcf 100644 --- a/pkg/tsdb/elasticsearch/models.go +++ b/pkg/tsdb/elasticsearch/models.go @@ -45,6 +45,7 @@ var metricAggType = map[string]string{ "percentiles": "Percentiles", "cardinality": "Unique Count", "moving_avg": "Moving Average", + "cumulative_sum": "Cumulative Sum", "derivative": "Derivative", "bucket_script": "Bucket Script", "raw_document": "Raw Document", @@ -62,9 +63,10 @@ var extendedStats = map[string]string{ } var pipelineAggType = map[string]string{ - "moving_avg": "moving_avg", - "derivative": "derivative", - "bucket_script": "bucket_script", + "moving_avg": "moving_avg", + "cumulative_sum": "cumulative_sum", + "derivative": "derivative", + "bucket_script": "bucket_script", } var pipelineAggWithMultipleBucketPathsType = map[string]string{ diff --git a/pkg/tsdb/elasticsearch/time_series_query_test.go b/pkg/tsdb/elasticsearch/time_series_query_test.go index 5de0fb22be3..22c43a4f891 100644 --- a/pkg/tsdb/elasticsearch/time_series_query_test.go +++ b/pkg/tsdb/elasticsearch/time_series_query_test.go @@ -486,6 +486,112 @@ func TestExecuteTimeSeriesQuery(t *testing.T) { So(plAgg.BucketPath, ShouldEqual, "3") }) + Convey("With cumulative sum", func() { + c := newFakeClient(5) + _, err := executeTsdbQuery(c, `{ + "timeField": "@timestamp", + "bucketAggs": [ + { "type": "date_histogram", "field": "@timestamp", "id": "4" } + ], + "metrics": [ + { "id": "3", "type": "sum", "field": "@value" }, + { + "id": "2", + "type": "cumulative_sum", + "field": "3", + "pipelineAgg": "3" + } + ] + }`, from, to, 15*time.Second) + So(err, ShouldBeNil) + sr := c.multisearchRequests[0].Requests[0] + + firstLevel := sr.Aggs[0] + So(firstLevel.Key, ShouldEqual, "4") + So(firstLevel.Aggregation.Type, ShouldEqual, "date_histogram") + So(firstLevel.Aggregation.Aggs, ShouldHaveLength, 2) + + sumAgg := firstLevel.Aggregation.Aggs[0] + So(sumAgg.Key, ShouldEqual, "3") + So(sumAgg.Aggregation.Type, ShouldEqual, "sum") + mAgg := sumAgg.Aggregation.Aggregation.(*es.MetricAggregation) + So(mAgg.Field, ShouldEqual, "@value") + + cumulativeSumAgg := firstLevel.Aggregation.Aggs[1] + So(cumulativeSumAgg.Key, ShouldEqual, "2") + So(cumulativeSumAgg.Aggregation.Type, ShouldEqual, "cumulative_sum") + pl := cumulativeSumAgg.Aggregation.Aggregation.(*es.PipelineAggregation) + So(pl.BucketPath, ShouldEqual, "3") + }) + + Convey("With cumulative sum doc count", func() { + c := newFakeClient(5) + _, err := executeTsdbQuery(c, `{ + "timeField": "@timestamp", + "bucketAggs": [ + { "type": "date_histogram", "field": "@timestamp", "id": "4" } + ], + "metrics": [ + { "id": "3", "type": "count", "field": "select field" }, + { + "id": "2", + "type": "cumulative_sum", + "field": "3", + "pipelineAgg": "3" + } + ] + }`, from, to, 15*time.Second) + So(err, ShouldBeNil) + sr := c.multisearchRequests[0].Requests[0] + + firstLevel := sr.Aggs[0] + So(firstLevel.Key, ShouldEqual, "4") + So(firstLevel.Aggregation.Type, ShouldEqual, "date_histogram") + So(firstLevel.Aggregation.Aggs, ShouldHaveLength, 1) + + cumulativeSumAgg := firstLevel.Aggregation.Aggs[0] + So(cumulativeSumAgg.Key, ShouldEqual, "2") + So(cumulativeSumAgg.Aggregation.Type, ShouldEqual, "cumulative_sum") + pl := cumulativeSumAgg.Aggregation.Aggregation.(*es.PipelineAggregation) + So(pl.BucketPath, ShouldEqual, "_count") + }) + + Convey("With broken cumulative sum", func() { + c := newFakeClient(5) + _, err := executeTsdbQuery(c, `{ + "timeField": "@timestamp", + "bucketAggs": [ + { "type": "date_histogram", "field": "@timestamp", "id": "5" } + ], + "metrics": [ + { "id": "3", "type": "sum", "field": "@value" }, + { + "id": "2", + "type": "cumulative_sum", + "pipelineAgg": "3" + }, + { + "id": "4", + "type": "cumulative_sum", + "pipelineAgg": "Metric to apply cumulative sum" + } + ] + }`, from, to, 15*time.Second) + So(err, ShouldBeNil) + sr := c.multisearchRequests[0].Requests[0] + + firstLevel := sr.Aggs[0] + So(firstLevel.Key, ShouldEqual, "5") + So(firstLevel.Aggregation.Type, ShouldEqual, "date_histogram") + + So(firstLevel.Aggregation.Aggs, ShouldHaveLength, 2) + + cumulativeSumAgg := firstLevel.Aggregation.Aggs[1] + So(cumulativeSumAgg.Key, ShouldEqual, "2") + plAgg := cumulativeSumAgg.Aggregation.Aggregation.(*es.PipelineAggregation) + So(plAgg.BucketPath, ShouldEqual, "3") + }) + Convey("With derivative", func() { c := newFakeClient(5) _, err := executeTsdbQuery(c, `{ diff --git a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html index 4863ed163d4..8f3eedd6a55 100644 --- a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html +++ b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html @@ -64,6 +64,11 @@
+
+ +
+ +
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.ts b/public/app/plugins/datasource/elasticsearch/query_def.ts index fbc3370d416..e85feadd360 100644 --- a/public/app/plugins/datasource/elasticsearch/query_def.ts +++ b/public/app/plugins/datasource/elasticsearch/query_def.ts @@ -64,6 +64,13 @@ export const metricAggTypes = [ isPipelineAgg: true, minVersion: 2, }, + { + text: 'Cumulative Sum', + value: 'cumulative_sum', + requiresField: false, + isPipelineAgg: true, + minVersion: 2, + }, { text: 'Bucket Script', value: 'bucket_script', @@ -143,6 +150,7 @@ export const pipelineOptions: any = { { text: 'minimize', default: false }, ], derivative: [{ text: 'unit', default: undefined }], + cumulative_sum: [{ text: 'format', default: undefined }], bucket_script: [], }; diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts b/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts index bebe2a8e83b..1b94965ceb4 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts @@ -104,13 +104,13 @@ describe('ElasticQueryDef', () => { describe('using esversion 2', () => { test('should get pipeline aggs', () => { - expect(queryDef.getMetricAggTypes(2).length).toBe(13); + expect(queryDef.getMetricAggTypes(2).length).toBe(14); }); }); describe('using esversion 5', () => { test('should get pipeline aggs', () => { - expect(queryDef.getMetricAggTypes(5).length).toBe(13); + expect(queryDef.getMetricAggTypes(5).length).toBe(14); }); }); });