Skip to content

Commit 7b7b754

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into security-baselines
2 parents 0029162 + bc2b0ad commit 7b7b754

File tree

71 files changed

+1554
-1395
lines changed

Some content is hidden

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

71 files changed

+1554
-1395
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48865,6 +48865,11 @@
4886548865
"source_path": "articles/media-services/previous/media-services-develop-video-players.md",
4886648866
"redirect_url": "/azure/media-services",
4886748867
"redirect_document_id": false
48868+
},
48869+
{
48870+
"source_path": "articles/virtual-machines/windows/chef-automation.md",
48871+
"redirect_url": "/azure/chef/chef-automation",
48872+
"redirect_document_id": true
4886848873
}
4886948874
]
4887048875
}

articles/active-directory/manage-apps/end-user-experiences.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Which method(s) you choose to deploy in your organization is your discretion.
2727

2828
## Azure AD access panel
2929

30-
The Access Panel at https://myapps.microsoft.com is a web-based portal that allows an end user with an organizational account in Azure Active Directory to view and launch cloud-based applications to which they have been granted access by the Azure AD administrator. If you are an end user with [Azure Active Directory Premium](https://azure.microsoft.com/pricing/details/active-directory/), you can also utilize self-service group management capabilities through the Access Panel.
30+
The Access Panel at https://myapps.microsoft.com is a web-based portal that allows an end user with an organizational account in Azure Active Directory to view and launch applications to which they have been granted access by the Azure AD administrator. If you are an end user with [Azure Active Directory Premium](https://azure.microsoft.com/pricing/details/active-directory/), you can also utilize self-service group management capabilities through the Access Panel.
3131

3232
![Screenshot shows the Azure AD Access Panel portal](media/what-is-single-sign-on/azure-ad-access-panel.png)
3333

articles/app-service/webjobs-sdk-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ static async Task Main()
420420
}
421421
```
422422

423-
For more details, see the [Event Hubs binding](../azure-functions/functions-bindings-event-hubs.md#hostjson-settings) article.
423+
For more details, see the [Event Hubs binding](../azure-functions/functions-bindings-event-hubs-output.md#hostjson-settings) article.
424424

425425
### Queue storage trigger configuration
426426

articles/azure-arc/servers/onboard-portal.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: azure-arc
66
ms.subservice: azure-arc-servers
77
author: mgoedtel
88
ms.author: magoedte
9-
ms.date: 02/12/2020
9+
ms.date: 02/24/2020
1010
ms.topic: conceptual
1111
---
1212

@@ -175,12 +175,26 @@ To disconnect a machine from Azure Arc for servers (preview), do the following:
175175
ForEach-Object {MsiExec.exe /x "$($_.PsChildName)" /qn}
176176
```
177177
178-
1. To uninstall the Linux agent, run the following command:
178+
1. To uninstall the Linux agent, the command to use depends on the Linux operating system.
179+
180+
- For Ubuntu, run the following command:
179181
180182
```bash
181183
sudo apt purge azcmagent
182184
```
183185
186+
- For RHEL, CentOS, and Amazon Linux, run the following command:
187+
188+
```bash
189+
sudo yum remove azcmagent
190+
```
191+
192+
- For SLES, run the following command:
193+
194+
```bash
195+
sudo zypper remove azcmagent
196+
```
197+
184198
## Next steps
185199
186200
- Learn how to manage your machine using [Azure Policy](../../governance/policy/overview.md), for such things as VM [guest configuration](../../governance/policy/concepts/guest-configuration.md), verifying the machine is reporting to the expected Log Analytics workspace, enable monitoring with [Azure Monitor with VMs](../../azure-monitor/insights/vminsights-enable-at-scale-policy.md), and much more.

articles/azure-arc/servers/overview.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.subservice: azure-arc-servers
77
author: mgoedtel
88
ms.author: magoedte
99
keywords: azure automation, DSC, powershell, desired state configuration, update management, change tracking, inventory, runbooks, python, graphical, hybrid
10-
ms.date: 02/20/2020
10+
ms.date: 02/24/2020
1111
ms.topic: overview
1212
---
1313

