Change Grafana dashboards since new metrics available

removed IO panel, because there are no io metrics anymore and this panel is useless; added general grafana panel with 4 new graphs: count of organizations, count of users, count of playlists, count of dashboards. Related-Bug: PROD-18204 Change-Id: I92034621746803ea5e744c1a055d08dd32e71a90
6 years ago · 52720eb1e5
parent 627cbfddbb
commit 52720eb1e5
1 changed files with 288 additions and 152 deletions
--- a/grafana/files/grafana_dashboards/grafana_prometheus.json
+++ b/grafana/files/grafana_dashboards/grafana_prometheus.json
@ -16,171 +16,316 @@
      "height": "250px",
      "panels": [
        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
          "datasource": null,
-          "fill": 1,
-          "id": 32,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
          },
-          "lines": true,
-          "linewidth": 1,
+          "id": 36,
+          "interval": null,
          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 6,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": true,
-          "steppedLine": false,
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 3,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": true
+          },
+          "tableColumn": "",
          "targets": [
            {
-              "expr": "irate(docker_container_cpu_usage_percent{com_docker_swarm_service_name=\"dashboard_grafana\"}[5m])",
+              "expr": "grafana_stat_total_orgs",
              "format": "time_series",
              "intervalFactor": 2,
-              "legendFormat": "Total",
+              "legendFormat": "",
              "refId": "A",
-              "step": 10
+              "step": 60
            }
          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "CPU Usage",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
+          "thresholds": "",
+          "title": "Organizations",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
            {
-              "format": "percent",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": "0",
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
            }
-          ]
+          ],
+          "valueName": "current"
        },
        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
          "datasource": null,
-          "fill": 1,
-          "id": 33,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
          },
-          "lines": true,
-          "linewidth": 1,
+          "id": 37,
+          "interval": null,
          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 3,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": true
+          },
+          "tableColumn": "",
          "targets": [
            {
-              "expr": "docker_container_mem_rss{com_docker_swarm_service_name=\"dashboard_grafana\"}",
+              "expr": "grafana_stat_total_playlists",
              "format": "time_series",
              "intervalFactor": 2,
-              "legendFormat": "RSS",
              "refId": "A",
-              "step": 10
+              "step": 60
+            }
+          ],
+          "thresholds": "",
+          "title": "Playlists",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "datasource": null,
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "id": 38,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
            },
            {
-              "expr": "docker_container_mem_usage{com_docker_swarm_service_name=\"dashboard_grafana\"}",
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 3,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": true
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "grafana_stat_total_users",
              "format": "time_series",
              "intervalFactor": 2,
-              "legendFormat": "used",
-              "refId": "B",
-              "step": 10
+              "refId": "A",
+              "step": 60
            }
          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Memory",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
+          "thresholds": "",
+          "title": "Users",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "datasource": null,
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
          },
-          "yaxes": [
+          "id": 39,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
            {
-              "format": "bytes",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": 0,
-              "show": true
+              "name": "value to text",
+              "value": 1
            },
            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "name": "range to text",
+              "value": 2
            }
-          ]
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 3,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": true
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "expr": "grafana_stat_totals_dashboard",
+              "format": "time_series",
+              "intervalFactor": 2,
+              "refId": "A",
+              "step": 60
+            }
+          ],
+          "thresholds": "",
+          "title": "Dashboards",
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "current"
        }
      ],
      "repeat": null,
      "repeatIteration": null,
      "repeatRowId": null,
      "showTitle": true,
-      "title": "CPU and Memory",
+      "title": "General",
      "titleSize": "h6"
    },
    {
@ -194,7 +339,7 @@
          "dashes": false,
          "datasource": null,
          "fill": 1,
-          "id": 23,
+          "id": 32,
          "legend": {
            "avg": false,
            "current": false,
@ -209,36 +354,28 @@
          "links": [],
          "nullPointMode": "null",
          "percentage": false,
-          "pointradius": 5,
+          "pointradius": 6,
          "points": false,
          "renderer": "flot",
          "seriesOverrides": [],
          "spaceLength": 10,
          "span": 6,
-          "stack": false,
+          "stack": true,
          "steppedLine": false,
          "targets": [
            {
-              "expr": "irate(docker_container_blkio_io_service_bytes_recursive_read{com_docker_swarm_service_name=\"dashboard_grafana\"}[5m])",
+              "expr": "irate(process_cpu_seconds_total{job=\"grafana\"}[5m])",
              "format": "time_series",
              "intervalFactor": 2,
-              "legendFormat": "read",
+              "legendFormat": "total",
              "refId": "A",
              "step": 10
-            },
-            {
-              "expr": "irate(docker_container_blkio_io_service_bytes_recursive_write{com_docker_swarm_service_name=\"dashboard_grafana\"}[5m])",
-              "format": "time_series",
-              "intervalFactor": 2,
-              "legendFormat": "write",
-              "refId": "B",
-              "step": 10
            }
          ],
          "thresholds": [],
          "timeFrom": null,
          "timeShift": null,
-          "title": "Disk",
+          "title": "CPU Usage",
          "tooltip": {
            "shared": true,
            "sort": 0,
@ -254,7 +391,7 @@
          },
          "yaxes": [
            {
-              "format": "Bps",
+              "format": "percentunit",
              "label": null,
              "logBase": 1,
              "max": null,
@ -278,7 +415,7 @@
          "dashes": false,
          "datasource": null,
          "fill": 1,
-          "id": 34,
+          "id": 33,
          "legend": {
            "avg": false,
            "current": false,
@ -303,19 +440,18 @@
          "steppedLine": false,
          "targets": [
            {
-              "expr": "sum(irate(docker_container_net_rx_bytes{com_docker_swarm_service_name=\"dashboard_grafana\"}[5m]))",
+              "expr": "process_resident_memory_bytes{job=\"grafana\"}",
              "format": "time_series",
-              "hide": false,
              "intervalFactor": 2,
-              "legendFormat": "rx",
+              "legendFormat": "RSS",
              "refId": "A",
              "step": 10
            },
            {
-              "expr": "sum(irate(docker_container_net_tx_bytes{com_docker_swarm_service_name=\"dashboard_grafana\"}[5m]))",
+              "expr": "process_virtual_memory_bytes{job=\"grafana\"}",
              "format": "time_series",
              "intervalFactor": 2,
-              "legendFormat": "tx",
+              "legendFormat": "used",
              "refId": "B",
              "step": 10
            }
@ -323,7 +459,7 @@
          "thresholds": [],
          "timeFrom": null,
          "timeShift": null,
-          "title": "Network",
+          "title": "Memory",
          "tooltip": {
            "shared": true,
            "sort": 0,
@ -339,7 +475,7 @@
          },
          "yaxes": [
            {
-              "format": "Bps",
+              "format": "bytes",
              "label": null,
              "logBase": 1,
              "max": null,
@ -361,7 +497,7 @@
      "repeatIteration": null,
      "repeatRowId": null,
      "showTitle": true,
-      "title": "I/O",
+      "title": "CPU and Memory",
      "titleSize": "h6"
    }
  ],
@ -402,6 +538,6 @@
  },
  "timezone": "browser",
  "title": "Grafana",
-  "version": 10
+  "version": 11
 }
-{%- endraw %}
+{%- endraw %}