Merge branch 'main' into k8s_node_ip_in_pod

open-telemetry · Jan 5, 2025 · b51ea37 · b51ea37
2 parents 463262b + b08f214
commit b51ea37
Show file tree

Hide file tree

Showing 46 changed files with 296 additions and 140 deletions.
diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-kube-stack
-version: 0.3.8
+version: 0.3.9
 description: |
   OpenTelemetry Quickstart chart for Kubernetes.
   Installs an operator and collector for an easy way to get started with Kubernetes observability.

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.8
+    helm.sh/chart: opentelemetry-kube-stack-0.3.9
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-cluster-stats
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.8
+    helm.sh/chart: opentelemetry-kube-stack-0.3.9
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        
@@ -187,7 +187,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.8
+    helm.sh/chart: opentelemetry-kube-stack-0.3.9
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.3.8
+              -l helm.sh/chart=opentelemetry-kube-stack-0.3.9
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
@@ -5,7 +5,7 @@ kind: Instrumentation
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.8
+    helm.sh/chart: opentelemetry-kube-stack-0.3.9
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/kubelet_scrape_configs.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/kubelet_scrape_configs.yaml
@@ -15,7 +15,7 @@
   relabel_configs:
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - job
@@ -25,7 +25,7 @@
     target_label: job
   - action: replace
     regex: "(.*)"
-    replacement: "${1}"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __meta_kubernetes_node_name
@@ -37,22 +37,22 @@
     target_label: endpoint
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __metrics_path__
     target_label: metrics_path
   - action: hashmod
     modulus: 1
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __address__
     target_label: __tmp_hash
   - action: keep
     regex: "$(SHARD)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __tmp_hash
@@ -81,37 +81,37 @@
   metric_relabel_configs:
   - action: drop
     regex: container_cpu_(cfs_throttled_seconds_total|load_average_10s|system_seconds_total|user_seconds_total)
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __name__
   - action: drop
     regex: container_fs_(io_current|io_time_seconds_total|io_time_weighted_seconds_total|reads_merged_total|sector_reads_total|sector_writes_total|writes_merged_total)
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __name__
   - action: drop
     regex: container_memory_(mapped_file|swap)
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __name__
   - action: drop
     regex: container_(file_descriptors|tasks_state|threads_max)
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __name__
   - action: drop
     regex: container_spec.*
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __name__
   - action: drop
     regex: ".+;"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - id
@@ -120,7 +120,7 @@
   relabel_configs:
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - job
@@ -130,7 +130,7 @@
     target_label: job
   - action: replace
     regex: "(.*)"
-    replacement: "${1}"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __meta_kubernetes_node_name
@@ -142,22 +142,22 @@
     target_label: endpoint
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __metrics_path__
     target_label: metrics_path
   - action: hashmod
     modulus: 1
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __address__
     target_label: __tmp_hash
   - action: keep
     regex: "$(SHARD)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __tmp_hash
@@ -189,7 +189,7 @@
   relabel_configs:
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - job
@@ -199,7 +199,7 @@
     target_label: job
   - action: replace
     regex: "(.*)"
-    replacement: "${1}"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __meta_kubernetes_node_name
@@ -211,22 +211,22 @@
     target_label: endpoint
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __metrics_path__
     target_label: metrics_path
   - action: hashmod
     modulus: 1
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __address__
     target_label: __tmp_hash
   - action: keep
     regex: "$(SHARD)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - __tmp_hash