From 131ad75e90f08b9f6f28de93ca2da7e581baad1f Mon Sep 17 00:00:00 2001 From: Matthias Theuermann Date: Fri, 16 Feb 2024 20:05:24 +0100 Subject: [PATCH] fix: using new yaml for jaeger --- dapr-distributed-calendar/jaeger/ingress.yaml | 2 +- dapr-distributed-calendar/jaeger/jaeger.yaml | 27 ++++++++++++++ .../jaeger/simplest.yaml | 5 --- .../kubernetes-deploy.sh | 7 ++-- .../otel/otel-collector-values.yaml | 2 +- .../traefik/ingress.yaml | 30 ++++++++++++++++ .../traefik/traefik-dashboard-ingress.yaml | 15 -------- .../traefik/traefik-dashboard-service.yaml | 18 ---------- .../traefik/traefik-services.yaml | 36 +++++++++++++++++++ .../traefik/traefik-values.yaml | 2 +- 10 files changed, 101 insertions(+), 43 deletions(-) create mode 100644 dapr-distributed-calendar/jaeger/jaeger.yaml delete mode 100644 dapr-distributed-calendar/jaeger/simplest.yaml create mode 100644 dapr-distributed-calendar/traefik/ingress.yaml delete mode 100644 dapr-distributed-calendar/traefik/traefik-dashboard-ingress.yaml delete mode 100644 dapr-distributed-calendar/traefik/traefik-dashboard-service.yaml create mode 100644 dapr-distributed-calendar/traefik/traefik-services.yaml diff --git a/dapr-distributed-calendar/jaeger/ingress.yaml b/dapr-distributed-calendar/jaeger/ingress.yaml index d98a817..12a0ffd 100644 --- a/dapr-distributed-calendar/jaeger/ingress.yaml +++ b/dapr-distributed-calendar/jaeger/ingress.yaml @@ -10,5 +10,5 @@ spec: - match: Host(`jaeger.--01..`) && PathPrefix(`/`) kind: Rule services: - - name: simplest-query + - name: jaeger-query port: 16686 \ No newline at end of file diff --git a/dapr-distributed-calendar/jaeger/jaeger.yaml b/dapr-distributed-calendar/jaeger/jaeger.yaml new file mode 100644 index 0000000..e95c9ad --- /dev/null +++ b/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.--01.." + metricsStorage: + type: prometheus + storage: + options: + memory: + max-traces: 100000 diff --git a/dapr-distributed-calendar/jaeger/simplest.yaml b/dapr-distributed-calendar/jaeger/simplest.yaml deleted file mode 100644 index 8f1ca78..0000000 --- a/dapr-distributed-calendar/jaeger/simplest.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: jaegertracing.io/v1 -kind: Jaeger -metadata: - name: simplest - namespace: observability \ No newline at end of file diff --git a/dapr-distributed-calendar/kubernetes-deploy.sh b/dapr-distributed-calendar/kubernetes-deploy.sh index 68b613e..1a36025 100755 --- a/dapr-distributed-calendar/kubernetes-deploy.sh +++ b/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 diff --git a/dapr-distributed-calendar/otel/otel-collector-values.yaml b/dapr-distributed-calendar/otel/otel-collector-values.yaml index 87d90e9..0b2ef62 100644 --- a/dapr-distributed-calendar/otel/otel-collector-values.yaml +++ b/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: diff --git a/dapr-distributed-calendar/traefik/ingress.yaml b/dapr-distributed-calendar/traefik/ingress.yaml new file mode 100644 index 0000000..f02d81f --- /dev/null +++ b/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.--01..`) && 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.--01..`) && PathPrefix(`/metrics`) + services: + - name: prometheus@internal + kind: TraefikService \ No newline at end of file diff --git a/dapr-distributed-calendar/traefik/traefik-dashboard-ingress.yaml b/dapr-distributed-calendar/traefik/traefik-dashboard-ingress.yaml deleted file mode 100644 index 38e24c1..0000000 --- a/dapr-distributed-calendar/traefik/traefik-dashboard-ingress.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: traefik-ingress - namespace: kube-system -spec: - entryPoints: - - web - routes: - - match: Host(`traefik.--01..`) && PathPrefix(`/`) - kind: Rule - services: - - name: traefik-dashboard - port: 9000 \ No newline at end of file diff --git a/dapr-distributed-calendar/traefik/traefik-dashboard-service.yaml b/dapr-distributed-calendar/traefik/traefik-dashboard-service.yaml deleted file mode 100644 index d71c2d0..0000000 --- a/dapr-distributed-calendar/traefik/traefik-dashboard-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -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 \ No newline at end of file diff --git a/dapr-distributed-calendar/traefik/traefik-services.yaml b/dapr-distributed-calendar/traefik/traefik-services.yaml new file mode 100644 index 0000000..cd8dc6b --- /dev/null +++ b/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 diff --git a/dapr-distributed-calendar/traefik/traefik-values.yaml b/dapr-distributed-calendar/traefik/traefik-values.yaml index 1134c9b..5e72e3e 100644 --- a/dapr-distributed-calendar/traefik/traefik-values.yaml +++ b/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"