From aaaa39a48e893a618ec47e330c28fa3fd27c16c4 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 11 Apr 2019 09:58:42 +0200 Subject: [PATCH] devenv: add worldmap panel panels for elasticsearch (#16313) --- .../datasource_tests_elasticsearch_v2.json | 78 +++++++++++++++++- .../datasource_tests_elasticsearch_v5.json | 79 +++++++++++++++++- .../datasource_tests_elasticsearch_v6.json | 80 ++++++++++++++++++- 3 files changed, 227 insertions(+), 10 deletions(-) diff --git a/devenv/dev-dashboards/datasource_tests_elasticsearch_v2.json b/devenv/dev-dashboards/datasource_tests_elasticsearch_v2.json index e7c580bb75e..08019ebbc3c 100644 --- a/devenv/dev-dashboards/datasource_tests_elasticsearch_v2.json +++ b/devenv/dev-dashboards/datasource_tests_elasticsearch_v2.json @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1542303970887, + "iteration": 1554310942895, "links": [ { "icon": "external link", @@ -586,9 +586,81 @@ "title": "ES Log query", "transform": "json", "type": "table" + }, + { + "circleMaxSize": 30, + "circleMinSize": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "gdev-elasticsearch-v2-metrics", + "decimals": 0, + "esGeoPoint": "@location", + "esMetric": "Average", + "gridPos": { + "h": 12, + "w": 24, + "x": 0, + "y": 27 + }, + "hideEmpty": false, + "hideZero": false, + "id": 8, + "initialZoom": 1, + "links": [], + "locationData": "geohash", + "mapCenter": "(0°, 0°)", + "mapCenterLatitude": 0, + "mapCenterLongitude": 0, + "maxDataPoints": 1, + "mouseWheelZoom": false, + "showLegend": true, + "stickyLabels": false, + "tableQueryOptions": { + "geohashField": "geohash", + "latitudeField": "latitude", + "longitudeField": "longitude", + "metricField": "metric", + "queryType": "geohash" + }, + "targets": [ + { + "bucketAggs": [ + { + "fake": true, + "field": "@location", + "id": "3", + "settings": { + "precision": 2 + }, + "type": "geohash_grid" + } + ], + "metrics": [ + { + "field": "@value", + "id": "1", + "meta": {}, + "settings": {}, + "type": "avg" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": "0,10", + "title": "World map panel", + "type": "grafana-worldmap-panel", + "unitPlural": "", + "unitSingle": "", + "valueName": "total" } ], - "schemaVersion": 16, + "schemaVersion": 18, "style": "dark", "tags": [ "elasticsearch", @@ -645,5 +717,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v2", "uid": "RlqLq2fiz", - "version": 2 + "version": 5 } \ No newline at end of file diff --git a/devenv/dev-dashboards/datasource_tests_elasticsearch_v5.json b/devenv/dev-dashboards/datasource_tests_elasticsearch_v5.json index a117815037b..d4f851612b4 100644 --- a/devenv/dev-dashboards/datasource_tests_elasticsearch_v5.json +++ b/devenv/dev-dashboards/datasource_tests_elasticsearch_v5.json @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1542303896062, + "iteration": 1554310560048, "links": [ { "asDropdown": false, @@ -588,9 +588,82 @@ "title": "ES Log query", "transform": "json", "type": "table" + }, + { + "circleMaxSize": 30, + "circleMinSize": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "gdev-elasticsearch-v5-metrics", + "decimals": 0, + "esGeoPoint": "@location", + "esLocationName": "", + "esMetric": "Average", + "gridPos": { + "h": 12, + "w": 24, + "x": 0, + "y": 27 + }, + "hideEmpty": false, + "hideZero": false, + "id": 8, + "initialZoom": 1, + "links": [], + "locationData": "geohash", + "mapCenter": "(0°, 0°)", + "mapCenterLatitude": 0, + "mapCenterLongitude": 0, + "maxDataPoints": 1, + "mouseWheelZoom": false, + "showLegend": true, + "stickyLabels": false, + "tableQueryOptions": { + "geohashField": "geohash", + "latitudeField": "latitude", + "longitudeField": "longitude", + "metricField": "metric", + "queryType": "geohash" + }, + "targets": [ + { + "bucketAggs": [ + { + "fake": true, + "field": "@location", + "id": "3", + "settings": { + "precision": 2 + }, + "type": "geohash_grid" + } + ], + "metrics": [ + { + "field": "@value", + "id": "1", + "meta": {}, + "settings": {}, + "type": "avg" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": "0,10", + "title": "World map panel", + "type": "grafana-worldmap-panel", + "unitPlural": "", + "unitSingle": "", + "valueName": "total" } ], - "schemaVersion": 16, + "schemaVersion": 18, "style": "dark", "tags": [ "elasticsearch", @@ -647,5 +720,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v5", "uid": "8HjT32Bmz", - "version": 27 + "version": 5 } \ No newline at end of file diff --git a/devenv/dev-dashboards/datasource_tests_elasticsearch_v6.json b/devenv/dev-dashboards/datasource_tests_elasticsearch_v6.json index ee5306d40cc..69a890f64e5 100644 --- a/devenv/dev-dashboards/datasource_tests_elasticsearch_v6.json +++ b/devenv/dev-dashboards/datasource_tests_elasticsearch_v6.json @@ -13,7 +13,7 @@ "type": "dashboard" }, { - "datasource": "Elastic 5 Logs", + "datasource": "gdev-elasticsearch-v6-logs", "enable": false, "iconColor": "rgba(255, 96, 96, 1)", "limit": 100, @@ -28,7 +28,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "iteration": 1542303999511, + "iteration": 1554310839317, "links": [ { "icon": "external link", @@ -586,9 +586,81 @@ "title": "ES Log query", "transform": "json", "type": "table" + }, + { + "circleMaxSize": 30, + "circleMinSize": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "gdev-elasticsearch-v6-metrics", + "decimals": 0, + "esGeoPoint": "@location", + "esMetric": "Average", + "gridPos": { + "h": 12, + "w": 24, + "x": 0, + "y": 27 + }, + "hideEmpty": false, + "hideZero": false, + "id": 8, + "initialZoom": "1", + "links": [], + "locationData": "geohash", + "mapCenter": "(0°, 0°)", + "mapCenterLatitude": 0, + "mapCenterLongitude": 0, + "maxDataPoints": 1, + "mouseWheelZoom": false, + "showLegend": true, + "stickyLabels": false, + "tableQueryOptions": { + "geohashField": "geohash", + "latitudeField": "latitude", + "longitudeField": "longitude", + "metricField": "metric", + "queryType": "geohash" + }, + "targets": [ + { + "bucketAggs": [ + { + "fake": true, + "field": "@location", + "id": "3", + "settings": { + "precision": 2 + }, + "type": "geohash_grid" + } + ], + "metrics": [ + { + "field": "@value", + "id": "1", + "meta": {}, + "settings": {}, + "type": "avg" + } + ], + "refId": "A", + "target": "", + "timeField": "@timestamp" + } + ], + "thresholds": "0,10", + "title": "World map panel", + "type": "grafana-worldmap-panel", + "unitPlural": "", + "unitSingle": "", + "valueName": "total" } ], - "schemaVersion": 16, + "schemaVersion": 18, "style": "dark", "tags": [ "elasticsearch", @@ -645,5 +717,5 @@ "timezone": "browser", "title": "Datasource tests - Elasticsearch v6", "uid": "NF8Pq2Biz", - "version": 2 + "version": 5 } \ No newline at end of file