Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[metricbeat] use deprecated kube-state-metrics config when existing #624

Merged
merged 11 commits into from
May 28, 2020
Merged

[metricbeat] use deprecated kube-state-metrics config when existing #624

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13b6865
[metricbeat] use deprecated kube-state-metrics config when existing
jmlrt May 15, 2020
4292f53
Update metricbeat/templates/deployment.yaml
jmlrt May 18, 2020
060d079
[metricbeat] fix deployment upgrade by removing chart label from .spe…
jmlrt May 18, 2020
e4d8a79
[metricbeat] add breaking changes notices
jmlrt May 18, 2020
2c68de5
[metricbeat] fix template if condition
jmlrt May 18, 2020
987729c
[metricbeat] update tests
jmlrt May 18, 2020
e3e135a
Fix configchecksum not being set (#634)
MaxRink May 27, 2020
8b645c7
Fix values links in examples/multi/README.md (#639)
coolbaluk May 27, 2020
4689c0c
[kibana] String/YAML conditions for `.Values.{extraContainers,extraIn…
maxkochubey May 27, 2020
69f6eb1
Merge branch 'master' into metricbeat-fix-deployment-config-upgrade
jmlrt May 27, 2020
235e4e4
[metricbeat] use index to get metricbeatConfig.kube-state-metrics-met…
jmlrt May 28, 2020
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
6 changes: 5 additions & 1 deletion metricbeat/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ spec:
image: "{{ .Values.image }}:{{ .Values.imageTag }}"
imagePullPolicy: "{{ .Values.imagePullPolicy }}"
args:
{{- if .Values.metricbeatConfig }}
jmlrt marked this conversation as resolved.
Show resolved Hide resolved
- "-c"
- "/usr/share/metricbeat/kube-state-metrics-metricbeat.yml"
{{- end }}
- "-e"
- "-E"
- "http.enabled=true"
Expand Down Expand Up @@ -119,4 +123,4 @@ spec:
{{- end }}
{{- if .Values.extraContainers }}
{{ tpl .Values.extraContainers . | indent 6 }}
{{- end }}
{{- end }}