Skip to content

Commit cf7be26

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 74ca9d7 + e29bd15 commit cf7be26

File tree

167 files changed

+11616
-590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+11616
-590
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11792,6 +11792,17 @@
1179211792
"source_path_from_root": "/articles/orbital/overview-analytics.md",
1179311793
"redirect_url": "/azure/orbital/overview",
1179411794
"redirect_document_id": false
11795+
},
11796+
{
11797+
"source_path_from_root": "/articles/azure-health-insights/request-info.md",
11798+
"redirect_url": "/azure/azure-health-insights/overview",
11799+
"redirect_document_id": false
11800+
11801+
},
11802+
{
11803+
"source_path_from_root": "/articles/azure-health-insights/response-info.md",
11804+
"redirect_url": "/azure/azure-health-insights/overview",
11805+
"redirect_document_id": false
1179511806
}
1179611807
]
1179711808
}

articles/ai-services/computer-vision/how-to/blob-storage-search.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Configure your blob storage container for image retrieval and video search
2+
title: Configure your blob storage container for image retrieval
33
titleSuffix: Azure AI services
44
description: Configure your Azure storage account to get started with the **Search photos image retrieval** experience in Vision Studio.
55
#services: cognitive-services
@@ -13,14 +13,14 @@ ms.author: pafarley
1313

1414
---
1515

16-
# Configure your blob storage for image retrieval and video search in Vision Studio
16+
# Configure your blob storage for image retrieval in Vision Studio
1717

18-
To get started with the **Search photos image retrieval** scenario in Vision Studio, you need to select or create a new Azure storage account. Your storage account can be in any region, but creating it in the same region as your Vision resource is more efficient and reduces cost.
18+
To get started with the **Search photos with image retrieval** scenario in Vision Studio, you need to select or create a new Azure storage account. Your storage account can be in any region, but creating it in the same region as your Vision resource is more efficient and reduces cost.
1919

2020
> [!IMPORTANT]
21-
> You need to create your storage account on the same Azure subscription as the Vision resource you're using in the **Search photos image retrieval** scenario as shown below.
22-
23-
:::image type="content" source="../media/storage-instructions/subscription.png" alt-text="Screenshot of resource selection.":::
21+
> You need to create your storage account on the same Azure subscription as the Vision resource you're using in the **Search photos with image retrieval** scenario.
22+
>
23+
> :::image type="content" source="../media/storage-instructions/subscription.png" alt-text="Screenshot of resource selection.":::
2424
2525
## Create a new storage account
2626

@@ -53,13 +53,9 @@ In the Allowed Methods field, select the `GET` checkbox to allow an authenticate
5353
:::image type="content" source="../media/storage-instructions/cors-rule.png" alt-text="Screenshot of completed CORS screen.":::
5454

5555

56-
This allows Vision Studio to access images and videos in your blob storage container to extract insights on your data.
57-
58-
## Upload images and videos in Vision Studio
59-
60-
In the **Try with your own video** or **Try with your own image** section in Vision Studio, select the storage account that you configured with the CORS rule. Select the container in which your images or videos are stored. If you don't have a container, you can create one and upload the images or videos from your local device. If you have updated the CORS rules on the storage account, refresh the Blob container or Video files on container sections.
61-
56+
This allows Vision Studio to access images in your blob storage container to extract insights on your data.
6257

63-
:::image type="content" source="../media/storage-instructions/video-selection.png" alt-text="Screenshot of image upload in Vision Studio.":::
58+
## Upload images in Vision Studio
6459

60+
In the **Search photos with image retrieval** section in Vision Studio, select the storage account that you configured with the CORS rule. Select the container in which your images are stored. If you don't have a container, you can create one and upload the images from your local device. If you have updated the CORS rules on the storage account, refresh the Blob container or Video files on container sections.
6561

articles/ai-services/computer-vision/how-to/image-retrieval.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88

