Skip to content

Commit af0808a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pl-github-96934
2 parents dddf734 + 73cb3f4 commit af0808a

21 files changed

+248
-364
lines changed

articles/aks/private-clusters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ As mentioned, virtual network peering is one way to access your private cluster.
151151

152152
2. The private DNS zone is linked only to the VNet that the cluster nodes are attached to (3). This means that the private endpoint can only be resolved by hosts in that linked VNet. In scenarios where no custom DNS is configured on the VNet (default), this works without issue as hosts point at 168.63.129.16 for DNS that can resolve records in the private DNS zone because of the link.
153153

154-
3. In scenarios where the VNet containing your cluster has custom DNS settings (4), cluster deployment fails unless the private DNS zone is linked to the VNet that contains the custom DNS resolvers (5). This link can be created manually after the private zone is created during cluster provisioning or via automation upon detection of creation of the zone using event-based deployment mechanisms (for example, Azure Event Grid and Azure Functions).
154+
3. In scenarios where the VNet containing your cluster has custom DNS settings (4), cluster deployment fails unless the private DNS zone is linked to the VNet that contains the custom DNS resolvers (5). This link can be created manually after the private zone is created during cluster provisioning or via automation upon detection of creation of the zone using event-based deployment mechanisms (for example, Azure Event Grid and Azure Functions). To avoid cluster failure during initial deployment, the cluster can be deployed with the private DNS zone resource ID. This only works with resource type Microsoft.ContainerService/managedCluster and API version 2022-07-01. Using an older version with an ARM template or Bicep resource definition is not supported.
155155

156156
> [!NOTE]
157157
> Conditional Forwarding doesn't support subdomains.
@@ -257,4 +257,4 @@ Once the A record is created, link the private DNS zone to the virtual network t
257257
[container-registry-private-link]: ../container-registry/container-registry-private-link.md
258258
[virtual-networks-name-resolution]: ../virtual-network/virtual-networks-name-resolution-for-vms-and-role-instances.md#name-resolution-that-uses-your-own-dns-server
259259
[virtual-networks-168.63.129.16]: ../virtual-network/what-is-ip-address-168-63-129-16.md
260-
[use-custom-domains]: coredns-custom.md#use-custom-domains
260+
[use-custom-domains]: coredns-custom.md#use-custom-domains

articles/api-management/devops-api-development-templates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ An API developer writes an API definition by providing a specification, settings
2727
There are several tools to assist producing the API definition:
2828

2929
* The [Azure API Management DevOps Resource Toolkit][4] includes two tools that provide an Azure Resource Manager (ARM) template. The _extractor_ creates an ARM template by extracting an API definition from an API Management service. The _creator_ produces the ARM template from a YAML specification. The DevOps Resource Toolkit supports SOAP, REST, and GraphQL APIs.
30-
* The [Azure APIOps Toolkit][5] provides a workflow built on top of a [git][21] source code control system (such as [GitHub][22] or [Azure Repos][23]). It uses an _extractor_ similar to the DevOps Resource Toolkit to produce an API definition that is then applied to a target API Management service. APIOps supports REST only at this time.
30+
* The [Azure APIOps Toolkit][5] provides a workflow built on top of a [git][21] source code control system (such as [GitHub][22] or [Azure Repos][23]). It uses an _extractor_ similar to the DevOps Resource Toolkit to produce an API definition that is then applied to a target API Management service. APIOps supports REST and GraphQL APIs at this time.
3131
* The [dotnet-apim][6] tool converts a well-formed YAML definition into an ARM template for later deployment. The tool is focused on REST APIs.
3232
* [Terraform][7] is an alternative to Azure Resource Manager to configure resources in Azure. You can create a Terraform configuration (together with policies) to implement the API in the same way that an ARM template is created.
3333

@@ -116,4 +116,4 @@ Review [Automated API deployments with APIOps][28] in the Azure Architecture Cen
116116
[25]: https://azure.microsoft.com/services/devops/
117117
[26]: https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md
118118
[27]: https://github.com/Azure/azure-api-style-guide
119-
[28]: /azure/architecture/example-scenario/devops/automated-api-deployments-apiops
119+
[28]: /azure/architecture/example-scenario/devops/automated-api-deployments-apiops

articles/azure-monitor/visualize/grafana-plugin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Use the following steps to set up a Grafana server and build dashboards for metr
1818

1919
## Set up Grafana
2020

21-
### Set up Azure Managed Grafana (Preview)
21+
### Set up Azure Managed Grafana
2222
Azure Managed Grafana is optimized for the Azure environment and works seamlessly with Azure Monitor. Enabling you to:
2323

