diff --git a/deploy/openshift/templates/monitoring/grafana-dashboards.yaml b/deploy/openshift/templates/monitoring/grafana-dashboards.yaml index 307eb62715d..e78d0dffb4c 100644 --- a/deploy/openshift/templates/monitoring/grafana-dashboards.yaml +++ b/deploy/openshift/templates/monitoring/grafana-dashboards.yaml @@ -3625,7 +3625,8 @@ data: "editable": true, "gnetId": null, "graphTooltip": 1, - "iteration": 1568816245781, + "id": 2, + "iteration": 1569330248249, "links": [], "panels": [ { @@ -3696,21 +3697,26 @@ data: ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, + "full": false, "lineColor": "rgb(31, 120, 193)", - "show": true + "show": false, + "ymax": null, + "ymin": null }, "tableColumn": "", "targets": [ { "expr": "che_user_total", "format": "time_series", + "instant": true, "intervalFactor": 1, + "legendFormat": "Number of Users", "refId": "A" } ], "thresholds": "", "timeFrom": null, + "timeShift": null, "title": "Number of Users", "type": "singlestat", "valueFontSize": "80%", @@ -3778,21 +3784,26 @@ data: ], "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, + "full": false, "lineColor": "rgb(31, 120, 193)", - "show": true + "show": false, + "ymax": null, + "ymin": null }, "tableColumn": "", "targets": [ { "expr": "sum(che_workspace_status)", "format": "time_series", + "instant": true, "intervalFactor": 1, + "legendFormat": "Number of Workspaces", "refId": "A" } ], "thresholds": "", "timeFrom": null, + "timeShift": null, "title": "Number of Workspaces", "type": "singlestat", "valueFontSize": "80%", @@ -4652,6 +4663,100 @@ data: "alignLevel": null } }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "decimals": 0, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 5, + "w": 6, + "x": 6, + "y": 17 + }, + "id": 77, + "legend": { + "avg": false, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(che_workspace_status)", + "format": "time_series", + "instant": false, + "intervalFactor": 1, + "legendFormat": "Number of Workspaces", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Number of Workspaces", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "decimals": null, + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, { "collapsed": false, "gridPos": { @@ -4660,6 +4765,111 @@ data: "x": 0, "y": 22 }, + "id": 80, + "panels": [], + "title": "Users", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "$datasource", + "decimals": 0, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 5, + "w": 6, + "x": 0, + "y": 23 + }, + "id": 78, + "legend": { + "avg": false, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "che_user_total", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "Number of Users", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Number of Users", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "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": 28 + }, "id": 24, "panels": [], "title": "Request", @@ -4677,7 +4887,7 @@ data: "h": 7, "w": 12, "x": 0, - "y": 23 + "y": 29 }, "id": 16, "legend": { @@ -4762,7 +4972,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 30 + "y": 36 }, "id": 64, "panels": [], @@ -4781,7 +4991,7 @@ data: "h": 6, "w": 6, "x": 0, - "y": 31 + "y": 37 }, "id": 66, "legend": { @@ -4867,7 +5077,7 @@ data: "h": 6, "w": 6, "x": 6, - "y": 31 + "y": 37 }, "id": 68, "legend": { @@ -4953,7 +5163,7 @@ data: "h": 6, "w": 6, "x": 12, - "y": 31 + "y": 37 }, "id": 70, "legend": { @@ -5040,7 +5250,7 @@ data: "h": 6, "w": 6, "x": 18, - "y": 31 + "y": 37 }, "id": 72, "legend": { @@ -5126,7 +5336,7 @@ data: "h": 6, "w": 6, "x": 0, - "y": 37 + "y": 43 }, "id": 74, "legend": { @@ -5212,7 +5422,7 @@ data: "h": 6, "w": 6, "x": 6, - "y": 37 + "y": 43 }, "id": 76, "legend": { @@ -5292,7 +5502,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 43 + "y": 49 }, "id": 22, "panels": [], @@ -5311,7 +5521,7 @@ data: "h": 7, "w": 8, "x": 0, - "y": 44 + "y": 50 }, "id": 18, "legend": { @@ -5427,7 +5637,7 @@ data: "h": 7, "w": 8, "x": 8, - "y": 44 + "y": 50 }, "id": 26, "legend": { @@ -5528,7 +5738,7 @@ data: "h": 7, "w": 8, "x": 16, - "y": 44 + "y": 50 }, "id": 32, "legend": { @@ -5631,7 +5841,7 @@ data: "h": 7, "w": 8, "x": 0, - "y": 51 + "y": 57 }, "id": 30, "legend": { @@ -5728,7 +5938,7 @@ data: "h": 7, "w": 8, "x": 8, - "y": 51 + "y": 57 }, "id": 34, "legend": { @@ -5827,7 +6037,7 @@ data: "h": 7, "w": 8, "x": 16, - "y": 51 + "y": 57 }, "id": 28, "legend": { @@ -5920,7 +6130,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 58 + "y": 64 }, "id": 61, "panels": [], @@ -5939,7 +6149,7 @@ data: "h": 7, "w": 12, "x": 0, - "y": 59 + "y": 65 }, "id": 55, "legend": { @@ -6052,7 +6262,7 @@ data: "h": 7, "w": 12, "x": 12, - "y": 59 + "y": 65 }, "id": 56, "legend": { @@ -6165,7 +6375,7 @@ data: "h": 7, "w": 12, "x": 0, - "y": 66 + "y": 72 }, "id": 51, "legend": { @@ -6278,7 +6488,7 @@ data: "h": 7, "w": 12, "x": 12, - "y": 66 + "y": 72 }, "id": 54, "legend": { @@ -6391,7 +6601,7 @@ data: "h": 7, "w": 12, "x": 0, - "y": 73 + "y": 79 }, "id": 58, "legend": { @@ -6484,7 +6694,7 @@ data: "h": 7, "w": 12, "x": 12, - "y": 73 + "y": 79 }, "id": 57, "legend": { @@ -6571,7 +6781,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 80 + "y": 86 }, "id": 42, "panels": [