Skip to content

Commit aaf93b4

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work01
2 parents a2d3fe7 + 0087e80 commit aaf93b4

16 files changed

+283
-328
lines changed

articles/automation/automation-dsc-onboarding.md

Lines changed: 106 additions & 140 deletions
Large diffs are not rendered by default.

articles/automation/automation-dsc-overview.md

Lines changed: 41 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,34 @@ manager: carmonm
1515

1616
Azure Automation State Configuration is an Azure service that allows you to write, manage, and
1717
compile PowerShell Desired State Configuration (DSC)
18-
[configurations](/powershell/scripting/dsc/configurations/configurations), import [DSC Resources](/powershell/scripting/dsc/resources/resources),
19-
and assign configurations to target nodes, all in the cloud.
18+
[configurations](/powershell/scripting/dsc/configurations/configurations). The service also imports [DSC Resources](/powershell/scripting/dsc/resources/resources), and assigns configurations to target nodes, all in the cloud.
2019

2120
## Why use Azure Automation State Configuration
2221

2322
Azure Automation State Configuration provides several advantages over using DSC outside of Azure.
2423

2524
### Built-in pull server
2625

27-
Azure Automation State Configuration provides a DSC pull server similar to the
28-
[Windows Feature DSC-Service](/powershell/scripting/dsc/pull-server/pullserver) so that target nodes automatically receive
29-
configurations, conform to the desired state, and report back on their compliance. The built-in pull
30-
server in Azure Automation eliminates the need to set up and maintain your own pull server. Azure
26+
Azure Automation State Configuration provides a DSC pull server similar to the [Windows Feature DSC-Service](/powershell/scripting/dsc/pull-server/pullserver). Target nodes can automatically receive
27+
configurations, conform to the desired state, and report on their compliance. The built-in pull server in Azure Automation eliminates the need to set up and maintain your own pull server. Azure
3128
Automation can target virtual or physical Windows or Linux machines, in the cloud or on-premises.
3229

3330
### Management of all your DSC artifacts
3431

35-
Azure Automation State Configuration brings the same management layer to
36-
[PowerShell Desired State Configuration](/powershell/scripting/dsc/overview/overview) as Azure Automation offers for PowerShell scripting.
37-
38-
From the Azure portal, or from PowerShell, you can manage all your DSC configurations, resources,
39-
and target nodes.
32+
Azure Automation State Configuration brings the same management layer to [PowerShell Desired State Configuration](/powershell/scripting/dsc/overview/overview) as it offers for PowerShell scripting. From the Azure portal or from PowerShell, you can manage all your DSC configurations, resources, and target nodes.
4033

4134
![Screenshot of the Azure Automation page](./media/automation-dsc-overview/azure-automation-blade.png)
4235

43-
### Import reporting data into Azure Monitor logs
36+
### Import of reporting data into Azure Monitor logs
4437

45-
Nodes that are managed with Azure Automation State Configuration send detailed reporting status
46-
data to the built-in pull server. You can configure Azure Automation State Configuration to send
47-
this data to your Log Analytics workspace. To learn how to send State Configuration status data to
48-
your Log Analytics workspace, see [Forward Azure Automation State Configuration reporting data to Azure Monitor logs](automation-dsc-diagnostics.md).
38+
Nodes that are managed with Azure Automation State Configuration send detailed reporting status data to the built-in pull server. You can configure Azure Automation State Configuration to send
39+
this data to your Log Analytics workspace. See [Forward Azure Automation State Configuration reporting data to Azure Monitor logs](automation-dsc-diagnostics.md).
4940

50-
## Prerequisites
41+
## Prerequisites for using Azure Automation State Configuration
5142

52-
Please consider the following requirements when using Azure Automation State Configuration (DSC).
43+
Please consider the following requirements when using Azure Automation State Configuration for DSC.
5344

54-
### Operating System Requirements
45+
### Operating system requirements
5546

5647
For nodes running Windows, the following versions are supported:
5748

@@ -64,64 +55,56 @@ For nodes running Windows, the following versions are supported:
6455
- Windows 8.1
6556
- Windows 7
6657

