Use Grafana in helm examples (#745)

example/helm/microservices-extras.yaml

@@ -10,8 +10,8 @@ spec:
   - http:
       paths:
       - backend:
-          serviceName: tempo-tempo-distributed-query-frontend
-          servicePort: 16686
+          serviceName: grafana
+          servicePort: 80
         path: /
 ---
 apiVersion: v1

example/helm/microservices-grafana-values.yaml

@@ -0,0 +1,21 @@
+env:
+  GF_AUTH_ANONYMOUS_ENABLED: true
+  GF_AUTH_ANONYMOUS_ORG_ROLE: 'Admin'
+  GF_AUTH_DISABLE_LOGIN_FORM: true
+
+datasources:
+  datasources.yaml:
+    apiVersion: 1
+
+    datasources:
+      - name: Tempo
+        type: tempo
+        access: proxy
+        orgId: 1
+        url: http://tempo-tempo-distributed-query-frontend:3100
+        basicAuth: false
+        isDefault: true
+        version: 1
+        editable: false
+        apiVersion: 1
+        uid: tempo

example/helm/readme.md

@@ -16,7 +16,7 @@ To test the Helm example locally requires:
 Create a cluster
 
 ```console
-k3d cluster create tempo --api-port 6443 --port "16686:80@loadbalancer"
+k3d cluster create tempo --api-port 6443 --port "3000:80@loadbalancer"
 ```
 
 If you wish to use a local image, you can import these into k3d
@@ -30,23 +30,37 @@ Next either deploy the microservices or the single binary.
 ### Microservices
 The microservices deploy of Tempo is fault tolerant, high volume, independently scalable.
 
+> Note: double check you're applying to your local k3d before running this!
+
 ```console
-# double check you're applying to your local k3d before running this!
 helm repo add grafana https://grafana.github.io/helm-charts
 helm repo update
+```
+
+Install Tempo, Grafana and synthetic-load-generator
+
+```console
 helm upgrade --set traces.jaeger.thriftHttp=true --install tempo grafana/tempo-distributed
+helm upgrade -f microservices-grafana-values.yaml --install grafana grafana/grafana
 kubectl create -f microservices-extras.yaml
 ```
 
 ### Single Binary
 The Tempo single binary configuration is currently setup to store traces locally on disk, but can easily be configured to
 store them in an S3 or GCS bucket.  See configuration docs or some of the other examples for help.
 
+> Note: double check you're applying to your local k3d before running this!
+
 ```console
-# double check you're applying to your local k3d before running this!
 helm repo add grafana https://grafana.github.io/helm-charts
 helm repo update
+```
+
+Install Tempo, Grafand and synthetic-load-generator
+
+```console
 helm upgrade --install tempo grafana/tempo
+helm upgrade -f single-binary-grafana-values.yaml --install grafana grafana/grafana
 kubectl create -f single-binary-extras.yaml
 ```
 
@@ -68,6 +82,7 @@ kubectl logs synthetic-load-generator-???
 Extract a trace id and view it in your browser at `http://localhost:16686/trace/<traceid>`
 
 ### Clean up
+
 ```console
 k3d cluster delete tempo
-```
+```

example/helm/single-binary-extras.yaml

@@ -10,8 +10,8 @@ spec:
   - http:
       paths:
       - backend:
-          serviceName: tempo
-          servicePort: 16686
+          serviceName: grafana
+          servicePort: 80
         path: /
 ---
 apiVersion: v1

example/helm/single-binary-grafana-values.yaml

@@ -0,0 +1,21 @@
+env:
+  GF_AUTH_ANONYMOUS_ENABLED: true
+  GF_AUTH_ANONYMOUS_ORG_ROLE: 'Admin'
+  GF_AUTH_DISABLE_LOGIN_FORM: true
+
+datasources:
+  datasources.yaml:
+    apiVersion: 1
+
+    datasources:
+      - name: Tempo
+        type: tempo
+        access: proxy
+        orgId: 1
+        url: http://tempo:3100
+        basicAuth: false
+        isDefault: true
+        version: 1
+        editable: false
+        apiVersion: 1
+        uid: tempo

example/tk/readme.md

@@ -13,7 +13,7 @@ The Jsonnet is meant to be applied to with [tanka](https://github.com/grafana/ta
 - k3d > v3.2.0
 - tanka > v0.12.0
 
-Create a cluster with 3 nodes
+Create a cluster
 
 ```console
 k3d cluster create tempo --api-port 6443 --port "3000:80@loadbalancer"