Skip to content

Commit b04f9dc

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-mg-custom-roles
2 parents 76e9aa6 + 7e5e676 commit b04f9dc

File tree

12 files changed

+18
-8
lines changed

12 files changed

+18
-8
lines changed

articles/automation/automation-first-runbook-graphical.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ Now that you have a variable to hold the subscription ID, you can configure the
123123
1. Navigate to your runbook and select **Edit** on the **MyFirstRunbook-Graphical** page.
124124
1. You don't need the `Write Hello World to output` entry any more. Just click the ellipsis and select **Delete**.
125125
1. In the Library control, expand **ASSETS**, then **Connections**. Add `AzureRunAsConnection` to the canvas by selecting **Add to canvas**.
126+
1. Rename `AzureRunAsConnection` to `Get Run As Connection`.
126127
1. In the Library control, type `Connect-AzAccount` in the search field.
127128
1. Add `Connect-AzAccount` to the canvas.
128-
1. Hover over **Get Run As Connection** until a circle appears on the bottom of the shape. Click the circle and drag the arrow to `Connect-AzAccount` to form a link. The runbook starts with `Get Run As Connection` and then runs `Connect-AzAccount`.<br> ![Create link between activities](media/automation-first-runbook-graphical/runbook-link-auth-activities.png)
129+
1. Hover over `Get Run As Connection` until a circle appears on the bottom of the shape. Click the circle and drag the arrow to `Connect-AzAccount` to form a link. The runbook starts with `Get Run As Connection` and then runs `Connect-AzAccount`.<br> ![Create link between activities](media/automation-first-runbook-graphical/runbook-link-auth-activities.png)
129130
1. On the canvas, select `Connect-AzAccount`. In the Configuration control pane, type **Login to Azure** in the **Label** field.
130131
1. Click **Parameters**, and the Activity Parameter Configuration page appears.
131132
1. The `Connect-AzAccount` cmdlet has multiple parameter sets, and you need to select one before providing parameter values. Click **Parameter Set** and then select **ServicePrincipalCertificateWithSubscriptionId**.

articles/automation/automation-windows-hrw-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid
2121

2222
To install and configure a Windows Hybrid Runbook Worker, you can use one of the following methods.
2323

24-
* For Azure VMs, install the Log Analytics agent for Windows using the [virtual machine extension for Windows](../virtual-machines/extensions/oms-windows.md). The extension installs the Log Analytics agent on Azure virtual machines, and enrolls virtual machines into an existing Log Analytics workspace using an Azure Resource Manager template or PowerShell. Once the agent is installed, the VM can be added to a Hybrid Runbook Worker group in your Automation account following step 4 in the [Manual deployment](#manual-deployment) section.
24+
* For Azure VMs, install the Log Analytics agent for Windows using the [virtual machine extension for Windows](../virtual-machines/extensions/oms-windows.md). The extension installs the Log Analytics agent on Azure virtual machines, and enrolls virtual machines into an existing Log Analytics workspace using an Azure Resource Manager template or PowerShell. Once the agent is installed, the VM can be added to a Hybrid Runbook Worker group in your Automation account. Refer to steps 3 and 4 in the [Manual deployment](#manual-deployment) section.
2525

2626
* Use an Automation runbook to completely automate the process of configuring a Windows computer. This is the recommended method for machines in your datacenter or another cloud environment.
2727

-803 Bytes
Loading
1.78 KB
Loading
20.7 KB
Loading
14.1 KB
Loading
8.12 KB
Loading

articles/media-services/latest/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
- name: Packaging and delivery
114114
items:
115115
- name: Dynamic packaging
116-
displayName: origin, packager, HLS, DASH, CMAF, Smooth, manifest, deliver, format, URL, streaming
116+
displayName: origin, packager, HLS, DASH, CMAF, Smooth, manifest, deliver, format, URL, streaming, audio, video
117117
href: dynamic-packaging-overview.md
118118
- name: Dynamic manifests
119119
href: filters-dynamic-manifest-overview.md

articles/media-services/latest/dynamic-packaging-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: media
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: overview
16-
ms.date: 03/09/2020
16+
ms.date: 03/17/2020
1717
ms.author: juliako
1818
#Customer intent: As a developer or content provider, I want to encode and stream on-demand or live content so my customers can view the content on a wide variety of clients (these clients understand different formats).
1919
---
@@ -68,6 +68,9 @@ Your streaming client can specify the following Smooth Streaming formats:
6868
|Smooth Streaming| `https://amsv3account-usw22.streaming.media.azure.net/21b17732-0112-4d76-b526-763dcd843449/ignite.ism/manifest`||
6969
|Smooth Streaming 2.0 (legacy manifest)|By default, Smooth Streaming manifest format contains the repeat tag (r-tag). However, some players do not support the `r-tag`. Clients with these players can use a format that disables the r-tag:<br/><br/>`https://amsv3account-usw22.streaming.media.azure.net/21b17732-0112-4d76-b526-763dcd843449/ignite.ism/manifest(format=fmp4-v20)`|
7070

71+
> [!NOTE]
72+
> Smooth Streaming requires that both audio and video should be present in your stream.
73+
7174
## On-demand streaming workflow
7275

7376
The following steps show a common Media Services streaming workflow where Dynamic Packaging is used along with the Standard Encoder in Azure Media Services.

articles/media-services/latest/streaming-endpoint-concept.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.author: juliako
1818

1919
# Streaming Endpoints (Origin) in Azure Media Services
2020

21-
In Microsoft Azure Media Services, a [Streaming Endpoint](https://docs.microsoft.com/rest/api/media/streamingendpoints) represents a dynamic (just-in-time) packaging and origin service that can deliver your live and on-demand content directly to a client player app using one of the common streaming media protocols (HLS or DASH). In addition, the **Streaming Endpoint** provides dynamic (just-in-time) encryption to industry-leading DRMs.
21+
In Microsoft Azure Media Services, a [Streaming Endpoint](https://docs.microsoft.com/rest/api/media/streamingendpoints) represents a dynamic (just-in-time) packaging and origin service that can deliver your live and on-demand content directly to a client player app using one of the common streaming media protocols (HLS or DASH). In addition, the **Streaming Endpoint** provides dynamic (just-in-time) encryption to industry-leading DRMs.
2222

2323
When you create a Media Services account, a **default** Streaming Endpoint is created for you in a stopped state. You can't delete the **default** Streaming Endpoint. More Streaming Endpoints can be created under the account (see [Quotas and limitations](limits-quotas-constraints.md)).
2424

@@ -27,6 +27,8 @@ When you create a Media Services account, a **default** Streaming Endpoint is cr
2727
>
2828
> You're only billed when your Streaming Endpoint is in the running state.
2929
30+
Make sure to also review the [Dynamic packaging](dynamic-packaging-overview.md) topic.
31+
3032
## Naming convention
3133

3234
The host name format of the streaming URL is: `{servicename}-{accountname}-{regionname}.streaming.media.azure.net`, where
@@ -155,10 +157,14 @@ See the following articles:
155157
- [CDN overview](../../cdn/cdn-overview.md)
156158
- [Scaling streaming with CDN](scale-streaming-cdn.md)
157159

158-
## Ask questions, give feedback, get updates
160+
## Ask questions and get updates
159161

160162
Check out the [Azure Media Services community](media-services-community.md) article to see different ways you can ask questions, give feedback, and get updates about Media Services.
161163

164+
## See also
165+
166+
[Dynamic packaging](dynamic-packaging-overview.md)
167+
162168
## Next steps
163169

164170
[Manage streaming endpoints](manage-streaming-endpoints-howto.md)

0 commit comments

Comments
 (0)