PR : Configure Grafana with behind Ingress Controller #433 (#445)

* WIP 433: Grafana Ingress Config
* Issue 433: Installation script/values revision; remove unrequired yaml files
* Issue 433: reconf install.sh -- apply custom prometheus stack
* fix grafana version to v9.0.1

Author: pasimoes

grabdish/observability/install.sh

@@ -14,25 +14,20 @@ echo Installing ServiceAccount, ClusterRole, and ClusterRole binding needed for
 kubectl apply -f install/prom_rbac.yaml -n msdataworkshop
 echo
 
-echo Installing Prometheus...
+echo Updating Helm Repo...
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-helm install stable prometheus-community/kube-prometheus-stack --namespace=msdataworkshop
-echo
-
-echo Installing Grafana...
-kubectl apply -f install/grafana-config-map-ini.yml -n msdataworkshop
-kubectl apply -f install/grafana.yaml -n msdataworkshop
-#todo instead of LB... kubectl apply -f install/grafana-ingress.yaml -n msdataworkshop
-#mkdir tls
-#chmod 700 tls
-#openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout tls/tls.key -out tls/tls.crt -subj "/CN=grabdish/O=grabdish"
-#kubectl create secret tls ssl-certificate-secret --key tls/tls.key --cert $GRABDISH_HOME/tls/tls.crt -n msdataworkshop
+helm repo add grafana https://grafana.github.io/helm-charts
+helm repo update
 
-echo Creating Grafana Service...
-kubectl apply -f install/grafana-service.yaml -n msdataworkshop
+echo Installing Prometheus and custom Grafana ...
+helm install stable prometheus-community/kube-prometheus-stack --namespace msdataworkshop -f install/prometheus-stack-values.yaml
+#helm install stable prometheus-community/kube-prometheus-stack --namespace=msdataworkshop --set grafana.enabled=false
 echo
 
+# echo Installing Grafana...
+# helm install grafana-lab grafana/grafana --namespace msdataworkshop -f install/grafana-helm-values.yaml
+# echo
+
 echo Installing loki-stack with Promtail...
-helm repo add grafana https://grafana.github.io/helm-charts
 helm install loki-stack grafana/loki-stack --create-namespace --namespace loki-stack --set promtail.enabled=true,loki.persistence.enabled=true,loki.persistence.size=100Gi
 echo

grabdish/observability/install/grafana-config-map-ini.yml

@@ -0,0 +1,28 @@
+# Administrator credentials when not using an existing secret (see below)
+adminPassword: prom-operator
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/enable-rewrite-log: "true"
+    #nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+
+  path: /grafana/?(.*)
+  hosts:
+    - ""
+  tls:
+    - secretName: ssl-certificate-secret
+
+persistence:
+  enabled: true
+  type: pvc
+  #size: 10Gi
+
+grafana.ini:
+  server:
+    root_url: "%(protocol)s://%(domain)s/grafana"
+    serve_from_sub_path: true
+    router_logging: true

grabdish/observability/install/grafana-helm-values.yaml

@@ -0,0 +1,30 @@
+## Using custom values based on https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
+##
+grafana:
+  image:
+    tag: "9.0.1"
+  ingress:
+    enabled: true
+    annotations:
+      kubernetes.io/ingress.class: "nginx"
+      nginx.ingress.kubernetes.io/rewrite-target: /$1
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/enable-rewrite-log: "true"
+      #nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+
+    path: /grafana/?(.*)
+    hosts:
+      - ""
+    tls:
+      - secretName: ssl-certificate-secret
+
+  persistence:
+    enabled: true
+    type: pvc
+    #size: 10Gi
+
+  grafana.ini:
+    server:
+      root_url: "%(protocol)s://%(domain)s/grafana"
+      serve_from_sub_path: true
+      router_logging: true