diff --git a/templates/APIService-prometheus-adapter.yaml b/templates/APIService-prometheus-adapter.yaml index 04d7bbf..e5c122a 100644 --- a/templates/APIService-prometheus-adapter.yaml +++ b/templates/APIService-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/AlertManager-k8s.yaml b/templates/AlertManager-k8s.yaml index 1c2f654..59b3547 100644 --- a/templates/AlertManager-k8s.yaml +++ b/templates/AlertManager-k8s.yaml @@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: labels: - app.kubernetes.io/instance: main - app.kubernetes.io/component: alert-router - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterPolicy-Prometheus-Role.yaml b/templates/ClusterPolicy-Prometheus-Role.yaml index bf01441..bb12de7 100644 --- a/templates/ClusterPolicy-Prometheus-Role.yaml +++ b/templates/ClusterPolicy-Prometheus-Role.yaml @@ -14,8 +14,7 @@ metadata: monitoring instances is created to enable monitoring of the namespace in question. labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -38,9 +37,7 @@ spec: data: metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterPolicy-Prometheus-RoleBinding.yaml b/templates/ClusterPolicy-Prometheus-RoleBinding.yaml index 2ec1e33..948f85a 100644 --- a/templates/ClusterPolicy-Prometheus-RoleBinding.yaml +++ b/templates/ClusterPolicy-Prometheus-RoleBinding.yaml @@ -14,8 +14,7 @@ metadata: monitoring instances is created to enable monitoring of the namespace in question. labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -38,8 +37,7 @@ spec: data: metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 14 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} roleRef: diff --git a/templates/ClusterRole-GrafanaAgent.yaml b/templates/ClusterRole-GrafanaAgent.yaml index a5886ab..423aff7 100644 --- a/templates/ClusterRole-GrafanaAgent.yaml +++ b/templates/ClusterRole-GrafanaAgent.yaml @@ -4,9 +4,7 @@ kind: ClusterRole metadata: name: grafana-agent labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-aggregated-metrics-reader.yaml b/templates/ClusterRole-aggregated-metrics-reader.yaml index bc2afd0..34fbf80 100644 --- a/templates/ClusterRole-aggregated-metrics-reader.yaml +++ b/templates/ClusterRole-aggregated-metrics-reader.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml b/templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml index 5648792..d9850f2 100644 --- a/templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml +++ b/templates/ClusterRole-binding-delegator-prometheus-adaptor.yaml @@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml b/templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml index 4785870..ce4a0e8 100644 --- a/templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml +++ b/templates/ClusterRole-binding-hpa-custom-metrics-prometheus-adaptor.yaml @@ -4,8 +4,7 @@ kind: ClusterRoleBinding metadata: name: hpa-controller-custom-metrics labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-binding-prometheus.yaml b/templates/ClusterRole-binding-prometheus.yaml index 4d6bc54..0f1eb18 100644 --- a/templates/ClusterRole-binding-prometheus.yaml +++ b/templates/ClusterRole-binding-prometheus.yaml @@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-grafana-SideCar.yaml b/templates/ClusterRole-grafana-SideCar.yaml index 42bf948..ceeb030 100644 --- a/templates/ClusterRole-grafana-SideCar.yaml +++ b/templates/ClusterRole-grafana-SideCar.yaml @@ -4,9 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml b/templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml index b5d028b..bef5b5b 100644 --- a/templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml +++ b/templates/ClusterRole-metrics-server-resources-prometheus-adaptor.yaml @@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-prometheus-adapter.yaml b/templates/ClusterRole-prometheus-adapter.yaml index 87cd65f..253f63d 100644 --- a/templates/ClusterRole-prometheus-adapter.yaml +++ b/templates/ClusterRole-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRole-prometheus.yaml b/templates/ClusterRole-prometheus.yaml index 151fe77..d6ca8de 100644 --- a/templates/ClusterRole-prometheus.yaml +++ b/templates/ClusterRole-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRoleBinding-Grafana-Agent.yaml b/templates/ClusterRoleBinding-Grafana-Agent.yaml index 403db42..8e1b21c 100644 --- a/templates/ClusterRoleBinding-Grafana-Agent.yaml +++ b/templates/ClusterRoleBinding-Grafana-Agent.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRoleBinding-Grafana-SideCar.yaml b/templates/ClusterRoleBinding-Grafana-SideCar.yaml index 367f863..00032cc 100644 --- a/templates/ClusterRoleBinding-Grafana-SideCar.yaml +++ b/templates/ClusterRoleBinding-Grafana-SideCar.yaml @@ -4,9 +4,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ClusterRoleBinding-prometheus.yaml b/templates/ClusterRoleBinding-prometheus.yaml index b54fa91..cef16b0 100644 --- a/templates/ClusterRoleBinding-prometheus.yaml +++ b/templates/ClusterRoleBinding-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ConfigMap-Grafana.yaml b/templates/ConfigMap-Grafana.yaml index eeb28f4..cf9f04d 100644 --- a/templates/ConfigMap-Grafana.yaml +++ b/templates/ConfigMap-Grafana.yaml @@ -5,9 +5,7 @@ metadata: name: grafana-config namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}" labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -50,9 +48,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ConfigMap-GrafanaAgent.yaml b/templates/ConfigMap-GrafanaAgent.yaml index 7d4d4a7..26f48fe 100644 --- a/templates/ConfigMap-GrafanaAgent.yaml +++ b/templates/ConfigMap-GrafanaAgent.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ConfigMap-GrafanaProvisioning.yaml b/templates/ConfigMap-GrafanaProvisioning.yaml index 6b35943..5f987d6 100644 --- a/templates/ConfigMap-GrafanaProvisioning.yaml +++ b/templates/ConfigMap-GrafanaProvisioning.yaml @@ -5,9 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ConfigMap-prometheus-adapter.yaml b/templates/ConfigMap-prometheus-adapter.yaml index 2f1a140..5f4124e 100644 --- a/templates/ConfigMap-prometheus-adapter.yaml +++ b/templates/ConfigMap-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Daemonset-GrafanaAgent.yaml b/templates/Daemonset-GrafanaAgent.yaml index 6a77656..ae5c175 100644 --- a/templates/Daemonset-GrafanaAgent.yaml +++ b/templates/Daemonset-GrafanaAgent.yaml @@ -3,9 +3,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -17,9 +15,7 @@ metadata: spec: selector: matchLabels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -29,9 +25,7 @@ spec: template: metadata: labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 8 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Deployment-prometheus-adapter.yaml b/templates/Deployment-prometheus-adapter.yaml index 3cbab58..1fd2df7 100644 --- a/templates/Deployment-prometheus-adapter.yaml +++ b/templates/Deployment-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -15,9 +13,7 @@ spec: replicas: 2 selector: matchLabels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -28,9 +24,7 @@ spec: template: metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 8 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Grafana-Grafana.yaml b/templates/Grafana-Grafana.yaml index db1d568..6b2c03d 100644 --- a/templates/Grafana-Grafana.yaml +++ b/templates/Grafana-Grafana.yaml @@ -3,9 +3,7 @@ apiVersion: grafana.integreatly.org/v1beta1 kind: Grafana metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -23,9 +21,7 @@ spec: deployment: metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 8 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -33,9 +29,7 @@ spec: replicas: {{ .Values.nfc_monitoring.grafana.replicas | int }} selector: matchLabels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 10 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} strategy: @@ -45,9 +39,7 @@ spec: template: metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 12 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/GrafanaDatasources.yaml b/templates/GrafanaDatasources.yaml index cf5b084..18a365d 100644 --- a/templates/GrafanaDatasources.yaml +++ b/templates/GrafanaDatasources.yaml @@ -18,9 +18,7 @@ items: spec: instanceSelector: matchLabels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 10 }} allowCrossNamespaceImport: true datasource: {{ toYaml . | nindent 8 }} diff --git a/templates/PodDisruptionBudget-alertmanager.yaml b/templates/PodDisruptionBudget-alertmanager.yaml index 43ed6fe..31141e4 100644 --- a/templates/PodDisruptionBudget-alertmanager.yaml +++ b/templates/PodDisruptionBudget-alertmanager.yaml @@ -3,9 +3,7 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -15,7 +13,5 @@ spec: maxUnavailable: 1 selector: matchLabels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/PodDisruptionBudget-prometheus-adapter.yaml b/templates/PodDisruptionBudget-prometheus-adapter.yaml index 17203c2..78d8454 100644 --- a/templates/PodDisruptionBudget-prometheus-adapter.yaml +++ b/templates/PodDisruptionBudget-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -15,7 +13,5 @@ spec: minAvailable: 1 selector: matchLabels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/PodDisruptionBudget-prometheus.yaml b/templates/PodDisruptionBudget-prometheus.yaml index 7a5374d..d5c02cc 100644 --- a/templates/PodDisruptionBudget-prometheus.yaml +++ b/templates/PodDisruptionBudget-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -15,6 +13,5 @@ spec: minAvailable: 1 selector: matchLabels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/Prometheus-prometheus.yaml b/templates/Prometheus-prometheus.yaml index 3b371fa..6011033 100644 --- a/templates/Prometheus-prometheus.yaml +++ b/templates/Prometheus-prometheus.yaml @@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -26,9 +25,7 @@ spec: kubernetes.io/os: linux podMetadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/PrometheusRule-alertmanager.yaml b/templates/PrometheusRule-alertmanager.yaml index 95ef2a1..a4c8115 100644 --- a/templates/PrometheusRule-alertmanager.yaml +++ b/templates/PrometheusRule-alertmanager.yaml @@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/PrometheusRule-grafana-agent.yaml b/templates/PrometheusRule-grafana-agent.yaml index 6b42288..8f29eaf 100644 --- a/templates/PrometheusRule-grafana-agent.yaml +++ b/templates/PrometheusRule-grafana-agent.yaml @@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} app.kubernetes.io/managed-by: {{ $.Release.Service }} diff --git a/templates/PrometheusRule-grafana.yaml b/templates/PrometheusRule-grafana.yaml index b505e52..f615bc3 100644 --- a/templates/PrometheusRule-grafana.yaml +++ b/templates/PrometheusRule-grafana.yaml @@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/component: grafana - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} app.kubernetes.io/managed-by: {{ $.Release.Service }} diff --git a/templates/PrometheusRule-prometheus.yaml b/templates/PrometheusRule-prometheus.yaml index 28e9b36..37f2894 100644 --- a/templates/PrometheusRule-prometheus.yaml +++ b/templates/PrometheusRule-prometheus.yaml @@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Role-SpecificNamespaces-prometheus.yaml b/templates/Role-SpecificNamespaces-prometheus.yaml index 8f3447f..7c3d372 100644 --- a/templates/Role-SpecificNamespaces-prometheus.yaml +++ b/templates/Role-SpecificNamespaces-prometheus.yaml @@ -7,9 +7,7 @@ items: kind: Role metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/RoleBinding-Config-prometheus.yaml b/templates/RoleBinding-Config-prometheus.yaml index 918804f..21fc634 100644 --- a/templates/RoleBinding-Config-prometheus.yaml +++ b/templates/RoleBinding-Config-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/RoleBinding-SpecificNamespaces-prometheus.yaml b/templates/RoleBinding-SpecificNamespaces-prometheus.yaml index d7c5ceb..38f1e6c 100644 --- a/templates/RoleBinding-SpecificNamespaces-prometheus.yaml +++ b/templates/RoleBinding-SpecificNamespaces-prometheus.yaml @@ -6,9 +6,7 @@ items: kind: RoleBinding metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/RoleBinding-prometheus-adapter-auth-reader.yaml b/templates/RoleBinding-prometheus-adapter-auth-reader.yaml index be46bee..393da02 100644 --- a/templates/RoleBinding-prometheus-adapter-auth-reader.yaml +++ b/templates/RoleBinding-prometheus-adapter-auth-reader.yaml @@ -3,8 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/version: 0.11.1 name: resource-metrics-auth-reader namespace: kube-system diff --git a/templates/RoleConfig-prometheus.yaml b/templates/RoleConfig-prometheus.yaml index 3628555..a63c08c 100644 --- a/templates/RoleConfig-prometheus.yaml +++ b/templates/RoleConfig-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Secret-alertmanager.yaml b/templates/Secret-alertmanager.yaml index 4e710be..b82c44e 100644 --- a/templates/Secret-alertmanager.yaml +++ b/templates/Secret-alertmanager.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: Secret metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Secret-prometheus-sidecar-thanos.yaml b/templates/Secret-prometheus-sidecar-thanos.yaml index f212082..024d8e8 100644 --- a/templates/Secret-prometheus-sidecar-thanos.yaml +++ b/templates/Secret-prometheus-sidecar-thanos.yaml @@ -3,6 +3,11 @@ apiVersion: v1 kind: Secret metadata: + labels: + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} + app.kubernetes.io/part-of: {{ $.Chart.Name }} + app.kubernetes.io/managed-by: {{ $.Release.Service }} + app.kubernetes.io/version: {{ $.Chart.Version }} name: thanos-sidecar-config namespace: monitoring type: Opaque diff --git a/templates/Service-Grafana.yaml b/templates/Service-Grafana.yaml index 019adc1..6e8d14a 100644 --- a/templates/Service-Grafana.yaml +++ b/templates/Service-Grafana.yaml @@ -6,17 +6,13 @@ metadata: name: grafana namespace: {{ .Values.nfc_monitoring.grafana.namespace }} labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} spec: selector: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} #type: NodePort #type: LoadBalancer diff --git a/templates/Service-GrafanaAgent.yaml b/templates/Service-GrafanaAgent.yaml index fc070ab..a3e9ad1 100644 --- a/templates/Service-GrafanaAgent.yaml +++ b/templates/Service-GrafanaAgent.yaml @@ -5,17 +5,13 @@ metadata: name: grafana-agent namespace: monitoring labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} spec: selector: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} ports: - name: grafana-metrics diff --git a/templates/Service-alertmanager.yaml b/templates/Service-alertmanager.yaml index 974e77e..2773898 100644 --- a/templates/Service-alertmanager.yaml +++ b/templates/Service-alertmanager.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/Service-prometheus-adapter.yaml b/templates/Service-prometheus-adapter.yaml index 406fd70..98b915e 100644 --- a/templates/Service-prometheus-adapter.yaml +++ b/templates/Service-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -17,7 +15,5 @@ spec: port: 443 targetPort: 6443 selector: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/Service-prometheus.yaml b/templates/Service-prometheus.yaml index fc1ff97..183b4c5 100644 --- a/templates/Service-prometheus.yaml +++ b/templates/Service-prometheus.yaml @@ -3,9 +3,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -20,9 +18,7 @@ spec: port: 8080 targetPort: reloader-web selector: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} sessionAffinity: ClientIP @@ -51,9 +47,6 @@ spec: port: 10902 targetPort: 10902 selector: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus - app.kubernetes.io/part-of: {{ $.Chart.Name }} + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} {{ end }} diff --git a/templates/ServiceAccount-Grafana.yaml b/templates/ServiceAccount-Grafana.yaml index 41eeb9e..ab3cf74 100644 --- a/templates/ServiceAccount-Grafana.yaml +++ b/templates/ServiceAccount-Grafana.yaml @@ -6,9 +6,7 @@ metadata: name: grafana namespace: {{ .Values.nfc_monitoring.grafana.namespace }} labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ServiceAccount-GrafanaAgent.yaml b/templates/ServiceAccount-GrafanaAgent.yaml index 32363be..d92044e 100644 --- a/templates/ServiceAccount-GrafanaAgent.yaml +++ b/templates/ServiceAccount-GrafanaAgent.yaml @@ -6,9 +6,7 @@ metadata: name: grafana-agent namespace: monitoring labels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ServiceAccount-alertmanager.yaml b/templates/ServiceAccount-alertmanager.yaml index f8c73b3..bf57425 100644 --- a/templates/ServiceAccount-alertmanager.yaml +++ b/templates/ServiceAccount-alertmanager.yaml @@ -4,9 +4,7 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ServiceAccount-prometheus-adapter.yaml b/templates/ServiceAccount-prometheus-adapter.yaml index ff50c47..08a9425 100644 --- a/templates/ServiceAccount-prometheus-adapter.yaml +++ b/templates/ServiceAccount-prometheus-adapter.yaml @@ -4,9 +4,7 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ServiceAccount-prometheus.yaml b/templates/ServiceAccount-prometheus.yaml index 871071f..ffcb338 100644 --- a/templates/ServiceAccount-prometheus.yaml +++ b/templates/ServiceAccount-prometheus.yaml @@ -4,9 +4,7 @@ automountServiceAccountToken: true kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} diff --git a/templates/ServiceMonitor-Grafana.yaml b/templates/ServiceMonitor-Grafana.yaml index 8a7bdb9..0706bd6 100644 --- a/templates/ServiceMonitor-Grafana.yaml +++ b/templates/ServiceMonitor-Grafana.yaml @@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 4 }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -31,7 +29,5 @@ spec: jobLabel: app.kubernetes.io/name selector: matchLabels: - app.kubernetes.io/component: graphing - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: grafana + {{ toYaml $.Values.nfc_monitoring.grafana.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/ServiceMonitor-Node.yaml b/templates/ServiceMonitor-Node.yaml index df88e17..ee21d9a 100644 --- a/templates/ServiceMonitor-Node.yaml +++ b/templates/ServiceMonitor-Node.yaml @@ -73,7 +73,5 @@ spec: regex: '(promtail_).*' selector: matchLabels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/ServiceMonitor-node-exporter.yaml b/templates/ServiceMonitor-node-exporter.yaml index 9620458..061489f 100644 --- a/templates/ServiceMonitor-node-exporter.yaml +++ b/templates/ServiceMonitor-node-exporter.yaml @@ -38,7 +38,5 @@ spec: insecureSkipVerify: true selector: matchLabels: - app.kubernetes.io/instance: k8s - app.kubernetes.io/component: exporter - app.kubernetes.io/name: grafana-agent + {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/ServiceMonitor-prometheus-adapter.yaml b/templates/ServiceMonitor-prometheus-adapter.yaml index 0270e70..0cfcb23 100644 --- a/templates/ServiceMonitor-prometheus-adapter.yaml +++ b/templates/ServiceMonitor-prometheus-adapter.yaml @@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -33,7 +31,5 @@ spec: insecureSkipVerify: true selector: matchLabels: - app.kubernetes.io/component: metrics-adapter - app.kubernetes.io/instance: main - app.kubernetes.io/name: prometheus-adapter + {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/templates/ServiceMonitor-prometheus.yaml b/templates/ServiceMonitor-prometheus.yaml index d1cfce6..86bc95e 100644 --- a/templates/ServiceMonitor-prometheus.yaml +++ b/templates/ServiceMonitor-prometheus.yaml @@ -3,8 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -25,9 +24,7 @@ spec: port: reloader-web selector: matchLabels: - app.kubernetes.io/component: prometheus - app.kubernetes.io/instance: k8s - app.kubernetes.io/name: prometheus + {{ toYaml $.Values.nfc_monitoring.prometheus.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} {{ if .Values.nfc_monitoring.thanos.sidecar.enabled }} diff --git a/templates/serviceMonitor-alertmanager.yaml b/templates/serviceMonitor-alertmanager.yaml index c7f08fc..e3d729b 100644 --- a/templates/serviceMonitor-alertmanager.yaml +++ b/templates/serviceMonitor-alertmanager.yaml @@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 4 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} @@ -23,7 +21,5 @@ spec: - "{{ .Values.nfc_monitoring.alert_manager.namespace }}" selector: matchLabels: - app.kubernetes.io/component: alert-router - app.kubernetes.io/instance: main - app.kubernetes.io/name: alertmanager + {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} diff --git a/values.yaml b/values.yaml index 1d700ae..c968f92 100644 --- a/values.yaml +++ b/values.yaml @@ -15,6 +15,12 @@ nfc_monitoring: image: name: quay.io/prometheus/alertmanager tag: 'v0.26.0' + + labels: + app.kubernetes.io/instance: main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager + namespace: alerting @@ -27,6 +33,11 @@ nfc_monitoring: name: grafana/grafana tag: '10.1.2' # '10.0.5' + labels: + app.kubernetes.io/component: graphing + app.kubernetes.io/instance: k8s + app.kubernetes.io/name: grafana + namespace: grafana replicas: 1 @@ -122,6 +133,12 @@ nfc_monitoring: image: name: grafana/agent tag: 'v0.36.1' + + labels: + app.kubernetes.io/instance: k8s + app.kubernetes.io/component: exporter + app.kubernetes.io/name: grafana-agent + namespace: monitoring @@ -169,6 +186,12 @@ nfc_monitoring: image: name: prom/prometheus tag: 'v2.47.0' + + # 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 @@ -251,6 +274,11 @@ nfc_monitoring: name: registry.k8s.io/prometheus-adapter/prometheus-adapter tag: 'v0.11.1' + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/instance: main + app.kubernetes.io/name: prometheus-adapter + namespace: monitoring affinity: