refactor: remove k8s and use release name for instance

!8

templates/APIService-prometheus-adapter.yaml

@@ -6,6 +6,7 @@ kind: APIService
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/AlertManager-k8s.yaml

@@ -4,10 +4,11 @@ kind: Alertmanager
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: main
+  name: {{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.alert_manager.namespace | quote }}
 spec:
   image: "{{ .Values.nfc_monitoring.alert_manager.image.name }}:{{ .Values.nfc_monitoring.alert_manager.image.tag }}"
@@ -16,7 +17,7 @@ spec:
   podMetadata:
     labels:
       app.kubernetes.io/component: alert-router
-      app.kubernetes.io/instance: main
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}

templates/ClusterPolicy-Prometheus-Role.yaml

@@ -15,6 +15,7 @@ metadata:
       question.
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -32,12 +33,13 @@ spec:
         synchronize: true
         apiVersion: rbac.authorization.k8s.io/v1
         kind: Role
-        name: prometheus-k8s
+        name: prometheus-{{ $.Release.Name }}
         namespace: "{{ `{{` }}request.object.metadata.name }}"
         data:
           metadata:
             labels:
               {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }}
+              app.kubernetes.io/instance: {{ $.Release.Name }}
               app.kubernetes.io/part-of: {{ $.Chart.Name }}
               app.kubernetes.io/version: {{ $.Chart.Version }}
             

templates/ClusterPolicy-Prometheus-RoleBinding.yaml

@@ -15,6 +15,7 @@ metadata:
       question.
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -32,20 +33,21 @@ spec:
         synchronize: true
         apiVersion: rbac.authorization.k8s.io/v1
         kind: RoleBinding
-        name: prometheus-k8s
+        name: prometheus-{{ $.Release.Name }}
         namespace: "{{ `{{` }}request.object.metadata.name }}"
         data:
           metadata:
             labels:
               {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }}
+              app.kubernetes.io/instance: {{ $.Release.Name }}
               app.kubernetes.io/part-of: {{ $.Chart.Name }}
               app.kubernetes.io/version: {{ $.Chart.Version }}
           roleRef:
             apiGroup: rbac.authorization.k8s.io
             kind: Role
-            name: prometheus-k8s
+            name: prometheus-{{ $.Release.Name }}
           subjects:
           - kind: ServiceAccount
-            name: prometheus-k8s
+            name: prometheus-{{ $.Release.Name }}
             namespace: "{{ .Values.nfc_monitoring.prometheus.namespace }}"
 {{ end }}

templates/ClusterRole-GrafanaAgent.yaml

@@ -5,6 +5,7 @@ metadata:
   name: grafana-agent
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-aggregated-metrics-reader.yaml

@@ -5,6 +5,7 @@ kind: ClusterRole
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml

@@ -4,6 +4,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml

@@ -5,6 +5,7 @@ metadata:
   name: hpa-controller-custom-metrics
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-binding-prometheus.yaml

@@ -4,6 +4,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-grafana-SideCar.yaml

@@ -6,6 +6,7 @@ kind: ClusterRole
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-kube-monitor-proxy.yaml

@@ -6,7 +6,7 @@ metadata:
   name: kube-monitor-proxy
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ClusterRole-kubeStateMetrics-1.yaml

@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ClusterRole-kubeStateMetrics.yaml

@@ -5,7 +5,7 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml

@@ -4,6 +4,7 @@ kind: ClusterRole
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-prometheus-adapter.yaml

@@ -4,6 +4,7 @@ kind: ClusterRole
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRole-prometheus.yaml

@@ -4,10 +4,11 @@ kind: ClusterRole
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
 rules:
 - apiGroups:
   - ""

templates/ClusterRoleBinding-Grafana-Agent.yaml

@@ -4,6 +4,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRoleBinding-Grafana-SideCar.yaml

@@ -6,6 +6,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ClusterRoleBinding-kube-monitor-proxy.yaml

@@ -5,7 +5,7 @@ metadata:
   name: kube-monitor-proxy
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ClusterRoleBinding-prometheus.yaml

@@ -4,15 +4,16 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/ConfigMap-Grafana.yaml

@@ -7,6 +7,7 @@ metadata:
   namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-GrafanaAgent.yaml

@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-GrafanaProvisioning.yaml

@@ -7,6 +7,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ConfigMap-prometheus-adapter.yaml

@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Daemonset-GrafanaAgent.yaml

@@ -4,6 +4,7 @@ kind: DaemonSet
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -16,6 +17,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -26,6 +28,7 @@ spec:
     metadata:
       labels:
         {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 8 }}
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Daemonset-kube-monitor-proxy.yaml

@@ -5,7 +5,7 @@ kind: DaemonSet
 metadata:
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -20,7 +20,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: proxy
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-monitor-proxy
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/component: proxy
-        app.kubernetes.io/instance: k8s
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/name: kube-monitor-proxy
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Deployment-kubeStateMetrics.yaml

@@ -5,7 +5,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -17,7 +17,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: exporter
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-state-metrics
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -27,7 +27,7 @@ spec:
         kubectl.kubernetes.io/default-container: kube-state-metrics
       labels:
         app.kubernetes.io/component: exporter
-        app.kubernetes.io/instance: k8s
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/name: kube-state-metrics
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Deployment-prometheus-adapter.yaml

@@ -4,6 +4,7 @@ kind: Deployment
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -14,6 +15,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -25,6 +27,7 @@ spec:
     metadata:
       labels:
         {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 8 }}
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Grafana-Grafana.yaml

@@ -5,6 +5,7 @@ kind: Grafana
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -17,6 +18,7 @@ spec:
     metadata:
       labels:
         {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 8 }}
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}
         app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -25,6 +27,7 @@ spec:
       selector:
         matchLabels:
           {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 10 }}
+          app.kubernetes.io/instance: {{ $.Release.Name }}
           app.kubernetes.io/managed-by: {{ $.Release.Service }}
           app.kubernetes.io/part-of: {{ $.Chart.Name }}
       strategy:
@@ -35,6 +38,7 @@ spec:
         metadata:
           labels:
             {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 12 }}
+            app.kubernetes.io/instance: {{ $.Release.Name }}
             app.kubernetes.io/managed-by: {{ $.Release.Service }}
             app.kubernetes.io/part-of: {{ $.Chart.Name }}
             app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -92,7 +96,7 @@ spec:
                 name: dashboards
           
           - image: "{{ .Values.nfc_monitoring.additions.dashboard_sidecar.image.name }}:{{ .Values.nfc_monitoring.additions.dashboard_sidecar.image.tag}}"
-            name: k8s-sidecar
+            name: sidecar
             env:
               - name: LABEL
                 value: "{{ .Values.nfc_monitoring.additions.dashboard_sidecar.label_name }}"

templates/GrafanaDashboard-AlertManager.yaml

@@ -12,7 +12,7 @@ spec:
   instanceSelector:
     matchLabels:
       app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: grafana
   grafanaCom:
     id: 9578

templates/GrafanaDashboard-Ceph.yaml

@@ -13,7 +13,7 @@ spec:
   instanceSelector:
     matchLabels:
       app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: grafana
   grafanaCom:
     id: 2842

templates/GrafanaDashboard-cluster-summary.yaml

@@ -12,7 +12,7 @@ spec:
   instanceSelector:
     matchLabels:
       app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: grafana
    {{ $Dashboard := .Files.Get "files/dashboard-summary.json" | fromJson }}
   json: >-

templates/GrafanaDashboard-node-exporter-full.yaml

@@ -12,7 +12,7 @@ spec:
   instanceSelector:
     matchLabels:
       app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: grafana
   grafanaCom:
     id: 1860

templates/GrafanaDatasources.yaml

@@ -11,7 +11,7 @@ items:
       namespace: "{{ $.Values.nfc_monitoring.grafana.namespace }}"
       labels:
         app.kubernetes.io/component: dashboard
-        app.kubernetes.io/instance: k8s
+        app.kubernetes.io/instance: {{ $.Release.Name }}
         app.kubernetes.io/name: grafana
         app.kubernetes.io/managed-by: {{ $.Release.Service }}
         app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/NetworkPolicy-kubeStateMetrics.yaml

@@ -5,6 +5,7 @@ kind: NetworkPolicy
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 2.8.1
@@ -26,6 +27,7 @@ spec:
   podSelector:
     matchLabels:
       app.kubernetes.io/component: exporter
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-state-metrics
       app.kubernetes.io/part-of: kube-prometheus
   policyTypes:

templates/NetworkPolicy.yaml

@@ -6,6 +6,7 @@ kind: NetworkPolicy
 metadata:
   labels:
     {{ toYaml (get $.Values.nfc_monitoring .name ).labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/PodDisruptionBudget-alertmanager.yaml

@@ -4,6 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -14,4 +15,5 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/PodDisruptionBudget-prometheus-adapter.yaml

@@ -4,6 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -14,4 +15,5 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/PodDisruptionBudget-prometheus.yaml

@@ -7,11 +7,12 @@ metadata:
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   minAvailable: 1
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Prometheus-prometheus.yaml

@@ -4,10 +4,11 @@ kind: Prometheus
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: k8s
+  name: {{ $.Release.Name }}
   namespace: "{{ .Values.nfc_monitoring.prometheus.namespace }}"
 spec:
   affinity:
@@ -26,6 +27,7 @@ spec:
   podMetadata:
     labels:
       {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -46,7 +48,7 @@ spec:
     fsGroup: 2000
     runAsNonRoot: true
     runAsUser: 1000
-  serviceAccountName: prometheus-k8s
+  serviceAccountName: prometheus-{{ $.Release.Name }}
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
   storage:

templates/PrometheusRule-alertmanager.yaml

@@ -4,10 +4,11 @@ kind: PrometheusRule
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: alertmanager-main-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-grafana-agent.yaml

@@ -4,10 +4,11 @@ kind: PrometheusRule
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: grafana-agent
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-grafana.yaml

@@ -5,10 +5,11 @@ kind: PrometheusRule
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: grafana-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-kubePrometheus.yaml

@@ -5,11 +5,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: kube-prometheus-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-kubeStateMetrics.yaml

@@ -5,11 +5,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: kube-state-metrics-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-kubernetesControlPlane.yaml

@@ -4,11 +4,12 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-prometheus
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: kubernetes-monitoring-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-loki.yaml

@@ -5,11 +5,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: logging
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: loki
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-nodeExporter.yaml

@@ -4,11 +4,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: node-exporter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: node-exporter-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/PrometheusRule-prometheus.yaml

@@ -4,12 +4,13 @@ kind: PrometheusRule
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
-  name: prometheus-k8s-prometheus-rules
+  name: prometheus-{{ $.Release.Name }}-prometheus-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:

templates/PrometheusRule-thanos.yaml

@@ -6,11 +6,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: metrics
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: thanos
     app.kubernetes.io/part-of: {{  $.Chart.Name }}
     app.kubernetes.io/managed-by: {{  $.Release.Service }}
     app.kubernetes.io/version: {{  $.Chart.Version }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: thanos-sidecar-rules
   namespace: {{  .Values.nfc_monitoring.prometheus.namespace }}

templates/Role-SpecificNamespaces-prometheus.yaml

@@ -8,10 +8,11 @@ items:
   metadata:
     labels:
       {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
-    name: prometheus-k8s
+    name: prometheus-{{ $.Release.Name }}
     namespace: {{ . | quote }}
   rules:
   - apiGroups:

templates/RoleBinding-Config-prometheus.yaml

@@ -4,6 +4,7 @@ kind: RoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -12,8 +13,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: prometheus-k8s-config
+  name: prometheus-{{ $.Release.Name }}-config
 subjects:
 - kind: ServiceAccount
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/RoleBinding-SpecificNamespaces-prometheus.yaml

@@ -7,18 +7,19 @@ items:
   metadata:
     labels:
       {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
       app.kubernetes.io/managed-by: {{ $.Release.Service }}
       app.kubernetes.io/version: {{ $.Chart.Version }}
-    name: prometheus-k8s
+    name: prometheus-{{ $.Release.Name }}
     namespace: {{ . | quote }}
   roleRef:
     apiGroup: rbac.authorization.k8s.io
     kind: Role
-    name: prometheus-k8s
+    name: prometheus-{{ $.Release.Name }}
   subjects:
   - kind: ServiceAccount
-    name: prometheus-k8s
+    name: prometheus-{{ $.Release.Name }}
     namespace: {{ $.Values.nfc_monitoring.prometheus.namespace }}
 {{ end }}
 

templates/RoleBinding-prometheus-adapter-auth-reader.yaml

@@ -4,6 +4,7 @@ kind: RoleBinding
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/version: 0.11.1
   name: resource-metrics-auth-reader
   namespace: kube-system

templates/RoleConfig-prometheus.yaml

@@ -4,10 +4,11 @@ kind: Role
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s-config
+  name: prometheus-{{ $.Release.Name }}-config
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 rules:
 - apiGroups:

templates/Secret-alertmanager.yaml

@@ -4,6 +4,7 @@ kind: Secret
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Secret-prometheus-sidecar-thanos.yaml

@@ -6,6 +6,7 @@ kind: Secret
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/Service-Grafana.yaml

@@ -7,12 +7,14 @@ metadata:
   namespace: {{ .Values.nfc_monitoring.grafana.namespace }}
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
 spec:
   selector:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   #type: NodePort
   #type: LoadBalancer

templates/Service-GrafanaAgent.yaml

@@ -6,12 +6,14 @@ metadata:
   namespace: monitoring
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
 spec:
   selector:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   ports:
     - name: grafana-metrics

templates/Service-alertmanager.yaml

@@ -4,10 +4,11 @@ kind: Service
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: alertmanager-main
+  name: alertmanager-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.alert_manager.namespace | quote }}
 spec:
   ports:
@@ -19,7 +20,7 @@ spec:
     targetPort: reloader-web
   selector:
     app.kubernetes.io/component: alert-router
-    app.kubernetes.io/instance: main
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   sessionAffinity: ClientIP

templates/Service-kube-monitor-proxy.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -17,7 +17,7 @@ metadata:
 spec:
   selector:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     

templates/Service-kubeStateMetrics.yaml

@@ -5,7 +5,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -23,7 +23,7 @@ spec:
     targetPort: https-self
   selector:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
 

templates/Service-prometheus-adapter.yaml

@@ -4,6 +4,7 @@ kind: Service
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -16,4 +17,5 @@ spec:
     targetPort: 6443
   selector:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/Service-prometheus.yaml

@@ -4,10 +4,11 @@ kind: Service
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   ports:
@@ -19,6 +20,7 @@ spec:
     targetPort: reloader-web
   selector:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
   sessionAffinity: ClientIP
 
@@ -30,7 +32,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: prometheus-sidecar
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: thanos-sidecar
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
@@ -48,5 +50,6 @@ spec:
     targetPort: 10902
   selector:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
 
 {{ end }}

templates/ServiceAccount-Grafana.yaml

@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Values.nfc_monitoring.grafana.namespace }}
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-GrafanaAgent.yaml

@@ -7,6 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-alertmanager.yaml

@@ -5,6 +5,7 @@ kind: ServiceAccount
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-kube-monitor-proxy.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-monitor-proxy
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceAccount-kubeStateMetrics.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceAccount-prometheus-adapter.yaml

@@ -5,6 +5,7 @@ kind: ServiceAccount
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceAccount-prometheus.yaml

@@ -5,8 +5,9 @@ kind: ServiceAccount
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/ServiceMonitor-APIServer.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: apiserver
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceMonitor-Cadvisor.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: cadvisor
     app.kubernetes.io/component: exporter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-Calico.yaml

@@ -5,6 +5,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: calico
     app.kubernetes.io/component: networking
     app.kubernetes.io/part-of: {{ $.Chart.Name }}

templates/ServiceMonitor-CoreDNS.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: coredns
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}

templates/ServiceMonitor-Grafana.yaml

@@ -5,6 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -32,6 +33,7 @@ spec:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 6 }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
 
 {{- end }}
 

