diff --git a/helm/config/grafana/dashboards/active-sessions.json b/helm/config/grafana/dashboards/active-sessions.json index 0c9dc2937..6ad115035 100644 --- a/helm/config/grafana/dashboards/active-sessions.json +++ b/helm/config/grafana/dashboards/active-sessions.json @@ -259,7 +259,7 @@ }, "gridPos": { "h": 7, - "w": 9, + "w": 8, "x": 8, "y": 0 }, @@ -294,71 +294,6 @@ "title": "Active sessions per tool", "type": "timeseries" }, - { - "datasource": { - "type": "prometheus", - "uid": "prometheus_ccm" - }, - "description": "Number of active sessions at the end of the time range.", - "fieldConfig": { - "defaults": { - "color": { - "fixedColor": "blue", - "mode": "fixed" - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 0, - "y": 7 - }, - "id": 2, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": ["lastNotNull"], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheus_ccm" - }, - "editorMode": "code", - "expr": "sum(count(up{tool_version_id=~\"$tool_version_id\",connection_method_id=~\"$connection_method_id\", session_type=~\"$session_type\", job=\"sessions\"})) OR on() vector(0)", - "legendFormat": "__auto", - "range": true, - "refId": "A" - } - ], - "title": "Active sessions", - "type": "stat" - }, { "datasource": { "type": "prometheus", @@ -427,8 +362,8 @@ }, "gridPos": { "h": 6, - "w": 14, - "x": 3, + "w": 16, + "x": 0, "y": 7 }, "id": 5, @@ -486,9 +421,9 @@ }, "gridPos": { "h": 3, - "w": 3, + "w": 4, "x": 0, - "y": 10 + "y": 13 }, "id": 7, "options": { @@ -528,6 +463,210 @@ ], "title": "Max", "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "description": "Number of active sessions at the end of the time range.", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "blue", + "mode": "fixed" + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 4, + "x": 4, + "y": 13 + }, + "id": 2, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.1.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "editorMode": "code", + "expr": "sum(count(up{tool_version_id=~\"$tool_version_id\",connection_method_id=~\"$connection_method_id\", session_type=~\"$session_type\", job=\"sessions\"})) OR on() vector(0)", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Active sessions", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "description": "Sum of all session minutes.", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "blue", + "mode": "fixed" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "m" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 4, + "x": 8, + "y": 13 + }, + "id": 8, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.1.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "editorMode": "code", + "expr": "sum(count_over_time(up{tool_version_id=~\"$tool_version_id\",connection_method_id=~\"$connection_method_id\", session_type=~\"$session_type\", job=\"sessions\"}[$__range]))/2", + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Counted Session Minutes", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "description": "Sum of unique sessions which were active in the selected range.", + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "blue", + "mode": "fixed" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 4, + "x": 12, + "y": 13 + }, + "id": 9, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.1.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus_ccm" + }, + "editorMode": "code", + "expr": "count(count_over_time(up{tool_version_id=~\"$tool_version_id\",connection_method_id=~\"$connection_method_id\", session_type=~\"$session_type\", job=\"sessions\"}[$__range]))", + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Sum of unique sessions", + "type": "stat" } ], "refresh": "", @@ -627,6 +766,6 @@ "timezone": "", "title": "Active sessions", "uid": "0kK_I7T4k", - "version": 12, + "version": 13, "weekStart": "" }