@@ -46,6 +46,10 @@ The following versions of the Windows and Linux operating system are officially
4646

4747
- Windows Server 2012 R2 and higher (including Windows Server Core)
4848
- Ubuntu 16.04 and 18.04
49+
- CentOS Linux 7
50+
- SUSE Linux Enterprise Server (SLES) 15
51+
- Red Hat Enterprise Linux (RHEL) 7
52+
- Amazon Linux 7
4953

5054
>[!NOTE]
5155
>This preview release of the Connected Machine agent for Windows only supports Windows Server configured to use the English language.

articles/azure-functions/TOC.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,27 @@
353353
- name: Output
354354
href: functions-bindings-event-grid-output.md
355355
- name: Event Hubs
356-
href: functions-bindings-event-hubs.md
356+
items:
357+
- name: Overview
358+
href: functions-bindings-event-hubs.md
359+
displayName: Azure Event Hubs
360+
- name: Trigger
361+
href: functions-bindings-event-hubs-trigger.md
362+
displayName: Azure Event Hubs
363+
- name: Output
364+
href: functions-bindings-event-hubs-output.md
365+
displayName: Azure Event Hubs
357366
- name: IoT Hub
358-
href: functions-bindings-event-iot.md
367+
items:
368+
- name: Overview
369+
href: functions-bindings-event-iot.md
370+
displayName: Azure IoT Hubs
371+
- name: Trigger
372+
href: functions-bindings-event-iot-trigger.md
373+
displayName: Azure IoT Hubs
374+
- name: Output
375+
href: functions-bindings-event-iot-output.md
376+
displayName: Azure IoT Hubs
359377
- name: HTTP and webhooks
360378
items:
361379
- name: Overview

articles/azure-functions/functions-bindings-error-pages.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ When integrating with Azure services, errors may originate from the APIs of the
2626

