From 5de94f2719578562b2b0488f24b6e972ec8d72f7 Mon Sep 17 00:00:00 2001 From: Garion Cox Date: Fri, 26 Apr 2024 17:02:30 -0600 Subject: [PATCH] Help4 --- .../workflows/KakeysBakery20240319120850.yml | 2 +- Telemetry/kube-configs/dashboard.yml | 142 ------------------ Telemetry/kube/grafana-dep.yml | 4 +- 3 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 Telemetry/kube-configs/dashboard.yml diff --git a/.github/workflows/KakeysBakery20240319120850.yml b/.github/workflows/KakeysBakery20240319120850.yml index d4f142c..5d8d144 100644 --- a/.github/workflows/KakeysBakery20240319120850.yml +++ b/.github/workflows/KakeysBakery20240319120850.yml @@ -106,7 +106,7 @@ jobs: kubectl -n $NAMESPACE create configmap grafana-datasource-config --from-file=grafana-datasource.yml kubectl -n $NAMESPACE delete configmap grafana-dashboard-config || true - kubectl -n $NAMESPACE create configmap grafana-dashboard-config --from-file=dashboard.yml + kubectl -n $NAMESPACE create configmap grafana-dashboard-config --from-file=dashboard.json kubectl -n $NAMESPACE delete configmap loki-config || true kubectl -n $NAMESPACE create configmap loki-config --from-file=loki-config.yml diff --git a/Telemetry/kube-configs/dashboard.yml b/Telemetry/kube-configs/dashboard.yml deleted file mode 100644 index c471f1f..0000000 --- a/Telemetry/kube-configs/dashboard.yml +++ /dev/null @@ -1,142 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "grafana", - "uid": "-- Grafana --" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "target": { - "limit": 100, - "matchAny": false, - "tags": [], - "type": "dashboard" - }, - "type": "dashboard" - } - ] - }, - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 1, - "links": [], - "liveNow": false, - "panels": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheus" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": 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": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheus" - }, - "editorMode": "code", - "expr": "up{job=\"blackbox\", instance=\"http://kakeysbakery.duckdns.org:80/health\"}", - "legendFormat": "__auto", - "range": true, - "refId": "A" - } - ], - "title": "Uptime", - "type": "timeseries" - } - ], - "refresh": "", - "revision": 1, - "schemaVersion": 38, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-6h", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Telemetry Dashboard", - "uid": "mRb3e0BSk", - "version": 1, - "weekStart": "" -} \ No newline at end of file diff --git a/Telemetry/kube/grafana-dep.yml b/Telemetry/kube/grafana-dep.yml index dcd1dfc..2336c8c 100644 --- a/Telemetry/kube/grafana-dep.yml +++ b/Telemetry/kube/grafana-dep.yml @@ -32,8 +32,8 @@ spec: mountPath: /etc/grafana/provisioning/datasources/datasource.yml subPath: grafana-datasource.yml - name: dashboards - mountPath: /etc/grafana/provisioning/dashboards/dashboard.yml - subPath: dashboard.yml + mountPath: /etc/grafana/provisioning/dashboards/dashboard.json + subPath: dashboard.json volumes: - name: datasources configMap: