feat(prometheus): Switch to upstream prometheus as the default Prometheus image #166
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,35 @@ | ||
| {{- if not .Values.prometheus.remote }} | ||
| {{- if not .Values.prometheus.enableSideCar }} | ||
| apiVersion: v1 | ||
|
There was a problem hiding this comment. These configurations match our specification, which can be found here or within the BindPlane repository under |
||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ include "bindplane.fullname" . }}-prometheus | ||
| data: | ||
| prometheus.yml: | | ||
| scrape_configs: [] | ||
| rule_files: [/etc/prometheus/rules.yml] | ||
| web.yml: | | ||
| # This file should be empty unless configured | ||
| # by the user. See the Prometheus auth and TLS | ||
| # docs here: https://prometheus.io/docs/prometheus/latest/configuration/https/ | ||
| rules.yml: | | ||
| groups: | ||
| - name: configuration-rollups | ||
| interval: 1m | ||
| rules: | ||
| - record: bindplane_agent_measurements:rollup:rate:1m | ||
| expr: sum without (agent) (rate(bindplane_agent_measurements{}[1m9s999ms] offset 10s)) | ||
| - name: 5m-configuration-rollups | ||
| interval: 5m | ||
| rules: | ||
| - record: bindplane_agent_measurements:rollup:rate:5m | ||
| expr: sum without (agent) (rate(bindplane_agent_measurements:1m{}[5m59s999ms] offset 10s)) | ||
| - name: 1h-configuration-rollups | ||
| interval: 1h | ||
| rules: | ||
| - record: bindplane_agent_measurements:rollup:rate:1h | ||
| expr: sum without (agent) (rate(bindplane_agent_measurements:15m{}[1h14m59s999ms] offset 10s)) | ||
| --- | ||
| apiVersion: apps/v1 | ||
| kind: StatefulSet | ||
| metadata: | ||
|
|
@@ -50,7 +80,16 @@ spec: | |
| {{- end }} | ||
| containers: | ||
| - name: prometheus | ||
| image: {{ .Values.prometheus.image.name }}:{{ .Values.prometheus.image.tag }} | ||
| args: | ||
|
There was a problem hiding this comment. These arguments match the args defined here. |
||
| - --config.file=/etc/prometheus/prometheus.yml | ||
| - --web.config.file=/etc/prometheus/web.yml | ||
| - --storage.tsdb.retention.time=2d | ||
| - --web.enable-remote-write-receiver | ||
| - --web.listen-address=:9090 | ||
| - --storage.tsdb.path=/prometheus | ||
| - --web.console.templates=/etc/prometheus/consoles | ||
| - --web.console.libraries=/etc/prometheus/console_libraries | ||
| imagePullPolicy: IfNotPresent | ||
| securityContext: | ||
| allowPrivilegeEscalation: false | ||
|
|
@@ -70,6 +109,19 @@ spec: | |
| volumeMounts: | ||
| - mountPath: /prometheus | ||
| name: {{ include "bindplane.fullname" . }}-prometheus-data | ||
| - mountPath: /etc/prometheus/prometheus.yml | ||
| subPath: prometheus.yml | ||
| name: config | ||
| - mountPath: /etc/prometheus/rules.yml | ||
| subPath: rules.yml | ||
| name: config | ||
| - mountPath: /etc/prometheus/web.yml | ||
| subPath: web.yml | ||
| name: config | ||
| volumes: | ||
| - name: config | ||
| configMap: | ||
| name: {{ include "bindplane.fullname" . }}-prometheus | ||
| persistentVolumeClaimRetentionPolicy: | ||
| whenDeleted: Retain | ||
| whenScaled: Retain | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
We used this helper to set the Prometheus image based on the Chartfile's application version (BindPlane's version). This is no longer nessisary because the values file has a default value for
prometheus.image.tag.