DX-87986: Prometheus metrics port can be configured

Change-Id: I3894d74fd70350885d5801ccf57e50d44f0bef6a
dremio · Apr 19, 2024 · 3ee0ba6 · 3ee0ba6
1 parent 7996faf
commit 3ee0ba6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/charts/dremio_v2/docs/Values-Reference.md b/charts/dremio_v2/docs/Values-Reference.md
@@ -1040,6 +1040,7 @@ Type: Boolean
 To enable dynamic scaling, this key must be present and set to `true`.
 
 `executor.nodeLifecycleService.metricsPort`
+
 Type: Integer
 
 By default, this value is set to 9010. This is the port where the `/metrics` endpoint is available for a pod.

diff --git a/charts/dremio_v2/templates/_helpers_executor.tpl b/charts/dremio_v2/templates/_helpers_executor.tpl
@@ -421,9 +421,15 @@ tolerations:
 Executor - Prometheus Metrics Port Number
 */}}
 {{ define "dremio.executor.metricsPortNumber" -}}
-{{- $metricsPortNumber := 9010 -}}
+{{- $context := index . 0 -}}
+{{- $engineName := index . 1 -}}
+{{- $engineConfiguration := default (dict) (get (default (dict) $context.Values.executor.engineOverride) $engineName) -}}
+{{- $nodeLifecycleServiceConfig := coalesce $engineConfiguration.nodeLifecycleService $context.Values.executor.nodeLifecycleService $context.Values.nodeLifecycleService -}}
+{{- if $nodeLifecycleServiceConfig.enabled -}}
+{{- $metricsPortNumber := default 9010 $nodeLifecycleServiceConfig.metricsPort -}}
 {{- $metricsPortNumber }}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Executor - Prometheus Executor Metrics Port

diff --git a/charts/dremio_v2/tests/dremio-executor_test.yaml b/charts/dremio_v2/tests/dremio-executor_test.yaml
@@ -62,3 +62,17 @@ tests:
           content:
             name: prometheus
             containerPort: 9010
+  - it: Metrics port should be configurable
+    set:
+      distStorage:
+        type: "gcp"
+      executor:
+        nodeLifecycleService:
+          enabled: true
+          metricsPort: 777
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].ports
+          content:
+            name: prometheus
+            containerPort: 777