99
ms.service: azure-ai-vision
1010
ms.topic: how-to
11-
ms.date: 01/19/2024
11+
ms.date: 01/30/2024
1212
ms.author: pafarley
1313
ms.custom: references_regions
1414
---
@@ -90,7 +90,9 @@ The API call returns a **vector** JSON object, which defines the text string's c
9090

9191
Cosine similarity is a method for measuring the similarity of two vectors. In an image retrieval scenario, you'll compare the search query vector with each image's vector. Images that are above a certain threshold of similarity can then be returned as search results.
9292

93-
The following example C# code calculates the cosine similarity between two vectors. It's up to you to decide what similarity threshold to use for returning images as search results.
93+
The following example code calculates the cosine similarity between two vectors. It's up to you to decide what similarity threshold to use for returning images as search results.
94+
95+
#### [C#](#tab/csharp)
9496

9597
```csharp
9698
public static float GetCosineSimilarity(float[] vector1, float[] vector2)
@@ -108,6 +110,17 @@ public static float GetCosineSimilarity(float[] vector1, float[] vector2)
108110
}
109111
```
110112

113+
#### [Python](#tab/python)
114+
115+
```python
116+
import numpy as np
117+
118+
def cosine_similarity(vector1, vector2):
119+
return np.dot(vector1, vector2) / (np.linalg.norm(vector1) * np.linalg.norm(vector2))
120+
```
121+
122+
---
123+
111124
## Next steps
112125

113126
[Image retrieval concepts](../concept-image-retrieval.md)

articles/ai-services/computer-vision/includes/identity-curl-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Get started with facial recognition using the Face REST API. The Face service pr
5252

5353
Save the IDs of each **Person** created; it's important to keep track of which person name has which ID.
5454

55-
1. Next you'll need to detect new faces and associate them with the **Person** objects that exist. The following command detects a face from the image *Family1-Dad.jpg* and adds it to the corresponding person. You need to specify the `personId` as the ID that was returned when you created the "Family1-Dad" **Person** object. The image name corresponds to the name of the created **Person**. Also enter the **LargePersonGroup** ID and your key in the appropriate fields.
55+
1. Next you'll need to detect new faces and associate them with the **Person** objects that exist. The following command detects a face from the image *Family1-Dad1.jpg* and adds it to the corresponding person. You need to specify the `personId` as the ID that was returned when you created the "Family1-Dad" **Person** object. The image name corresponds to the name of the created **Person**. Also enter the **LargePersonGroup** ID and your key in the appropriate fields.
5656

5757
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_add_face":::
5858

articles/ai-services/openai/includes/dall-e-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 11/06/2023
1313

1414
Use this guide to get started generating images with the Azure OpenAI SDK for Python.
1515

