add cluster name to o2 collector

Author: prabhatsharma

README.md

@@ -3,6 +3,7 @@
 Following charts are available in this repository:
 
 - [openobserve](charts/openobserve/README.md)
+- [openobserve-standalone](charts/openobserve-standalone/README.md)
 - [openobserve-collector](charts/openobserve-collector/README.md)
 
 

charts/openobserve-collector/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.3.15
+version: 0.3.16
 
 # 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

charts/openobserve-collector/README.md

@@ -45,7 +45,7 @@ If you are developing this chart then you should clone the repo and make any mod
 You can generate output of the chart using below command to verify:
 
 ```shell
-helm -n openobserve-collector template o2c . > o1.yaml
+helm -n openobserve-collector template o2c . > o2c1.yaml
 ```
 
 You can install using:
@@ -59,6 +59,7 @@ or
 ```shell
 helm --namespace openobserve-collector \
   install o2c . \
+  --set k8sCluster=cluster1  \
   --set exporters."otlphttp/openobserve".endpoint=URL  \
   --set exporters."otlphttp/openobserve".headers.Authorization="Basic base64 encoded auth"  \
   --set exporters."otlphttp/openobserve_k8s_events".endpoint=URL  \

charts/openobserve-collector/templates/agent.yaml

@@ -45,6 +45,11 @@ spec:
     connectors:
 {{ toYaml .Values.agent.connectors | indent 6 }}
     processors:
+      attributes:
+        actions:
+          - key: k8s_cluster
+            action: insert
+            value: {{ .Values.k8sCluster | quote }}
 {{ toYaml .Values.agent.processors | indent 6 }}
     extensions:
 {{ toYaml .Values.agent.extensions | indent 6 }}

charts/openobserve-collector/templates/gateway.yaml

@@ -46,6 +46,11 @@ spec:
     connectors:
 {{ toYaml .Values.gateway.connectors | indent 6 }}
     processors:
+      attributes:
+        actions:
+          - key: k8s_cluster
+            action: insert
+            value: {{ .Values.k8sCluster | quote }}
 {{ toYaml .Values.gateway.processors | indent 6 }}
     extensions:
 {{ toYaml .Values.gateway.extensions | indent 6 }}

charts/openobserve-collector/values.yaml

@@ -14,6 +14,7 @@ exporters:
       stream-name: k8s_events
 
 replicaCount: 1
+k8sCluster: "cluster1"
 
 image:
   repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib

charts/openobserve-standalone/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: https://charts.min.io
   version: 5.3.0
 digest: sha256:c539f29a4cbdeef50e73fccb320917baf7e08913288b2b2ba68f89f0eaf266de
-generated: "2024-12-13T12:15:22.86877+08:00"
+generated: "2024-12-14T14:34:01.474465-08:00"

charts/openobserve/Chart.lock

@@ -9,4 +9,4 @@ dependencies:
   repository: https://charts.min.io
   version: 5.3.0
 digest: sha256:63714207ce2a35dd0dac5d8f70e4c23cb058f1a6f710689dcdbd6fe018221cb0
-generated: "2024-12-13T12:15:12.433456+08:00"
+generated: "2024-12-14T14:33:57.460734-08:00"

charts/openobserve/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.14.2
+version: 0.14.3
 
 # 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

index.yaml

@@ -58,6 +58,34 @@ entries:
     - https://charts.openobserve.ai/charts/minio-5.0.7.tgz
     version: 5.0.7
   openobserve:
+  - apiVersion: v2
+    appVersion: v0.14.0
+    created: "2024-12-14T14:34:01.790371-08:00"
+    dependencies:
+    - condition: etcd.enabled
+      name: etcd
+      repository: https://charts.bitnami.com/bitnami
+      version: 10.4.2
+    - condition: nats.enabled
+      name: nats
+      repository: https://nats-io.github.io/k8s/helm/charts/
+      version: 1.2.6
+    - condition: minio.enabled
+      name: minio
+      repository: https://charts.min.io
+      version: 5.3.0
+    description: Logs, Metrics and Traces, Dashboards, RUM, Error tracking, Session
+      replay etc. Elasticsearch API compatibility.
+    digest: 3b6557992f943bc02f0741282e3422f5f5baac2d668df9e6ebd73fe91c06e677
+    maintainers:
+    - email: [email protected]
+      name: OpenObserve
+      url: https://openobserve.ai
+    name: openobserve
+    type: application
+    urls:
+    - openobserve-0.14.3.tgz
+    version: 0.14.3
   - apiVersion: v2
     appVersion: v0.14.0
     created: "2024-12-13T12:15:24.132311+08:00"
@@ -3607,6 +3635,20 @@ entries:
     - https://charts.openobserve.ai/openobserve-0.5.0.tgz
     version: 0.5.0
   openobserve-collector:
+  - apiVersion: v2
+    appVersion: 0.113.0
+    created: "2024-12-14T14:34:01.791765-08:00"
+    description: An opinionated installation of OTEL Collector for OpenObserve
+    digest: aed47e10b526fad0941a8af3b11328d90e8852119bd931f8f2eae42c58880440
+    maintainers:
+    - email: [email protected]
+      name: OpenObserve
+      url: https://openobserve.ai
+    name: openobserve-collector
+    type: application
+    urls:
+    - openobserve-collector-0.3.16.tgz
+    version: 0.3.16
   - apiVersion: v2
     appVersion: 0.113.0
     created: "2024-12-13T12:15:24.133308+08:00"
@@ -4114,15 +4156,15 @@ entries:
   openobserve-standalone:
   - apiVersion: v2
     appVersion: v0.14.0
-    created: "2024-12-13T12:15:24.134918+08:00"
+    created: "2024-12-14T14:34:01.793041-08:00"
     dependencies:
     - condition: minio.enabled
       name: minio
       repository: https://charts.min.io
       version: 5.3.0
     description: Logs, Metrics and Traces, Dashboards, RUM, Error tracking, Session
       replay etc. Elasticsearch API compatibility.
-    digest: 8164dc556be74c2a522d447513e7d2874241aec127cb4c859ee29c963fd2468e
+    digest: 1c7370e5a766a5ccf70fd2da58a27de987c9b5ce91f31bab7a9d2949549c2a6f
     maintainers:
     - email: [email protected]
       name: OpenObserve
@@ -4632,4 +4674,4 @@ entries:
     urls:
     - openobserve-standalone-0.7.29.tgz
     version: 0.7.29
-generated: "2024-12-13T12:15:24.126286+08:00"
+generated: "2024-12-14T14:34:01.786083-08:00"