From ba1fb22cc7479dfb703daa18a45d2e2b12cbffa8 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Mon, 30 Sep 2024 22:50:18 +0200
Subject: [PATCH] Move grafana to the monitoring ns

---
 installations/monitoring/helmfile.yaml    | 10 ++++++++++
 values/badhouseplants/values.traefik.yaml | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/installations/monitoring/helmfile.yaml b/installations/monitoring/helmfile.yaml
index 85eda27..5489b8f 100644
--- a/installations/monitoring/helmfile.yaml
+++ b/installations/monitoring/helmfile.yaml
@@ -6,6 +6,8 @@ repositories:
     url: https://bedag.github.io/helm-charts/
   - name: prometheus-community
     url: https://prometheus-community.github.io/helm-charts
+  - name: grafana
+    url: https://grafana.github.io/helm-charts
 releases:
   - name: prometheus
     chart: prometheus-community/kube-prometheus-stack
@@ -15,3 +17,11 @@ releases:
       - template: default-env-values
       - template: default-env-secrets
       - template: crd-management-hook
+  - name: grafana
+    chart: grafana/grafana
+    namespace: applications
+    version: 8.5.1
+    installed: true
+    inherit:
+      - template: default-env-values
+      - template: default-env-secrets
diff --git a/values/badhouseplants/values.traefik.yaml b/values/badhouseplants/values.traefik.yaml
index 5bb8fd8..5b664e4 100644
--- a/values/badhouseplants/values.traefik.yaml
+++ b/values/badhouseplants/values.traefik.yaml
@@ -16,6 +16,12 @@ ports:
       default: true
     exposedPort: 1194
     protocol: TCP
+  xray:
+    port: 1195
+    expose:
+      default: true
+    exposedPort: 1195
+    protocol: TCP
     #  valve-server:
     #    port: 27015
     #    expose:
@@ -82,9 +88,3 @@ ports:
     exposedPort: 8388
     expose:
       default: true
-  shadowsocks-udp:
-    port: 8388
-    protocol: UDP
-    exposedPort: 8388
-    expose:
-      default: true