Skip to content

Commit fcc3125

Browse files
authored
Merge pull request #176959 from nshankar13/nshankar/OSM_AKS_add_on_observability_single_mesh
Fix OSM add-on docs for observability, single mesh
2 parents de4daf8 + 6500e81 commit fcc3125

File tree

2 files changed

+47
-2
lines changed

2 files changed

+47
-2
lines changed

articles/aks/open-service-mesh-deploy-addon-az-cli.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ For an existing AKS cluster scenario, you will enable the OSM add-on to an exist
9393

9494
To enable the AKS OSM add-on, you will need to run the `az aks enable-addons --addons` command passing the parameter `open-service-mesh`
9595

96+
> [!NOTE]
97+
> For the OSM add-on deployment to succeed, only one OSM mesh instance should be deployed on your cluster. If you have other OSM mesh instances on your cluster, please uninstall them before running the `enable-addons` command.
98+
9699
```azurecli-interactive
97100
az aks enable-addons --addons open-service-mesh -g <my-osm-aks-cluster-rg> -n <my-osm-aks-cluster-name>
98101
```

articles/aks/open-service-mesh-open-source-observability.md

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ On the **Configure your Prometheus data source below** page, enter the Kubernete
459459

460460
OSM Dashboards are available both through:
461461

462-
- [Our repository](https://github.com/grafana/grafana), and are importable as json blobs through the web admin portal
462+
- [Our repository](https://github.com/openservicemesh/osm/tree/release-v0.11/charts/osm/grafana/dashboards), and are importable as json blobs through the web admin portal
463463
- or [online at Grafana.com](https://grafana.com/grafana/dashboards/14145)
464464

465465
To import a dashboard, look for the `+` sign on the left menu and select `import`.
@@ -477,6 +477,12 @@ As soon as you select import, it will bring you automatically to your imported d
477477

478478
### Deploy Jaeger to the AKS cluster
479479

480+
First, create a jaeger namespace:
481+
482+
```azurecli-interactive
483+
kubectl create namespace jaeger
484+
```
485+
480486
Apply the following manifest to install Jaeger:
481487

482488
```azurecli-interactive
@@ -538,14 +544,50 @@ deployment.apps/jaeger created
538544
service/jaeger created
539545
```
540546

547+
### Add RBAC for Jaeger SA
548+
549+
Apply the following RBAC to grant the Jaeger Service Account the specified Cluster Role:
550+
551+
```yaml
552+
apiVersion: v1
553+
kind: ServiceAccount
554+
metadata:
555+
labels:
556+
app: jaeger
557+
name: jaeger
558+
namespace: jaeger
559+
---
560+
kind: ClusterRole
561+
apiVersion: rbac.authorization.k8s.io/v1
562+
metadata:
563+
labels:
564+
app: jaeger
565+
name: jaeger
566+
---
567+
kind: ClusterRoleBinding
568+
apiVersion: rbac.authorization.k8s.io/v1
569+
metadata:
570+
name: jaeger
571+
labels:
572+
app: jaeger
573+
subjects:
574+
- kind: ServiceAccount
575+
name: jaeger
576+
namespace: jaeger
577+
roleRef:
578+
kind: ClusterRole
579+
name: jaeger
580+
apiGroup: rbac.authorization.k8s.io
581+
```
582+
541583
### Enable Tracing for the OSM add-on
542584
543585
Next we will need to enable tracing for the OSM add-on.
544586
545587
Run the following command to enable tracing for the OSM add-on:
546588
547589
```azurecli-interactive
548-
kubectl patch meshconfig osm-mesh-config -n kube-system -p '{"spec":{"observability":{"tracing":{"enable":true}}}}' --type=merge
590+
kubectl patch meshconfig osm-mesh-config -n kube-system -p '{"spec":{"observability":{"tracing":{"enable":true, "address": "jaeger.jaeger.svc.cluster.local"}}}}' --type=merge
549591
```
550592
551593
```Output

0 commit comments

Comments
 (0)