67-
The [Microsoft Hyper-V Server](/windows-server/virtualization/hyper-v/hyper-v-server-2016)
68-
standalone product sku does not contain an implementation of Desired State Configuraion
69-
so it cannot be managed by PowerShell DSC or Azure Automation State Configuration.
70-
71-
For nodes running Linux, the following distros/versions are supported:
58+
>[!NOTE]
59+
>The [Microsoft Hyper-V Server](/windows-server/virtualization/hyper-v/hyper-v-server-2016) standalone product SKU does not contain an implementation of DSC. Thus it can't be managed by PowerShell DSC or Azure Automation State Configuration.
7260
73-
The DSC Linux extension supports all the Linux distributions listed under [Supported Linux Distributions](https://github.com/Azure/azure-linux-extensions/tree/master/DSC#4-supported-linux-distributions).
61+
For nodes running Linux, the DSC Linux extension supports all the Linux distributions listed under [Supported Linux Distributions](https://github.com/Azure/azure-linux-extensions/tree/master/DSC#4-supported-linux-distributions).
7462

7563
### DSC requirements
7664

7765
For all Windows nodes running in Azure,
7866
[WMF 5.1](https://docs.microsoft.com/powershell/scripting/wmf/setup/install-configure)
79-
will be installed during onboarding. For nodes running Windows Server 2012 and Windows 7,
80-
[WinRM will be enabled](https://docs.microsoft.com/powershell/scripting/dsc/troubleshooting/troubleshooting#winrm-dependency).
67+
is installed during onboarding. For nodes running Windows Server 2012 and Windows 7,
68+
[WinRM](https://docs.microsoft.com/powershell/scripting/dsc/troubleshooting/troubleshooting#winrm-dependency) is enabled.
8169

8270
For all Linux nodes running in Azure,
8371
[PowerShell DSC for Linux](https://github.com/Microsoft/PowerShell-DSC-for-Linux)
84-
will be installed during onboarding.
72+
is installed during onboarding.
8573

86-
### <a name="network-planning"></a>Configure private networks
74+
### <a name="network-planning"></a>Configuration of private networks
8775

88-
If your nodes are located within a private network,
89-
the following port and URLs are required for State Configuration (DSC) to communicate with Automation:
76+
If your nodes are located in a private network, the following port and URLs are required. These resources provide network connectivity for the managed node and allow DSC to communicate with Azure Automation.
9077

91-
* Port: Only TCP 443 is required for outbound internet access.
92-
* Global URL: *.azure-automation.net
93-
* Global URL of US Gov Virginia: *.azure-automation.us
94-
* Agent service: https://\<workspaceId\>.agentsvc.azure-automation.net
78+
* Port: Only TCP 443 required for outbound internet access
79+
* Global URL: ***.azure-automation.net**
80+
* Global URL of US Gov Virginia: ***.azure-automation.us**
81+
* Agent service: **https://\<workspaceId\>.agentsvc.azure-automation.net**
9582

96-
This provides network connectivity for the managed node to communicate with Azure Automation.
9783
If you are using DSC resources that communicate between nodes,
9884
such as the [WaitFor* resources](https://docs.microsoft.com/powershell/scripting/dsc/reference/resources/windows/waitForAllResource),
99-
you will also need to allow traffic between nodes.
100-
See the documentation for each DSC resource to understand those network requirements.
85+
you also need to allow traffic between nodes. See the documentation for each DSC resource to understand these network requirements.
10186

102-
#### Proxy Support
87+
#### Proxy support
10388

104-
Proxy support for the DSC agent is available in Windows version 1809 and later.
105-
To configure this option,
106-
set the value for **ProxyURL** and **ProxyCredential** in the
107-
[metaconfiguration script](automation-dsc-onboarding.md#generating-dsc-metaconfigurations)
89+
Proxy support for the DSC agent is available in Windows version 1809 and later. This option is enabled by setting the values for `ProxyURL` and `ProxyCredential` in the [metaconfiguration script](automation-dsc-onboarding.md#generating-dsc-metaconfigurations)
10890
used to register nodes.
109-
Proxy is not available in DSC for previous versions of Windows.
11091

111-
For Linux nodes,
112-
the DSC agent supports proxy and will utilize the http_proxy variable to determine the url.
92+
>[!NOTE]
93+
>Azure Automation State Configuration does not provide DSC proxy support for previous versions of Windows.
94+
95+
For Linux nodes, the DSC agent supports proxy and uses the `http_proxy` variable to determine the URL.
11396

114-
#### Azure State Configuration network ranges and namespace
97+
#### Azure Automation State Configuration network ranges and namespace
11598

116-
It's recommended to use the addresses listed when defining exceptions. For IP addresses you can download the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653). This file is updated weekly, and has the currently deployed ranges and any upcoming changes to the IP ranges.
99+
It's recommended to use the addresses listed below when defining exceptions. For IP addresses, you can download the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653). This file is updated weekly, and has the currently deployed ranges and any upcoming changes to the IP ranges.
117100

118101
If you have an Automation account that's defined for a specific region, you can restrict communication to that regional datacenter. The following table provides the DNS record for each region:
119102

120103
| **Region** | **DNS record** |
121104
| --- | --- |
122105
| West Central US | wcus-jobruntimedata-prod-su1.azure-automation.net</br>wcus-agentservice-prod-1.azure-automation.net |
123106
| South Central US |scus-jobruntimedata-prod-su1.azure-automation.net</br>scus-agentservice-prod-1.azure-automation.net |
124-
| East US | eus-jobruntimedata-prod-su1.azure-automation.net</br>eus-agentservice-prod-1.azure-automation.net |
107+
| East US | eus-jobruntimedata-prod-su1.azure-automation.net</br>eus-agentservice-prod-1.azure-automation.net |
125108
| East US 2 |eus2-jobruntimedata-prod-su1.azure-automation.net</br>eus2-agentservice-prod-1.azure-automation.net |
126109
| Canada Central |cc-jobruntimedata-prod-su1.azure-automation.net</br>cc-agentservice-prod-1.azure-automation.net |
127110
| West Europe |we-jobruntimedata-prod-su1.azure-automation.net</br>we-agentservice-prod-1.azure-automation.net |
@@ -138,15 +121,15 @@ For a list of region IP addresses instead of region names, download the [Azure D
138121
> [!NOTE]
139122
> The Azure Datacenter IP address XML file lists the IP address ranges that are used in the Microsoft Azure datacenters. The file includes compute, SQL, and storage ranges.
140123
>
141-
>An updated file is posted weekly. The file reflects the currently deployed ranges and any upcoming changes to the IP ranges. New ranges that appear in the file aren't used in the datacenters for at least one week.
142-
>
143-
> It's a good idea to download the new XML file every week. Then, update your site to correctly identify services running in Azure. Azure ExpressRoute users should note that this file is used to update the Border Gateway Protocol (BGP) advertisement of Azure space in the first week of each month.
124+
>An updated file is posted weekly. The file reflects the currently deployed ranges and any upcoming changes to the IP ranges. New ranges that appear in the file aren't used in the datacenters for at least one week. It's a good idea to download the new XML file every week. Then update your site to correctly identify services running in Azure.
125+
126+
Azure ExpressRoute users should note that this file is used to update the Border Gateway Protocol (BGP) advertisement of Azure space in the first week of each month.
144127

145128
## Next steps
146129

147-
- To get started, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md)
148-
- To learn how to onboard nodes, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md)
149-
- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md)
150-
- For PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/azurerm.automation/#automation)
151-
- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/)
152-
- To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous Deployment Using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md)
130+
- To get started using DSC in Azure Automation State Configuration, see [Getting started with Azure Automation State Configuration](automation-dsc-getting-started.md).
131+
- To learn how to onboard nodes, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md).
132+
- To learn about compiling DSC configurations so that you can assign them to target nodes, see [Compiling configurations in Azure Automation State Configuration](automation-dsc-compile.md).
133+
- For PowerShell cmdlet reference, see [Azure Automation State Configuration cmdlets](/powershell/module/azurerm.automation/#automation).
134+
- For pricing information, see [Azure Automation State Configuration pricing](https://azure.microsoft.com/pricing/details/automation/).
135+
- To see an example of using Azure Automation State Configuration in a continuous deployment pipeline, see [Continuous deployment using Azure Automation State Configuration and Chocolatey](automation-dsc-cd-chocolatey.md).

articles/event-hubs/TOC.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,15 @@
160160
maintainContext: true
161161
- name: Integrate with Apache Kafka
162162
items:
163-
- name: Create Apache Kafka-enabled event hubs
164-
href: event-hubs-create-kafka-enabled.md
165-
- name: Mirror a Kafka broker in an Apache Kafka-enabled event hub
163+
- name: Mirror a Kafka broker in an event hub
166164
href: event-hubs-kafka-mirror-maker-tutorial.md
167-
- name: Connect Apache Spark to an Apache Kafka-enabled event hub
165+
- name: Connect Apache Spark to an event hub
168166
href: event-hubs-kafka-spark-tutorial.md
169-
- name: Connect Apache Flink to an Apache Kafka-enabled event hub
167+
- name: Connect Apache Flink to an event hub
170168
href: event-hubs-kafka-flink-tutorial.md
171-
- name: Integrate Apache Kafka Connect with a Kafka-enabled event hub (Preview)
169+
- name: Integrate Apache Kafka Connect with a hub (Preview)
172170
href: event-hubs-kafka-connect-tutorial.md
173-
- name: Connect Akka Streams to an Apache Kafka-enabled event hub
171+
- name: Connect Akka Streams to an event hub
174172
href: event-hubs-kafka-akka-streams-tutorial.md
175173
- name: Manage and monitor
176174
items:

articles/event-hubs/event-hubs-exchange-events-different-protocols.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,10 @@ String myStringProperty = new String(rawbytes, StandardCharsets.UTF_8);
338338
```
339339

340340
## Next steps
341-
In this article, you learned how to stream into Kafka-enabled Event Hubs without changing your protocol clients or running your own clusters. To learn more about Event Hubs and Event Hubs for Kafka, see the following articles:
341+
In this article, you learned how to stream into Event Hubs without changing your protocol clients or running your own clusters. To learn more about Event Hubs and Event Hubs for Kafka, see the following articles:
342342

343343
* [Learn about Event Hubs](event-hubs-what-is-event-hubs.md)
344344
* [Learn about Event Hubs for Kafka](event-hubs-for-kafka-ecosystem-overview.md)
345345
* [Explore more samples on the Event Hubs for Kafka GitHub](https://github.com/Azure/azure-event-hubs-for-kafka)
346-
* Use [MirrorMaker](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27846330) to [stream events from Kafka on premises to Kafka enabled Event Hubs on cloud.](event-hubs-kafka-mirror-maker-tutorial.md)
347-
* Learn how to stream into Kafka enabled Event Hubs using [native Kafka applications](event-hubs-quickstart-kafka-enabled-event-hubs.md), [Apache Flink](event-hubs-kafka-flink-tutorial.md), or [Akka Streams](event-hubs-kafka-akka-streams-tutorial.md)
346+
* Use [MirrorMaker](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27846330) to [stream events from Kafka on premises to Event Hubs on cloud.](event-hubs-kafka-mirror-maker-tutorial.md)
347+
* Learn how to stream into Event Hubs using [native Kafka applications](event-hubs-quickstart-kafka-enabled-event-hubs.md), [Apache Flink](event-hubs-kafka-flink-tutorial.md), or [Akka Streams](event-hubs-kafka-akka-streams-tutorial.md)

articles/event-hubs/event-hubs-faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ If you use the zone redundancy for your namespace, you need to do a few addition
106106
Event Hubs provides a Kafka endpoint that can be used by your existing Apache Kafka based applications. A configuration change is all that is required to have the PaaS Kafka experience. It provides an alternative to running your own Kafka cluster. Event Hubs supports Apache Kafka 1.0 and newer client versions and works with your existing Kafka applications, tools, and frameworks. For more information, see [Event Hubs for Kafka repo](https://github.com/Azure/azure-event-hubs-for-kafka).
107107
108108
### What configuration changes need to be done for my existing application to talk to Event Hubs?
109-
To connect to a Kafka-enabled Event Hub, you'll need to update the Kafka client configs. It's done by creating an Event Hubs namespace and obtaining the [connection string](event-hubs-get-connection-string.md). Change the bootstrap.servers to point the Event Hubs FQDN and the port to 9093. Update the sasl.jaas.config to direct the Kafka client to your Kafka-enabled Event Hubs endpoint (which is the connection string you've obtained), with correct authentication as shown below:
109+
To connect to an event hub, you'll need to update the Kafka client configs. It's done by creating an Event Hubs namespace and obtaining the [connection string](event-hubs-get-connection-string.md). Change the bootstrap.servers to point the Event Hubs FQDN and the port to 9093. Update the sasl.jaas.config to direct the Kafka client to your Event Hubs endpoint (which is the connection string you've obtained), with correct authentication as shown below:
110110
111111
bootstrap.servers={YOUR.EVENTHUBS.FQDN}:9093
112112
request.timeout.ms=60000
@@ -124,8 +124,8 @@ sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule require
124124
125125
Note: If sasl.jaas.config isn't a supported configuration in your framework, find the configurations that are used to set the SASL username and password and use those instead. Set the username to $ConnectionString and the password to your Event Hubs connection string.
126126
127-
### What is the message/event size for Kafka-enabled Event Hubs?
128-
The maximum message size allowed for Kafka-enabled Event Hubs is 1 MB.
127+
### What is the message/event size for Event Hubs?
128+
The maximum message size allowed for Event Hubs is 1 MB.
129129
130130
## Throughput units
131131

0 commit comments

Comments
 (0)