Merge branch 'master' into feat/otel-refactoring

portefaix · Feb 26, 2025 · 7169d08 · 7169d08
2 parents 5b4c2f9 + de7f5b1
commit 7169d08
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
       with:
         egress-policy: audit
 

diff --git a/gitops/argocd/apps/observability/values-talos-homelab.yaml b/gitops/argocd/apps/observability/values-talos-homelab.yaml
@@ -49,10 +49,10 @@ argocd-apps:
             # prune: true
           - appName: opentelemetry-operator
             namespace: opentelemetry
-            targetRevision: HEAD
+            targetRevision: feat/otel-refactoring
           - appName: opentelemetry-collector
             namespace: opentelemetry
-            targetRevision: HEAD
+            targetRevision: feat/otel-refactoring
           - appName: alloy
             namespace: opentelemetry
             targetRevision: HEAD

diff --git a/gitops/argocd/charts/ai/ollama/Chart.yaml b/gitops/argocd/charts/ai/ollama/Chart.yaml
@@ -10,4 +10,4 @@ appVersion: 1.0.0
 dependencies:
 - name: ollama
   repository: https://otwld.github.io/ollama-helm
-  version: 1.6.0
+  version: 1.7.0
diff --git a/gitops/argocd/charts/alerting/keep/Chart.yaml b/gitops/argocd/charts/alerting/keep/Chart.yaml
@@ -10,4 +10,4 @@ appVersion: 1.0.0
 dependencies:
 - name: keep
   repository: https://keephq.github.io/helm-charts
-  version: 0.1.64
+  version: 0.1.65
diff --git a/gitops/argocd/charts/opentelemetry/alloy-otel/Chart.yaml b/gitops/argocd/charts/opentelemetry/alloy-otel/Chart.yaml
@@ -10,27 +10,27 @@ appVersion: 1.0.0
 dependencies:
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-metrics
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-logs
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-traces
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-events
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-profiles
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
   alias: alloy-frontend
 - name: alloy-mixin
   repository: oci://ghcr.io/portefaix/charts

diff --git a/gitops/argocd/charts/opentelemetry/alloy/Chart.yaml b/gitops/argocd/charts/opentelemetry/alloy/Chart.yaml
@@ -10,4 +10,4 @@ appVersion: 1.0.0
 dependencies:
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.11.0
+  version: 0.12.0
diff --git a/gitops/argocd/charts/opentelemetry/alloy/templates/alloy/endpoints/_endpoints_metrics.alloy b/gitops/argocd/charts/opentelemetry/alloy/templates/alloy/endpoints/_endpoints_metrics.alloy
@@ -8,11 +8,11 @@
 
 otelcol.receiver.prometheus "local" {
   output {
-    metrics = [otelcol.exporter.otlp.local.input]
+    metrics = [otelcol.exporter.otlphttp.local.input]
   }
 }
 
-otelcol.exporter.otlp "local" {
+otelcol.exporter.otlphttp "local" {
   client {
     endpoint = {{ .Values.observability.otlp.endpoint | quote }}
   }

diff --git a/gitops/argocd/charts/opentelemetry/alloy/values.yaml b/gitops/argocd/charts/opentelemetry/alloy/values.yaml
@@ -9,7 +9,7 @@ portefaixVersion: v0.54.0
 
 observability:
   otlp:
-    endpoint: http://opentelemetry-collector-opentelemetry-metrics.opentelemetry.svc.cluster.local:4318
+    endpoint: http://opentelemetry-collector-opentelemetry-gateway.opentelemetry.svc.cluster.local:4318
 
 alloy:
   alloy:
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ portefaixVersion: v0.54.0 @@
     observability:
       otlp:
-        endpoint: http://opentelemetry-collector-opentelemetry-metrics.opentelemetry.svc.cluster.local:4318
+        endpoint: http://opentelemetry-collector-opentelemetry-gateway.opentelemetry.svc.cluster.local:4318
     alloy:
       alloy:
@@ Expand Down @@