From 18db11bf69cdaab0132665761adadb41b5c2c5c5 Mon Sep 17 00:00:00 2001 From: lavado Date: Tue, 30 Oct 2018 21:06:04 -0700 Subject: [PATCH] Enhancing Grafana sample dashboard Change-Id: If5d871e0c919dba5dd07179740f5f20d511ed699 Signed-off-by: lavado --- .../osm_metrics/osm-sample-dashboard.json | 238 ++++++++++++++---- 1 file changed, 193 insertions(+), 45 deletions(-) diff --git a/installers/docker/osm_metrics/osm-sample-dashboard.json b/installers/docker/osm_metrics/osm-sample-dashboard.json index a640c504..cb9ca068 100644 --- a/installers/docker/osm_metrics/osm-sample-dashboard.json +++ b/installers/docker/osm_metrics/osm-sample-dashboard.json @@ -1,34 +1,4 @@ { - "__inputs": [ - { - "name": "osm_prometheus", - "label": "osm_prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "5.0.4" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - } - ], "annotations": { "list": [ { @@ -45,7 +15,6 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": null, "links": [], "panels": [ { @@ -56,8 +25,8 @@ "datasource": "osm_prometheus", "fill": 1, "gridPos": { - "h": 9, - "w": 24, + "h": 8, + "w": 12, "x": 0, "y": 0 }, @@ -89,14 +58,14 @@ "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "{{vdu_name}}", + "legendFormat": "NS {{ns_id}} - VNF {{vnf_member_index}} - VDU {{vdu_name}}", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "VDU CPU Metrics", + "title": "VDU CPU Metric (VIM)", "tooltip": { "shared": true, "sort": 0, @@ -127,7 +96,11 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "aliasColors": {}, @@ -137,10 +110,95 @@ "datasource": "osm_prometheus", "fill": 1, "gridPos": { - "h": 10, - "w": 24, + "h": 8, + "w": 12, + "x": 12, + "y": 0 + }, + "id": 4, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "average_memory_utilization", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "NS {{ns_id}} - VNF {{vnf_member_index}} - VDU {{vdu_name}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "VDU Memory Metric (VIM)", + "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": "osm_prometheus", + "fill": 1, + "gridPos": { + "h": 8, + "w": 12, "x": 0, - "y": 9 + "y": 8 }, "id": 3, "legend": { @@ -166,18 +224,103 @@ "steppedLine": false, "targets": [ { - "expr": "average_memory_utilization", + "expr": "load", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "NS {{ns_id}} - VNF {{vnf_member_index}} - VDU {{vdu_name}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "VDU Load Metric (VCA)", + "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": "osm_prometheus", + "fill": 1, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 8 + }, + "id": 5, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "users", "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "{{vdu_name}}", + "legendFormat": "NS {{ns_id}} - VNF {{vnf_member_index}} - VDU {{vdu_name}}", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "VDU Memory Metrics", + "title": "VNF Users Metric (VCA)", "tooltip": { "shared": true, "sort": 0, @@ -208,9 +351,14 @@ "min": null, "show": true } - ] + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], + "refresh": "5s", "schemaVersion": 16, "style": "dark", "tags": [], @@ -218,7 +366,7 @@ "list": [] }, "time": { - "from": "now-6h", + "from": "now-1m", "to": "now" }, "timepicker": { @@ -250,4 +398,4 @@ "title": "OSM Sample Dashboard", "uid": "x5vtPXmik", "version": 1 -} +} \ No newline at end of file -- 2.25.1