docs(observability): update docs after consolidating metrics, logs, traces into observability (#103)

* docs(observability): update docs after consolidating metrics, logs, traces into observability

Signed-off-by: slonka <[email protected]>

Author: slonka

README.md

@@ -36,6 +36,23 @@ Once this is done you can go in `explore` and pick the kuma-datasource with the
 
 Add to the datasource configuration:
 
+#### kuma >= 1.7.0
+
+```yaml
+    datasources:
+      - name: Prometheus
+        type: prometheus
+        access: proxy
+        url: http://prometheus-server.mesh-observability
+      - name: Kuma
+        type: kumahq-kuma-datasource
+        url: http://kuma-control-plane.kuma-system:5681
+        jsonData:
+          prometheusDataSourceId: "1"
+```
+
+#### kuma < 1.7.0
+
 ```yaml
     datasources:
       - name: Prometheus
@@ -51,7 +68,13 @@ Add to the datasource configuration:
 
 ### With `kumactl`
 
-If you use `kumactl install metrics` with a version of kumactl >= 1.3.0 the plugin will be setup automatically.
+#### kumactl >= 1.7.0
+
+If you use `kumactl install observability` with a version of kumactl >= 1.7.0 the plugin will be setup automatically.
+
+#### kumactl 1.3.0-1.6.*
+
+If you use `kumactl install metrics` with a version of kumactl 1.3.0-1.6.* the plugin will be setup automatically.
 
 ## Future features
 

tools/setup_k3d.sh

@@ -16,5 +16,5 @@ kubectl wait -n kuma-test --timeout=30s --for condition=Ready --all pods
 docker run  -p 3000:3000 -d  --network k3d-kuma-demo -e GF_DEFAULT_APP_MODE=development -v /Users/cmolter/code/kuma-datasource/dist:/var/lib/grafana/plugins --name=grafana grafana/grafana:8.2.2
 
 
-echo "grafana is expose on 3000, control-plane of 5681 and prometheus-server on 9090 interrupt to close these port-forward"
+echo "grafana is exposed on port 3000, control-plane on 5681 and prometheus-server on 9090 interrupt to close these port-forward"
 wait