Skip to content

Commit ae0b070

Browse files
authored
Merge pull request #176386 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 72fe5c1 + 7962631 commit ae0b070

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

articles/active-directory/fundamentals/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The modern Edge browser is now included in the requirement to provide an `Origin
7474
**Service category:** User Access Management
7575
**Product capability:** Entitlement Management
7676

77-
There is now an additional option for advanced expiration settings in entitlement management. It's possible to configure an access package that'll expire in hours, in addition to prior settings. [Learn more]../governance/entitlement-management-access-package-create.md#lifecycle).
77+
There is now an additional option for advanced expiration settings in entitlement management. It's possible to configure an access package that'll expire in hours, in addition to prior settings. [Learn more](../governance/entitlement-management-access-package-create.md#lifecycle).
7878

7979
---
8080

articles/cosmos-db/plan-manage-costs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure Cosmos DB is available in two different capacity modes: provisioned throug
3232

3333
### Capacity planning
3434

35-
As an aid for estimating costs, it can be helpful to do capacity planning for a migration to Azure Cosmos DB. If you are planning a migration from an existing database cluster to Azure Cosmos DB, uou can use information about your existing database cluster for capacity planning.
35+
As an aid for estimating costs, it can be helpful to do capacity planning for a migration to Azure Cosmos DB. If you are planning a migration from an existing database cluster to Azure Cosmos DB, you can use information about your existing database cluster for capacity planning.
3636
* If all you know is the number of vcores and servers in your existing database cluster, read about [estimating request units using vCores or vCPUs](convert-vcore-to-request-unit.md)
3737

3838
![Migrate a replica set with 3 replicas of a four-core SKU to Azure Cosmos DB](media/convert-vcore-to-request-unit/one-replica-set.png)
@@ -162,4 +162,4 @@ See the following articles to learn more on how pricing works in Azure Cosmos DB
162162
* Learn [how to optimize your cloud investment with Azure Cost Management](../cost-management-billing/costs/cost-mgt-best-practices.md?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn).
163163
* Learn more about managing costs with [cost analysis](../cost-management-billing/costs/quick-acm-cost-analysis.md?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn).
164164
* Learn about how to [prevent unexpected costs](../cost-management-billing/cost-management-billing-overview.md?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn).
165-
* Take the [Cost Management](/learn/paths/control-spending-manage-bills?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn) guided learning course.
165+
* Take the [Cost Management](/learn/paths/control-spending-manage-bills?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn) guided learning course.

articles/hdinsight/kafka/apache-kafka-mirroring.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,14 @@ Configure IP advertising to enable a client to connect using broker IP addresses
131131
132132
For information, see [Use SSH with HDInsight](../hdinsight-hadoop-linux-use-ssh-unix.md).
133133
134-
1. Use the following command to create a variable with the Apache Zookeeper hosts for the primary cluster. The strings like `ZOOKEEPER_IP_ADDRESS1` must be replaced with the actual IP addresses recorded earlier, such as `10.23.0.11` and `10.23.0.7`. If you're using FQDN resolution with a custom DNS server, follow [these steps](apache-kafka-get-started.md#getkafkainfo) to get broker and zookeeper names.:
134+
1. Use the following command to create two environment variables with the Apache Zookeeper hosts and Broker hosts for the primary cluster. The strings like `ZOOKEEPER_IP_ADDRESS1` must be replaced with the actual IP addresses recorded earlier, such as `10.23.0.11` and `10.23.0.7`. The same goes for `BROKER_IP_ADDRESS1`. If you're using FQDN resolution with a custom DNS server, follow [these steps](apache-kafka-get-started.md#getkafkainfo) to get broker and zookeeper names.:
135135
136136
```bash
137137
# get the zookeeper hosts for the primary cluster
138138
export PRIMARY_ZKHOSTS='ZOOKEEPER_IP_ADDRESS1:2181, ZOOKEEPER_IP_ADDRESS2:2181, ZOOKEEPER_IP_ADDRESS3:2181'
139+
140+
# get the broker hosts for the primary cluster
141+
export PRIMARY_BROKERHOSTS='BROKER_IP_ADDRESS1:9092,BROKER_IP_ADDRESS2:9092,BROKER_IP_ADDRESS2:9092'
139142
```
140143
141144
1. To create a topic named `testtopic`, use the following command:
@@ -152,15 +155,15 @@ Configure IP advertising to enable a client to connect using broker IP addresses
152155
153156
The response contains `testtopic`.
154157
155-
1. Use the following to view the Zookeeper host information for this (the **primary**) cluster:
158+
1. Use the following to view the Broker host information for this (the **primary**) cluster:
156159
157160
```bash
158-
echo $PRIMARY_ZKHOSTS
161+
echo $PRIMARY_BROKERHOSTS
159162
```
160163
161164
This returns information similar to the following text:
162165
163-
`10.23.0.11:2181,10.23.0.7:2181,10.23.0.9:2181`
166+
`10.23.0.11:9092,10.23.0.7:9092,10.23.0.9:9092`
164167
165168
Save this information. It's used in the next section.
166169
@@ -185,11 +188,11 @@ Configure IP advertising to enable a client to connect using broker IP addresses
185188
Use the following text as the contents of the `consumer.properties` file:
186189
187190
```yaml
188-
zookeeper.connect=PRIMARY_ZKHOSTS
191+
bootstrap.servers=PRIMARY_BROKERHOSTS
189192
group.id=mirrorgroup
190193
```
191194
192-
Replace **PRIMARY_ZKHOSTS** with the Zookeeper IP Addresses from the **primary** cluster.
195+
Replace **PRIMARY_BROKERHOSTS** with the Broker host IP Addresses from the **primary** cluster.
193196
194197
This file describes the consumer information to use when reading from the primary Kafka cluster. For more information consumer configuration, see [Consumer Configs](https://kafka.apache.org/documentation#consumerconfigs) at kafka.apache.org.
195198
@@ -275,16 +278,15 @@ Configure IP advertising to enable a client to connect using broker IP addresses
275278
2. From the SSH connection to the **primary** cluster, use the following command to start a producer and send messages to the topic:
276279
277280
```bash
278-
export PRIMARY_BROKERHOSTS=BROKER_IP_ADDRESS1:9092,BROKER_IP_ADDRESS2:9092,BROKER_IP_ADDRESS2:9092
279-
/usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $SOURCE_BROKERHOSTS --topic testtopic
281+
/usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $PRIMARY_BROKERHOSTS --topic testtopic
280282
```
281283
282284
When you arrive at a blank line with a cursor, type in a few text messages. The messages are sent to the topic on the **primary** cluster. When done, use **Ctrl + C** to end the producer process.
283285
284286
3. From the SSH connection to the **secondary** cluster, use **Ctrl + C** to end the MirrorMaker process. It may take several seconds to end the process. To verify that the messages were replicated to the secondary, use the following command:
285287
286288
```bash
287-
/usr/hdp/current/kafka-broker/bin/kafka-console-consumer.sh --bootstrap-server $SECONDARY_ZKHOSTS --topic testtopic --from-beginning
289+
/usr/hdp/current/kafka-broker/bin/kafka-console-consumer.sh --bootstrap-server $SECONDARY_BROKERHOSTS --topic testtopic --from-beginning
288290
```
289291
290292
The list of topics now includes `testtopic`, which is created when MirrorMaster mirrors the topic from the primary cluster to the secondary. The messages retrieved from the topic are the same as the ones you entered on the primary cluster.

articles/machine-learning/how-to-deploy-with-rest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ You can use the tool [jq](https://stedolan.github.io/jq/) to parse the JSON resu
7878
Get the storage key:
7979

8080
```bash
81-
AZURE_STORAGE_KEY=$(az storage account keys list --account-name $AZURE_STORAGE_ACCOUNT | jq '.[0].value')
81+
export AZURE_STORAGE_KEY=$(az storage account keys list --account-name $AZURE_STORAGE_ACCOUNT | jq '.[0].value')
8282
```
8383

8484
### Upload & register code
@@ -159,4 +159,4 @@ If you aren't going use the deployment, you should delete it with the below comm
159159
* Learn [Safe rollout for online endpoints (preview)](how-to-safely-rollout-managed-endpoints.md).
160160
* [View costs for an Azure Machine Learning managed online endpoint (preview)](how-to-view-online-endpoints-costs.md).
161161
* [Managed online endpoints SKU list (preview)](reference-managed-online-endpoints-vm-sku-list.md).
162-
* Learn about limits on managed online endpoints in [Manage and increase quotas for resources with Azure Machine Learning](how-to-manage-quotas.md#azure-machine-learning-managed-online-endpoints-preview).
162+
* Learn about limits on managed online endpoints in [Manage and increase quotas for resources with Azure Machine Learning](how-to-manage-quotas.md#azure-machine-learning-managed-online-endpoints-preview).

articles/security/fundamentals/feature-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ The following tables display the current Azure Sentinel feature availability in
134134
|- [SOC incident audit metrics](../../sentinel/manage-soc-with-incident-metrics.md) | GA | GA |
135135
|- [Watchlists](../../sentinel/watchlists.md) | GA | GA |
136136
| **Threat intelligence support** | | |
137-
| - [Threat Intelligence - TAXII data connector](../../sentinel/understand-threat-intelligence.md) | GA | Not Available |
137+
| - [Threat Intelligence - TAXII data connector](../../sentinel/understand-threat-intelligence.md) | GA | GA |
138138
| - [Threat Intelligence Platform data connector](../../sentinel/understand-threat-intelligence.md) | Public Preview | Not Available |
139-
| - [Threat Intelligence Research Blade](https://techcommunity.microsoft.com/t5/azure-sentinel/what-s-new-threat-intelligence-menu-item-in-public-preview/ba-p/1646597) | GA | Not Available |
139+
| - [Threat Intelligence Research Blade](https://techcommunity.microsoft.com/t5/azure-sentinel/what-s-new-threat-intelligence-menu-item-in-public-preview/ba-p/1646597) | GA | GA |
140140
| - [URL Detonation](https://techcommunity.microsoft.com/t5/azure-sentinel/using-the-new-built-in-url-detonation-in-azure-sentinel/ba-p/996229) | Public Preview | Not Available |
141141
| - [Threat Intelligence workbook](/azure/architecture/example-scenario/data/sentinel-threat-intelligence) | GA | Not Available |
142142
|**Detection support** | | |

0 commit comments

Comments
 (0)