diff --git a/charts/feature-integrations/tests/mysql_test.yaml b/charts/feature-integrations/tests/mysql_test.yaml index 3807b0c11..47ead92c7 100644 --- a/charts/feature-integrations/tests/mysql_test.yaml +++ b/charts/feature-integrations/tests/mysql_test.yaml @@ -28,13 +28,13 @@ tests: argument "metrics_destinations" { comment = "Must be a list of metric destinations where collected metrics should be forwarded to" } - - + + remote.kubernetes.secret "my_database" { name = "my-database-release-name-k8s-monitoring-feature-integrations" namespace = "NAMESPACE" } - + prometheus.exporter.mysql "my_database" { data_source_name = string.format("%s:%s@(%s:%d)/", nonsensitive(remote.kubernetes.secret.my_database.data["username"]), @@ -49,7 +49,7 @@ tests: job_name = "integration/mysql" forward_to = [prometheus.relabel.my_database.receiver] } - + prometheus.relabel "my_database" { max_cache_size = 100000 rule { @@ -106,7 +106,7 @@ tests: argument "metrics_destinations" { comment = "Must be a list of metric destinations where collected metrics should be forwarded to" } - + prometheus.exporter.mysql "test_db" { data_source_name = string.format("%s:%d/", "database.test.svc", 3306) enable_collectors = ["heartbeat","mysql.user"] @@ -116,7 +116,7 @@ tests: job_name = "integration/mysql" forward_to = [prometheus.relabel.test_db.receiver] } - + prometheus.relabel "test_db" { max_cache_size = 100000 rule { @@ -125,7 +125,7 @@ tests: } forward_to = argument.metrics_destinations.value } - + prometheus.exporter.mysql "staging_db" { data_source_name = "root:password@database.staging.svc:3306/" enable_collectors = ["heartbeat","mysql.user"] @@ -135,7 +135,7 @@ tests: job_name = "integration/mysql" forward_to = [prometheus.relabel.staging_db.receiver] } - + prometheus.relabel "staging_db" { max_cache_size = 100000 rule { @@ -144,13 +144,13 @@ tests: } forward_to = argument.metrics_destinations.value } - - + + remote.kubernetes.secret "prod_db" { name = "prod-db-release-name-k8s-monitoring-feature-integrations" namespace = "NAMESPACE" } - + prometheus.exporter.mysql "prod_db" { data_source_name = string.format("%s:%s@(%s:%d)/", nonsensitive(remote.kubernetes.secret.prod_db.data["username"]), @@ -165,7 +165,7 @@ tests: job_name = "integration/mysql" forward_to = [prometheus.relabel.prod_db.receiver] } - + prometheus.relabel "prod_db" { max_cache_size = 100000 rule { @@ -204,7 +204,7 @@ tests: dataSource: host: test-database-mysql.mysql.svc auth: - usernameFrom: env(MYSQL_ROOT_USER) + usernameFrom: sys.env(MYSQL_ROOT_USER) passwordKey: mysql-root-password secret: create: false @@ -222,16 +222,16 @@ tests: argument "metrics_destinations" { comment = "Must be a list of metric destinations where collected metrics should be forwarded to" } - - + + remote.kubernetes.secret "test_database" { name = "test-database-mysql" namespace = "mysql" } - + prometheus.exporter.mysql "test_database" { data_source_name = string.format("%s:%s@(%s:%d)/", - env(MYSQL_ROOT_USER), + sys.env(MYSQL_ROOT_USER), remote.kubernetes.secret.test_database.data["mysql-root-password"], "test-database-mysql.mysql.svc", 3306, @@ -243,7 +243,7 @@ tests: job_name = "integration/mysql" forward_to = [prometheus.relabel.test_database.receiver] } - + prometheus.relabel "test_database" { max_cache_size = 100000 rule { diff --git a/charts/feature-node-logs/templates/_module.alloy.tpl b/charts/feature-node-logs/templates/_module.alloy.tpl index dfbf795ab..d92a5ec22 100644 --- a/charts/feature-node-logs/templates/_module.alloy.tpl +++ b/charts/feature-node-logs/templates/_module.alloy.tpl @@ -68,7 +68,7 @@ declare "node_logs" { relabel_rules = loki.relabel.journal.rules labels = { job = {{ .Values.journal.jobLabel | quote }}, - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/feature-node-logs/tests/default_test.yaml b/charts/feature-node-logs/tests/default_test.yaml index b913cffc0..5445152a3 100644 --- a/charts/feature-node-logs/tests/default_test.yaml +++ b/charts/feature-node-logs/tests/default_test.yaml @@ -71,7 +71,7 @@ tests: relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/feature-node-logs/tests/filter_units_test.yaml b/charts/feature-node-logs/tests/filter_units_test.yaml index a68f6b94a..37afd9af2 100644 --- a/charts/feature-node-logs/tests/filter_units_test.yaml +++ b/charts/feature-node-logs/tests/filter_units_test.yaml @@ -82,7 +82,7 @@ tests: relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/feature-node-logs/tests/labels_test.yaml b/charts/feature-node-logs/tests/labels_test.yaml index b2ce68b9a..24d6edd75 100644 --- a/charts/feature-node-logs/tests/labels_test.yaml +++ b/charts/feature-node-logs/tests/labels_test.yaml @@ -76,7 +76,7 @@ tests: relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/feature-node-logs/tests/structured_metadata_test.yaml b/charts/feature-node-logs/tests/structured_metadata_test.yaml index edf24e57a..39936ce9d 100644 --- a/charts/feature-node-logs/tests/structured_metadata_test.yaml +++ b/charts/feature-node-logs/tests/structured_metadata_test.yaml @@ -77,7 +77,7 @@ tests: relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/feature-pod-logs/templates/_volumes.alloy.tpl b/charts/feature-pod-logs/templates/_volumes.alloy.tpl index fcd6ed1b4..4ca6f2cb4 100644 --- a/charts/feature-pod-logs/templates/_volumes.alloy.tpl +++ b/charts/feature-pod-logs/templates/_volumes.alloy.tpl @@ -3,7 +3,7 @@ discovery.kubernetes "pods" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } {{- if .Values.namespaces }} namespaces { diff --git a/charts/feature-pod-logs/tests/default_test.yaml b/charts/feature-pod-logs/tests/default_test.yaml index e62deee54..4edee6277 100644 --- a/charts/feature-pod-logs/tests/default_test.yaml +++ b/charts/feature-pod-logs/tests/default_test.yaml @@ -77,7 +77,7 @@ tests: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } @@ -228,7 +228,7 @@ tests: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } @@ -378,7 +378,7 @@ tests: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/feature-profiling/templates/_ebpf.tpl b/charts/feature-profiling/templates/_ebpf.tpl index 6d62a9d5d..b66d80813 100644 --- a/charts/feature-profiling/templates/_ebpf.tpl +++ b/charts/feature-profiling/templates/_ebpf.tpl @@ -4,7 +4,7 @@ discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } {{- if .Values.ebpf.namespaces }} namespaces { diff --git a/charts/feature-profiling/templates/_java.tpl b/charts/feature-profiling/templates/_java.tpl index 852af6d52..56dfcb571 100644 --- a/charts/feature-profiling/templates/_java.tpl +++ b/charts/feature-profiling/templates/_java.tpl @@ -4,7 +4,7 @@ discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } {{- if .Values.java.namespaces }} namespaces { diff --git a/charts/feature-profiling/templates/_pprof.tpl b/charts/feature-profiling/templates/_pprof.tpl index 99bc27469..f8d2da0c2 100644 --- a/charts/feature-profiling/templates/_pprof.tpl +++ b/charts/feature-profiling/templates/_pprof.tpl @@ -4,7 +4,7 @@ discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } {{- if .Values.pprof.namespaces }} namespaces { diff --git a/charts/feature-profiling/tests/ebpf_test.yaml b/charts/feature-profiling/tests/ebpf_test.yaml index c8678e54d..7a0b84ee1 100644 --- a/charts/feature-profiling/tests/ebpf_test.yaml +++ b/charts/feature-profiling/tests/ebpf_test.yaml @@ -26,11 +26,11 @@ tests: discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } - + discovery.relabel "ebpf_pods" { targets = discovery.kubernetes.ebpf_pods.targets rule { @@ -63,7 +63,7 @@ tests: target_label = "service_name" } } - + pyroscope.ebpf "ebpf_pods" { targets = discovery.relabel.ebpf_pods.output demangle = "none" @@ -100,14 +100,14 @@ tests: discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } namespaces { names = ["default"] } role = "pod" } - + discovery.relabel "ebpf_pods" { targets = discovery.kubernetes.ebpf_pods.targets rule { @@ -145,7 +145,7 @@ tests: action = "drop" } } - + pyroscope.ebpf "ebpf_pods" { targets = discovery.relabel.ebpf_pods.output demangle = "none" diff --git a/charts/feature-profiling/tests/java_test.yaml b/charts/feature-profiling/tests/java_test.yaml index a2a4fc9b3..0c575b81e 100644 --- a/charts/feature-profiling/tests/java_test.yaml +++ b/charts/feature-profiling/tests/java_test.yaml @@ -26,15 +26,15 @@ tests: discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } - + discovery.process "java_pods" { join = discovery.kubernetes.java_pods.targets } - + discovery.relabel "java_pods" { targets = discovery.process.java_pods.targets rule { @@ -69,7 +69,7 @@ tests: target_label = "container" } } - + pyroscope.java "java_pods" { targets = discovery.relabel.java_pods.output profiling_config { diff --git a/charts/feature-profiling/tests/pprof_test.yaml b/charts/feature-profiling/tests/pprof_test.yaml index 8a8f7fa6f..f08547c03 100644 --- a/charts/feature-profiling/tests/pprof_test.yaml +++ b/charts/feature-profiling/tests/pprof_test.yaml @@ -26,11 +26,11 @@ tests: discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } - + discovery.relabel "pprof_pods" { targets = discovery.kubernetes.pprof_pods.targets rule { @@ -38,7 +38,7 @@ tests: source_labels = ["__meta_kubernetes_pod_phase"] regex = "Pending|Succeeded|Failed|Completed" } - + rule { regex = "__meta_kubernetes_pod_label_(.+)" action = "labelmap" @@ -56,7 +56,7 @@ tests: target_label = "container" } } - + discovery.relabel "pprof_pods_block_default_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -69,7 +69,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_block_scheme"] action = "replace" @@ -92,7 +92,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_block_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -110,7 +110,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_block_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_block_scheme"] action = "replace" @@ -133,10 +133,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_block" { targets = concat(discovery.relabel.pprof_pods_block_default_name.output, discovery.relabel.pprof_pods_block_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -167,7 +167,7 @@ tests: enabled = false } } - + forward_to = argument.profiles_destinations.value } discovery.relabel "pprof_pods_cpu_default_name" { @@ -182,7 +182,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_cpu_scheme"] action = "replace" @@ -205,7 +205,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_cpu_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -223,7 +223,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_cpu_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_cpu_scheme"] action = "replace" @@ -246,10 +246,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_cpu" { targets = concat(discovery.relabel.pprof_pods_cpu_default_name.output, discovery.relabel.pprof_pods_cpu_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -280,7 +280,7 @@ tests: enabled = false } } - + forward_to = argument.profiles_destinations.value } discovery.relabel "pprof_pods_fgprof_default_name" { @@ -295,7 +295,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_fgprof_scheme"] action = "replace" @@ -318,7 +318,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_fgprof_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -336,7 +336,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_fgprof_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_fgprof_scheme"] action = "replace" @@ -359,10 +359,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_fgprof" { targets = concat(discovery.relabel.pprof_pods_fgprof_default_name.output, discovery.relabel.pprof_pods_fgprof_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -393,7 +393,7 @@ tests: enabled = false } } - + forward_to = argument.profiles_destinations.value } discovery.relabel "pprof_pods_goroutine_default_name" { @@ -408,7 +408,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_goroutine_scheme"] action = "replace" @@ -431,7 +431,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_goroutine_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -449,7 +449,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_goroutine_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_goroutine_scheme"] action = "replace" @@ -472,10 +472,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_goroutine" { targets = concat(discovery.relabel.pprof_pods_goroutine_default_name.output, discovery.relabel.pprof_pods_goroutine_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -506,7 +506,7 @@ tests: enabled = false } } - + forward_to = argument.profiles_destinations.value } discovery.relabel "pprof_pods_memory_default_name" { @@ -521,7 +521,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_memory_scheme"] action = "replace" @@ -544,7 +544,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_memory_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -562,7 +562,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_memory_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_memory_scheme"] action = "replace" @@ -585,10 +585,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_memory" { targets = concat(discovery.relabel.pprof_pods_memory_default_name.output, discovery.relabel.pprof_pods_memory_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -619,7 +619,7 @@ tests: enabled = false } } - + forward_to = argument.profiles_destinations.value } discovery.relabel "pprof_pods_mutex_default_name" { @@ -634,7 +634,7 @@ tests: regex = "" action = "keep" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_mutex_scheme"] action = "replace" @@ -657,7 +657,7 @@ tests: replacement = "$1:$2" } } - + discovery.relabel "pprof_pods_mutex_custom_name" { targets = discovery.relabel.pprof_pods.output rule { @@ -675,7 +675,7 @@ tests: target_label = "__meta_kubernetes_pod_annotation_profiles_grafana_com_mutex_port_name" action = "keepequal" } - + rule { source_labels = ["__meta_kubernetes_pod_annotation_profiles_grafana_com_mutex_scheme"] action = "replace" @@ -698,10 +698,10 @@ tests: replacement = "$1:$2" } } - + pyroscope.scrape "pyroscope_scrape_mutex" { targets = concat(discovery.relabel.pprof_pods_mutex_default_name.output, discovery.relabel.pprof_pods_mutex_custom_name.output) - + bearer_token_file = "/var/run/secrets/kubernetes.io/serviceaccount/token" profiling_config { profile.block { @@ -732,7 +732,7 @@ tests: enabled = true } } - + forward_to = argument.profiles_destinations.value } } diff --git a/charts/k8s-monitoring/Chart.lock b/charts/k8s-monitoring/Chart.lock index 5061a9573..eea4f8094 100644 --- a/charts/k8s-monitoring/Chart.lock +++ b/charts/k8s-monitoring/Chart.lock @@ -45,4 +45,4 @@ dependencies: repository: https://grafana.github.io/helm-charts version: 0.10.1 digest: sha256:e2eab36a3b814d7ec09942c3fe46a5c76d606f7c3022628905c41fba7a47b405 -generated: "2024-12-19T15:59:34.686215-06:00" +generated: "2024-12-20T17:11:20.22437-05:00" diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz index 4b593d1d9..029386144 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz index ff014b7dc..dff5c3b69 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz index 888ee6847..31bc07700 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz index 54b601654..70552ed09 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz index 94d7aa203..c33a67826 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz index b7b29a3e4..2757285f9 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz index 4c35d9d44..e883d0717 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz index 44a8ddd12..b5f080d78 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz index 43b202ff4..23f83f54d 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz index 6ea5618b8..bfc38a69a 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy index fb5ac760f..e2c5dd740 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy @@ -83,7 +83,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml index 00aa08cb6..c14c6c2a0 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml @@ -314,7 +314,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy index 4f7369467..530a7ef00 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy @@ -83,7 +83,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml index c5b98c8df..fc9715689 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml @@ -303,7 +303,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy index cca6e85ed..2f0febceb 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy @@ -95,7 +95,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml index c84ebab4e..d6b5b2719 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml @@ -323,7 +323,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy index 8563bca02..905932497 100644 --- a/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml index 8369bfa5f..0fc94516b 100644 --- a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml +++ b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml @@ -527,7 +527,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/alloy-logs.alloy index 646d6b6fe..62c9be259 100644 --- a/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/alloy-logs.alloy @@ -135,7 +135,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml b/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml index 8bb817cd2..a0d80ddc3 100644 --- a/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml +++ b/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml @@ -613,7 +613,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy index 186110a66..b56a5014a 100644 --- a/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy @@ -89,7 +89,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml index c7ead7476..35d58875f 100644 --- a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml +++ b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml @@ -724,7 +724,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy index 5a557203f..69c761410 100644 --- a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml index 67c3a8c79..5d876b0ef 100644 --- a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml @@ -845,7 +845,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy index 080ef8c74..4777cd05a 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy @@ -96,7 +96,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml index 609492c46..d36fb6bca 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml @@ -460,7 +460,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy index af4d6eb05..5f98ce767 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy @@ -110,7 +110,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml index 4ee8a7399..ee06eea6b 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml @@ -333,7 +333,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/node-logs/default/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/node-logs/default/alloy-logs.alloy index 9ec737b38..702cb4be7 100644 --- a/charts/k8s-monitoring/docs/examples/features/node-logs/default/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/node-logs/default/alloy-logs.alloy @@ -76,7 +76,7 @@ declare "node_logs" { relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml index 11572890c..a76c193f4 100644 --- a/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml @@ -101,7 +101,7 @@ data: relabel_rules = loki.relabel.journal.rules labels = { job = "integrations/kubernetes/journal", - instance = env("HOSTNAME"), + instance = sys.env("HOSTNAME"), } forward_to = [loki.process.journal_logs.receiver] } diff --git a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy index ddbfd2249..9768ea2f6 100644 --- a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml index ba8e148d3..6a1b9f3d4 100644 --- a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml @@ -107,7 +107,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy b/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy index 585f442f3..2af44c232 100644 --- a/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy +++ b/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy @@ -24,7 +24,7 @@ declare "profiling" { discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -71,7 +71,7 @@ declare "profiling" { discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -130,7 +130,7 @@ declare "profiling" { discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml index 15da78c26..bca72df50 100644 --- a/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml @@ -49,7 +49,7 @@ data: discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -96,7 +96,7 @@ data: discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -155,7 +155,7 @@ data: discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy index 53d71a65f..b4dad0b30 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml index 63d2e9c3e..a9811ffe5 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml @@ -696,7 +696,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy index 79cb76962..c3e95a68d 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml index f9e0ce67f..b8aa78165 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml @@ -644,7 +644,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy index 44055447a..e5fade496 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml index 11045cfc9..f2251d376 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml @@ -750,7 +750,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy index 800078045..019cc0f2d 100644 --- a/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/private-image-registries/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml index 72d667716..c3f75de84 100644 --- a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml +++ b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml @@ -533,7 +533,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy index ef4347323..4a7a4b688 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy @@ -82,7 +82,7 @@ declare "pod_logs" { role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy index bda88a3d2..75e6918b3 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy +++ b/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy @@ -24,7 +24,7 @@ declare "profiling" { discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -71,7 +71,7 @@ declare "profiling" { discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -130,7 +130,7 @@ declare "profiling" { discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml index 0e28839ed..77af54b5e 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/output.yaml +++ b/charts/k8s-monitoring/docs/examples/proxies/output.yaml @@ -732,7 +732,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } @@ -1075,7 +1075,7 @@ data: discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -1122,7 +1122,7 @@ data: discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -1181,7 +1181,7 @@ data: discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } diff --git a/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml index 5d678e64f..8fde16bbe 100644 --- a/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml @@ -718,7 +718,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } namespaces { names = ["default"] diff --git a/charts/k8s-monitoring/tests/integration/cluster-monitoring/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/cluster-monitoring/.rendered/output.yaml index 67c9ffed0..8dba0f91b 100644 --- a/charts/k8s-monitoring/tests/integration/cluster-monitoring/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/cluster-monitoring/.rendered/output.yaml @@ -868,7 +868,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/.rendered/output.yaml index c432a4ffc..a3f22a64a 100644 --- a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/.rendered/output.yaml @@ -843,7 +843,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml index 344c0e09d..63162d81c 100644 --- a/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml @@ -984,7 +984,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml index 51c98afd2..9797d6a40 100644 --- a/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml @@ -312,7 +312,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/tests/integration/profiling/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/profiling/.rendered/output.yaml index 0d5585069..cb24d8663 100644 --- a/charts/k8s-monitoring/tests/integration/profiling/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/profiling/.rendered/output.yaml @@ -49,7 +49,7 @@ data: discovery.kubernetes "ebpf_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -96,7 +96,7 @@ data: discovery.kubernetes "java_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } @@ -155,7 +155,7 @@ data: discovery.kubernetes "pprof_pods" { selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } role = "pod" } diff --git a/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml index 48ada7078..6c07dfb35 100644 --- a/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml @@ -1060,7 +1060,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } } diff --git a/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml index e1660776e..42d7e6a0f 100644 --- a/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml @@ -822,7 +822,7 @@ data: role = "pod" selectors { role = "pod" - field = "spec.nodeName=" + env("HOSTNAME") + field = "spec.nodeName=" + sys.env("HOSTNAME") } }