diff --git a/templates/ServiceMonitor-APIServer.yaml b/templates/ServiceMonitor-APIServer.yaml index 7d423d9..6f9945b 100644 --- a/templates/ServiceMonitor-APIServer.yaml +++ b/templates/ServiceMonitor-APIServer.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.apiserver }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -76,3 +77,5 @@ spec: matchLabels: component: apiserver provider: kubernetes + +{{ end }} diff --git a/templates/ServiceMonitor-Cadvisor.yaml b/templates/ServiceMonitor-Cadvisor.yaml index 1e8be30..0392696 100644 --- a/templates/ServiceMonitor-Cadvisor.yaml +++ b/templates/ServiceMonitor-Cadvisor.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.cadvisor }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -50,3 +51,5 @@ spec: selector: matchLabels: app.kubernetes.io/name: kubelet + +{{ end }} diff --git a/templates/ServiceMonitor-CoreDNS.yaml b/templates/ServiceMonitor-CoreDNS.yaml index 5c96bb3..0d839d9 100644 --- a/templates/ServiceMonitor-CoreDNS.yaml +++ b/templates/ServiceMonitor-CoreDNS.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.coredns }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -26,3 +27,5 @@ spec: selector: matchLabels: k8s-app: kube-dns + +{{ end }} \ No newline at end of file diff --git a/templates/ServiceMonitor-Grafana.yaml b/templates/ServiceMonitor-Grafana.yaml index 0e89a64..590ec53 100644 --- a/templates/ServiceMonitor-Grafana.yaml +++ b/templates/ServiceMonitor-Grafana.yaml @@ -34,3 +34,4 @@ spec: app.kubernetes.io/part-of: {{ $.Chart.Name }} {{- end }} + diff --git a/templates/ServiceMonitor-Kubelet.yaml b/templates/ServiceMonitor-Kubelet.yaml index b921127..1f8a97b 100644 --- a/templates/ServiceMonitor-Kubelet.yaml +++ b/templates/ServiceMonitor-Kubelet.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.kubelet }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -85,3 +86,5 @@ spec: selector: matchLabels: app.kubernetes.io/name: kubelet + +{{ end }} \ No newline at end of file diff --git a/templates/ServiceMonitor-Node.yaml b/templates/ServiceMonitor-Node.yaml index ee21d9a..4153460 100644 --- a/templates/ServiceMonitor-Node.yaml +++ b/templates/ServiceMonitor-Node.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.grafana_agent.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -75,3 +76,5 @@ spec: matchLabels: {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} diff --git a/templates/ServiceMonitor-kube-controller-manager.yaml b/templates/ServiceMonitor-kube-controller-manager.yaml index 21d30f2..130eccc 100644 --- a/templates/ServiceMonitor-kube-controller-manager.yaml +++ b/templates/ServiceMonitor-kube-controller-manager.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.kube_controller_manager }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -80,3 +81,5 @@ spec: app.kubernetes.io/instance: k8s app.kubernetes.io/name: kube-monitor-proxy app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} \ No newline at end of file diff --git a/templates/ServiceMonitor-kube-scheduler.yaml b/templates/ServiceMonitor-kube-scheduler.yaml index 71149ce..f51a1ab 100644 --- a/templates/ServiceMonitor-kube-scheduler.yaml +++ b/templates/ServiceMonitor-kube-scheduler.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.service_monitor.kube_scheduler }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -34,3 +35,5 @@ spec: app.kubernetes.io/instance: k8s app.kubernetes.io/name: kube-monitor-proxy app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} \ No newline at end of file diff --git a/templates/ServiceMonitor-kubeStateMetrics.yaml b/templates/ServiceMonitor-kubeStateMetrics.yaml index 20ca550..6bef033 100644 --- a/templates/ServiceMonitor-kubeStateMetrics.yaml +++ b/templates/ServiceMonitor-kubeStateMetrics.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.kube_state_metrics.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -44,3 +45,5 @@ spec: app.kubernetes.io/instance: k8s app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} diff --git a/templates/ServiceMonitor-node-exporter.yaml b/templates/ServiceMonitor-node-exporter.yaml index 061489f..a9b02ff 100644 --- a/templates/ServiceMonitor-node-exporter.yaml +++ b/templates/ServiceMonitor-node-exporter.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.grafana_agent.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -40,3 +41,5 @@ spec: matchLabels: {{ toYaml $.Values.nfc_monitoring.grafana_agent.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} diff --git a/templates/ServiceMonitor-prometheus-adapter.yaml b/templates/ServiceMonitor-prometheus-adapter.yaml index 0cfcb23..078627f 100644 --- a/templates/ServiceMonitor-prometheus-adapter.yaml +++ b/templates/ServiceMonitor-prometheus-adapter.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus_adaptor.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -33,3 +34,5 @@ spec: matchLabels: {{ toYaml $.Values.nfc_monitoring.prometheus_adaptor.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} diff --git a/templates/ServiceMonitor-prometheus.yaml b/templates/ServiceMonitor-prometheus.yaml index 148364f..0a8f7c1 100644 --- a/templates/ServiceMonitor-prometheus.yaml +++ b/templates/ServiceMonitor-prometheus.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.prometheus.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/templates/serviceMonitor-alertmanager.yaml b/templates/serviceMonitor-alertmanager.yaml index cc16a5b..3b56507 100644 --- a/templates/serviceMonitor-alertmanager.yaml +++ b/templates/serviceMonitor-alertmanager.yaml @@ -1,3 +1,4 @@ +{{ if .Values.nfc_monitoring.alert_manager.enabled -}} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -38,3 +39,5 @@ spec: matchLabels: {{ toYaml $.Values.nfc_monitoring.alert_manager.labels | nindent 6 }} app.kubernetes.io/part-of: {{ $.Chart.Name }} + +{{ end }} diff --git a/values.yaml b/values.yaml index 1742e3d..90a8885 100644 --- a/values.yaml +++ b/values.yaml @@ -12,6 +12,8 @@ nfc_monitoring: alert_manager: + + enabled: true image: name: quay.io/prometheus/alertmanager tag: 'v0.26.0' @@ -200,6 +202,9 @@ nfc_monitoring: grafana_agent: + + enabled: true + image: name: grafana/agent tag: 'v0.36.1' @@ -247,6 +252,8 @@ nfc_monitoring: kube_state_metrics: + + enabled: false image: name: registry.k8s.io/kube-state-metrics/kube-state-metrics tag: 'v2.8.1' @@ -383,6 +390,8 @@ nfc_monitoring: prometheus_adaptor: + enalbed: false + image: name: registry.k8s.io/prometheus-adapter/prometheus-adapter tag: 'v0.11.1'