fix: using new yaml for jaeger

dapr-distributed-calendar/jaeger/ingress.yaml

@@ -10,5 +10,5 @@ spec:
     - match: Host(`jaeger.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
       kind: Rule
       services:
-        - name: simplest-query
+        - name: jaeger-query
           port: 16686

dapr-distributed-calendar/jaeger/jaeger.yaml

@@ -0,0 +1,27 @@
+# apiVersion: jaegertracing.io/v1
+# kind: Jaeger
+# metadata:
+#   name: simplest
+#   namespace: observability
+
+apiVersion: jaegertracing.io/v1
+kind: Jaeger
+metadata:
+  name: jaeger
+  namespace: observability
+spec:
+  strategy: allInOne
+  allInOne:
+    image: jaegertracing/all-in-one:latest
+    options:
+      log-level: debug
+      query:
+        base-path: /jaeger
+      prometheus:
+        server-url: "http://prom.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>"
+    metricsStorage:
+      type: prometheus
+  storage:
+    options:
+      memory:
+        max-traces: 100000

dapr-distributed-calendar/kubernetes-deploy.sh

@@ -30,8 +30,11 @@ helm upgrade --install \
 
 # install jaeger (requires cert-manager) OPTIONAL
 kubectl create namespace observability
-kubectl create -f https://github.com/jaegertracing/jaeger-operator/releases/download/v1.38.0/jaeger-operator.yaml -n observability
-kubectl wait --for=condition=ready pod --all --timeout=200s -n observability
+helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
+helm repo update
+helm install jaeger jaegertracing/jaeger-operator -n observability --wait
+# kubectl create -f https://github.com/jaegertracing/jaeger-operator/releases/download/v1.38.0/jaeger-operator.yaml -n observability
+# kubectl wait --for=condition=ready pod --all --timeout=200s -n observability
 kubectl apply -f jaeger/.
 
 # install prometheus OPTIONAL

dapr-distributed-calendar/otel/otel-collector-values.yaml

@@ -34,7 +34,7 @@ spec:
       debug:
         verbosity: detailed
       otlp/jaeger:
-        endpoint: simplest-collector.observability:4317
+        endpoint: jaeger-collector.observability:4317
         tls:
             insecure: true
       prometheus:

dapr-distributed-calendar/traefik/ingress.yaml

@@ -0,0 +1,30 @@
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: traefik-ingress
+  namespace: kube-system
+spec:
+  entryPoints:
+    - web
+  routes:
+    - match: Host(`traefik.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/`)
+      kind: Rule
+      services:
+        - name: traefik-dashboard
+          port: 9000
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: traefik-metrics
+  namespace: kube-system
+spec:
+  entryPoints:
+    - web
+  routes:
+    - kind: Rule
+      match: Host(`traefik.<ENV-NAME>-<ENV-USER-ID>-01.<ENV-ANIMAL>.<ENV-DOMAIN>`) && PathPrefix(`/metrics`)
+      services:
+        - name: prometheus@internal
+          kind: TraefikService

dapr-distributed-calendar/traefik/traefik-services.yaml

@@ -0,0 +1,36 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: traefik-dashboard
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/instance: traefik-dashboard-kube-system
+    app.kubernetes.io/name: traefik-dashboard
+spec:
+  type: ClusterIP
+  ports:
+  - name: traefik
+    port: 9000
+    targetPort: traefik
+    protocol: TCP
+  selector:
+    app.kubernetes.io/instance: traefik-kube-system
+    app.kubernetes.io/name: traefik
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: traefik-metrics
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/instance: traefik-kube-system
+    app.kubernetes.io/name: traefik-metrics
+spec:
+  type: ClusterIP
+  ports:
+  - name: metrics
+    port: 9100
+    protocol: TCP
+  selector:
+    app.kubernetes.io/instance: traefik-kube-system
+    app.kubernetes.io/name: traefik

dapr-distributed-calendar/traefik/traefik-values.yaml

@@ -4,7 +4,7 @@ logs:
   access:
     enabled: true
 metrics:
-  prometheus: null
+  # prometheus: null
   openTelemetry:
     ## Address of the OpenTelemetry Collector to send metrics to.
     address: "otel-dapr-collector.opentelemetry:4317"