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

Jump to bottom

remove cluster label from prometheus config in values.yaml #422

Merged
merged 3 commits into from
Feb 18, 2020
Merged

remove cluster label from prometheus config in values.yaml #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
227fe28
remove cluster label from prometheus config in values.yaml and add in…
vsinghal13 Feb 15, 2020
f48d017
Generate new 'fluentd-sumologic.yaml.tmpl'
Feb 15, 2020
04f716b
Generate new overrides yaml/libsonnet file(s).
Feb 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions deploy/helm/prometheus-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ prometheus:
matchLabels:
app: fluent-bit
prometheusSpec:
externalLabels:
# Set this to a value to distinguish between different k8s clusters
cluster: kubernetes
remoteWrite:
- # kube state metrics
url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.state
Expand Down
6 changes: 6 additions & 0 deletions deploy/helm/sumologic/conf/metrics/metrics.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
@label @DATAPOINT
</match>
<label @DATAPOINT>
<filter prometheus.metrics**>
@type record_modifier
<record>
cluster {{ .Values.sumologic.clusterName }}
</record>
</filter>
<filter prometheus.metrics**>
@type enhance_k8s_metadata
cache_size "#{ENV['K8S_METADATA_FILTER_CACHE_SIZE']}"
Expand Down
3 changes: 0 additions & 3 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,6 @@ prometheus-operator:
matchLabels:
app: fluent-bit
prometheusSpec:
externalLabels:
# Set this to a value to distinguish between different k8s clusters
cluster: kubernetes
remoteWrite:
# kube state metrics
- url: http://collection-sumologic.sumologic.svc.cluster.local:9888/prometheus.metrics.state
Expand Down
6 changes: 6 additions & 0 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ data:
@label @DATAPOINT
</match>
<label @DATAPOINT>
<filter prometheus.metrics**>
@type record_modifier
<record>
cluster kubernetes
</record>
</filter>
<filter prometheus.metrics**>
@type enhance_k8s_metadata
cache_size "#{ENV['K8S_METADATA_FILTER_CACHE_SIZE']}"
Expand Down