Sheldan/Sissi
1
0
Fork 0
mirror of https://github.com/Sheldan/Sissi.git synced 2026-01-26 19:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SIS-xxx] updating grafana dashboards

Browse Source 
adding http request panel
updating abstracto versions to get http metric and remind hint text
This commit is contained in:
Sheldan
2026-01-08 00:40:29 +01:00
parent ca05ce4abf
commit 82378e3f5e
3 changed files with 170 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
deployment/helm/sissi/configuration/grafana/sissi-discord-dashboard.json
View File

@@ -20,7 +20,6 @@
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"links": [], "links": [],
"liveNow": false,
"panels": [ "panels": [
{ {
"datasource": { "datasource": {
@@ -33,11 +32,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -69,7 +70,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -95,10 +96,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -127,11 +130,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -163,7 +168,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -189,10 +194,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -221,11 +228,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -257,7 +266,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -283,10 +292,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -315,11 +326,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -351,7 +364,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -377,10 +390,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -409,11 +424,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -445,7 +462,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -471,10 +488,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -542,11 +561,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -578,7 +599,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -604,10 +625,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -636,11 +659,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -672,7 +697,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -698,10 +723,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -730,11 +757,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -766,7 +795,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -792,10 +821,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -824,11 +855,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -860,7 +893,100 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 15,
"w": 24,
"x": 0,
"y": 32
},
"id": 11,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"hideZeros": false,
"mode": "single",
"sort": "none"
}
},
"pluginVersion": "12.1.1",
"targets": [
{
"editorMode": "code",
"expr": "increase(jda_request_total{namespace=\"sissi\"}[1m]) / 2",
"legendFormat": "{{ "{{" }} http_key {{ "}}" }}",
"range": true,
"refId": "A"
}
],
"title": "HTTP Requests",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"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": 0
}, },
{ {
"color": "red", "color": "red",
@@ -875,7 +1001,7 @@
"h": 16, "h": 16,
"w": 24, "w": 24,
"x": 0, "x": 0,
"y": 32 "y": 47
}, },
"id": 9, "id": 9,
"options": { "options": {
@@ -886,10 +1012,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -908,18 +1036,21 @@
"type": "timeseries" "type": "timeseries"
} }
], ],
"preload": false,
"refresh": "", "refresh": "",
"schemaVersion": 38, "schemaVersion": 41,
"style": "dark",
"tags": [], "tags": [],
"templating": { "templating": {
"list": [ "list": [
{ {
"current": {
"text": "Sissi",
"value": "Sissi"
},
"hide": 2, "hide": 2,
"label": "",
"name": "application", "name": "application",
"query": "Sissi", "query": "Sissi",
"skipUrlSync": false, "skipUrlSync": true,
"type": "constant" "type": "constant"
} }
] ]
@@ -932,7 +1063,7 @@
"timezone": "", "timezone": "",
"title": "Sissi Discord status", "title": "Sissi Discord status",
"uid": "a7b3297d-972e-4dbd-9223-88d589817d34", "uid": "a7b3297d-972e-4dbd-9223-88d589817d34",
"version": 2, "version": 3,
"weekStart": "" "weekStart": ""
}, },
"overwrite": true "overwrite": true

29
deployment/helm/sissi/configuration/grafana/sissi-log-dashboard.json
View File

@@ -20,8 +20,8 @@
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"id": 12,
"links": [], "links": [],
"liveNow": false,
"panels": [ "panels": [
{ {
"datasource": { "datasource": {
@@ -29,6 +29,10 @@
"uid": "loki" "uid": "loki"
}, },
"description": "Display logs and search for logs", "description": "Display logs and search for logs",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"gridPos": { "gridPos": {
"h": 13, "h": 13,
"w": 24, "w": 24,
@@ -38,6 +42,7 @@
"id": 4, "id": 4,
"options": { "options": {
"dedupStrategy": "none", "dedupStrategy": "none",
"enableInfiniteScrolling": false,
"enableLogDetails": true, "enableLogDetails": true,
"prettifyLogMessage": false, "prettifyLogMessage": false,
"showCommonLabels": false, "showCommonLabels": false,
@@ -46,6 +51,7 @@
"sortOrder": "Ascending", "sortOrder": "Ascending",
"wrapLogMessage": true "wrapLogMessage": true
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -68,6 +74,10 @@
"uid": "loki" "uid": "loki"
}, },
"description": "Any line on level ERROR", "description": "Any line on level ERROR",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"gridPos": { "gridPos": {
"h": 8, "h": 8,
"w": 12, "w": 12,
@@ -77,6 +87,7 @@
"id": 2, "id": 2,
"options": { "options": {
"dedupStrategy": "none", "dedupStrategy": "none",
"enableInfiniteScrolling": false,
"enableLogDetails": true, "enableLogDetails": true,
"prettifyLogMessage": false, "prettifyLogMessage": false,
"showCommonLabels": false, "showCommonLabels": false,
@@ -85,6 +96,7 @@
"sortOrder": "Ascending", "sortOrder": "Ascending",
"wrapLogMessage": true "wrapLogMessage": true
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -113,11 +125,13 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisBorderShow": false,
"axisCenteredZero": false, "axisCenteredZero": false,
"axisColorMode": "text", "axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
@@ -149,7 +163,7 @@
"steps": [ "steps": [
{ {
"color": "green", "color": "green",
"value": null "value": 0
}, },
{ {
"color": "red", "color": "red",
@@ -175,10 +189,12 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"hideZeros": false,
"mode": "single", "mode": "single",
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "12.1.1",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
@@ -195,20 +211,18 @@
"type": "timeseries" "type": "timeseries"
} }
], ],
"preload": false,
"refresh": "", "refresh": "",
"schemaVersion": 38, "schemaVersion": 41,
"style": "dark",
"tags": [], "tags": [],
"templating": { "templating": {
"list": [ "list": [
{ {
"current": { "current": {
"selected": false,
"text": "", "text": "",
"value": "" "value": ""
}, },
"description": "What to search in the logs", "description": "What to search in the logs",
"hide": 0,
"name": "logFilter", "name": "logFilter",
"options": [ "options": [
{ {
@@ -218,7 +232,6 @@
} }
], ],
"query": "", "query": "",
"skipUrlSync": false,
"type": "textbox" "type": "textbox"
} }
] ]
@@ -231,7 +244,7 @@
"timezone": "", "timezone": "",
"title": "Sissi Logs", "title": "Sissi Logs",
"uid": "a5b429af-860c-4438-a575-24bed6dcba09", "uid": "a5b429af-860c-4438-a575-24bed6dcba09",
"version": 2, "version": 3,
"weekStart": "" "weekStart": ""
}, },
"overwrite": true "overwrite": true

4
pom.xml
View File

@@ -18,8 +18,8 @@
<properties> <properties>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<abstracto.version>1.6.19</abstracto.version> <abstracto.version>1.6.20-SNAPSHOT</abstracto.version>
<abstracto.templates.version>1.4.65</abstracto.templates.version> <abstracto.templates.version>1.4.66-SNAPSHOT</abstracto.templates.version>
<apache-jena.version>4.9.0</apache-jena.version> <apache-jena.version>4.9.0</apache-jena.version>
<rssreader.version>3.5.0</rssreader.version> <rssreader.version>3.5.0</rssreader.version>
<jsoup.version>1.21.2</jsoup.version> <jsoup.version>1.21.2</jsoup.version>