2727
+ [Blob storage](functions-bindings-storage-blob-output.md#exceptions-and-return-codes)
2828

29-
+ [Event Hubs](functions-bindings-event-hubs.md#exceptions-and-return-codes)
29+
+ [Event Hubs](functions-bindings-event-hubs-output.md#exceptions-and-return-codes)
30+
31+
+ [IoT Hubs](functions-bindings-event-iot-output.md#exceptions-and-return-codes)
3032

3133
+ [Notification Hubs](functions-bindings-notification-hubs.md#exceptions-and-return-codes)
3234

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: Azure Event Hubs output binding for Azure Functions
3+
description: Learn to write messages to Azure Event Hubs streams using Azure Functions.
4+
author: craigshoemaker
5+
ms.assetid: daf81798-7acc-419a-bc32-b5a41c6db56b
6+
ms.topic: reference
7+
ms.date: 02/21/2020
8+
ms.author: cshoe
9+
---
10+
11+
# Azure Event Hubs output binding for Azure Functions
12+
13+
This article explains how to work with [Azure Event Hubs](../event-hubs/event-hubs-what-is-event-hubs.md) bindings for Azure Functions. Azure Functions supports trigger and output bindings for Event Hubs.
14+
15+
For information on setup and configuration details, see the [overview](functions-bindings-event-hubs.md).
16+
17+
[!INCLUDE [functions-bindings-event-hubs](../../includes/functions-bindings-event-hubs-output.md)]
18+
19+
## Next steps
20+
21+
- [Respond to events sent to an event hub event stream (Trigger)](./functions-bindings-storage-blob-trigger.md)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: Azure Event Hubs trigger for Azure Functions
3+
description: Learn to use Azure Event Hubs trigger in Azure Functions.
4+
author: craigshoemaker
5+
ms.assetid: daf81798-7acc-419a-bc32-b5a41c6db56b
6+
ms.topic: reference
7+
ms.date: 02/21/2020
8+
ms.author: cshoe
9+
---
10+
11+
# Azure Event Hubs bindings for Azure Functions
12+
13+
This article explains how to work with [Azure Event Hubs](../event-hubs/event-hubs-what-is-event-hubs.md) trigger for Azure Functions. Azure Functions supports trigger and [output bindings](functions-bindings-event-hubs-output.md) for Event Hubs.
14+
15+
For information on setup and configuration details, see the [overview](functions-bindings-event-hubs.md).
16+
17+
[!INCLUDE [functions-bindings-event-hubs-trigger](../../includes/functions-bindings-event-hubs-trigger.md)]
18+
19+
## Next steps
20+
21+
- [Write events to an event stream (Output binding)](./functions-bindings-storage-blob-output.md)
Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
11
---
22
title: Azure Event Hubs bindings for Azure Functions
3-
description: Understand how to use Azure Event Hubs bindings in Azure Functions.
3+
description: Learn to use Azure Event Hubs trigger and bindings in Azure Functions.
44
author: craigshoemaker
5-
65
ms.assetid: daf81798-7acc-419a-bc32-b5a41c6db56b
76
ms.topic: reference
8-
ms.date: 11/08/2017
7+
ms.date: 02/21/2020
98
ms.author: cshoe
10-
119
---
12-
# Azure Event Hubs bindings for Azure Functions
13-
14-
This article explains how to work with [Azure Event Hubs](../event-hubs/event-hubs-what-is-event-hubs.md) bindings for Azure Functions. Azure Functions supports trigger and output bindings for Event Hubs.
15-
16-
[!INCLUDE [intro](../../includes/functions-bindings-intro.md)]
1710

18-
## Packages - Functions 1.x
11+
# Azure Event Hubs trigger and bindings for Azure Functions
1912

20-
For Azure Functions version 1.x, the Event Hubs bindings are provided in the [Microsoft.Azure.WebJobs.ServiceBus](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.ServiceBus) NuGet package, version 2.x.
21-
Source code for the package is in the [azure-webjobs-sdk](https://github.com/Azure/azure-webjobs-sdk/tree/v2.x/src/Microsoft.Azure.WebJobs.ServiceBus/EventHubs) GitHub repository.
22-
23-
24-
[!INCLUDE [functions-package](../../includes/functions-package.md)]
25-
26-
## Packages - Functions 2.x and higher
27-
28-
For Functions 2.x and higher, use the [Microsoft.Azure.WebJobs.Extensions.EventHubs](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.EventHubs) package, version 3.x.
29-
Source code for the package is in the [azure-webjobs-sdk](https://github.com/Azure/azure-webjobs-sdk/tree/master/src/Microsoft.Azure.WebJobs.Extensions.EventHubs) GitHub repository.
13+
This article explains how to work with [Azure Event Hubs](../event-hubs/event-hubs-what-is-event-hubs.md) bindings for Azure Functions. Azure Functions supports trigger and output bindings for Event Hubs.
3014

31-
[!INCLUDE [functions-package-v2](../../includes/functions-package-v2.md)]
15+
| Action | Type |
16+
|--------|------|
17+
| Respond to events sent to an event hub event stream. | [Trigger](./functions-bindings-event-hubs-trigger.md) |
18+
| Write events to an event stream | [Output binding](./functions-bindings-event-hubs-output.md) |
3219

3320
[!INCLUDE [functions-bindings-event-hubs](../../includes/functions-bindings-event-hubs.md)]
3421

3522
## Next steps
3623

37-
> [!div class="nextstepaction"]
38-
> [Learn more about Azure functions triggers and bindings](functions-triggers-bindings.md)
24+
- [Respond to events sent to an event hub event stream (Trigger)](./functions-bindings-event-hubs-trigger.md)
25+
- [Write events to an event stream (Output binding)](./functions-bindings-event-hubs-output.md)

0 commit comments

Comments
 (0)