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

[SIS-xxx] fixing tilt file caching

Browse Source 
updating dashboards to filter for namespace
upgrading to new abstracto version -snapshot
This commit is contained in:
Sheldan
2023-09-02 21:28:13 +02:00
parent 0073d5b069
commit 7a37f7e040
4 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Tiltfile
View File

@@ -5,13 +5,13 @@ registry = 'harbor.sheldan.dev/sissi/'
local_resource( local_resource(
'sissi-java-compile', 'sissi-java-compile',
'mvn install && ' + ' mvn install && ' +
'rm -rf application/executable/target/jar-staging && ' + ' rm -rf application/executable/target/jar-staging && ' +
'unzip -o application/executable/target/sissi-exec.jar -d application/executable/target/jar-staging && ' + ' unzip -o application/executable/target/sissi-exec.jar -d application/executable/target/jar-staging && ' +
'rsync --delete --inplace --checksum -r application/executable/target/jar-staging/ application/executable/target/jar && ' + ' rsync --delete --inplace --checksum --exclude="*-SNAPSHOT.jar" -r application/executable/target/jar-staging/ application/executable/target/jar && ' +
'mkdir application/executable/target/jar/snapshots && ' + ' rm -rf application/executable/target/jar/snapshots && ' +
'rsync --delete --inplace --checksum -r application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar application/executable/target/jar/snapshots && ' + ' mkdir application/executable/target/jar/snapshots && ' +
'rm -f application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar ', ' rsync --delete --inplace --checksum --include="*/" --include="*-SNAPSHOT.jar" --exclude="*" -r application/executable/target/jar-staging/BOOT-INF/lib/ application/executable/target/jar/snapshots',
deps=['pom.xml']) deps=['pom.xml'])
docker_build_with_restart( docker_build_with_restart(

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

@@ -46,6 +46,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -105,7 +106,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(discord_api_interactions_total[1m]) /2", "expr": "increase(discord_api_interactions_total{namespace=\"sissi\"}[1m]) /2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}", "legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true, "range": true,
@@ -139,6 +140,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -198,7 +200,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(command_processed_total[1m]) / 2 ", "expr": "increase(command_processed_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}", "legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}",
"range": true, "range": true,
@@ -232,6 +234,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -291,7 +294,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(message_total[1m]) / 2", "expr": "increase(message_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}", "legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true, "range": true,
@@ -325,6 +328,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -384,7 +388,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(okhttp_request_total[1m]) / 2", "expr": "increase(okhttp_request_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }} http_code {{ "}}" }}", "legendFormat": "{{ "{{" }} http_code {{ "}}" }}",
"range": true, "range": true,
@@ -418,6 +422,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -477,7 +482,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "Cache evictions", "legendFormat": "Cache evictions",
"range": true, "range": true,
@@ -489,7 +494,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false, "hide": false,
"instant": false, "instant": false,
"legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}", "legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}",
@@ -502,7 +507,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false, "hide": false,
"instant": false, "instant": false,
"legendFormat": "Cache puts", "legendFormat": "Cache puts",
@@ -515,7 +520,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(cache_removals{application=\"$application\", cache=\"messages\"}[1m]) / 2", "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\", namespace=\"sissi\"}[1m]) / 2",
"hide": false, "hide": false,
"instant": false, "instant": false,
"legendFormat": "Cache removals", "legendFormat": "Cache removals",
@@ -550,6 +555,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -609,7 +615,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "discord_gateway_ping", "expr": "discord_gateway_ping{namespace=\"sissi\"}",
"instant": false, "instant": false,
"legendFormat": "Gateway ping", "legendFormat": "Gateway ping",
"range": true, "range": true,
@@ -643,6 +649,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -702,7 +709,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(starboard_stars_total[1m]) / 2", "expr": "increase(starboard_stars_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }} action {{ "}}" }}", "legendFormat": "{{ "{{" }} action {{ "}}" }}",
"range": true, "range": true,
@@ -736,6 +743,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -795,7 +803,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(emote_usages_total[1m]) / 2", "expr": "increase(emote_usages_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "Used emotes", "legendFormat": "Used emotes",
"range": true, "range": true,
@@ -829,6 +837,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -850,7 +859,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green" "color": "green",
"value": null
}, },
{ {
"color": "red", "color": "red",
@@ -887,7 +897,7 @@
"uid": "prometheus" "uid": "prometheus"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "increase(jda_event_total[1m]) / 2", "expr": "increase(jda_event_total{namespace=\"sissi\"}[1m]) / 2",
"instant": false, "instant": false,
"legendFormat": "{{ "{{" }} event_class {{ "}}" }}", "legendFormat": "{{ "{{" }} event_class {{ "}}" }}",
"range": true, "range": true,
@@ -922,7 +932,7 @@
"timezone": "", "timezone": "",
"title": "Sissi Discord status", "title": "Sissi Discord status",
"uid": "a7b3297d-972e-4dbd-9223-88d589817d34", "uid": "a7b3297d-972e-4dbd-9223-88d589817d34",
"version": 1, "version": 2,
"weekStart": "" "weekStart": ""
}, },
"overwrite": true "overwrite": true

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

@@ -53,7 +53,7 @@
"uid": "loki" "uid": "loki"
}, },
"editorMode": "builder", "editorMode": "builder",
"expr": "{app=\"sissi\"} |= `$logFilter`", "expr": "{app=\"sissi\", namespace=\"sissi\"} |= `$logFilter`",
"maxLines": 5000, "maxLines": 5000,
"queryType": "range", "queryType": "range",
"refId": "A" "refId": "A"
@@ -92,7 +92,7 @@
"uid": "loki" "uid": "loki"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "{app=\"sissi\"} |= \"ERROR\"", "expr": "{app=\"sissi\", namespace=\"sissi\"} |= \"ERROR\"",
"maxLines": 5000, "maxLines": 5000,
"queryType": "range", "queryType": "range",
"refId": "A" "refId": "A"
@@ -126,6 +126,7 @@
"tooltip": false, "tooltip": false,
"viz": false "viz": false
}, },
"insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "linear",
"lineWidth": 1, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
@@ -185,7 +186,7 @@
"uid": "loki" "uid": "loki"
}, },
"editorMode": "code", "editorMode": "code",
"expr": "rate({app=\"sissi\"}[$__interval])", "expr": "rate({app=\"sissi\", namespace=\"sissi\"}[$__interval])",
"queryType": "range", "queryType": "range",
"refId": "A" "refId": "A"
} }

4
pom.xml
View File

@@ -20,8 +20,8 @@
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<!-- edit in release.yml as well --> <!-- edit in release.yml as well -->
<!-- when releasing a new bot version, update the .env as well--> <!-- when releasing a new bot version, update the .env as well-->
<abstracto.version>1.5.5</abstracto.version> <abstracto.version>1.5.6-SNAPSHOT</abstracto.version>
<abstracto.templates.version>1.4.18</abstracto.templates.version> <abstracto.templates.version>1.4.19-SNAPSHOT</abstracto.templates.version>
</properties> </properties>
<modules> <modules>