16-
[Library source code](https://github.com/openai/openai-python/tree/main/openai) | [Package](https://github.com/openai/openai-python) | [Samples](https://github.com/openai/openai-python/tree/main/examples)
16+
[Library source code](https://github.com/openai/openai-python/tree/main/src/openai) | [Package](https://github.com/openai/openai-python) | [Samples](https://github.com/openai/openai-python/tree/main/examples)
1717

1818
## Prerequisites
1919

articles/aks/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,12 @@
646646
href: events.md
647647
- name: Monitor kube-audit events
648648
href: monitor-apiserver.md
649+
- name: Monitor control plane metrics
650+
href: monitor-control-plane-metrics.md
649651
- name: Monitor reference
650652
href: monitor-aks-reference.md
653+
- name: Control plane metrics reference
654+
href: control-plane-metrics-default-list.md
651655
- name: View the kubelet logs
652656
href: kubelet-logs.md
653657
- name: View container data real-time

articles/aks/app-routing-dns-ssl.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ az keyvault create -g <ResourceGroupName> -l <Location> -n <KeyVaultName> --enab
5757

5858
### Create and export a self-signed SSL certificate
5959

60-
> [!NOTE]
61-
> If you already have a certificate, you can skip this step.
62-
>
60+
For testing, you can use a self-signed public certificate instead of a Certificate Authority (CA)-signed certificate. If you already have a certificate, you can skip this step.
61+
62+
> [!CAUTION]
63+
> Self-signed certificates are digital certificates that are not signed by a trusted third-party CA. Self-signed certificates are created, issued, and signed by the company or developer who is responsible for the website or software being signed. This is why self-signed certificates are considered unsafe for public-facing websites and applications. Azure Key Vault has a [trusted partnership with the some Certificate Authorities](../key-vault/certificates/how-to-integrate-certificate-authority.md).
64+
6365
1. Create a self-signed SSL certificate to use with the Ingress using the `openssl req` command. Make sure you replace *`<Hostname>`* with the DNS name you're using.
6466

6567
```bash
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
---
2+
title: List of control plane metrics in Azure Monitor managed service for Prometheus (preview)
3+
description: This article describes the minimal ingestion profile metrics for Azure Kubernetes Service (AKS) control plane metrics.
4+
ms.topic: conceptual
5+
ms.date: 01/31/2024
6+
ms.reviewer: aritraghosh
7+
---
8+
9+
# Minimal ingestion profile for control plane Metrics in Managed Prometheus
10+
11+
Azure Monitor metrics addon collects many Prometheus metrics by default. `Minimal ingestion profile` is a setting that helps reduce ingestion volume of metrics, as only metrics used by default dashboards, default recording rules and default alerts are collected. This article describes how this setting is configured specifically for control plane metrics. This article also lists metrics collected by default when `minimal ingestion profile` is enabled.
12+
13+
> [!NOTE]
14+
> For addon based collection, `Minimal ingestion profile` setting is enabled by default. The discussion here is focused on control plane metrics. The current set of default targets and metrics is listed [here][azure-monitor-prometheus-metrics-scrape-config-minimal].
15+
16+
Following targets are **enabled/ON** by default - meaning you don't have to provide any scrape job configuration for scraping these targets, as metrics addon scrapes these targets automatically by default:
17+
18+
- `controlplane-apiserver` (job=`controlplane-apiserver`)
19+
- `controlplane-etcd` (job=`controlplane-etcd`)
20+
21+
Following targets are available to scrape, but scraping isn't enabled (**disabled/OFF**) by default. Meaning you don't have to provide any scrape job configuration for scraping these targets, and you need to turn **ON/enable** scraping for these targets using the [ama-metrics-settings-configmap][ama-metrics-settings-configmap-github] under the `default-scrape-settings-enabled` section.
22+
23+
- `controlplane-cluster-autoscaler`
24+
- `controlplane-kube-scheduler`
25+
- `controlplane-kube-controller-manager`
26+
27+
> [!NOTE]
28+
> The default scrape frequency for all default targets and scrapes is `30 seconds`. You can override it for each target using the [ama-metrics-settings-configmap][ama-metrics-settings-configmap-github] under `default-targets-scrape-interval-settings` section.
29+
30+
### Minimal ingestion for default ON targets
31+
32+
The following metrics are allow-listed with `minimalingestionprofile=true` for default **ON** targets. The below metrics are collected by default, as these targets are scraped by default.
33+
34+
**controlplane-apiserver**
35+
36+
- `apiserver_request_total`
37+
- `apiserver_cache_list_fetched_objects_total`
38+
- `apiserver_cache_list_returned_objects_total`
39+
- `apiserver_flowcontrol_demand_seats_average`
40+
- `apiserver_flowcontrol_current_limit_seats`
41+
- `apiserver_request_sli_duration_seconds_bucket`
42+
- `apiserver_request_sli_duration_seconds_sum`
43+
- `apiserver_request_sli_duration_seconds_count`
44+
- `process_start_time_seconds`
45+
- `apiserver_request_duration_seconds_bucket`
46+
- `apiserver_request_duration_seconds_sum`
47+
- `apiserver_request_duration_seconds_count`
48+
- `apiserver_storage_list_fetched_objects_total`
49+
- `apiserver_storage_list_returned_objects_total`
50+
- `apiserver_current_inflight_requests`
51+
52+
**controlplane-etcd**
53+
54+
- `etcd_server_has_leader`
55+
- `rest_client_requests_total`
56+
- `etcd_mvcc_db_total_size_in_bytes`
57+
- `etcd_mvcc_db_total_size_in_use_in_bytes`
58+
- `etcd_server_slow_read_indexes_total`
59+
- `etcd_server_slow_apply_total`
60+
- `etcd_network_client_grpc_sent_bytes_total`
61+
- `etcd_server_heartbeat_send_failures_total`
62+
63+
### Minimal ingestion for default OFF targets
64+
65+
The following are metrics that are allow-listed with `minimalingestionprofile=true` for default **OFF** targets. These metrics aren't collected by default. You can turn **ON** scraping for these targets using `default-scrape-settings-enabled.<target-name>=true` using the [ama-metrics-settings-configmap][ama-metrics-settings-configmap-github] under the `default-scrape-settings-enabled` section.
66+
67+
**controlplane-kube-controller-manager**
68+
69+
- `workqueue_depth `
70+
- `rest_client_requests_total`
71+
- `rest_client_request_duration_seconds `
72+
73+
**controlplane-kube-scheduler**
74+
75+
- `scheduler_pending_pods`
76+
- `scheduler_unschedulable_pods`
77+
- `scheduler_queue_incoming_pods_total`
78+
- `scheduler_schedule_attempts_total`
79+
- `scheduler_preemption_attempts_total`
80+
81+
**controlplane-cluster-autoscaler**
82+
83+
- `rest_client_requests_total`
84+
- `cluster_autoscaler_last_activity`
85+
- `cluster_autoscaler_cluster_safe_to_autoscale`
86+
- `cluster_autoscaler_failed_scale_ups_total`
87+
- `cluster_autoscaler_scale_down_in_cooldown`
88+
- `cluster_autoscaler_scaled_up_nodes_total`
89+
- `cluster_autoscaler_unneeded_nodes_count`
90+
- `cluster_autoscaler_unschedulable_pods_count`
91+
- `cluster_autoscaler_nodes_count`
92+
- `cloudprovider_azure_api_request_errors`
93+
- `cloudprovider_azure_api_request_duration_seconds_bucket`
94+
- `cloudprovider_azure_api_request_duration_seconds_count`
95+
96+
> [!NOTE]
97+
> The CPU and memory usage metrics for all control-plane targets are not exposed irrespective of the profile.
98+
99+
## References
100+
101+
- [Kubernetes Upstream metrics list][kubernetes-metrics-instrumentation-reference]
102+
103+
- [Cluster autoscaler metrics list][kubernetes-metrics-autoscaler-reference]
104+
105+
## Next steps
106+
107+
- [Learn more about control plane metrics in Managed Prometheus](monitor-control-plane-metrics.md)
108+
109+
<!-- EXTERNAL LINKS -->
110+
[ama-metrics-settings-configmap-github]: https://github.com/Azure/prometheus-collector/blob/89e865a73601c0798410016e9beb323f1ecba335/otelcollector/configmaps/ama-metrics-settings-configmap.yaml
111+
[kubernetes-metrics-instrumentation-reference]: https://kubernetes.io/docs/reference/instrumentation/metrics/
112+
(https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/proposals/metrics.md)
113+
[kubernetes-metrics-autoscaler-reference]: https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/proposals/metrics.md
114+
115+
<!-- INTERNAL LINKS -->
116+
[azure-monitor-prometheus-metrics-scrape-config-minimal]: ../azure-monitor/containers/prometheus-metrics-scrape-configuration-minimal.md
409 KB
Loading

0 commit comments

Comments
 (0)