Expose jaeger via ui (#384)

digma-ai · Feb 4, 2025 · 26394c8 · 26394c8
1 parent d4af739
commit 26394c8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/charts/digma-ng/Chart.yaml b/charts/digma-ng/Chart.yaml
@@ -41,5 +41,5 @@ description: A Helm chart containing Digma's services
 home: https://github.com/digma-ai/digma
 icon: https://digma.ai/wp-content/uploads/2024/02/logo-alt-1.svg
 type: application
-version: 1.0.282
+version: 1.0.283
 
diff --git a/charts/digma-ng/README.md b/charts/digma-ng/README.md
@@ -1,11 +1,17 @@
 # digma-ng
 
-![Version: 1.0.282](https://img.shields.io/badge/Version-1.0.282-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.215](https://img.shields.io/badge/AppVersion-0.3.215-informational?style=flat-square)
+
+
+
+![Version: 1.0.283](https://img.shields.io/badge/Version-1.0.283-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.215](https://img.shields.io/badge/AppVersion-0.3.215-informational?style=flat-square) 
 
 A Helm chart containing Digma's services
 
 **Homepage:** <https://github.com/digma-ai/digma>
 
+
+
+
 ## License Key
 Digma will not function without a valid license key.
 You can obtain a license key by signing up for a free account using this [link](https://digma.ai/sign-up/).
@@ -26,6 +32,7 @@ helm upgrade --install digma digma/digma-ng -n digma --set digma.licenseKey=$DIG
 
 This chart bootstraps a [Digma](https://digma.ai) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
+
 ## Prerequisites
 
 - Kubernetes 1.23+

diff --git a/charts/digma-ng/files/nginx.conf b/charts/digma-ng/files/nginx.conf
@@ -54,14 +54,15 @@ http {
             try_files $uri /admin/index.html;
         }
 
-        location /jaeger/api/ {
-            proxy_pass          http://jaeger/api/;
-            proxy_set_header    X-Original-URI $request_uri;
-
+        location /jaeger/ {
             auth_request        /auth/validate;
             auth_request_set    $auth_cookies       $upstream_http_set_cookie;
             add_header          Set-Cookie          $auth_cookies;
             auth_request_set    $auth_fail_reason   $upstream_http_x_auth_fail_reason;
+            error_page 401 = @error401;
+
+            proxy_pass          http://jaeger/jaeger/;
+            proxy_set_header    X-Original-URI $request_uri;
         }
 
         location /api/ {
@@ -113,7 +114,12 @@ http {
     server {
         listen {{ .Values.jaeger.service.ports.http_ui }};
 
+        # redirect any request that does NOT start with /jaeger, to /jaeger
         location / {
+            rewrite ^/(?!jaeger)(.*)$ /jaeger/$1 redirect;
+        }
+
+        location /jaeger {
             # Call /auth/validate before serving the request
             auth_request /auth/validate;
             # Catch the cookie from /auth/validate
@@ -123,7 +129,7 @@ http {
             # Catch header "X-Auth-Fail-Reason" from /auth/validate
             auth_request_set $auth_fail_reason $upstream_http_x_auth_fail_reason;
 
-            proxy_pass http://jaeger;
+            proxy_pass http://jaeger/jaeger;
         }
 
         error_page 401 = @error401;

diff --git a/charts/digma-ng/templates/jaeger/deployment.yaml b/charts/digma-ng/templates/jaeger/deployment.yaml
@@ -47,6 +47,7 @@ spec:
         resources: {{- toYaml .Values.jaeger.resources | nindent 12 }}
         args:
         - "--query.additional-headers=Access-Control-Allow-Origin: *"  # to enable CORS
+        - "--query.base-path=/jaeger"
         {{- range .Values.jaeger.args }}
         - {{ . }}
         {{- end }}

diff --git a/charts/digma-ng/templates/ui/ui-config.yaml b/charts/digma-ng/templates/ui/ui-config.yaml
@@ -13,7 +13,7 @@ data:
   admin-env.js: |
     window.areInsightSuggestionsEnabled = {{ .Values.ai.enabled }};
     window.isJaegerEnabled = true;
-    window.jaegerURL = "{{ include "digma.jaeger.publicBaseUrl" . }}";
+    window.jaegerURL = "/jaeger";
     window.jaegerApiPath = "/jaeger/api";
     window.isSandboxModeEnabled = {{ .Values.ui.sandboxEnabled }};
     window.platform = "Web";