2424
- Manage user authentication and access control using Azure Active Directory identities

articles/cosmos-db/mongodb/quickstart-nodejs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Create a doc with the *product* properties for the `adventureworks` database:
197197

198198
:::code language="javascript" source="~/samples-cosmosdb-mongodb-javascript/001-quickstart/index.js" id="new_doc":::
199199

200-
Create an doc in the collect by calling [``Collection.UpdateOne``](https://mongodb.github.io/node-mongodb-native/4.5/classes/Collection.html#updateOne). In this example, we chose to *upsert* instead of *create* a new doc in case you run this sample code more than once.
200+
Create an doc in the collection by calling [``Collection.UpdateOne``](https://mongodb.github.io/node-mongodb-native/4.5/classes/Collection.html#updateOne). In this example, we chose to *upsert* instead of *create* a new doc in case you run this sample code more than once.
201201

202202
### Get a doc
203203

@@ -217,7 +217,7 @@ Troubleshooting:
217217

218218
## Run the code
219219

220-
This app creates a API for MongoDB database and collection and creates a doc and then reads the exact same doc back. Finally, the example issues a query that should only return that single doc. With each step, the example outputs information to the console about the steps it has performed.
220+
This app creates an API for MongoDB database and collection and creates a doc and then reads the exact same doc back. Finally, the example issues a query that should only return that single doc. With each step, the example outputs information to the console about the steps it has performed.
221221

222222
To run the app, use a terminal to navigate to the application directory and run the application.
223223

articles/defender-for-cloud/quickstart-onboard-gcp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ To have full visibility to Microsoft Defender for Servers security content, ensu
124124
- Additional extensions should be enabled on the Arc-connected machines.
125125
- Microsoft Defender for Endpoint
126126
- VA solution (TVM/ Qualys)
127-
- Log Analytics (LA) agent on Arc machines. Ensure the selected workspace has security solution installed.
127+
- Log Analytics (LA) agent on Arc machines or Azure Monitor agent (AMA). Ensure the selected workspace has security solution installed.
128128

129-
The LA agent is currently configured in the subscription level, such that all the multicloud accounts and projects (from both AWS and GCP) under the same subscription will inherit the subscription settings with regard to the LA agent.
129+
The LA agent and AMA are currently configured in the subscription level, such that all the multicloud accounts and projects (from both AWS and GCP) under the same subscription will inherit the subscription settings with regard to the LA agent and AMA.
130130

131131
Learn more about [monitoring components](monitoring-components.md) for Defender for Cloud.
132132

articles/defender-for-iot/organizations/how-to-forward-alert-information-to-partners.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ Enter the following parameters:
135135

136136
| Syslog CEF output format | Description |
137137
|--|--|
138-
| Date and time | Date and time that the syslog server machine received the information. |
139138
| Priority | User.Alert |
140-
| Hostname | Sensor IP address |
139+
| Date and time | Date and time that the syslog server machine received the information. (Added by Syslog server) |
140+
| Hostname | Sensor hostname (Added by Syslog server) |
141141
| Message | CEF:0 <br />Microsoft Defender for IoT/CyberX <br />Sensor name <br />Sensor version <br />Microsoft Defender for IoT Alert <br />Alert title <br />Integer indication of serverity. 1=**Warning**, 4=**Minor**, 8=**Major**, or 10=**Critical**.<br />msg= The message of the alert. <br />protocol= The protocol of the alert. <br />severity= **Warning**, **Minor**, **Major**, or **Critical**. <br />type= **Protocol Violation**, **Policy Violation**, **Malware**, **Anomaly**, or **Operational**. <br />UUID= UUID of the alert <br /> start= The time that the alert was detected. <br />Might vary from the time of the syslog server machine, and depends on the time-zone configuration of the forwarding rule. <br />src_ip= IP address of the source device. <br />src_mac= MAC address of the source device. (Optional) <br />dst_ip= IP address of the destination device.<br />dst_mac= MAC address of the destination device. (Optional)<br />cat= The alert group associated with the alert. |
142142

143143
| Syslog LEEF output format | Description |

articles/search/TOC.yml

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@
184184
href: /security/benchmark/azure/baselines/cognitive-search-security-baseline?toc=/azure/search/TOC.json
185185
- name: How-to guides
186186
items:
187+
- name: Create a search service
188+
href: search-create-service-portal.md
187189
- name: Planning
188190
items:
189191
- name: Choose a tier
@@ -200,8 +202,6 @@
200202
href: search-modeling-multitenant-saas-applications.md
201203
- name: Service management
202204
items:
203-
- name: Create a service
204-
href: search-create-service-portal.md
205205
- name: Manage in the portal
206206
href: search-manage.md
207207
- name: Manage with PowerShell
@@ -422,46 +422,50 @@
422422
items:
423423
- name: Create a basic query
424424
href: search-query-create.md
425-
- name: Create a semantic query
426-
href: semantic-how-to-query-request.md
427-
- name: Return a semantic answer
428-
href: semantic-answers.md
429-
- name: Add spell check to queries
430-
href: speller-how-to-add.md
431-
- name: Search results paging and formatting
432-
href: search-pagination-page-layout.md
433425
- name: Use simple syntax (examples)
434426
href: search-query-simple-examples.md
435-
- name: Use full Lucene (examples)
436-
href: search-query-lucene-examples.md
437-
- name: Partial terms and special characters
438-
href: search-query-partial-matching.md
439-
- name: Fuzzy search
440-
href: search-query-fuzzy.md
427+
- name: Add spell check to queries
428+
href: speller-how-to-add.md
441429
- name: Autocomplete "Search-as-you-type"
442430
items:
443431
- name: Create a suggester
444432
href: index-add-suggesters.md
445433
- name: Add autocomplete and suggestions
446434
href: search-add-autocomplete-suggestions.md
447-
- name: Filters
448-
items:
449-
- name: Filter overview
450-
href: search-filters.md
451-
- name: Add faceted navigation
452-
href: search-faceted-navigation.md
453-
- name: Troubleshoot collection filters
454-
href: search-query-troubleshoot-collection-filters.md
455-
- name: Understand collection filters
456-
href: search-query-understand-collection-filters.md
457-
- name: Normalize text
458-
href: search-normalizers.md
435+
- name: Filters
436+
items:
437+
- name: Filter overview
438+
href: search-filters.md
439+
- name: Add faceted navigation
440+
href: search-faceted-navigation.md
441+
- name: Troubleshoot collection filters
442+
href: search-query-troubleshoot-collection-filters.md
443+
- name: Understand collection filters
444+
href: search-query-understand-collection-filters.md
445+
- name: Normalize text
446+
href: search-normalizers.md
447+
- name: Search results
448+
items:
449+
- name: Paging, sorting, and formatting
450+
href: search-pagination-page-layout.md
451+
- name: Return a semantic answer
452+
href: semantic-answers.md
453+
- name: Advanced queries
454+
items:
455+
- name: Use full Lucene (examples)
456+
href: search-query-lucene-examples.md
457+
- name: Partial terms and special characters
458+
href: search-query-partial-matching.md
459+
- name: Fuzzy search
460+
href: search-query-fuzzy.md
459461
- name: Relevance
460462
items:
461463
- name: Configure scoring
462464
href: index-ranking-similarity.md
463465
- name: Add a scoring profile
464466
href: index-add-scoring-profiles.md
467+
- name: Configure semantic search
468+
href: semantic-how-to-query-request.md
465469
- name: Performance and monitoring
466470
items:
467471
- name: Performance analysis

articles/search/search-howto-index-mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The data source definition specifies the data to index, credentials, and policie
6565
api-key: [admin key]
6666
6767
{
68-
"name" : "hotel-mysql-ds"
68+
"name" : "hotel-mysql-ds",
6969
"description" : "[Description of MySQL data source]",
7070
"type" : "mysql",
7171
"credentials" : {

articles/search/search-pagination-page-layout.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: How to work with search results
33
titleSuffix: Azure Cognitive Search
4-
description: Structure and sort search results, get a document count, and add content navigation to search results in Azure Cognitive Search.
4+
description: Define search result composition, get a document count, sort results, and add content navigation to search results in Azure Cognitive Search.
55

66
manager: nitinme
77
author: HeidiSteen
88
ms.author: heidist
99
ms.service: cognitive-search
10-
ms.topic: conceptual
11-
ms.date: 07/22/2022
10+
ms.topic: how-to
11+
ms.date: 11/01/2022
1212
---
1313

1414
# How to work with search results in Azure Cognitive Search
@@ -20,7 +20,7 @@ Parameters on the query determine:
2020
+ Selection of fields within results
2121
+ Count of matches found in the index for the query
2222
+ Number of results in the response (up to 50, by default)
23-
+ Sort order of results
23+
+ Sort order
2424
+ Highlighting of terms within a result, matching on either the whole or partial term in the body
2525

2626
## Result composition
@@ -53,7 +53,7 @@ Occasionally, the substance and not the structure of results are unexpected. For
5353

5454
## Counting matches
5555

56-
The count parameter returns the number of documents in the index that are considered a match for the query. To return the count, add **`$count=true`** to the query request. There is no maximum value imposed by the search service. Depending on your query and the content of your documents, the count could be as high as every document in the index.
56+
The count parameter returns the number of documents in the index that are considered a match for the query. To return the count, add **`$count=true`** to the query request. There's no maximum value imposed by the search service. Depending on your query and the content of your documents, the count could be as high as every document in the index.
5757

5858
Count is accurate when the index is stable. If the system is actively adding, updating, or deleting documents, the count will be approximate, excluding any documents that aren't fully indexed.
5959

@@ -74,7 +74,7 @@ To control the paging of all documents returned in a result set, add `$top` and
7474

7575
+ Return the second set, skipping the first 15 to get the next 15: `$top=15&$skip=15`. Repeat for the third set of 15: `$top=15&$skip=30`
7676

77-
The results of paginated queries aren't guaranteed to be stable if the underlying index is changing. Paging changes the value of `$skip` for each page, but each query is independent and operates on the current view of the data as it exists in the index at query time (in other words, there is no caching or snapshot of results, such as those found in a general purpose database).
77+
The results of paginated queries aren't guaranteed to be stable if the underlying index is changing. Paging changes the value of `$skip` for each page, but each query is independent and operates on the current view of the data as it exists in the index at query time (in other words, there's no caching or snapshot of results, such as those found in a general purpose database).
7878

7979
Following is an example of how you might get duplicates. Assume an index with four documents:
8080

@@ -103,9 +103,9 @@ Notice that document 2 is fetched twice. This is because the new document 5 has
103103

104104
## Ordering results
105105

106-
In a full text search query, results can be ranked by a search score, a semantic re-ranker score (if using [semantic search](semantic-search-overview.md)), or by an **`$orderby`** expression in the query request.
106+
In a full text search query, results can be ranked by a search score, a semantic reranker score (if using [semantic search](semantic-search-overview.md)), or by an **`$orderby`** expression in the query request.
107107

108-
A @search.score equal to 1.00 indicates an un-scored or un-ranked result set, where the 1.0 score is uniform across all results. Un-scored results occur when the query form is fuzzy search, wildcard or regex queries, or an empty search (`search=*`). If you need to impose a ranking structure over un-scored results, an **`$orderby`** expression will help you achieve that objective.
108+
A @search.score equal to 1.00 indicates an unscored or unranked result set, where the 1.0 score is uniform across all results. Unscored results occur when the query form is fuzzy search, wildcard or regex queries, or an empty search (`search=*`). If you need to impose a ranking structure over unscored results, an **`$orderby`** expression will help you achieve that objective.
109109

110110
For full text search queries, results are automatically ranked by a search score, calculated based on term frequency and proximity in a document (derived from [TF-IDF](https://en.wikipedia.org/wiki/Tf%E2%80%93idf)), with higher scores going to documents having more or stronger matches on a search term.
111111

@@ -129,7 +129,7 @@ Another approach that promotes order consistency is using a [custom scoring prof
129129

130130
Hit highlighting refers to text formatting (such as bold or yellow highlights) applied to matching terms in a result, making it easy to spot the match. Highlighting is useful for longer content fields, such as a description field, where the match isn't immediately obvious.
131131

132-
Notice that highlighting is applied to individual terms. There is no highlight capability for the contents of an entire field. If you want highlighting over a phrase, you'll have to provide the matching terms (or phrase) in a quote-enclosed query string. This technique is described further on in this section.
132+
Notice that highlighting is applied to individual terms. There's no highlight capability for the contents of an entire field. If you want to highlight over a phrase, you'll have to provide the matching terms (or phrase) in a quote-enclosed query string. This technique is described further on in this section.
133133

134134
Hit highlighting instructions are provided on the [query request](/rest/api/searchservice/search-documents). Queries that trigger query expansion in the engine, such as fuzzy and wildcard search, have limited support for hit highlighting.
135135

@@ -166,7 +166,7 @@ In a keyword search, each term is scanned for independently. A query for "divine
166166

167167
### Keyword search highlighting
168168

169-
Within a highlighted field, formatting is applied to whole terms. For example, on a match against "The Divine Secrets of the Ya-Ya Sisterhood", formatting is applied to each term separately, even though they are consecutive.
169+
Within a highlighted field, formatting is applied to whole terms. For example, on a match against "The Divine Secrets of the Ya-Ya Sisterhood", formatting is applied to each term separately, even though they're consecutive.
170170

171171
```json
172172
"@odata.count": 39,

0 commit comments

Comments
 (0)