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.

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

Major cleanup of the helm chart and configurations. #7

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions charts/meta-monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ dependencies:
repository: https://grafana.github.io/helm-charts
version: 0.3.2
alias: alloy-metrics
condition: alloy.metrics.enabled
condition: alloy-metrics.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.2
alias: alloy-logs
condition: alloy.logs.enabled
condition: alloy-logs.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.2
alias: alloy-events
condition: alloy.events.enabled
condition: alloy-events.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.2
alias: alloy-traces
condition: alloy.traces.enabled
condition: alloy-traces.enabled
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
version: 5.3.0
Expand Down
14 changes: 11 additions & 3 deletions charts/meta-monitoring/templates/alloy/_helpers-agent.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,31 @@

{{- define "alloy.logs.namespaces" -}}
{{- $list := list }}
{{- range .Values.alloy.logs.namespacesToMonitor }}
{{- range index .Values "alloy-logs" "namespacesToMonitor" }}
{{- $list = append $list (printf "\"%s\"" .) }}
{{- end }}
{{- join ", " $list }}
{{- end }}

{{- define "alloy.events.namespaces" -}}
{{- $list := list }}
{{- range .Values.alloy.events.namespacesToMonitor }}
{{- range index .Values "alloy-events" "namespacesToMonitor" }}
{{- $list = append $list (printf "\"%s\"" .) }}
{{- end }}
{{- join ", " $list }}
{{- end }}

{{- define "alloy.cadvisor.namespaces" -}}
{{- $list := list }}
{{- range .Values.alloy.metrics.cadvisor.namespacesToMonitor }}
{{- range index .Values "alloy-metrics" "cadvisor" "namespacesToMonitor" }}
{{- $list = append $list (printf "\"%s\"" .) }}
{{- end }}
{{- join ", " $list }}
{{- end }}

{{- define "alloy.ksm.namespaces" -}}
{{- $list := list }}
{{- range index .Values "alloy-metrics" "kube_state_metrics" "namespacesToMonitor" }}
{{- $list = append $list (printf "\"%s\"" .) }}
{{- end }}
{{- join ", " $list }}
Expand Down
Loading