Merge pull request #89 from lightstep/fix-syntax

Update syntax usage for 105

Author: jaronoff97

charts/collector-k8s/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: otelcollector
 description: Deprecated chart for using the OpenTelemetry Collector to scape static or dynamic metric targets.
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: 0.91.1
 deprecated: true
 dependencies: []

charts/collector-k8s/scrape_configs_ds.yaml

@@ -1,26 +1,27 @@
 - job_name: otel-collector
   scrape_interval: 5s
   static_configs:
-  - labels:
-      collector_name: ${KUBE_POD_NAME}
-    targets:
-      - 0.0.0.0:8888
+    - labels:
+        collector_name: ${env:KUBE_POD_NAME}
+      targets:
+        - 0.0.0.0:8888
 - job_name: apps
   kubernetes_sd_configs:
-  - role: pod
-    selectors:
     - role: pod
-      # only scrape data from pods running on the same node as collector
-      field: "spec.nodeName=$KUBE_NODE_NAME"
+      selectors:
+        - role: pod
+          # only scrape data from pods running on the same node as collector
+          field: "spec.nodeName=${env:KUBE_POD_NAME}"
   relabel_configs:
-  # scrape pods annotated with "prometheus.io/scrape: true"
-  - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
-    regex: "true"
-    action: keep
-  # read the port from "prometheus.io/port: <port>" annotation and update scraping address accordingly
-  - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
-    action: replace
-    target_label: __address__
-    regex: ([^:]+)(?::\d+)?;(\d+)
-    # escaped $1:$2
-    replacement: $$1:$$2
+    # scrape pods annotated with "prometheus.io/scrape: true"
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+      regex: "true"
+      action: keep
+    # read the port from "prometheus.io/port: <port>" annotation and update scraping address accordingly
+    - source_labels:
+        [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+      action: replace
+      target_label: __address__
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      # escaped $1:$2
+      replacement: $$1:$$2

charts/kube-otel-stack/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kube-otel-stack
 description: Chart for sending Kubernetes metrics to Lightstep using the OpenTelemetry Operator.
 type: application
-version: 0.7.0
+version: 0.8.0
 appVersion: 0.92.0
 dependencies:
   # cert manager must be manually installed because it has CRDs

charts/kube-otel-stack/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
@@ -77,37 +77,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
@@ -116,7 +116,7 @@
   relabel_configs:
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - job
@@ -126,7 +126,7 @@
     target_label: job
   - action: replace
     regex: "(.*)"
-    replacement: "${1}"
+    replacement: "$${1}"
     separator: ";"
     source_labels:
     - __meta_kubernetes_node_name
@@ -138,22 +138,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
@@ -179,7 +179,7 @@
   relabel_configs:
   - action: replace
     regex: "(.*)"
-    replacement: "$1"
+    replacement: "$$1"
     separator: ";"
     source_labels:
     - job
@@ -189,7 +189,7 @@
     target_label: job
   - action: replace
     regex: "(.*)"
-    replacement: "${1}"
+    replacement: "$${1}"
     separator: ";"
     source_labels:
     - __meta_kubernetes_node_name
@@ -201,22 +201,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
@@ -226,4 +226,4 @@
   tls_config:
     ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
     insecure_skip_verify: true
-{{- end }}
+{{- end }}

charts/kube-otel-stack/templates/collector.yaml

@@ -115,16 +115,16 @@ spec:
             scrape_interval: 5s
             static_configs:
             - labels:
-                collector_name: ${OTEL_K8S_POD_NAME}
+                collector_name: ${env:OTEL_K8S_POD_NAME}
               targets:
-                - ${OTEL_K8S_POD_IP}:8888
+                - ${env:OTEL_K8S_POD_IP}:8888
           {{ end }}
         {{- if $collector.targetallocator }}
         {{- if $collector.targetallocator.enabled }}
         target_allocator:
           endpoint: http://{{ $collectorName }}-targetallocator:80
           interval: 30s
-          collector_id: ${OTEL_K8S_POD_NAME}
+          collector_id: ${env:OTEL_K8S_POD_NAME}
           http_sd_config:
             refresh_interval: 60s
         {{ end }}

charts/kube-otel-stack/values.yaml

@@ -59,7 +59,7 @@ tracesCollector:
   name: traces
   clusterName: ""
 
-  image: otel/opentelemetry-collector-contrib:0.103.0
+  image: otel/opentelemetry-collector-contrib:0.105.0
   mode: deployment
   replicas: 1
   hpa:
@@ -220,7 +220,7 @@ tracesCollector:
 metricsCollector:
   name: metrics
   clusterName: ""
-  image: otel/opentelemetry-collector-contrib:0.103.0
+  image: otel/opentelemetry-collector-contrib:0.105.0
   enabled: true
   mode: statefulset
   replicas: 3
@@ -233,7 +233,7 @@ metricsCollector:
     enabled: true
     allocationStrategy: "consistent-hashing"
     replicas: 2
-    image: ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:0.103.0
+    image: ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:0.104.0
     prometheusCR:
       enabled: true
     # Override Default targetAllocator resources
@@ -348,7 +348,7 @@ metricsCollector:
 logsCollector:
   name: logs
   clusterName: ""
-  image: otel/opentelemetry-collector-contrib:0.103.0
+  image: otel/opentelemetry-collector-contrib:0.105.0
   enabled: false
   mode: daemonset
   resources:
@@ -1252,7 +1252,7 @@ opAMPBridge:
   addManagedLabel: false
   image:
     repository: ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge
-    tag: "0.103.0"
+    tag: "0.104.0"
   endpoint: "wss://opamp.lightstep.com/v1/opamp"
   headers:
     "Authorization": "bearer ${LS_OPAMP_API_KEY}"

charts/otel-cloud-stack/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.6.0"
+version: "0.7.0"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to