Skip to content

Commit 2ba7db6

Browse files
petewallpetewall
committed
Wip
Signed-off-by: Pete Wall <[email protected]>
1 parent c2243bb commit 2ba7db6

File tree

50 files changed

+5028
-3454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5028
-3454
lines changed

‎charts/k8s-monitoring/charts/feature-node-logs/templates/_collector_validation.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
{{- fail (printf "Node Logs feature requires Alloy to mount /var/log.\nPlease set:\n%s:\n alloy:\n mounts:\n varlog: true" .CollectorName) }}
99
{{- end -}}
1010
{{- if .Collector.alloy.clustering.enabled }}
11-
{{- fail (printf "Node Logs feature requires Alloy to not be in clustering mode.\nPlease set:\n%s:\n alloy:\n clustering:\n enabled: true" .CollectorName) }}
11+
{{- fail (printf "Node Logs feature requires Alloy clustering to be disabled.\nPlease set:\n%s:\n alloy:\n clustering:\n enabled: false" .CollectorName) }}
1212
{{- end -}}
1313
{{- end -}}

‎charts/k8s-monitoring/charts/feature-pod-logs/templates/_api.alloy.tpl

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,46 @@
11
{{- define "feature.podLogs.kubernetesApi.alloy" }}
2+
{{- $labelSelectors := list }}
3+
{{- range $k, $v := .Values.kubernetesApiGathering.labelSelectors }}
4+
{{- if kindIs "slice" $v }}
5+
{{- $labelSelectors = append $labelSelectors (printf "%s in (%s)" $k (join "," $v)) }}
6+
{{- else }}
7+
{{- $labelSelectors = append $labelSelectors (printf "%s=%s" $k $v) }}
8+
{{- end }}
9+
{{- end }}
10+
{{- $nodeLabelSelectors := list }}
11+
{{- range $k, $v := .Values.kubernetesApiGathering.nodeLabelSelectors }}
12+
{{- if kindIs "slice" $v }}
13+
{{- $nodeLabelSelectors = append $nodeLabelSelectors (printf "%s in (%s)" $k (join "," $v)) }}
14+
{{- else }}
15+
{{- $nodeLabelSelectors = append $nodeLabelSelectors (printf "%s=%s" $k $v) }}
16+
{{- end }}
17+
{{- end }}
218
discovery.kubernetes "kubernetes_api_pods" {
319
role = "pod"
420
{{- if .Values.kubernetesApiGathering.namespaces }}
521
namespaces {
622
names = {{ .Values.namespaces | toJson }}
723
}
824
{{- end }}
9-
{{- if or .Values.kubernetesApiGathering.labelSelectors .Values.kubernetesApiGathering.fieldSelectors }}
25+
{{- if or $labelSelectors .Values.kubernetesApiGathering.fieldSelectors }}
1026
selectors {
1127
role = "pod"
12-
{{- if .Values.kubernetesApiGathering.labelSelectors }}
13-
label = {{ .Values.kubernetesApiGathering.labelSelectors | toJson }}
28+
{{- if $labelSelectors }}
29+
label = {{ $labelSelectors | join "," | quote }}
1430
{{- end }}
1531
{{- if .Values.kubernetesApiGathering.fieldSelectors }}
1632
field = {{ .Values.kubernetesApiGathering.fieldSelectors | join "," | quote }}
1733
{{- end }}
1834
}
1935
{{- end }}
20-
{{- if or .Values.kubernetesApiGathering.nodeLabelSelectors .Values.kubernetesApiGathering.nodeFieldSelectors }}
36+
{{- if or $nodeLabelSelectors .Values.kubernetesApiGathering.nodeFieldSelectors }}
2137
attach_metadata {
2238
node = true
2339
}
2440
selectors {
2541
role = "node"
26-
{{- if .Values.kubernetesApiGathering.nodeLabelSelectors }}
27-
label = {{ .Values.kubernetesApiGathering.nodeLabelSelectors | toJson }}
42+
{{- if $nodeLabelSelectors }}
43+
label = {{ $nodeLabelSelectors | join "," | quote }}
2844
{{- end }}
2945
{{- if .Values.kubernetesApiGathering.nodeFieldSelectors }}
3046
field = {{ .Values.kubernetesApiGathering.nodeFieldSelectors | join "," | quote }}

‎charts/k8s-monitoring/charts/feature-pod-logs/templates/_collector_validation.tpl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
{{- fail (printf "Pod Logs feature requires Alloy to be in clustering mode when using the \"kubernetesApi\" gather method.\nPlease set:\n%s:\n alloy:\n clustering:\n enabled: true" .CollectorName) }}
1616
{{- end -}}
1717
{{- end -}}
18-
19-
{{- if .Values.lokiReceiver.enabled }}
20-
{{- if not .Collector.alloy.clustering.enabled }}
21-
{{- fail (printf "Pod Logs feature requires Alloy to be in clustering mode when using the \"kubernetesApi\" gather method.\nPlease set:\n%s:\n alloy:\n clustering:\n enabled: true" .CollectorName) }}
22-
{{- end -}}
2318
{{- end -}}
2419

20+
{{- define "feature.podLogs.validate" -}}
21+
{{/*Validate that if both volume gathering and k8s api gathering, there are some selectors set*/}}
22+
{{- if and (or .Values.volumeGathering.enabled (eq .Values.gatherMethod "volumes")) (or .Values.kubernetesApiGathering.enabled (eq .Values.gatherMethod "kubernetesApi")) }}
2523

2624
{{- end -}}
25+
{{- end -}}

‎charts/k8s-monitoring/charts/feature-pod-logs/templates/_notes.tpl

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,25 @@ Gather logs from Kubernetes Pods
66

77
{{- define "feature.podLogs.notes.actions" }}{{- end }}
88

9+
{{- define "feature.podLogs.notes.deprecations" }}
10+
{{- if .Values.gatherMethod }}
11+
* The `gatherMethod` value is deprecated and will be removed in a future release.
12+
Please enable the desired Pod log gathering methods individually:
13+
volumeGathering:
14+
enabled: true
15+
kubernetesApiGathering:
16+
enabled: true
17+
lokiReceiver:
18+
enabled: true
19+
{{- end }}
20+
{{- end }}
21+
922
{{- define "feature.podLogs.summary" -}}
23+
{{- $methods := list }}
24+
{{- if .Values.volumeGathering.enabled }}{{- $methods = append $methods "volumes" }}{{ end }}
25+
{{- if .Values.kubernetesApiGathering.enabled }}{{- $methods = append $methods "kubernetesApi" }}{{ end }}
26+
{{- if .Values.lokiReceiver.enabled }}{{- $methods = append $methods "lokiReceiver" }}{{ end }}
27+
{{- if .Values.lokiReceiver.openShiftClusterLogForwarder.enabled }}{{- $methods = append $methods "OSClusterLogForwarder" }}{{ end }}
1028
version: {{ .Chart.Version }}
11-
method: {{ .Values.gatherMethod }}
29+
methods: {{ $methods | join "," }}
1230
{{- end }}

‎charts/k8s-monitoring/charts/feature-pod-logs/templates/_volumeGathering.alloy.tpl

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
{{- define "feature.podLogs.volumeGathering.alloy" }}
2+
{{- $labelSelectors := list }}
3+
{{- range $k, $v := .Values.volumeGathering.labelSelectors }}
4+
{{- if kindIs "slice" $v }}
5+
{{- $labelSelectors = append $labelSelectors (printf "%s in (%s)" $k (join "," $v)) }}
6+
{{- else }}
7+
{{- $labelSelectors = append $labelSelectors (printf "%s=%s" $k $v) }}
8+
{{- end }}
9+
{{- end }}
10+
{{- $nodeLabelSelectors := list }}
11+
{{- range $k, $v := .Values.volumeGathering.nodeLabelSelectors }}
12+
{{- if kindIs "slice" $v }}
13+
{{- $nodeLabelSelectors = append $nodeLabelSelectors (printf "%s in (%s)" $k (join "," $v)) }}
14+
{{- else }}
15+
{{- $nodeLabelSelectors = append $nodeLabelSelectors (printf "%s=%s" $k $v) }}
16+
{{- end }}
17+
{{- end }}
218
discovery.kubernetes "volume_gathering_pods" {
319
role = "pod"
420
selectors {
@@ -10,25 +26,25 @@ discovery.kubernetes "volume_gathering_pods" {
1026
names = {{ .Values.namespaces | toJson }}
1127
}
1228
{{- end }}
13-
{{- if or .Values.volumeGathering.labelSelectors .Values.volumeGathering.fieldSelectors }}
29+
{{- if or $labelSelectors .Values.volumeGathering.fieldSelectors }}
1430
selectors {
1531
role = "pod"
16-
{{- if .Values.volumeGathering.labelSelectors }}
17-
label = {{ .Values.volumeGathering.labelSelectors | toJson }}
32+
{{- if $labelSelectors }}
33+
label = {{ $labelSelectors | join "," | quote }}
1834
{{- end }}
1935
{{- if .Values.volumeGathering.fieldSelectors }}
2036
field = {{ .Values.volumeGathering.fieldSelectors | join "," | quote }}
2137
{{- end }}
2238
}
2339
{{- end }}
24-
{{- if or .Values.volumeGathering.nodeLabelSelectors .Values.volumeGathering.nodeFieldSelectors }}
40+
{{- if or $nodeLabelSelectors .Values.volumeGathering.nodeFieldSelectors }}
2541
attach_metadata {
2642
node = true
2743
}
2844
selectors {
2945
role = "node"
30-
{{- if .Values.volumeGathering.nodeLabelSelectors }}
31-
label = {{ .Values.volumeGathering.nodeLabelSelectors | toJson }}
46+
{{- if $nodeLabelSelectors }}
47+
label = {{ $nodeLabelSelectors | join "," | quote }}
3248
{{- end }}
3349
{{- if .Values.volumeGathering.nodeFieldSelectors }}
3450
field = {{ .Values.volumeGathering.nodeFieldSelectors | join "," | quote }}
@@ -160,8 +176,8 @@ local.file_match "volume_gathering_pods" {
160176

161177
loki.source.file "volume_gathering_pods" {
162178
targets = local.file_match.volume_gathering_pods.targets
163-
{{- if .Values.volumeGathering.onlyGatherNewLogLines | default .Values.volumeGatherSettings.onlyGatherNewLogLines }}
164-
tail_from_end = {{ .Values.volumeGathering.onlyGatherNewLogLines | default .Values.volumeGatherSettings.onlyGatherNewLogLines }}
179+
{{- if .Values.volumeGathering.onlyGatherNewLogLines | default (dig "volumeGatherSettings" "onlyGatherNewLogLines" false .Values) }}
180+
tail_from_end = {{ .Values.volumeGathering.onlyGatherNewLogLines | default (dig "volumeGatherSettings" "onlyGatherNewLogLines" false .Values) }}
165181
{{- end }}
166182
forward_to = [loki.process.pod_log_processor.receiver]
167183
}

‎charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/k8s-monitoring/docs/examples/collector-storage/output.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)