-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
[prometheus] Add support for external_labels #3892
Changes from all commits
48b3aa8
84201b0
6bc9f01
513b648
9e93bf1
de09535
748d771
ae3c207
04de4b7
e249b2f
4803d80
81ca46e
d010286
ddc2d40
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -20,6 +20,10 @@ data: | |||||||||||||||
{{- if eq $key "prometheus.yml" }} | ||||||||||||||||
global: | ||||||||||||||||
{{ $root.Values.server.global | toYaml | trimSuffix "\n" | indent 6 }} | ||||||||||||||||
{{- if $root.Values.server.global.externalLabels }} | ||||||||||||||||
external_labels: | ||||||||||||||||
{{- include "prometheus.server.global.externalLabels" $root | nindent 8 }} | ||||||||||||||||
{{- end }} | ||||||||||||||||
Comment on lines
+23
to
+26
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The managed field
Suggested change
|
||||||||||||||||
{{- if $root.Values.server.remoteWrite }} | ||||||||||||||||
remote_write: | ||||||||||||||||
{{- include "prometheus.server.remoteWrite" $root | nindent 4 }} | ||||||||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -271,6 +271,9 @@ | |
"global": { | ||
"type": "object", | ||
"properties": { | ||
"external_labels": { | ||
"type": "object" | ||
}, | ||
Comment on lines
+274
to
+276
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As shown above, you are setting the field nested in |
||
"evaluation_interval": { | ||
"type": "string" | ||
}, | ||
|
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -245,6 +245,9 @@ server: | |||||||||||||
## How frequently to evaluate rules | ||||||||||||||
## | ||||||||||||||
evaluation_interval: 1m | ||||||||||||||
## https://prometheus.io/docs/prometheus/latest/configuration/configuration/ | ||||||||||||||
## | ||||||||||||||
externalLabels: {} | ||||||||||||||
Comment on lines
+248
to
+250
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As in the comment above, needs to be moved out of
Suggested change
|
||||||||||||||
## https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write | ||||||||||||||
## | ||||||||||||||
remoteWrite: [] | ||||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The helper template is unnecessary.