Skip to content

Support custom nodeLabels for all gatherMethods of feature-pod-logs #1981

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support custom nodeLabels for all gatherMethods of feature-pod-logs #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd08053
Support custom nodeLabels for all gatherMethods of feature-pod-logs
baurmatt Sep 9, 2025
f803b19
Fix wrongly spelled nodeLabels
baurmatt Sep 10, 2025
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
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/charts/feature-pod-logs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
| namespaceAnnotations | object | `{}` | Log labels to set with values copied from the Kubernetes Namespace annotations. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_namespace_annotation>`. |
| namespaceLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Namespace labels. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_namespace_label>`. |
| nodeAnnotations | object | `{}` | Log labels to set with values copied from the Kubernetes Node annotations. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_node_annotation>`. |
| nodeLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Node labels. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_node_label>`. |
| nodeLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Node labels. Format: `<log_label>: <kubernetes_node_label>`. |
| staticLabels | object | `{}` | Log labels to set with static values. |
| staticLabelsFrom | object | `{}` | Log labels to set with static values, not quoted so it can reference config components. |

Expand Down
8 changes: 8 additions & 0 deletions charts/k8s-monitoring/charts/feature-pod-logs/templates/_nodes_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{{- $attachMetadata = or $attachMetadata .Values.nodeLabels.nodeOS -}}
{{- $attachMetadata = or $attachMetadata .Values.nodeLabels.nodeArchitecture -}}
{{- $attachMetadata = or $attachMetadata .Values.nodeLabels.instanceType -}}
{{- $attachMetadata = or $attachMetadata (gt (keys .Values.nodeLabels | len) 0) -}}
{{- if eq $attachMetadata true }}
attach_metadata {
node = true
Expand Down Expand Up @@ -99,4 +100,11 @@ rule {
target_label = "instance_type"
}
{{- end }}
{{- range $attribute, $label := (omit .Values.nodeLabels "nodePool" "region" "availabilityZone" "nodeRole" "nodeOS" "nodeArchitecture" "instanceType")}}

rule {
source_labels = [{{ $label | quote }}]
target_label = {{ $attribute | quote }}
}
{{- end }}
{{- end }}
1 change: 0 additions & 1 deletion charts/k8s-monitoring/charts/feature-pod-logs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ labels:
app_kubernetes_io_name: app.kubernetes.io/name

# -- Log labels to set with values copied from the Kubernetes Node labels.
# Only used for "filelog" gather method.
# Format: `<log_label>: <kubernetes_node_label>`.
# @section -- Log Processing
nodeLabels: {}
Expand Down
12 changes: 6 additions & 6 deletions charts/k8s-monitoring/docs/examples/meta-monitoring/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ integrations:
region: true
availability_zone: true
node_role: true
os: true
architecture: true
nodeOS: true
nodeArchitecture: true
instance_type: true

alloy:
Expand Down Expand Up @@ -111,8 +111,8 @@ clusterMetrics:
region: true
availabilityZone: true
nodeRole: true
os: true
architecture: true
nodeOS: true
nodeArchitecture: true
instanceType: true

kubelet:
Expand Down Expand Up @@ -169,8 +169,8 @@ podLogs:
region: true
availabilityZone: true
nodeRole: true
os: true
architecture: true
nodeOS: true
nodeArchitecture: true
instanceType: true

structuredMetadata:
Expand Down
133 changes: 133 additions & 0 deletions charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading