diff --git a/docs/values.md b/docs/values.md index 67aa187cfb1ad065716e82d4391f71286ecb4d66..7e265bd7afc2b879747146c2b4416f027c651245 100644 --- a/docs/values.md +++ b/docs/values.md @@ -65,6 +65,7 @@ This file contains the markdown version of the default values that this chart ta | metrics.prometheus.server.retention | string | `"24h"` | interval during which local cluster prometheus will store metrics | | metrics.prometheus.server.scrapeInterval | string | `"10s"` | interval used to self scrape metrics | | metrics.prometheus.server.scrapeTimeout | string | `"5s"` | timeout for self scraped metrics | +| metrics.prometheus.server.image | string | `"registry.cern.ch/monit/cern-it-monitoring-prometheus:v2.50.0"` | prometheus image to use by the local cluster prometheus | | metrics.prometheus.server.version | string | `"v2.50.0"` | prometheus version to use by the local cluster prometheus | | otlp.endpoint | string | `"monit-otlp.cern.ch"` | otlp endpoint where the otlp receivers are listening | | otlp.port | int | `4319` | otlp port where the otlp receivers are listening | diff --git a/templates/fluentbit-logs/daemonset.yaml b/templates/fluentbit-logs/daemonset.yaml index 3a0029b37eff7e08015fe31a1483f9ab6ae0560c..0b5defa1d4ad3da91f38940f878d90fc8bd0a6a6 100644 --- a/templates/fluentbit-logs/daemonset.yaml +++ b/templates/fluentbit-logs/daemonset.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: it-monit-logs-collector-fluentbit containers: - name: it-monit-logs-collector-fluentbit - image: fluent/fluent-bit:3.0.6 # Not valid for windows nodes. T.B.E. (To Be Explored) + image: registry.cern.ch/monit/cern-it-monitoring-fluent-bit:3.0.6 # Not valid for windows nodes. T.B.E. (To Be Explored) command: [ "/fluent-bit/bin/fluent-bit" ] args: - --workdir=/fluent-bit/etc diff --git a/templates/fluentbit-metrics/statefulset.yaml b/templates/fluentbit-metrics/statefulset.yaml index 569e713c49ef1996ff7ab31f8b9b7ef1cc5dee4f..8b65fc9144d32915e538826e51410ecc6051b4de 100644 --- a/templates/fluentbit-metrics/statefulset.yaml +++ b/templates/fluentbit-metrics/statefulset.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: it-monit-metrics-collector-fluentbit - image: fluent/fluent-bit:3.0.6 # Not valid for windows nodes. T.B.E. (To Be Explored) + image: registry.cern.ch/monit/cern-it-monitoring-fluent-bit:3.0.6 # Not valid for windows nodes. T.B.E. (To Be Explored) command: [ "/fluent-bit/bin/fluent-bit" ] args: - --workdir=/fluent-bit/etc diff --git a/templates/kube_state/deployment.yaml b/templates/kube_state/deployment.yaml index bb64d7d0de9e4951ec6bd9da0315530618c89371..981de6c896897ff6490d3138d1c4d0359f4aaff4 100644 --- a/templates/kube_state/deployment.yaml +++ b/templates/kube_state/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: automountServiceAccountToken: true containers: - - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.11.0 + - image: registry.cern.ch/monit/cern-it-monitoring-kube-state-metrics:v2.11.0 livenessProbe: httpGet: path: /healthz diff --git a/templates/node_exporter/daemonset.yaml b/templates/node_exporter/daemonset.yaml index c80372bb7db07b9e374dac0c4f7bb935b876c449..591fe63bf493941a69fa4c4b68c1066681349438 100644 --- a/templates/node_exporter/daemonset.yaml +++ b/templates/node_exporter/daemonset.yaml @@ -33,7 +33,7 @@ spec: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/) - --collector.netclass.ignored-devices=^(veth.*)$ name: it-monit-metrics-collector-nodeexporter - image: prom/node-exporter:v1.8.1 + image: registry.cern.ch/monit/cern-it-monitoring-node-exporter:v1.8.1 ports: - containerPort: 9100 protocol: TCP diff --git a/templates/prometheus/prometheus.yaml b/templates/prometheus/prometheus.yaml index e5d57d0528a26623dce6636a97253135e6c7ba20..9bc348b2f61f799beeabdacfa70009f47653af67 100644 --- a/templates/prometheus/prometheus.yaml +++ b/templates/prometheus/prometheus.yaml @@ -5,6 +5,7 @@ metadata: name: it-monit-metrics-collector-prometheus namespace: {{ .Release.Namespace }} spec: + image: {{ .Values.metrics.prometheus.server.image }} version: {{ .Values.metrics.prometheus.server.version }} scrapeInterval: {{ .Values.metrics.prometheus.server.scrapeInterval }} scrapeTimeout: {{ .Values.metrics.prometheus.server.scrapeTimeout }} diff --git a/templates/prometheus_operator/deployment.yaml b/templates/prometheus_operator/deployment.yaml index 03395357a69277b1e13c1386ace404835b20345b..795efaa449a26d610793cf7ddbe81e1d1a9308f2 100644 --- a/templates/prometheus_operator/deployment.yaml +++ b/templates/prometheus_operator/deployment.yaml @@ -20,11 +20,11 @@ spec: containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.72.0 + - --prometheus-config-reloader=registry.cern.ch/monit/cern-it-monitoring-prometheus-config-reloader:v0.72.0 env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.72.0 + image: registry.cern.ch/monit/cern-it-monitoring-prometheus-operator:v0.72.0 name: it-monit-metrics-operator-prometheus ports: - containerPort: 8080 diff --git a/values.yaml b/values.yaml index a37e7112a6fa45acdf0502e1f64ae4490b7ab356..19723d887903842e11b76c2e9d662718daed646a 100644 --- a/values.yaml +++ b/values.yaml @@ -78,7 +78,8 @@ metrics: server: # If set it will override the metrics.defaultNodeSelector. nodeSelector: {} - # -- prometheus version to use by the local cluster prometheus + # -- prometheus version to use by the local cluster prometheus. Make sure this version exists in the indicated image repository. + image: registry.cern.ch/monit/cern-it-monitoring-prometheus:v2.50.0 version: "v2.50.0" # -- interval used to self scrape metrics scrapeInterval: "10s"