Skip to content

Commit 39a0bf2

Browse files
authored
Merge pull request #176506 from shalier/updateAksOsmDocs
Updates OSM AKS addon docs
2 parents e32f544 + 9a513f0 commit 39a0bf2

File tree

3 files changed

+90
-233
lines changed

3 files changed

+90
-233
lines changed

articles/aks/open-service-mesh-deploy-new-application.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ Namespace [bookwarehouse] successfully added to mesh [osm]
6464
## Deploy the Bookstore application to the AKS cluster
6565

6666
```azurecli-interactive
67-
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookbuyer.yaml
67+
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookbuyer.yaml
6868
```
6969

7070
```azurecli-interactive
71-
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookthief.yaml
71+
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookthief.yaml
7272
```
7373

7474
```azurecli-interactive
75-
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookstore.yaml
75+
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookstore.yaml
7676
```
7777

7878
```azurecli-interactive
79-
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookwarehouse.yaml
79+
kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookwarehouse.yaml
8080
```
8181

8282
All of the deployment outputs are summarized below.

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

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ In this tutorial, you will:
2828
> [!div class="checklist"]
2929
>
3030
> - Create and deploy a Prometheus instance
31-
> - Configure OSM to allow Prometheus scraping
3231
> - Update the Prometheus `Configmap`
3332
> - Create and deploy a Grafana instance
3433
> - Configure Grafana with the Prometheus datasource
34+
> - Enable Prometheus metrics for a user namespace
3535
> - Import OSM dashboard for Grafana
3636
> - Create and deploy a Jaeger instance
3737
> - Configure Jaeger tracing for OSM
@@ -100,29 +100,9 @@ For more information on running Prometheus, visit:
100100
https://prometheus.io/
101101
```
102102

103-
### Configure OSM to allow Prometheus scraping
104-
105-
To ensure that the OSM components are configured for Prometheus scrapes, we'll want to check the **prometheus_scraping** configuration located in the osm-config config file. View the configuration with the following command:
106-
107-
```azurecli-interactive
108-
kubectl get configmap -n kube-system osm-config -o json | jq '.data.prometheus_scraping'
109-
```
110-
111-
The output of the previous command should return `true` if OSM is configured for Prometheus scraping. If the returned value is `false`, we will need to update the configuration to be `true`. Run the following command to turn **on** OSM Prometheus scraping:
112-
113-
```azurecli-interactive
114-
kubectl patch configmap -n kube-system osm-config --type merge --patch '{"data":{"prometheus_scraping":"true"}}'
115-
```
116-
117-
You should see the following output.
118-
119-
```Output
120-
configmap/osm-config patched
121-
```
122-
123103
### Update the Prometheus Configmap
124104

125-
The default installation of Prometheus will contain two Kubernetes `configmaps`. You can view the list of Prometheus `configmaps` with the following command.
105+
By default, Prometheus is set to scrape the OSM components. The default installation of Prometheus will contain two Kubernetes `configmaps`. You can view the list of Prometheus `configmaps` with the following command.
126106

127107
```azurecli-interactive
128108
kubectl get configmap | grep prometheus
@@ -452,6 +432,12 @@ Click the **Add data source** button and select Prometheus under time series dat
452432

453433
On the **Configure your Prometheus data source below** page, enter the Kubernetes cluster FQDN for the Prometheus service for the HTTP URL setting. The default FQDN should be `stable-prometheus-server.default.svc.cluster.local`. Once you have entered that Prometheus service endpoint, scroll to the bottom of the page and select **Save & Test**. You should receive a green checkbox indicating the data source is working.
454434

435+
### Enable Prometheus metrics for a user namespace
436+
In order to configure Prometheus to scrape metrics from an application namespace, run the following command.
437+
```azurecli-interactive
438+
osm metrics enable --namespace <app-namespace>
439+
```
440+
455441
### Importing OSM Dashboards
456442

457443
OSM Dashboards are available both through:

0 commit comments

Comments
 (0)