Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-classic-admin-retire-steps-prepare

Author: rolyon

articles/azure-monitor/containers/prometheus-metrics-scrape-configuration.md

@@ -57,6 +57,34 @@ The following table has a list of all the default targets that the Azure Monitor
 
 If you want to turn on the scraping of the default targets that aren't enabled by default, edit the [configmap](https://aka.ms/azureprometheus-addon-settings-configmap) `ama-metrics-settings-configmap` to update the targets listed under `default-scrape-settings-enabled` to `true`. Apply the configmap to your cluster.
 
+### Enable pod annotation-based scraping
+To scrape application pods without needing to create a custom Prometheus config, annotations can be added to the pods. The annotation `prometheus.io/scrape: "true"` is required for the pod to be scraped. The annotations `prometheus.io/path` and `prometheus.io/port` indicate the path and port that the metrics are hosted at on the pod. The annotations for a pod that is hosting metrics at `<pod IP>:8080/metrics` would be:
+
+```yaml
+metadata:   
+  annotations:
+    prometheus.io/scrape: 'true'
+    prometheus.io/path: '/metrics'
+    prometheus.io/port: '8080'
+```
+
+Scraping these pods with specific annotations is disabled by default. To enable, in the `ama-metrics-settings-configmap`, add the regex for the namespace(s) of the pods with annotations you wish to scrape as the value of the field `podannotationnamespaceregex`.
+
+For example, the following setting scrapes pods with annotations only in the namespaces `kube-system` and `default`:
+
+```yaml
+pod-annotation-based-scraping: |-
+    podannotationnamespaceregex = "kube-system|my-namespace"
+```
+
+To enable scraping for pods with annotations in all namespaces, use:
+
+```yaml
+pod-annotation-based-scraping: |-
+    podannotationnamespaceregex = ".*"
+```
+
+
 ### Customize metrics collected by default targets
 By default, for all the default targets, only minimal metrics used in the default recording rules, alerts, and Grafana dashboards are ingested as described in [minimal-ingestion-profile](prometheus-metrics-scrape-configuration-minimal.md). To collect all metrics from default targets, update the keep-lists in the settings configmap under `default-targets-metrics-keep-list`, and set `minimalingestionprofile` to `false`.
 
