add grafana with jaeger

README.md

@@ -56,6 +56,7 @@ TODO
 | https://charts.bitnami.com/bitnami/ | rabbitmq | 12.0.10 |
 | https://charts.dexidp.io/ | dex | 0.14.2 |
 | https://charts.min.io/ | minio | 5.0.11 |
+| https://grafana.github.io/helm-charts | grafana | 6.59.4 |
 | https://jaegertracing.github.io/helm-charts | jaeger | 0.71.14 |
 | https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.68.0 |
 | https://opensearch-project.github.io/helm-charts/ | opensearch | 2.13.1 |
@@ -103,6 +104,14 @@ TODO
 | diracx.settings.DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS | string | `"[\"http://anything:8000/docs/oauth2-redirect\"]"` |  |
 | diracx.settings.DIRACX_SERVICE_AUTH_TOKEN_KEY | string | `"file:///signing-key/rs256.key"` |  |
 | fullnameOverride | string | `""` |  |
+| grafana.datasources."datasources.yaml".apiVersion | int | `1` |  |
+| grafana.datasources."datasources.yaml".datasources[0].name | string | `"Jaeger"` |  |
+| grafana.datasources."datasources.yaml".datasources[0].type | string | `"jaeger"` |  |
+| grafana.datasources."datasources.yaml".datasources[0].url | string | `"http://diracx-demo-jaeger-query:16686"` |  |
+| grafana.enabled | bool | `true` |  |
+| grafana.service.nodePort | int | `32004` |  |
+| grafana.service.port | int | `32004` |  |
+| grafana.service.type | string | `"NodePort"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"ghcr.io/diracgrid/diracx/server"` |  |
 | image.tag | string | `"latest"` |  |
@@ -150,7 +159,7 @@ TODO
 | opensearch.opensearchJavaOpts | string | `"-Xms256m -Xmx256m"` |  |
 | opensearch.singleNode | bool | `true` |  |
 | opentelemetry-collector.config.exporters.logging.loglevel | string | `"debug"` |  |
-| opentelemetry-collector.config.exporters.otlp/jaeger.endpoint | string | `"jaeger-collector:4317"` |  |
+| opentelemetry-collector.config.exporters.otlp/jaeger.endpoint | string | `"diracx-demo-jaeger-collector:4317"` |  |
 | opentelemetry-collector.config.exporters.otlp/jaeger.tls.insecure | bool | `true` |  |
 | opentelemetry-collector.config.service.pipelines.logs.exporters[0] | string | `"logging"` |  |
 | opentelemetry-collector.config.service.pipelines.metrics.exporters[0] | string | `"logging"` |  |

demo/demo_cluster_conf.tpl.yaml

@@ -37,3 +37,7 @@ nodes:
   - containerPort: 32003
     hostPort: 32003
     protocol: TCP
+  # Grafana web interface
+  - containerPort: 32004
+    hostPort: 32004
+    protocol: TCP

diracx/Chart.lock

@@ -20,5 +20,8 @@ dependencies:
 - name: jaeger
   repository: https://jaegertracing.github.io/helm-charts
   version: 0.71.14
-digest: sha256:5ba23c7da04668a0ecb5ea4822c125cb7b3605b4308d10a1cb813cbe2908fd2a
-generated: "2023-09-20T15:50:26.550254029+02:00"
+- name: grafana
+  repository: https://grafana.github.io/helm-charts
+  version: 6.59.4
+digest: sha256:16668a529a541a56423e037a155e62d882f73e00305b239fdf14664e407a82ba
+generated: "2023-09-20T16:57:09.20840973+02:00"

diracx/Chart.yaml

@@ -56,3 +56,8 @@ dependencies:
   version: 0.71.14
   repository: https://jaegertracing.github.io/helm-charts
   condition: jaeger.enabled
+
+- name: grafana
+  version: 6.59.4
+  repository: https://grafana.github.io/helm-charts
+  condition: grafana.enabled

diracx/values.yaml

@@ -202,7 +202,7 @@ opentelemetry-collector:
   config:
     exporters:
       otlp/jaeger:
-        endpoint: jaeger-collector:4317
+        endpoint: diracx-demo-jaeger-collector:4317
         tls:
           insecure: true
       logging:
@@ -242,7 +242,27 @@ jaeger:
 
 
 ##########################
+grafana:
+  enabled: true
+  # To get the password for admin
+  # kubectl get secrets diracx-demo-grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
+
+  service:
+     type: NodePort
+     port: 32004
+     nodePort: 32004
 
+
+  # data source jaeger with url http://diracx-demo-jaeger-query:16686
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: Jaeger
+        type: jaeger
+        url: http://diracx-demo-jaeger-query:16686
+
+##########################
 service:
   type: ClusterIP
   port: 8000