From add303cb2ae4b8cc0a1eccc958ef5bef3574a17c Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 29 Dec 2023 23:39:14 +0100 Subject: [PATCH 1/2] observability: let top right camp counter cover summer 2024 instead fo 2023 --- observability/grafana-prod.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/observability/grafana-prod.json b/observability/grafana-prod.json index 2bf7846642..c389030fd4 100644 --- a/observability/grafana-prod.json +++ b/observability/grafana-prod.json @@ -185,14 +185,6 @@ { "color": "green", "value": null - }, - { - "color": "#EAB839", - "value": 40 - }, - { - "color": "red", - "value": 50 } ] } @@ -231,7 +223,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select count(1)\nfrom camp c\nwhere c.isprototype = false\nand exists (\n select 1\n from period p\n where p.campid = c.id\n and p.end > TO_DATE('20230601','YYYYMMDD')\n and p.start < TO_DATE('20230831','YYYYMMDD')\n)", + "rawSql": "select count(1)\nfrom camp c\nwhere c.isprototype = false\nand exists (\n select 1\n from period p\n where p.campid = c.id\n and p.end > TO_DATE('20240601','YYYYMMDD')\n and p.start < TO_DATE('20240831','YYYYMMDD')\n)", "refId": "A", "select": [ [ @@ -255,7 +247,7 @@ ] } ], - "title": "Sommerlager 2023", + "title": "Sommerlager 2024", "type": "stat" }, { @@ -1398,6 +1390,6 @@ "timezone": "", "title": "eCamp3", "uid": "PxIt89u4z", - "version": 1, + "version": 7, "weekStart": "" } From 2d56b865c96ee6a725e214e1fd1f76c9d1ffb26b Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 29 Dec 2023 23:39:44 +0100 Subject: [PATCH 2/2] move observability folder to .ops directory --- {observability => .ops/observability}/README.md | 0 {observability => .ops/observability}/grafana-dev.json | 0 {observability => .ops/observability}/grafana-prod.json | 0 {observability => .ops/observability}/grafana-staging.json | 0 {observability => .ops/observability}/prometheus-values-dev.yml | 0 {observability => .ops/observability}/prometheus-values-prod.yml | 0 .../observability}/prometheus-values-staging.yml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {observability => .ops/observability}/README.md (100%) rename {observability => .ops/observability}/grafana-dev.json (100%) rename {observability => .ops/observability}/grafana-prod.json (100%) rename {observability => .ops/observability}/grafana-staging.json (100%) rename {observability => .ops/observability}/prometheus-values-dev.yml (100%) rename {observability => .ops/observability}/prometheus-values-prod.yml (100%) rename {observability => .ops/observability}/prometheus-values-staging.yml (100%) diff --git a/observability/README.md b/.ops/observability/README.md similarity index 100% rename from observability/README.md rename to .ops/observability/README.md diff --git a/observability/grafana-dev.json b/.ops/observability/grafana-dev.json similarity index 100% rename from observability/grafana-dev.json rename to .ops/observability/grafana-dev.json diff --git a/observability/grafana-prod.json b/.ops/observability/grafana-prod.json similarity index 100% rename from observability/grafana-prod.json rename to .ops/observability/grafana-prod.json diff --git a/observability/grafana-staging.json b/.ops/observability/grafana-staging.json similarity index 100% rename from observability/grafana-staging.json rename to .ops/observability/grafana-staging.json diff --git a/observability/prometheus-values-dev.yml b/.ops/observability/prometheus-values-dev.yml similarity index 100% rename from observability/prometheus-values-dev.yml rename to .ops/observability/prometheus-values-dev.yml diff --git a/observability/prometheus-values-prod.yml b/.ops/observability/prometheus-values-prod.yml similarity index 100% rename from observability/prometheus-values-prod.yml rename to .ops/observability/prometheus-values-prod.yml diff --git a/observability/prometheus-values-staging.yml b/.ops/observability/prometheus-values-staging.yml similarity index 100% rename from observability/prometheus-values-staging.yml rename to .ops/observability/prometheus-values-staging.yml