From b503307c40438ba436fb72ccb5ae8a05fea7fc1a Mon Sep 17 00:00:00 2001
From: Israel Blancas <iblancasa@gmail.com>
Date: Fri, 14 Jul 2023 21:05:24 +0200
Subject: [PATCH 1/2] Add section for the Tempo Operator

---
 .../p8s-jaeger-grafana/jaeger.md              | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md b/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
index 305f1425b..87b82d67b 100644
--- a/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
+++ b/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
@@ -52,3 +52,64 @@ If your Jaeger setup differs significantly from the sample add-ons, make sure
 that Istio is also properly configured to push traces to the right URL.
 {{% /alert %}}
 
+## Use Jaeger frontend with Grafana Tempo tracing backend
+
+It is possible to use the Grafana Tempo tracing backend exposing the Jaeger API.
+[tempo-query](https://github.com/grafana/tempo/tree/main/cmd/tempo-query) is a
+Jaeger storage plugin. It accepts the full Jaeger query API and translates these
+requests into Tempo queries.
+
+Since Tempo is not yet part of the built-in addons that are part of Istio, you
+need to manage your Tempo instance.
+
+### Tempo Operator
+
+The [Tempo Operator for Kubernetes](https://github.com/grafana/tempo-operator)
+provides a native Kubernetes solution to deploy Tempo easily in your system.
+
+After installing the Tempo Operator in your cluster, you can create a new
+Tempo instance with the following CRD:
+
+```yaml
+kubectl create namespace tempo
+kubectl apply -n tempo -f - <<EOF
+apiVersion: tempo.grafana.com/v1alpha1
+kind: TempoStack
+metadata:
+  name: smm
+spec:
+  storageSize: 1Gi
+  storage:
+    secret:
+      type: s3
+      name: object-storage
+  resources:
+    total:
+      limits:
+        memory: 2Gi
+        cpu: 2000m
+  template:
+    queryFrontend:
+      jaegerQuery:
+        enabled: true
+        ingress:
+          type: ingress
+EOF
+```
+
+Note the name of the bucket where the traces will be stored in our example is
+called `object-storage`. Check the
+[Tempo Operator](https://github.com/grafana/tempo-operator/blob/main/docs/tempostack/object_storage.md)
+documentation to know more about what storages are supported and how to create
+the secret properly to provide it to your Tempo instance.
+
+Now, you are ready to configure the
+[`meshConfig.defaultConfig.tracing.zipkin.address`](https://istio.io/latest/docs/reference/config/istio.mesh.v1alpha1/#ProxyConfig-tracing)
+field in your Istio installation. It needs to be set to the `9411` port of the
+Tempo Distributor service. For the previous example, this value will be
+`tempo-smm-distributor.tempo.svc.cluster.local:9411`.
+
+Now, you need to configure the `in_cluster_url` setting from Kiali to access
+the Jaeger API. You can point to the `16685` port to use GRPC or `16686` if not.
+For the given example, the value would be
+`http://tempo-ssm-query-frontend.tempo.svc.cluster.local:16685`.

From 988bfe44b70f9e25ce72f4a517e03d00337b30ac Mon Sep 17 00:00:00 2001
From: Israel Blancas <iblancasa@gmail.com>
Date: Mon, 17 Jul 2023 19:29:40 +0200
Subject: [PATCH 2/2] Fix typo

Signed-off-by: Israel Blancas <iblancasa@gmail.com>
---
 content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md b/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
index 87b82d67b..860986588 100644
--- a/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
+++ b/content/en/docs/Configuration/p8s-jaeger-grafana/jaeger.md
@@ -68,7 +68,7 @@ The [Tempo Operator for Kubernetes](https://github.com/grafana/tempo-operator)
 provides a native Kubernetes solution to deploy Tempo easily in your system.
 
 After installing the Tempo Operator in your cluster, you can create a new
-Tempo instance with the following CRD:
+Tempo instance with the following CR:
 
 ```yaml
 kubectl create namespace tempo