From 361af0f33c75b2d0d1f5ad2194a4febc2ddf40b9 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 21 May 2025 10:18:51 +0200
Subject: [PATCH] WIP
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../dashboards/System/dbrepo.json | 8 +-
helm/dbrepo/files/dbrepo.json | 8 +-
helm/dbrepo/files/logging.json | 87 ++++++++++++++-----
3 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/dbrepo-dashboard-ui/dashboards/System/dbrepo.json b/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
index f014c05f38..0d3f4956b0 100644
--- a/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
+++ b/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
@@ -18,7 +18,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
- "id": 4,
+ "id": 5,
"links": [
{
"asDropdown": false,
@@ -121,7 +121,7 @@
},
"disableTextWrap": false,
"editorMode": "code",
- "expr": "sum(up)*100/count(up)",
+ "expr": "sum(up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"})*100/count(up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"})",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
@@ -1838,7 +1838,7 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "up",
+ "expr": "up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"}",
"fullMetaSearch": false,
"hide": false,
"includeNullMetadata": true,
@@ -3050,6 +3050,6 @@
"timezone": "browser",
"title": "DBRepo",
"uid": "bdz20owu8zn5se",
- "version": 1,
+ "version": 2,
"weekStart": ""
}
\ No newline at end of file
diff --git a/helm/dbrepo/files/dbrepo.json b/helm/dbrepo/files/dbrepo.json
index f014c05f38..0d3f4956b0 100644
--- a/helm/dbrepo/files/dbrepo.json
+++ b/helm/dbrepo/files/dbrepo.json
@@ -18,7 +18,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
- "id": 4,
+ "id": 5,
"links": [
{
"asDropdown": false,
@@ -121,7 +121,7 @@
},
"disableTextWrap": false,
"editorMode": "code",
- "expr": "sum(up)*100/count(up)",
+ "expr": "sum(up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"})*100/count(up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"})",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
@@ -1838,7 +1838,7 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "up",
+ "expr": "up{instance=~\".*-service.*|ui.*|.*-db-metrics.*\"}",
"fullMetaSearch": false,
"hide": false,
"includeNullMetadata": true,
@@ -3050,6 +3050,6 @@
"timezone": "browser",
"title": "DBRepo",
"uid": "bdz20owu8zn5se",
- "version": 1,
+ "version": 2,
"weekStart": ""
}
\ No newline at end of file
diff --git a/helm/dbrepo/files/logging.json b/helm/dbrepo/files/logging.json
index 4bd065db8e..cafc736261 100644
--- a/helm/dbrepo/files/logging.json
+++ b/helm/dbrepo/files/logging.json
@@ -17,8 +17,8 @@
},
"editable": true,
"fiscalYearStartMonth": 0,
- "graphTooltip": 0,
- "id": 4,
+ "graphTooltip": 1,
+ "id": 30,
"links": [],
"panels": [
{
@@ -29,9 +29,10 @@
"x": 0,
"y": 0
},
- "id": 6,
+ "id": 24,
"panels": [],
- "title": "System",
+ "repeat": "service",
+ "title": "$service",
"type": "row"
},
{
@@ -100,7 +101,7 @@
"x": 0,
"y": 1
},
- "id": 1,
+ "id": 25,
"options": {
"legend": {
"calcs": [],
@@ -134,15 +135,14 @@
},
"format": "table",
"hide": false,
- "luceneQueryType": "Metric",
+ "luceneQueryType": "Logs",
"metrics": [
{
- "hide": false,
"id": "1",
- "type": "count"
+ "type": "logs"
}
],
- "query": "log_level: WARN",
+ "query": "log_level: WARN AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "warn",
"timeField": "@timestamp"
@@ -217,7 +217,7 @@
"x": 12,
"y": 1
},
- "id": 18,
+ "id": 28,
"options": {
"legend": {
"calcs": [],
@@ -259,7 +259,7 @@
"type": "count"
}
],
- "query": "log_level: ERROR",
+ "query": "log_level: ERROR AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "warn",
"timeField": "@timestamp"
@@ -323,7 +323,7 @@
"type": "logs"
}
],
- "query": "log_level: WARN",
+ "query": "log_level: WARN AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "A",
"timeField": "@timestamp"
@@ -367,7 +367,7 @@
"x": 12,
"y": 5
},
- "id": 19,
+ "id": 29,
"options": {
"dedupStrategy": "none",
"enableInfiniteScrolling": false,
@@ -406,7 +406,7 @@
"type": "logs"
}
],
- "query": "log_level: ERROR",
+ "query": "log_level: ERROR AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "A",
"timeField": "@timestamp"
@@ -500,7 +500,7 @@
"x": 0,
"y": 15
},
- "id": 20,
+ "id": 30,
"options": {
"legend": {
"calcs": [],
@@ -542,7 +542,7 @@
"type": "count"
}
],
- "query": "log_level: DEBUG",
+ "query": "log_level: DEBUG AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "warn",
"timeField": "@timestamp"
@@ -659,7 +659,7 @@
"type": "count"
}
],
- "query": "log_level: INFO",
+ "query": "log_level: INFO AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "warn",
"timeField": "@timestamp"
@@ -723,7 +723,7 @@
"type": "logs"
}
],
- "query": "log_level: DEBUG",
+ "query": "log_level: DEBUG AND service_name: $service",
"queryType": "lucene",
"refId": "A",
"timeField": "@timestamp"
@@ -767,7 +767,7 @@
"x": 12,
"y": 19
},
- "id": 22,
+ "id": 19,
"options": {
"dedupStrategy": "none",
"enableInfiniteScrolling": false,
@@ -806,13 +806,13 @@
"type": "logs"
}
],
- "query": "log_level: INFO",
+ "query": "log_level: ERROR AND service_name: \"$service\"",
"queryType": "lucene",
"refId": "A",
"timeField": "@timestamp"
}
],
- "title": "Infos",
+ "title": "Errors",
"transformations": [
{
"id": "filterFieldsByName",
@@ -850,16 +850,55 @@
"search"
],
"templating": {
- "list": []
+ "list": [
+ {
+ "current": {
+ "text": "metadata-service",
+ "value": "metadata-service"
+ },
+ "includeAll": true,
+ "label": "Service",
+ "name": "service",
+ "options": [
+ {
+ "selected": false,
+ "text": "analyse-service",
+ "value": "analyse-service"
+ },
+ {
+ "selected": false,
+ "text": "dashboard-service",
+ "value": "dashboard-service"
+ },
+ {
+ "selected": false,
+ "text": "data-service",
+ "value": "data-service"
+ },
+ {
+ "selected": true,
+ "text": "metadata-service",
+ "value": "metadata-service"
+ },
+ {
+ "selected": false,
+ "text": "search-service",
+ "value": "search-service"
+ }
+ ],
+ "query": "analyse-service, dashboard-service, data-service, metadata-service, search-service",
+ "type": "custom"
+ }
+ ]
},
"time": {
- "from": "now-30m",
+ "from": "now-1h",
"to": "now"
},
"timepicker": {},
"timezone": "browser",
"title": "Logging - Overview",
"uid": "aejhojr0mrpj4c",
- "version": 1,
+ "version": 23,
"weekStart": ""
}
\ No newline at end of file
--
GitLab