@@ -280,66 +308,6 @@ metric_relabel_configs:
   regex: '.+'
 ```
 
-### Pod annotation-based scraping
-
-The following scrape config uses the `__meta_*` labels added from the `kubernetes_sd_configs` for the `pod` role to filter for pods with certain annotations.
-
-To scrape certain pods, specify the port, path, and scheme through annotations for the pod and the following job scrapes only the address specified by the annotation:
-
-- `prometheus.io/scrape`: Enable scraping for this pod.
-- `prometheus.io/scheme`: If the metrics endpoint is secured, you need to set scheme to `https` and most likely set the TLS config.
-- `prometheus.io/path`: If the metrics path isn't /metrics, define it with this annotation.
-- `prometheus.io/port`: Specify a single port that you want to scrape.
-
-```yaml
-scrape_configs:
-  - job_name: 'kubernetespods-sample'
-
-    kubernetes_sd_configs:
-    - role: pod
-
-    relabel_configs:
-    # Scrape only pods with the annotation: prometheus.io/scrape = true
-    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
-      action: keep
-      regex: true
-
-    # If prometheus.io/path is specified, scrape this path instead of /metrics
-    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
-      action: replace
-      target_label: __metrics_path__
-      regex: (.+)
-
-    # If prometheus.io/port is specified, scrape this port instead of the default
-    - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
-      action: replace
-      regex: ([^:]+)(?::\d+)?;(\d+)
-      replacement: $1:$2
-      target_label: __address__
-
-    # If prometheus.io/scheme is specified, scrape with this scheme instead of http
-    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scheme]
-      action: replace
-      regex: (http|https)
-      target_label: __scheme__
-
-    # Include the pod namespace as a label for each metric
-    - source_labels: [__meta_kubernetes_namespace]
-      action: replace
-      target_label: kubernetes_namespace
-
-    # Include the pod name as a label for each metric
-    - source_labels: [__meta_kubernetes_pod_name]
-      action: replace
-      target_label: kubernetes_pod_name
-
-    # [Optional] Include all pod labels as labels for each metric
-    - action: labelmap
-      regex: __meta_kubernetes_pod_label_(.+)
-```
-
-See the [Apply config file](prometheus-metrics-scrape-validate.md#deploy-config-file-as-configmap) section to create a configmap from the Prometheus config.
-
 ## Next steps
 
 [Setup Alerts on Prometheus metrics](./container-insights-metric-alerts.md)<br>

articles/azure-monitor/essentials/prometheus-api-promql.md

@@ -207,7 +207,7 @@ The following limitations are in addition to those detailed in the Prometheus sp
 
 For more information on Prometheus metrics limits, see [Prometheus metrics](../../azure-monitor/service-limits.md#prometheus-metrics)
 
-[!INCLUDE [prometheus-case-sensitivity.md](..//includes/prometheus-case-sensitivity.md)]
+[!INCLUDE [prometheus-case-sensitivity.md](../includes/prometheus-case-sensitivity.md)]
 
 ## Frequently asked questions
 

articles/communication-services/quickstarts/telephony/get-phone-number.md

@@ -10,7 +10,7 @@ ms.topic: quickstart
 ms.service: azure-communication-services
 ms.subservice: pstn
 ms.custom: references_regions, mode-other, devx-track-extended-java, devx-track-js, devx-track-python
-zone_pivot_groups: acs-azcli-azp-java-net-python-csharp-js
+zone_pivot_groups: acs-azcli-azp-azpnew-java-net-python-csharp-js
 ---
 
 # Quickstart: Get and manage phone numbers
@@ -27,6 +27,10 @@ zone_pivot_groups: acs-azcli-azp-java-net-python-csharp-js
 [!INCLUDE [Azure portal](./includes/phone-numbers-portal.md)]
 ::: zone-end
 
+::: zone pivot="platform-azp-new"
+[!INCLUDE [Azure portal (new)](./includes/phone-numbers-portal-new.md)]
+::: zone-end
+
 ::: zone pivot="programming-language-csharp"
 [!INCLUDE [Azure portal](./includes/phone-numbers-net.md)]
 ::: zone-end

articles/communication-services/quickstarts/telephony/includes/phone-numbers-portal-new.md

@@ -0,0 +1,65 @@
+[!INCLUDE [Public Preview Notice](../../../includes/public-preview-include.md)]
+
+Azure Communication Services is introducing a new user experience for purchasing phone numbers. This experience is currently being flighted, and you might be introduced to this experience when purchasing a phone number in Azure portal. If you have feedback on this experience, don't hesitate to give it through the **Give feedback** button on Azure portal extension.
+
+## Prerequisites
+
+- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
+- [An active Communication Services resource.](../../create-communication-resource.md)
+
+## Purchase a phone number
+
+1. Navigate to your Communication Service resource in the [Azure portal](https://portal.azure.com).
+ 
+   :::image type="content" source="../media/trial-phone-numbers/trial-overview.png" alt-text="Screenshot showing a Communication Services resource's main page." lightbox="../media/trial-phone-numbers/trial-overview.png":::
+
+2. In the Communication Services resource overview, select on the "Phone numbers" option in the left-hand menu. 
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-start.png" alt-text="Screenshot showing a Communication Services resource's phone numbers page." lightbox="../media/phone-numbers-portal/get-phone-number-start.png":::
+
+3. Select **Get** on the top left of the page to purchase your phone number. Selecting this launches our shopping wizard:
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-search.png" alt-text="Screenshot showing phone number shopping cart search wizard." lightbox="../media/phone-numbers-portal/get-phone-number-search.png":::
+
+4. Choose the **Country/region** where you would like to provision the phone number. Country availability is based on the billing location for your Azure subscription. More information on what numbers are available for each country can be found [here](../../../concepts/numbers/sub-eligibility-number-capability.md). Next you'll choose the [number type](../../../concepts/telephony/plan-solution.md#phone-number-types-in-azure-communication-services). You can select from two phone number types: **Local**, and **Toll-free**.
+
+5. Select **Search** to pull up numbers that meet your selected criteria. You have various filters to search for the number that fits your needs, including:
+
+   - **Use case**: This is for whether you are using this number to call from an application (A2P) or from a human agent (P2P).
+   - **Calling**: This is for determining the Calling capabilities you would like for your phone number: Making calls and/or receiving calls. 
+   - **SMS**: This is for determining the SMS capabilities you would like for your phone number: Sending and/or receiving SMS messages.
+   - **Custom**: You can also add custom filters to get a certain prefix or set of digits in your phone number.
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-cart.png" alt-text="Screenshot showing phone number purchase page with available phone numbers." lightbox="../media/phone-numbers-portal/get-phone-number-cart.png":::
+
+6. Once you find the phone number or numbers to your choosing, select **Add to cart** to hold the numbers in the Telephony cart. These numbers are held for 16 minutes before your cart is automatically cleared. 
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-cart-2.png" alt-text="Screenshot showing phone number shopping cart with two phone numbers in the cart." lightbox="../media/phone-numbers-portal/get-phone-number-cart-2.png":::
+
+   > [!NOTE]
+   > The prices shown are the **monthly recurring charges** which cover the cost of leasing the selected phone number to you. Not included in this view is the **Pay-as-you-go costs** which are incurred when you make or receive calls. The price lists are [available here](../../../concepts/pricing.md). These costs depend on number type and destinations called. For example, price-per-minute for a call from a Seattle regional number to a regional number in New York and a call from the same number to a UK mobile number may be different.
+
+7. Select **Next** to review your purchase. To complete your purchase, select **Buy now**.
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-review.png" alt-text="Screenshot showing 2 phone numbers to review and purchase." lightbox="../media/phone-numbers-portal/get-phone-number-review.png":::
+
+8. You can find your purchased numbers back on the **Phone numbers** page. It might take a few minutes for the numbers to be provisioned. 
+
+   :::image type="content" source="../media/phone-numbers-portal/get-phone-number-purchased.png" alt-text="Screenshot of the phone numbers page with the newly purchased phone numbers boxed with a red border." lightbox="../media/phone-numbers-portal/get-phone-number-purchased.png":::
+
+
+### Update Phone Number Capabilities
+
+On the **Phone Numbers** page, you can select a phone number to configure it.
+
+:::image type="content" source="../../media/manage-phone-azure-portal-capability-update.png" alt-text="Screenshot showing the update features page." lightbox="../../media/manage-phone-azure-portal-capability-update.png":::
+
+Select the features from the available options, then select **Save** to apply your selection.
+
+### Release Phone Number
+
+On the **Numbers** page, you can release phone numbers.
+
+:::image type="content" source="../../media/manage-phone-azure-portal-release-number.png" alt-text="Screenshot showing the release phone numbers page." lightbox="../../media/manage-phone-azure-portal-release-number.png":::
+
+Select the phone number that you want to release and then select on the **Release** button.

articles/communication-services/quickstarts/telephony/includes/phone-numbers-portal.md

@@ -8,7 +8,7 @@
 
 To begin provisioning numbers, go to your Communication Services resource on the [Azure portal](https://portal.azure.com).
 
-:::image type="content" source="../../media/manage-phone-azure-portal-start.png" alt-text="Screenshot showing a Communication Services resource's main page.":::
+:::image type="content" source="../media/trial-phone-numbers/trial-overview.png" alt-text="Screenshot showing a Communication Services resource's main page." lightbox="../media/trial-phone-numbers/trial-overview.png":::
 
 ### Search for Available Phone Numbers