From 3a0920656779fa80ac481846d8078231d7878ba3 Mon Sep 17 00:00:00 2001 From: Aaron Tye Date: Wed, 18 Sep 2024 12:53:28 -0400 Subject: [PATCH] [charts/csm-authorization-v2.0]: Add OTEL Collector address to storage-service and expose prometheus metrics (#512) * Cherry-picked .github/dependabot.yaml from 6e0b47db63705f312cda144e3e8512154f5a5722 (#481) * [charts/csm-authorization-v2.0] Enable dependabot for authorization v2 (#495) * add dependabot config * combine into one * updating dependabot.yaml for isilon (#491) * Add dependabot compatibility for csi-powerstore images (#506) * Add dependabot compatibility for csi-powerstore images * Update dependabot.yml * Adding dependabot compatibility for csi-unity (#509) * Adding dependabot compatibility for csi-unity * Adding dependabot compatibility for csi-unity * Adding dependabot compatibility for csi-unity * add collector address * remove depdendabot --------- Co-authored-by: Eric Young Co-authored-by: shaynafinocchiaro Co-authored-by: aqu-dell <108017114+arnchiequ-dell@users.noreply.github.com> Co-authored-by: Akshay Saini <109056238+AkshaySainiDell@users.noreply.github.com> Co-authored-by: sakshi-garg1 <74704849+sakshi-garg1@users.noreply.github.com> --- .../csm-authorization-v2.0/templates/storage-service.yaml | 6 ++++++ charts/csm-authorization-v2.0/values.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/charts/csm-authorization-v2.0/templates/storage-service.yaml b/charts/csm-authorization-v2.0/templates/storage-service.yaml index ed8f3894..6ed30607 100644 --- a/charts/csm-authorization-v2.0/templates/storage-service.yaml +++ b/charts/csm-authorization-v2.0/templates/storage-service.yaml @@ -91,9 +91,12 @@ spec: - "--redis-sentinel={{ $str }}" - "--redis-password=$(REDIS_PASSWORD)" - "--leader-election=true" + - "--collector-address={{ .Values.authorization.openTelemetryCollectorAddress}}" ports: - containerPort: 50051 name: grpc + - containerPort: 2112 + name: promhttp volumeMounts: - name: config-volume mountPath: /etc/karavi-authorization/config @@ -139,6 +142,9 @@ spec: - port: 50051 targetPort: 50051 name: grpc + - port: 2112 + targetPort: 2112 + name: promhttp --- {{- $namespace := . }} {{- range .Values.vault }} diff --git a/charts/csm-authorization-v2.0/values.yaml b/charts/csm-authorization-v2.0/values.yaml index 4a3f76b1..996ac74d 100644 --- a/charts/csm-authorization-v2.0/values.yaml +++ b/charts/csm-authorization-v2.0/values.yaml @@ -56,6 +56,9 @@ authorization: # collectoruri: http://DNS-hostname:9411/api/v2/spans # probability: 1 + # openTelemetryCollectorAddress: the OTLP receiving endpoint using gRPC + openTelemetryCollectorAddress: "" + # proxy-server ingress configuration proxyServerIngress: ingressClassName: nginx