From f55a2c36b20124acece77b5ac00d1ec94c3280e2 Mon Sep 17 00:00:00 2001 From: Yuwei Sung Date: Thu, 26 Oct 2023 23:16:46 -0700 Subject: [PATCH] [charts/sn-platform] Add prometheus pod name to sts env (#1087) * fix repeat ca tag When specify certs.internalal_issuer.typ = secret, the output of issuer spec: ca:ca: secretName: root-ca-secret * Update tls-cert-internal-issuer.yaml fix syntax * add external labels * fix the var naming * pod_name is required for prometheus ha detector * missed curly quotes * remove test --------- Co-authored-by: Eric Shen (cherry picked from commit bfe965700519d1920b4f0f5124ddd54bb76eb418) --- .../templates/prometheus/prometheus-configmap.yaml | 4 ++++ .../templates/prometheus/prometheus-statefulset.yaml | 5 +++++ charts/sn-platform/values.yaml | 1 + 3 files changed, 10 insertions(+) diff --git a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml index a32619737..4a264511c 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-configmap.yaml @@ -32,6 +32,10 @@ data: prometheus.yml: | global: scrape_interval: {{ .Values.prometheus.scrapeInterval }} +{{- if .Values.prometheus.externalLabels }} + external_labels: +{{ toYaml .Values.prometheus.externalLabels | indent 8 }} +{{- end }} {{- if .Values.monitoring.alert_manager }} rule_files: - 'rules.yml' diff --git a/charts/sn-platform/templates/prometheus/prometheus-statefulset.yaml b/charts/sn-platform/templates/prometheus/prometheus-statefulset.yaml index f8df49daa..fdd3953a9 100644 --- a/charts/sn-platform/templates/prometheus/prometheus-statefulset.yaml +++ b/charts/sn-platform/templates/prometheus/prometheus-statefulset.yaml @@ -116,6 +116,11 @@ spec: - name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}" image: "{{ .Values.images.prometheus.repository }}:{{ .Values.images.prometheus.tag }}" imagePullPolicy: {{ .Values.images.prometheus.pullPolicy }} + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name {{- if .Values.prometheus.resources }} resources: {{ toYaml .Values.prometheus.resources | indent 10 }} diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml index bff2a4e2e..b26aa115d 100644 --- a/charts/sn-platform/values.yaml +++ b/charts/sn-platform/values.yaml @@ -1784,6 +1784,7 @@ prometheus: # https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects - --storage.tsdb.wal-compression scrapeInterval: 15s + externalLabels: {} securityContext: runAsUser: 65534 runAsNonRoot: true