templates/ServiceMonitor-Kubelet.yaml

@@ -4,6 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kubelet
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -86,5 +87,6 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: kubelet
+      app.kubernetes.io/instance: {{ $.Release.Name }}
 
 {{ end }}

templates/ServiceMonitor-Node.yaml

@@ -5,6 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: node
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -75,6 +76,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ end }}

templates/ServiceMonitor-ceph.yaml

@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: ceph
     app.kubernetes.io/component: storage
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}

templates/ServiceMonitor-kube-controller-manager.yaml

@@ -6,7 +6,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-controller-manager
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -79,7 +79,7 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-monitor-proxy
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 

templates/ServiceMonitor-kube-scheduler.yaml

@@ -6,7 +6,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: proxy
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-scheduler
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -33,7 +33,7 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-monitor-proxy
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 

templates/ServiceMonitor-kubeStateMetrics.yaml

@@ -5,7 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/instance: k8s
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
@@ -42,7 +42,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: exporter
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: kube-state-metrics
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 

templates/ServiceMonitor-node-exporter.yaml

@@ -5,6 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: exporter
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: node-exporter
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -40,6 +41,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ end }}

templates/ServiceMonitor-prometheus-adapter.yaml

@@ -5,6 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -33,6 +34,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ end }}

templates/ServiceMonitor-prometheus.yaml

