From 1bc3644e25cc387d5ab8f6ca5f58363a51330231 Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Tue, 23 Oct 2018 16:55:44 +0200 Subject: [PATCH] Add business metrics from Service Catalog manager (#1386) --- .../grafana/dashboards/service-catalog.json | 439 ++++++++++++++---- 1 file changed, 349 insertions(+), 90 deletions(-) diff --git a/resources/core/charts/monitoring/charts/grafana/dashboards/service-catalog.json b/resources/core/charts/monitoring/charts/grafana/dashboards/service-catalog.json index 373bd2902c28..2917dd543627 100644 --- a/resources/core/charts/monitoring/charts/grafana/dashboards/service-catalog.json +++ b/resources/core/charts/monitoring/charts/grafana/dashboards/service-catalog.json @@ -15,10 +15,22 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 21, - "iteration": 1537961321571, + "iteration": 1540194257160, "links": [], "panels": [ + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 36, + "panels": [], + "title": "Overview", + "type": "row" + }, { "cacheTimeout": null, "colorBackground": false, @@ -41,7 +53,7 @@ "h": 3, "w": 8, "x": 0, - "y": 0 + "y": 1 }, "id": 2, "interval": null, @@ -121,7 +133,7 @@ "h": 3, "w": 8, "x": 8, - "y": 0 + "y": 1 }, "id": 3, "interval": null, @@ -201,7 +213,7 @@ "h": 3, "w": 8, "x": 16, - "y": 0 + "y": 1 }, "id": 5, "interval": null, @@ -264,6 +276,19 @@ ], "valueName": "avg" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 4 + }, + "id": 40, + "panels": [], + "title": "ETCD", + "type": "row" + }, { "aliasColors": {}, "bars": false, @@ -275,15 +300,15 @@ "h": 8, "w": 8, "x": 0, - "y": 3 + "y": 5 }, - "id": 9, + "id": 25, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": false, + "show": true, "total": false, "values": false }, @@ -301,17 +326,17 @@ "steppedLine": false, "targets": [ { - "expr": "sum(container_memory_usage_bytes{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}) / 1024^2", + "expr": "(sum(container_memory_usage_bytes{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}) by (pod_name))/ 1024^2", "format": "time_series", "intervalFactor": 1, - "legendFormat": "Memory [GB]", + "legendFormat": "{{pod_name}}", "refId": "B" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[APISERVER] Memory [MB]", + "title": "[ETCD] Memory [MB]", "tooltip": { "shared": true, "sort": 0, @@ -359,15 +384,15 @@ "h": 8, "w": 8, "x": 8, - "y": 3 + "y": 5 }, - "id": 7, + "id": 26, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": false, + "show": true, "total": false, "values": false }, @@ -385,19 +410,19 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}[1m]))", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}[1m])) by (pod_name)", "format": "time_series", "instant": false, "interval": "1m", "intervalFactor": 1, - "legendFormat": "CPU", + "legendFormat": "{{pod_name}}", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[APISERVER] CPU", + "title": "[ETCD] CPU", "tooltip": { "shared": true, "sort": 0, @@ -445,15 +470,15 @@ "h": 8, "w": 8, "x": 16, - "y": 3 + "y": 5 }, - "id": 11, + "id": 27, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": false, + "show": true, "total": false, "values": false }, @@ -471,16 +496,17 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}[3m]))", + "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}[3m])) by (pod_name)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{pod_name}}", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[APISERVER] Network in [kB/s]", + "title": "[ETCD] Network in [kB/s]", "tooltip": { "shared": true, "sort": 0, @@ -517,6 +543,19 @@ "alignLevel": null } }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 13 + }, + "id": 38, + "panels": [], + "title": "[CONTROLLER] Pod Metrics", + "type": "row" + }, { "aliasColors": {}, "bars": false, @@ -528,7 +567,7 @@ "h": 8, "w": 8, "x": 0, - "y": 11 + "y": 14 }, "id": 10, "legend": { @@ -564,7 +603,7 @@ "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[CONTROLLER] Memory [MB]", + "title": "Memory [MB]", "tooltip": { "shared": true, "sort": 0, @@ -612,7 +651,7 @@ "h": 8, "w": 8, "x": 8, - "y": 11 + "y": 14 }, "id": 8, "legend": { @@ -650,7 +689,7 @@ "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[CONTROLLER] CPU", + "title": "CPU", "tooltip": { "shared": true, "sort": 0, @@ -698,7 +737,7 @@ "h": 8, "w": 8, "x": 16, - "y": 11 + "y": 14 }, "id": 12, "legend": { @@ -733,7 +772,7 @@ "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[CONTROLLER] Network in [kB/s]", + "title": "Network in [kB/s]", "tooltip": { "shared": true, "sort": 0, @@ -770,6 +809,228 @@ "alignLevel": null } }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 22 + }, + "id": 31, + "panels": [], + "title": "[CONTROLLER] Business Metrics", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "This diagram represent the number of service classes and service plans by Broker", + "fill": 1, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 23 + }, + "id": 34, + "legend": { + "alignAsTable": false, + "avg": false, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "plans from core-helm-broker ", + "yaxis": 2 + }, + { + "alias": "plans from remote-env-broker ", + "yaxis": 2 + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "servicecatalog_broker_service_class_count", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "classes from {{ broker }}", + "refId": "A" + }, + { + "expr": "servicecatalog_broker_service_plan_count", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "plans from {{ broker }} ", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "No. of classes and plans by Broker", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": false, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "short", + "label": "No. of classes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "decimals": 0, + "format": "short", + "label": "No. of plans", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "", + "fill": 1, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 23 + }, + "id": 33, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": true, + "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": "servicecatalog_osb_request_count", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{ broker }} {{ method }} {{ status }}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Requests by API Method", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": false, + "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 + } + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 32 + }, + "id": 29, + "panels": [], + "title": "[APISERVER] Pod Metrics", + "type": "row" + }, { "aliasColors": {}, "bars": false, @@ -781,15 +1042,15 @@ "h": 8, "w": 8, "x": 0, - "y": 19 + "y": 33 }, - "id": 25, + "id": 9, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": true, + "show": false, "total": false, "values": false }, @@ -807,17 +1068,17 @@ "steppedLine": false, "targets": [ { - "expr": "(sum(container_memory_usage_bytes{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}) by (pod_name))/ 1024^2", + "expr": "sum(container_memory_usage_bytes{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}) / 1024^2", "format": "time_series", "intervalFactor": 1, - "legendFormat": "{{pod_name}}", + "legendFormat": "Memory [GB]", "refId": "B" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[ETCD] Memory [MB]", + "title": "Memory [MB]", "tooltip": { "shared": true, "sort": 0, @@ -865,15 +1126,15 @@ "h": 8, "w": 8, "x": 8, - "y": 19 + "y": 33 }, - "id": 26, + "id": 7, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": true, + "show": false, "total": false, "values": false }, @@ -891,19 +1152,19 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}[1m])) by (pod_name)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}[1m]))", "format": "time_series", "instant": false, "interval": "1m", "intervalFactor": 1, - "legendFormat": "{{pod_name}}", + "legendFormat": "CPU", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[ETCD] CPU", + "title": "CPU", "tooltip": { "shared": true, "sort": 0, @@ -951,15 +1212,15 @@ "h": 8, "w": 8, "x": 16, - "y": 19 + "y": 33 }, - "id": 27, + "id": 11, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": true, + "show": false, "total": false, "values": false }, @@ -977,17 +1238,16 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"kyma-system\",pod_name=~\"$etcddeploy.*\"}[3m])) by (pod_name)", + "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"kyma-system\",pod_name=~\"$apiserverdeploy.*\"}[3m]))", "format": "time_series", "intervalFactor": 1, - "legendFormat": "{{pod_name}}", "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "[ETCD] Network in [kB/s]", + "title": "Network in [kB/s]", "tooltip": { "shared": true, "sort": 0, @@ -1025,18 +1285,17 @@ } }, { - "content": "", + "collapsed": false, "gridPos": { - "h": 2, + "h": 1, "w": 24, "x": 0, - "y": 27 + "y": 41 }, - "id": 14, - "links": [], - "mode": "markdown", - "title": "[APISERVER] go metrics", - "type": "text" + "id": 42, + "panels": [], + "title": "[APISERVER] Go Metrics", + "type": "row" }, { "aliasColors": {}, @@ -1049,7 +1308,7 @@ "h": 8, "w": 8, "x": 0, - "y": 29 + "y": 42 }, "id": 16, "legend": { @@ -1128,14 +1387,18 @@ "dashLength": 10, "dashes": false, "datasource": "Prometheus", + "editable": true, + "error": false, "fill": 1, + "grid": {}, "gridPos": { "h": 8, "w": 8, "x": 8, - "y": 29 + "y": 42 }, - "id": 17, + "id": 24, + "isNew": true, "legend": { "avg": false, "current": false, @@ -1146,9 +1409,9 @@ "values": false }, "lines": true, - "linewidth": 1, + "linewidth": 2, "links": [], - "nullPointMode": "null", + "nullPointMode": "connected", "percentage": false, "pointradius": 5, "points": false, @@ -1159,21 +1422,24 @@ "steppedLine": false, "targets": [ { - "expr": "go_goroutines{service=\"core-catalog-apiserver\"}", + "expr": "process_open_fds{service=\"$apiserverdeploy\"}", "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A" + "intervalFactor": 2, + "legendFormat": "{{service}}", + "metric": "process_open_fds", + "refId": "A", + "step": 4 } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Goroutines", + "title": "open fds", "tooltip": { + "msResolution": false, "shared": true, "sort": 0, - "value_type": "individual" + "value_type": "cumulative" }, "type": "graph", "xaxis": { @@ -1217,7 +1483,7 @@ "h": 8, "w": 8, "x": 16, - "y": 29 + "y": 42 }, "id": 18, "legend": { @@ -1301,10 +1567,10 @@ "fill": 1, "grid": {}, "gridPos": { - "h": 7, - "w": 8, + "h": 8, + "w": 12, "x": 0, - "y": 37 + "y": 50 }, "id": 22, "isNew": true, @@ -1420,18 +1686,14 @@ "dashLength": 10, "dashes": false, "datasource": "Prometheus", - "editable": true, - "error": false, "fill": 1, - "grid": {}, "gridPos": { - "h": 7, - "w": 8, - "x": 8, - "y": 37 + "h": 8, + "w": 12, + "x": 12, + "y": 50 }, - "id": 24, - "isNew": true, + "id": 17, "legend": { "avg": false, "current": false, @@ -1442,9 +1704,9 @@ "values": false }, "lines": true, - "linewidth": 2, + "linewidth": 1, "links": [], - "nullPointMode": "connected", + "nullPointMode": "null", "percentage": false, "pointradius": 5, "points": false, @@ -1455,24 +1717,21 @@ "steppedLine": false, "targets": [ { - "expr": "process_open_fds{service=\"$apiserverdeploy\"}", + "expr": "go_goroutines{service=\"core-catalog-apiserver\"}", "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{service}}", - "metric": "process_open_fds", - "refId": "A", - "step": 4 + "intervalFactor": 1, + "legendFormat": "{{pod}}", + "refId": "A" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "open fds", + "title": "Goroutines", "tooltip": { - "msResolution": false, "shared": true, "sort": 0, - "value_type": "cumulative" + "value_type": "individual" }, "type": "graph", "xaxis": { @@ -1617,5 +1876,5 @@ "timezone": "", "title": "Service Catalog", "uid": "i-0LJp0mz", - "version": 3 + "version": 1 } \ No newline at end of file