Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[charts/sn-platform] Add prometheus pod name to sts env #1087

Merged
merged 9 commits into from
Oct 27, 2023
Merged

[charts/sn-platform] Add prometheus pod name to sts env #1087

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5164ec0
fix repeat ca tag
yuweisung Jan 20, 2023
93a390f
Update tls-cert-internal-issuer.yaml
yuweisung Jan 20, 2023
f214ab8
Merge branch 'master' into master
ericsyh Feb 17, 2023
5cc2138
Merge branch 'streamnative:master' into master
yuweisung Jul 31, 2023
04d7672
add external labels
yuweisung Jul 31, 2023
a1ddf61
fix the var naming
yuweisung Aug 1, 2023
7c94111
pod_name is required for prometheus ha detector
yuweisung Aug 17, 2023
93654b1
missed curly quotes
yuweisung Aug 17, 2023
be3be93
remove test
yuweisung Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/sn-platform/templates/prometheus/prometheus-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 5 additions & 0 deletions charts/sn-platform/templates/prometheus/prometheus-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 5 additions & 1 deletion charts/sn-platform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,6 +1771,10 @@ prometheus:
# https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects
- --storage.tsdb.wal-compression
scrapeInterval: 15s
externalLabels:
yuweisung marked this conversation as resolved.
Show resolved Hide resolved
test1: test2
test3: test4
test5: test6
securityContext:
runAsUser: 65534
runAsNonRoot: true
Expand All @@ -1789,7 +1793,7 @@ prometheus:
periodSeconds: 10
customRelabelConfigs: []
extraScrapeConfigs: []
extraCustomArgs: {}
extraCustomArgs:
yuweisung marked this conversation as resolved.
Show resolved Hide resolved

## Prometheus service
## templates/prometheus-service.yaml
Expand Down