From 838ccaccf2c67e7ca692b14d349fc907a3512137 Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Wed, 21 Sep 2022 18:17:32 +0200
Subject: [PATCH] feat(grafana): Add ingress

Basic ingress for grafana (beta) and force some containers to specific node (beta environment)
---
 monitoring/grafana/datasources.yaml   |  2 +-
 monitoring/grafana/deployment.yaml    |  1 +
 monitoring/grafana/ingress.yaml       | 23 +++++++++++++++++++++++
 monitoring/grafana/service.yaml       |  2 --
 monitoring/loki/statefulset.yaml      |  1 +
 monitoring/prometheus/deployment.yaml |  1 +
 6 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 monitoring/grafana/ingress.yaml

diff --git a/monitoring/grafana/datasources.yaml b/monitoring/grafana/datasources.yaml
index 3a7be3d..3dea96e 100644
--- a/monitoring/grafana/datasources.yaml
+++ b/monitoring/grafana/datasources.yaml
@@ -24,6 +24,6 @@ data:
     - name: Prometheus
       type: prometheus
       access: proxy
-      url: "http://prometheus-svc:3100"
+      url: "http://prometheus-svc:9090"
       version: 1
       isDefault: false
diff --git a/monitoring/grafana/deployment.yaml b/monitoring/grafana/deployment.yaml
index ff581c2..d89ccb1 100644
--- a/monitoring/grafana/deployment.yaml
+++ b/monitoring/grafana/deployment.yaml
@@ -39,6 +39,7 @@ spec:
         runAsGroup: 472
         runAsUser: 472
       enableServiceLinks: true
+      nodeName: slave-1
       containers:
         - name: grafana-sc-datasources
           image: "quay.io/kiwigrid/k8s-sidecar:1.15.6"
diff --git a/monitoring/grafana/ingress.yaml b/monitoring/grafana/ingress.yaml
new file mode 100644
index 0000000..089f034
--- /dev/null
+++ b/monitoring/grafana/ingress.yaml
@@ -0,0 +1,23 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+    name: grafana-ingress
+    namespace: monitoring
+    annotations:
+        kubernetes.io/ingress.class: "traefik"
+spec:
+    tls:
+      - secretName: grafana-beta-tls
+        hosts:
+            - grafana.beta.halia.dev
+    rules:
+      - host: grafana.beta.halia.dev
+        http:
+            paths:
+              - path: /
+                pathType: Prefix
+                backend:
+                    service:
+                        name: loki-grafana
+                        port:
+                            number: 80
diff --git a/monitoring/grafana/service.yaml b/monitoring/grafana/service.yaml
index d878dac..6b36661 100644
--- a/monitoring/grafana/service.yaml
+++ b/monitoring/grafana/service.yaml
@@ -10,9 +10,7 @@ metadata:
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: loki
     app.kubernetes.io/version: "8.3.5"
-    app.kubernetes.io/managed-by: Helm
 spec:
-  type: ClusterIP
   ports:
     - name: service
       port: 80
diff --git a/monitoring/loki/statefulset.yaml b/monitoring/loki/statefulset.yaml
index c53b163..7d2f5e8 100644
--- a/monitoring/loki/statefulset.yaml
+++ b/monitoring/loki/statefulset.yaml
@@ -41,6 +41,7 @@ spec:
         runAsUser: 10001
       initContainers:
         []
+      nodeName: slave-1
       containers:
         - name: loki
           image: "grafana/loki:2.6.1"
diff --git a/monitoring/prometheus/deployment.yaml b/monitoring/prometheus/deployment.yaml
index a6dfebd..2c7123b 100644
--- a/monitoring/prometheus/deployment.yaml
+++ b/monitoring/prometheus/deployment.yaml
@@ -43,3 +43,4 @@ spec:
             name: prometheus-server-conf
         - name: prometheus-storage-volume
           emptyDir: {}
+      nodeName: slave-1