From 0100684faa5436c2d16cdfd3076969dcbb47151c Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Wed, 29 Jun 2022 19:04:24 +0200
Subject: [PATCH] chore(helm): nginx-ingress-controller enabled metrics

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../helmcharts/manifests/grafana-ingress.yaml | 27 -------------------
 scripts/helmcharts/vars.yaml                  |  9 +++++++
 2 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 ee/scripts/helmcharts/manifests/grafana-ingress.yaml

diff --git a/ee/scripts/helmcharts/manifests/grafana-ingress.yaml b/ee/scripts/helmcharts/manifests/grafana-ingress.yaml
deleted file mode 100644
index 0226c05ed..000000000
--- a/ee/scripts/helmcharts/manifests/grafana-ingress.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: grafana
-  namespace: monitoring
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
-spec:
-  ingressClassName: "{{ tpl .Values.ingress.className . }}" 
-  rules:
-    - host: {{ .Values.global.domainName }} 
-      http:
-        paths:
-          - pathType: Prefix
-            backend:
-              service:
-                name: monitoring-grafana
-                port:
-                  number: 80
-            path: /grafana/(.*)
-  tls:
-    - hosts:
-      - {{ .Values.global.domainName }}
-      {{- if .Values.ingress.tls.secretName}}
-      secretName: {{ .Values.ingress.tls.secretName }}
-      {{- end}}
diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml
index 531b46fea..fa2a7a0c9 100644
--- a/scripts/helmcharts/vars.yaml
+++ b/scripts/helmcharts/vars.yaml
@@ -63,6 +63,15 @@ ingress-nginx: &ingress-nginx
     ingressClassResource:
       # -- Name of the ingressClass
       name: openreplay
+    # Onlf if Metrics enabled
+    # metrics:
+    #   enabled: true
+    #   serviceMonitor:
+    #     enabled: true
+    #     additionalLabels:
+    #       release: monitoring
+    #     namespaceSelector:
+    #       any: true
   # -- For backwards compatibility with ingress.class annotation, use ingressClass.
   # Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation
     ingressClass: openreplay