digma-ai · asafchen-dig · Nov 19, 2024 · Nov 19, 2024 · Nov 19, 2024 · Nov 19, 2024
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*-values.yaml
+*-values.yaml
+.DS_Store
diff --git a/src/digma/embedded-jaeger-proxy-files/index.js b/src/digma/embedded-jaeger-proxy-files/index.js
diff --git a/src/digma/embedded-jaeger-proxy-files/login-page.html b/src/digma/embedded-jaeger-proxy-files/login-page.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+  </head>
+  <body>
+    <div id="root"></div>
+    <!-- Environment variables -->
+    <script>
+      window.platform = "Web";
+    </script>
+    <script src="./index.js"></script>
+  </body>
+</html>
diff --git a/src/digma/embedded-jaeger-proxy-files/nginx.conf b/src/digma/embedded-jaeger-proxy-files/nginx.conf
@@ -0,0 +1,58 @@
+events { }
+
+http {
+    upstream jaeger {
+        server {{ tpl .Values.embeddedJaeger.host . }}:16686;
+    }
+    upstream digma {
+        server {{ tpl .Values.digmaAnalytics.host . }}:5051;
+    }
+    port_in_redirect off;
+    absolute_redirect off;
+    server {
+        listen 16686;
+
+        location / {
+            # Call /auth/validate before serving the request
+            auth_request /auth/validate;
+            # Catch the cookie from /auth/validate
+            auth_request_set $auth_cookie $upstream_http_set_cookie;
+            # Forward the cookie to th client
+            add_header Set-Cookie $auth_cookie;
+            # 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;
+        }
+
+        error_page 401 = @error401;
+
+        location @error401 {
+            # Forward header "X-Auth-Fail-Reason" to the client as part of the redirect response
+            add_header X-Auth-Fail-Reason $auth_fail_reason;
+            return 302 /login-page.html?return_url=$request_uri;
+        }
+
+        location /login-page.html {
+            root /etc/nginx;
+        }        
+        location /index.js {
+            root /etc/nginx;
+        }
+
+        location /auth/validate {
+            internal;
+            proxy_pass              https://digma/authentication/jaeger/validate-or-refresh;
+            proxy_pass_request_body off;
+            proxy_set_header        Content-Length "";
+            proxy_set_header        X-Original-URI $request_uri;
+            proxy_set_header        Digma-Access-Token {{ printf "Token %s" (.Values.digmaAnalytics.accesstoken) | quote }};
+        }
+
+        location /auth/login {
+            proxy_pass              https://digma/authentication/jaeger/login;
+            proxy_set_header        X-Original-URI $request_uri;
+            proxy_set_header        Digma-Access-Token {{ printf "Token %s" (.Values.digmaAnalytics.accesstoken) | quote }};
+        }
+    }
+}
diff --git a/src/digma/templates/digma-analytics.yaml b/src/digma/templates/digma-analytics.yaml
@@ -66,6 +66,4 @@ spec:
         - name: Analytics.Endpoints__Default__Secured
           value: {{ .Values.digmaAnalytics.secured | quote }}
         - name: CollectorUrl
-          value: {{ printf " http://%s:5048" (tpl .Values.digmaCollectorApi.host .)}}
-
-
+          value: {{ printf " http://%s:5048" (tpl .Values.digmaCollectorApi.host .)}}
diff --git a/src/digma/templates/embedded-jaeger-proxy.yaml b/src/digma/templates/embedded-jaeger-proxy.yaml
@@ -0,0 +1,67 @@
+{{- if .Values.embeddedJaeger.enabled }}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-embedded-jaeger-proxy-files
+data:
+  nginxConf: |
+{{ tpl (.Files.Get "embedded-jaeger-proxy-files/nginx.conf") $ | indent 4 }}
+
+  loginPageHtml: | 
+{{ .Files.Get "embedded-jaeger-proxy-files/login-page.html" | indent 4 }}
+
+  indexJs: |
+{{ .Files.Get "embedded-jaeger-proxy-files/index.js" | indent 4 }}
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-embedded-jaeger-proxy-deployment
+  labels:
+    app: embedded-jaeger-proxy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: embedded-jaeger-proxy
+  template:
+    metadata:
+      labels:
+        app: embedded-jaeger-proxy
+    spec:
+      containers:
+        - name: embedded-jaeger-proxy
+          image: nginx:1.27
+          volumeMounts:
+            - name: files
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginxConf
+            - name: files
+              mountPath: /etc/nginx/login-page.html
+              subPath: loginPageHtml
+            - name: files
+              mountPath: /etc/nginx/index.js
+              subPath: indexJs
+      volumes:
+        - name: files
+          configMap:
+            name: {{ .Release.Name }}-embedded-jaeger-proxy-files
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ tpl .Values.embeddedJaeger.proxyHost . }}
+spec:
+  type: ClusterIP
+  selector:
+     app: "embedded-jaeger-proxy"
+  ports:
+  - name: api
+    port: 16686
+    protocol: TCP
+
+{{- end }}
diff --git a/src/digma/values.yaml b/src/digma/values.yaml
@@ -119,6 +119,7 @@ pgadmin:
 
 embeddedJaeger:
   host: "{{ .Release.Name }}-embedded-jaeger"
+  proxyHost: "{{ .Release.Name }}-embedded-jaeger-proxy"
   imageTag: "1.61.0"
   enabled: true
   loadbalancer: true