Skip to content

Commit

Permalink
Conflict in UIDs of Grafana dashboard when running multiple Fluent Bi…
Browse files Browse the repository at this point in the history
…t Helm Release. (#503)

Conflict in UIDs of Grafana dashboard when running multiple Fluent Bit Helm Release.

Conflict in UIDs of Grafana dashboard when running multiple Fluent Bit Helm Release.

Signed-off-by: jagdeep.khatana <[email protected]>
Co-authored-by: jagdeep.khatana <[email protected]>
  • Loading branch information
captainpro-eng and jagdeep.khatana authored May 16, 2024
1 parent d635acb commit a9833f7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions charts/fluent-bit/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ keywords:
- logging
- fluent-bit
- fluentd
version: 0.46.5
version: 0.46.6
appVersion: 3.0.3
icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
home: https://fluentbit.io/
Expand All @@ -23,4 +23,4 @@ maintainers:
annotations:
artifacthub.io/changes: |
- kind: added
description: "Support setting Service's externalIPs."
description: "Create unqiue uid for grafana fluent-bit dashboard."
4 changes: 2 additions & 2 deletions charts/fluent-bit/dashboards/fluent-bit.json
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@
},
"timezone": "",
"title": "{{ include "fluent-bit.fullname" . }}",
"uid": "d557c8f6-cac1-445f-8ade-4c351a9076b1",
"uid": "{{ include "fluent-bit.dashboard.uid" . }}",
"version": 7,
"weekStart": ""
}
}
6 changes: 6 additions & 0 deletions charts/fluent-bit/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,9 @@ Create the name of OpenShift SecurityContextConstraints to use
{{- printf "%s" (default (include "fluent-bit.fullname" .) .Values.openShift.securityContextConstraints.name) -}}
{{- end -}}
{{- end -}}
{{/*
Create the uid for grafana fluent-bit dashboard
*/}}
{{- define "fluent-bit.dashboard.uid" -}}
{{- sha256sum (printf "%s/%s" .Release.Namespace .Release.Name) }}
{{- end -}}

0 comments on commit a9833f7

Please sign in to comment.