@@ -5,10 +5,11 @@ kind: ServiceMonitor
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-  name: prometheus-k8s
+  name: prometheus-{{ $.Release.Name }}
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   endpoints:
@@ -26,6 +27,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ if .Values.nfc_monitoring.thanos.sidecar.enabled }}
@@ -37,7 +39,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/component: prometheus-sidecar
-    app.kubernetes.io/instance: thanos-sidecar
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: thanos-sidecar
     app.kubernetes.io/version: v0.30.2
   name: thanos-sidecar
@@ -55,7 +57,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: prometheus-sidecar
-      app.kubernetes.io/instance: k8s
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/name: thanos-sidecar
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 

templates/prometheusRule-ceph.yaml

@@ -6,11 +6,12 @@ kind: PrometheusRule
 metadata:
   labels:
     app.kubernetes.io/component: storage
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: ceph
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
-    prometheus: k8s
+    prometheus: {{ $.Release.Name }}
     role: alert-rules
   name: ceph-rules
   namespace: {{ .Values.nfc_monitoring.prometheus.namespace }}

templates/serviceMonitor-alertmanager.yaml

@@ -5,6 +5,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/part-of: {{ $.Chart.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/version: {{ $.Chart.Version }}
@@ -38,6 +39,7 @@ spec:
   selector:
     matchLabels:
       {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/part-of: {{ $.Chart.Name }}
 
 {{ end }}

values.yaml

@@ -45,7 +45,6 @@ nfc_monitoring:
                         name: web
     
     labels:
-      app.kubernetes.io/instance: main
       app.kubernetes.io/component: alert-router
       app.kubernetes.io/name: alertmanager
 
@@ -105,7 +104,6 @@ nfc_monitoring:
 
     labels:
       app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
       app.kubernetes.io/name: grafana
 
     namespace: grafana
@@ -210,7 +208,6 @@ nfc_monitoring:
       tag: 'v0.39.2'
 
     labels:
-      app.kubernetes.io/instance: k8s
       app.kubernetes.io/component: exporter
       app.kubernetes.io/name: grafana-agent
 
@@ -292,28 +289,13 @@ nfc_monitoring:
       annotations:
         cert-manager.io/cluster-issuer: "selfsigned-issuer"
         nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      # enabled: false # Optional, boolean.
-      spec:
-        tls:
-          - hosts:
-              - prometheus.local
-            secretName: certificate-tls-prometheus
-        rules:
-          - host:  prometheus.local
-            http:
-              paths:
-                - path: /
-                  pathType: Prefix
-                  backend:
-                    service:
-                      name: prometheus-k8s
-                      port:
-                        name: web
+      enabled: true
+      hostname:  prometheus.local
+
     
     # These labels are appended to all Prometheus items and are also the selector labels
     labels:
       app.kubernetes.io/component: prometheus
-      app.kubernetes.io/instance: k8s
       app.kubernetes.io/name: prometheus
 
     namespace: monitoring
@@ -411,7 +393,6 @@ nfc_monitoring:
 
     labels:
       app.kubernetes.io/component: metrics-adapter
-      app.kubernetes.io/instance: main
       app.kubernetes.io/name: prometheus-adapter
 
     namespace: monitoring