diff --git a/templates/ClusterRoleBinding-prometheus.yaml b/templates/ClusterRoleBinding-prometheus.yaml index 5468c07..b54fa91 100644 --- a/templates/ClusterRoleBinding-prometheus.yaml +++ b/templates/ClusterRoleBinding-prometheus.yaml @@ -17,4 +17,4 @@ roleRef: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} diff --git a/templates/PodDisruptionBudget-prometheus.yaml b/templates/PodDisruptionBudget-prometheus.yaml index 9ee858e..7a5374d 100644 --- a/templates/PodDisruptionBudget-prometheus.yaml +++ b/templates/PodDisruptionBudget-prometheus.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: minAvailable: 1 selector: diff --git a/templates/PrometheusRule-alertmanager.yaml b/templates/PrometheusRule-alertmanager.yaml index 988dad9..95ef2a1 100644 --- a/templates/PrometheusRule-alertmanager.yaml +++ b/templates/PrometheusRule-alertmanager.yaml @@ -12,7 +12,7 @@ metadata: prometheus: k8s role: alert-rules name: alertmanager-main-rules - namespace: {{ .Values.nfc_monitoring.alert_manager.namespace | quote }} + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: alertmanager.rules diff --git a/templates/PrometheusRule-grafana-agent.yaml b/templates/PrometheusRule-grafana-agent.yaml index 6467f12..640733c 100644 --- a/templates/PrometheusRule-grafana-agent.yaml +++ b/templates/PrometheusRule-grafana-agent.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: grafana-agent-promtail name: grafana-agent - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: grafana_agent diff --git a/templates/PrometheusRule-grafana.yaml b/templates/PrometheusRule-grafana.yaml index 71f3d0d..b505e52 100644 --- a/templates/PrometheusRule-grafana.yaml +++ b/templates/PrometheusRule-grafana.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: alert-rules name: grafana-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: GrafanaAlerts diff --git a/templates/PrometheusRule-kubePrometheus.yaml b/templates/PrometheusRule-kubePrometheus.yaml index 42ad467..268491b 100644 --- a/templates/PrometheusRule-kubePrometheus.yaml +++ b/templates/PrometheusRule-kubePrometheus.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: alert-rules name: kube-prometheus-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: general.rules diff --git a/templates/PrometheusRule-kubeStateMetrics.yaml b/templates/PrometheusRule-kubeStateMetrics.yaml index 18d2bb0..6df5352 100644 --- a/templates/PrometheusRule-kubeStateMetrics.yaml +++ b/templates/PrometheusRule-kubeStateMetrics.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: alert-rules name: kube-state-metrics-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: kube-state-metrics diff --git a/templates/PrometheusRule-kubernetesControlPlane.yaml b/templates/PrometheusRule-kubernetesControlPlane.yaml index a41dc70..6845600 100644 --- a/templates/PrometheusRule-kubernetesControlPlane.yaml +++ b/templates/PrometheusRule-kubernetesControlPlane.yaml @@ -10,7 +10,7 @@ metadata: prometheus: k8s role: alert-rules name: kubernetes-monitoring-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: kubernetes-apps diff --git a/templates/PrometheusRule-loki.yaml b/templates/PrometheusRule-loki.yaml index ef5c24f..13a424f 100644 --- a/templates/PrometheusRule-loki.yaml +++ b/templates/PrometheusRule-loki.yaml @@ -12,7 +12,7 @@ metadata: prometheus: k8s role: alert-rules name: loki - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: loki_rules diff --git a/templates/PrometheusRule-nodeExporter.yaml b/templates/PrometheusRule-nodeExporter.yaml index 5063919..24bfbe2 100644 --- a/templates/PrometheusRule-nodeExporter.yaml +++ b/templates/PrometheusRule-nodeExporter.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: alert-rules name: node-exporter-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: node-exporter diff --git a/templates/PrometheusRule-prometheus.yaml b/templates/PrometheusRule-prometheus.yaml index e5f0d5d..28e9b36 100644 --- a/templates/PrometheusRule-prometheus.yaml +++ b/templates/PrometheusRule-prometheus.yaml @@ -11,7 +11,7 @@ metadata: prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: prometheus diff --git a/templates/Role-SpecificNamespaces-prometheus.yaml b/templates/Role-SpecificNamespaces-prometheus.yaml index f212f70..959efde 100644 --- a/templates/Role-SpecificNamespaces-prometheus.yaml +++ b/templates/Role-SpecificNamespaces-prometheus.yaml @@ -90,7 +90,7 @@ items: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} rules: - apiGroups: - "" diff --git a/templates/RoleBinding-Config-prometheus.yaml b/templates/RoleBinding-Config-prometheus.yaml index 06b9035..918804f 100644 --- a/templates/RoleBinding-Config-prometheus.yaml +++ b/templates/RoleBinding-Config-prometheus.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s-config - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -18,4 +18,4 @@ roleRef: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} diff --git a/templates/RoleBinding-SpecificNamespaces-prometheus.yaml b/templates/RoleBinding-SpecificNamespaces-prometheus.yaml index 7973ab0..d5b4dcc 100644 --- a/templates/RoleBinding-SpecificNamespaces-prometheus.yaml +++ b/templates/RoleBinding-SpecificNamespaces-prometheus.yaml @@ -20,7 +20,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -41,7 +41,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} @@ -64,7 +64,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 @@ -86,7 +86,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -107,7 +107,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -128,7 +128,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} @@ -175,7 +175,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -195,7 +195,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -215,7 +215,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -235,7 +235,7 @@ items: subjects: - kind: ServiceAccount name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} diff --git a/templates/RoleConfig-prometheus.yaml b/templates/RoleConfig-prometheus.yaml index 28da8b3..3628555 100644 --- a/templates/RoleConfig-prometheus.yaml +++ b/templates/RoleConfig-prometheus.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s-config - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} rules: - apiGroups: - "" diff --git a/templates/Service-prometheus.yaml b/templates/Service-prometheus.yaml index 5a6d35e..c44eef8 100644 --- a/templates/Service-prometheus.yaml +++ b/templates/Service-prometheus.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: ports: - name: web diff --git a/templates/ServiceAccount-prometheus.yaml b/templates/ServiceAccount-prometheus.yaml index d1f3a21..871071f 100644 --- a/templates/ServiceAccount-prometheus.yaml +++ b/templates/ServiceAccount-prometheus.yaml @@ -11,4 +11,4 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} diff --git a/templates/ServiceMonitor-prometheus.yaml b/templates/ServiceMonitor-prometheus.yaml index 3512aca..824d709 100644 --- a/templates/ServiceMonitor-prometheus.yaml +++ b/templates/ServiceMonitor-prometheus.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/managed-by: {{ $.Release.Service }} app.kubernetes.io/version: {{ $.Chart.Version }} name: prometheus-k8s - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: endpoints: - interval: 30s diff --git a/templates/prometheusRule-ceph.yaml b/templates/prometheusRule-ceph.yaml index dc53b82..61c279b 100644 --- a/templates/prometheusRule-ceph.yaml +++ b/templates/prometheusRule-ceph.yaml @@ -13,7 +13,7 @@ metadata: prometheus: k8s role: alert-rules name: ceph-rules - namespace: monitoring + namespace: {{ .Values.nfc_monitoring.prometheus.namespace }} spec: groups: - name: "cluster health"