From 9bfb9a58d20c84af688f479b8ed08aa31777d5f9 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Tue, 8 Oct 2024 15:29:29 +0200 Subject: [PATCH] Fixed the dashboard --- helm/dbrepo/files/system.json | 829 ++++++++++++-------- helm/dbrepo/templates/dashboard-secret.yaml | 5 +- helm/dbrepo/values.yaml | 10 +- 3 files changed, 522 insertions(+), 322 deletions(-) diff --git a/helm/dbrepo/files/system.json b/helm/dbrepo/files/system.json index 68279f8fe4..4eb40a1a2e 100644 --- a/helm/dbrepo/files/system.json +++ b/helm/dbrepo/files/system.json @@ -18,7 +18,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, - "id": 2, "links": [ { "asDropdown": false, @@ -55,34 +54,17 @@ }, "fieldConfig": { "defaults": { - "displayName": "QoS", "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "purple", + "color": "blue", "value": null - }, - { - "color": "red", - "value": 0 - }, - { - "color": "orange", - "value": 60 - }, - { - "color": "#EAB839", - "value": 80 - }, - { - "color": "green", - "value": 100 } ] }, - "unit": "percent" + "unit": "short" }, "overrides": [] }, @@ -92,7 +74,7 @@ "x": 0, "y": 1 }, - "id": 9, + "id": 4, "options": { "colorMode": "background", "graphMode": "none", @@ -110,7 +92,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "", + "pluginVersion": "11.2.2", "targets": [ { "datasource": { @@ -118,17 +100,18 @@ "uid": "P18F45E9DC7E75912" }, "disableTextWrap": false, - "editorMode": "code", - "expr": "sum(up)*100/count(up)", + "editorMode": "builder", + "expr": "dbrepo_database_count", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, - "legendFormat": "Services Running", + "legendFormat": "__auto", "range": true, "refId": "A", "useBackend": false } ], + "title": "Databases", "type": "stat" }, { @@ -139,34 +122,17 @@ }, "fieldConfig": { "defaults": { - "displayName": "UI Response Time (Mean)", "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "purple", + "color": "blue", "value": null - }, - { - "color": "green", - "value": 0 - }, - { - "color": "yellow", - "value": 200 - }, - { - "color": "orange", - "value": 400 - }, - { - "color": "red", - "value": 600 } ] }, - "unit": "ms" + "unit": "short" }, "overrides": [] }, @@ -176,7 +142,7 @@ "x": 4, "y": 1 }, - "id": 17, + "id": 5, "options": { "colorMode": "background", "graphMode": "none", @@ -194,22 +160,71 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "", + "pluginVersion": "11.2.2", "targets": [ { "datasource": { "type": "prometheus", "uid": "P18F45E9DC7E75912" }, - "editorMode": "code", - "expr": "avg(page_total_time)", - "format": "table", - "intervalFactor": 3, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "dbrepo_view_count", + "fullMetaSearch": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "Views", + "useBackend": false + }, + { + "datasource": { + "type": "prometheus", + "uid": "P18F45E9DC7E75912" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "dbrepo_subset_count", + "fullMetaSearch": false, + "hide": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "Subsets", + "useBackend": false + }, + { + "datasource": { + "type": "prometheus", + "uid": "P18F45E9DC7E75912" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "dbrepo_table_count", + "fullMetaSearch": false, + "hide": false, + "includeNullMetadata": true, + "instant": false, "legendFormat": "__auto", "range": true, - "refId": "B", - "step": 15, - "target": "dev.grafana.cb-office.alerting.active_alerts" + "refId": "Tables", + "useBackend": false + } + ], + "title": "Datasources", + "transformations": [ + { + "id": "calculateField", + "options": { + "alias": "", + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true + } } ], "type": "stat" @@ -220,9 +235,9 @@ "type": "prometheus", "uid": "P18F45E9DC7E75912" }, + "description": "", "fieldConfig": { "defaults": { - "displayName": "Databases", "mappings": [], "thresholds": { "mode": "absolute", @@ -233,7 +248,7 @@ } ] }, - "unit": "short" + "unit": "decbytes" }, "overrides": [] }, @@ -243,7 +258,7 @@ "x": 8, "y": 1 }, - "id": 4, + "id": 8, "options": { "colorMode": "background", "graphMode": "none", @@ -261,7 +276,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "", + "pluginVersion": "11.2.2", "targets": [ { "datasource": { @@ -270,7 +285,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "dbrepo_database_count", + "expr": "dbrepo_volume_sum", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -280,38 +295,70 @@ "useBackend": false } ], + "title": "Data Volume", "type": "stat" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 4 + }, + "id": 2, + "panels": [], + "title": "Services", + "type": "row" + }, { "datasource": { "default": true, "type": "prometheus", "uid": "P18F45E9DC7E75912" }, + "description": "Quality of Service", "fieldConfig": { "defaults": { - "displayName": "Datasources", "mappings": [], + "max": 100, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "blue", + "color": "purple", "value": null + }, + { + "color": "red", + "value": 0 + }, + { + "color": "orange", + "value": 60 + }, + { + "color": "#EAB839", + "value": 80 + }, + { + "color": "green", + "value": 100 } ] }, - "unit": "short" + "unit": "percent" }, "overrides": [] }, "gridPos": { - "h": 3, + "h": 4, "w": 4, - "x": 12, - "y": 1 + "x": 0, + "y": 5 }, - "id": 5, + "id": 9, "options": { "colorMode": "background", "graphMode": "none", @@ -329,7 +376,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "", + "pluginVersion": "11.2.2", "targets": [ { "datasource": { @@ -337,33 +384,92 @@ "uid": "P18F45E9DC7E75912" }, "disableTextWrap": false, - "editorMode": "builder", - "expr": "dbrepo_view_count", + "editorMode": "code", + "expr": "sum(up)*100/count(up)", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, - "legendFormat": "__auto", + "legendFormat": "Services Running", "range": true, - "refId": "Views", + "refId": "A", "useBackend": false - }, - { - "datasource": { - "type": "prometheus", - "uid": "P18F45E9DC7E75912" + } + ], + "title": "QoS", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "P18F45E9DC7E75912" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "dbrepo_subset_count", - "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": true, - "instant": false, - "legendFormat": "__auto", - "range": true, - "refId": "Subsets", - "useBackend": false + "custom": { + "fillOpacity": 70, + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineWidth": 1 + }, + "mappings": [ + { + "options": { + "0": { + "index": 0, + "text": "DOWN" + }, + "1": { + "index": 1, + "text": "UP" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 20, + "x": 4, + "y": 5 + }, + "id": 16, + "options": { + "colWidth": 0.9, + "legend": { + "displayMode": "list", + "placement": "bottom", + "showLegend": false + }, + "rowHeight": 0.9, + "showValue": "auto", + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ { "datasource": { "type": "prometheus", @@ -371,42 +477,30 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "dbrepo_table_count", + "expr": "up", "fullMetaSearch": false, - "hide": false, "includeNullMetadata": true, "instant": false, - "legendFormat": "__auto", + "legendFormat": "{{instance}}", "range": true, - "refId": "Tables", + "refId": "A", "useBackend": false } ], - "transformations": [ - { - "id": "calculateField", - "options": { - "alias": "", - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "type": "stat" + "title": "Service QoS", + "type": "status-history" }, { "datasource": { - "default": true, "type": "prometheus", "uid": "P18F45E9DC7E75912" }, + "description": "Total used disk space in Storage Service", "fieldConfig": { "defaults": { - "displayName": "Volume", "mappings": [], + "max": 100, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -421,12 +515,12 @@ "overrides": [] }, "gridPos": { - "h": 3, + "h": 4, "w": 4, - "x": 16, - "y": 1 + "x": 0, + "y": 9 }, - "id": 8, + "id": 17, "options": { "colorMode": "background", "graphMode": "none", @@ -444,7 +538,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "", + "pluginVersion": "11.2.2", "targets": [ { "datasource": { @@ -452,8 +546,8 @@ "uid": "P18F45E9DC7E75912" }, "disableTextWrap": false, - "editorMode": "builder", - "expr": "dbrepo_volume_sum", + "editorMode": "code", + "expr": "SeaweedFS_volumeServer_total_disk_size", "fullMetaSearch": false, "includeNullMetadata": true, "instant": false, @@ -463,21 +557,9 @@ "useBackend": false } ], + "title": "S3 Volume", "type": "stat" }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 4 - }, - "id": 2, - "panels": [], - "title": "Services", - "type": "row" - }, { "datasource": { "type": "prometheus", @@ -486,7 +568,40 @@ "fieldConfig": { "defaults": { "color": { - "mode": "thresholds" + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 25, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "smooth", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" + } }, "mappings": [], "thresholds": { @@ -496,50 +611,97 @@ "color": "green", "value": null }, - { - "color": "#EAB839", - "value": 200 - }, - { - "color": "orange", - "value": 400 - }, { "color": "red", - "value": 600 + "value": 80 } ] }, - "unit": "ms" + "unit": "none" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "auth-service:8080" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "yellow", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "data-service:8080" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "metadata-service:8080" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "metadata-service:80" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { - "h": 9, - "w": 24, + "h": 7, + "w": 12, "x": 0, - "y": 5 + "y": 13 }, - "id": 13, + "id": 6, "options": { - "displayMode": "gradient", - "maxVizHeight": 300, - "minVizHeight": 16, - "minVizWidth": 8, - "namePlacement": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": false + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, - "showUnfilled": true, - "sizing": "auto", - "valueMode": "color" + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "pluginVersion": "", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -548,23 +710,19 @@ }, "disableTextWrap": false, "editorMode": "builder", - "exemplar": false, - "expr": "page_total_time{path!=\"empty: empty\"}", - "format": "time_series", + "expr": "process_cpu_usage", "fullMetaSearch": false, + "hide": false, "includeNullMetadata": true, "instant": false, - "intervalFactor": 3, - "legendFormat": "{{path}}", + "legendFormat": "{{instance}}", "range": true, - "refId": "B", - "step": 15, - "target": "dev.grafana.cb-office.alerting.active_alerts", + "refId": "process_cpu_usage", "useBackend": false } ], - "title": "UI Response Time", - "type": "bargauge" + "title": "CPU Usage", + "type": "timeseries" }, { "datasource": { @@ -572,6 +730,7 @@ "type": "prometheus", "uid": "P18F45E9DC7E75912" }, + "description": "Heap and non-heap memory summed", "fieldConfig": { "defaults": { "color": { @@ -584,6 +743,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 25, "gradientMode": "none", @@ -592,9 +752,9 @@ "tooltip": false, "viz": false }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, + "insertNulls": false, + "lineInterpolation": "smooth", + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -616,13 +776,10 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] - } + }, + "unit": "decbytes" }, "overrides": [ { @@ -643,13 +800,13 @@ { "matcher": { "id": "byName", - "options": "broker-service:15692" + "options": "data-service:8080" }, "properties": [ { "id": "color", "value": { - "fixedColor": "light-blue", + "fixedColor": "blue", "mode": "fixed" } } @@ -670,36 +827,6 @@ } ] }, - { - "matcher": { - "id": "byName", - "options": "analyse-service:80" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "super-light-red", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "auth-service-metrics:8080" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "green", - "mode": "fixed" - } - } - ] - }, { "matcher": { "id": "byName", @@ -714,61 +841,16 @@ } } ] - }, - { - "matcher": { - "id": "byName", - "options": "data-service:80" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "purple", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "search-service:80" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "semi-dark-purple", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "ui:80" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "super-light-purple", - "mode": "fixed" - } - } - ] } ] }, "gridPos": { - "h": 6, - "w": 24, - "x": 0, - "y": 14 + "h": 7, + "w": 12, + "x": 12, + "y": 13 }, - "id": 1, + "id": 7, "options": { "legend": { "calcs": [], @@ -777,7 +859,7 @@ "showLegend": true }, "tooltip": { - "mode": "single", + "mode": "multi", "sort": "none" } }, @@ -790,10 +872,10 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "up", + "expr": "sum by(instance) (jvm_memory_used_bytes)", "fullMetaSearch": false, "hide": false, - "includeNullMetadata": true, + "includeNullMetadata": false, "instant": false, "legendFormat": "{{instance}}", "range": true, @@ -801,12 +883,11 @@ "useBackend": false } ], - "title": "Service Instances Running", + "title": "JVM Memory Usage", "type": "timeseries" }, { "datasource": { - "default": true, "type": "prometheus", "uid": "P18F45E9DC7E75912" }, @@ -822,6 +903,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 25, "gradientMode": "none", @@ -832,7 +914,7 @@ }, "insertNulls": false, "lineInterpolation": "smooth", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -841,7 +923,7 @@ "spanNulls": false, "stacking": { "group": "A", - "mode": "normal" + "mode": "none" }, "thresholdsStyle": { "mode": "off" @@ -854,25 +936,22 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] - } + }, + "unit": "reqps" }, "overrides": [ { "matcher": { - "id": "byName", - "options": "auth-service:8080" + "id": "byRegexp", + "options": "/.*search-service.*/" }, "properties": [ { "id": "color", "value": { - "fixedColor": "yellow", + "fixedColor": "orange", "mode": "fixed" } } @@ -880,29 +959,123 @@ }, { "matcher": { - "id": "byName", - "options": "data-service:8080" + "id": "byRegexp", + "options": "/.*analyse-service.*/" }, "properties": [ { "id": "color", "value": { - "fixedColor": "blue", + "fixedColor": "super-light-orange", "mode": "fixed" } } ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 20 + }, + "id": 18, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "P18F45E9DC7E75912" + }, + "editorMode": "code", + "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])", + "instant": false, + "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})", + "range": true, + "refId": "A" + } + ], + "title": "Successful API Requests", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "P18F45E9DC7E75912" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 25, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "smooth", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] }, + "unit": "reqps" + }, + "overrides": [ { "matcher": { - "id": "byName", - "options": "metadata-service:8080" + "id": "byRegexp", + "options": "/.*search-service.*/" }, "properties": [ { "id": "color", "value": { - "fixedColor": "purple", + "fixedColor": "orange", "mode": "fixed" } } @@ -910,14 +1083,14 @@ }, { "matcher": { - "id": "byName", - "options": "metadata-service:80" + "id": "byRegexp", + "options": "/.*analyse-service.*/" }, "properties": [ { "id": "color", "value": { - "fixedColor": "blue", + "fixedColor": "super-light-orange", "mode": "fixed" } } @@ -926,12 +1099,12 @@ ] }, "gridPos": { - "h": 6, - "w": 24, - "x": 0, + "h": 7, + "w": 12, + "x": 12, "y": 20 }, - "id": 6, + "id": 19, "options": { "legend": { "calcs": [], @@ -944,27 +1117,21 @@ "sort": "none" } }, - "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "P18F45E9DC7E75912" }, - "disableTextWrap": false, - "editorMode": "builder", - "expr": "process_cpu_usage", - "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": true, + "editorMode": "code", + "expr": "rate(flask_http_request_duration_seconds_count{status!~\"200|201|202\"}[$__rate_interval])", "instant": false, - "legendFormat": "{{instance}}", + "legendFormat": "{{method}} {{instance}} ({{status}})", "range": true, - "refId": "Java", - "useBackend": false + "refId": "A" } ], - "title": "CPU Usage", + "title": "Failed API Requests", "type": "timeseries" }, { @@ -973,7 +1140,6 @@ "type": "prometheus", "uid": "P18F45E9DC7E75912" }, - "description": "Heap and non-heap memory summed", "fieldConfig": { "defaults": { "color": { @@ -986,8 +1152,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", - "fillOpacity": 25, + "fillOpacity": 0, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1005,7 +1172,7 @@ "spanNulls": false, "stacking": { "group": "A", - "mode": "normal" + "mode": "none" }, "thresholdsStyle": { "mode": "off" @@ -1020,20 +1187,19 @@ "value": null } ] - }, - "unit": "decbytes" + } }, "overrides": [ { "matcher": { "id": "byName", - "options": "auth-service:8080" + "options": "DELETE" }, "properties": [ { "id": "color", "value": { - "fixedColor": "yellow", + "fixedColor": "red", "mode": "fixed" } } @@ -1042,7 +1208,7 @@ { "matcher": { "id": "byName", - "options": "data-service:8080" + "options": "GET" }, "properties": [ { @@ -1057,7 +1223,7 @@ { "matcher": { "id": "byName", - "options": "metadata-service:8080" + "options": "HEAD" }, "properties": [ { @@ -1072,13 +1238,42 @@ { "matcher": { "id": "byName", - "options": "metadata-service:80" + "options": "PATCH" }, "properties": [ { "id": "color", "value": { - "fixedColor": "blue", + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "OPTIONS" + }, + "properties": [ + { + "id": "color", + "value": { + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "POST" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", "mode": "fixed" } } @@ -1087,12 +1282,12 @@ ] }, "gridPos": { - "h": 6, - "w": 24, + "h": 7, + "w": 12, "x": 0, - "y": 26 + "y": 27 }, - "id": 7, + "id": 20, "options": { "legend": { "calcs": [], @@ -1105,7 +1300,6 @@ "sort": "none" } }, - "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -1114,18 +1308,17 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "sum by(instance) (jvm_memory_used_bytes)", + "expr": "tusd_requests_total", "fullMetaSearch": false, - "hide": false, - "includeNullMetadata": false, + "includeNullMetadata": true, "instant": false, - "legendFormat": "{{instance}}", + "legendFormat": "{{method}}", "range": true, "refId": "A", "useBackend": false } ], - "title": "JVM Memory Usage", + "title": "Storage Service Requests", "type": "timeseries" } ], diff --git a/helm/dbrepo/templates/dashboard-secret.yaml b/helm/dbrepo/templates/dashboard-secret.yaml index 6e5a05e176..c224c1d17b 100644 --- a/helm/dbrepo/templates/dashboard-secret.yaml +++ b/helm/dbrepo/templates/dashboard-secret.yaml @@ -6,8 +6,11 @@ metadata: name: dashboard-service-secret namespace: {{ include "common.names.namespace" . | quote }} stringData: + GF_SERVER_PROTOCOL: "http" GF_SERVER_DOMAIN: "dashboard-service" - GF_SERVER_ROOT_URL: "http://dashboard-service:3000/dashboard/" + GF_SERVER_ROOT_URL: "http://%(domain)s/dashboard/" + GF_AUTH_ANONYMOUS_ENABLED: "true" + GF_AUTH_ANONYMOUS_ORG_ROLE: "Viewer" GF_SERVER_SERVE_FROM_SUB_PATH: "true" GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true" LDAP_ADMIN_USERNAME: "{{ .Values.identityservice.global.adminUser }}" diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index d889cc85b7..8dabf4c8ec 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -854,14 +854,18 @@ metricdb: enabled: true ## @skip metricdb.server.extraScrapeConfigs extraScrapeConfigs: - - job_name: 'spring boot scrape' + - job_name: 'actuator scrape' metrics_path: '/actuator/prometheus' static_configs: - - targets: [ 'data-service', 'metadata-service' ] + - targets: [ 'data-service', 'metadata-service', 'ui' ] - job_name: 'metrics scrape' metrics_path: '/metrics' static_configs: - - targets: [ 'auth-service-metrics:8080', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'ui', 'metadata-db-metrics:9104', 'dashboard-service:3000', 'storage-service-master-metrics:9327', 'upload-service' ] + - targets: [ 'auth-service-metrics:8080', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'metadata-db-metrics:9104', 'storage-service-master-metrics:9327', 'upload-service' ] + - job_name: 'dashboard scrape' + metrics_path: '/dashboard/metrics' + static_configs: + - targets: [ 'dashboard-service:3000' ] ## @section Ingress -- GitLab