Merge pull request #177953 from MicrosoftDocs/master

Merge default branch to integration branch
miloriano · Oct 28, 2021 · 7569a87 · 7569a87
2 parents d810d26 + 2b22814
commit 7569a87
Show file tree

Hide file tree

Showing 18 changed files with 671 additions and 718 deletions.
diff --git a/articles/aks/TOC.yml b/articles/aks/TOC.yml
@@ -388,7 +388,7 @@
               items:
                 - name: Manage a new application deployment
                   href: open-service-mesh-deploy-new-application.md
-                - name: Manage an existing application deployment
+                - name: Onboard applications to the mesh
                   href: open-service-mesh-deploy-existing-application.md
                 - name: Using Azure Application Gateway Ingress
                   href: open-service-mesh-azure-application-gateway-ingress.md

diff --git a/articles/aks/open-service-mesh-deploy-existing-application.md b/articles/aks/open-service-mesh-deploy-existing-application.md
diff --git a/articles/aks/open-service-mesh-deploy-new-application.md b/articles/aks/open-service-mesh-deploy-new-application.md
@@ -64,19 +64,19 @@ Namespace [bookwarehouse] successfully added to mesh [osm]
 ## Deploy the Bookstore application to the AKS cluster
 
 ```azurecli-interactive
-kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookbuyer.yaml
+kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookbuyer.yaml
 ```
 
 ```azurecli-interactive
-kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookthief.yaml
+kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookthief.yaml
 ```
 
 ```azurecli-interactive
-kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookstore.yaml
+kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookstore.yaml
 ```
 
 ```azurecli-interactive
-kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.9/docs/example/manifests/apps/bookwarehouse.yaml
+kubectl apply -f https://raw.githubusercontent.com/openservicemesh/osm/release-v0.11/docs/example/manifests/apps/bookwarehouse.yaml
 ```
 
 All of the deployment outputs are summarized below.

diff --git a/articles/aks/open-service-mesh-open-source-observability.md b/articles/aks/open-service-mesh-open-source-observability.md
@@ -28,10 +28,10 @@ In this tutorial, you will:
 > [!div class="checklist"]
 >
 > - Create and deploy a Prometheus instance
-> - Configure OSM to allow Prometheus scraping
 > - Update the Prometheus `Configmap`
 > - Create and deploy a Grafana instance
 > - Configure Grafana with the Prometheus datasource
+> - Enable Prometheus metrics for a user namespace
 > - Import OSM dashboard for Grafana
 > - Create and deploy a Jaeger instance
 > - Configure Jaeger tracing for OSM
@@ -100,29 +100,9 @@ For more information on running Prometheus, visit:
 https://prometheus.io/
 ```
 
-### Configure OSM to allow Prometheus scraping
-
-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:
-
-```azurecli-interactive
-kubectl get configmap -n kube-system osm-config -o json | jq '.data.prometheus_scraping'
-```
-
-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:
-
-```azurecli-interactive
-kubectl patch configmap -n kube-system osm-config --type merge --patch '{"data":{"prometheus_scraping":"true"}}'
-```
-
-You should see the following output.
-
-```Output
-configmap/osm-config patched
-```
-
 ### Update the Prometheus Configmap
 
-The default installation of Prometheus will contain two Kubernetes `configmaps`. You can view the list of Prometheus `configmaps` with the following command.
+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.
 
 ```azurecli-interactive
 kubectl get configmap | grep prometheus
@@ -452,6 +432,12 @@ Click the **Add data source** button and select Prometheus under time series dat
 
 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.
 
+### Enable Prometheus metrics for a user namespace
+In order to configure Prometheus to scrape metrics from an application namespace, run the following command.
+```azurecli-interactive
+osm metrics enable --namespace <app-namespace>
+```
+
 ### Importing OSM Dashboards
 
 OSM Dashboards are available both through: