Skip to content

Commit 605834c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 1678688-adding-zone-pivots-bing-video-search
2 parents 1e352fa + 6c56de4 commit 605834c

File tree

6 files changed

+52
-122
lines changed

6 files changed

+52
-122
lines changed

articles/cloud-services/applications-dont-support-tls-1-2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ $reboot = Set-CryptoSetting 1 Enabled 1 DWord $reboot
221221
$reboot = Set-CryptoSetting 2 DisabledByDefault 0 DWord $reboot
222222
$reboot = Set-CryptoSetting 2 Enabled 1 DWord $reboot
223223
224-
# Ensure TLS 1.1 disabled for client/server
224+
# Ensure TLS 1.1 enabled for client/server
225225
$reboot = Set-CryptoSetting 4 DisabledByDefault 0 DWord $reboot
226226
$reboot = Set-CryptoSetting 4 Enabled 1 DWord $reboot
227227
$reboot = Set-CryptoSetting 5 DisabledByDefault 0 DWord $reboot

articles/governance/policy/concepts/guest-configuration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ file format can be renamed to '.zip' to uncompress and review.
209209

210210
The Guest Configuration extension writes log files to the following locations:
211211

212-
Windows: `C:\Packages\Plugins\Microsoft.GuestConfiguration.ConfigurationforWindows\<version>\dsc\logs\dsc.log`
212+
Windows: `C:\ProgramData\GuestConfig\gc_agent_logs\gc_agent.log`
213213

214-
Linux: `/var/lib/waagent/Microsoft.GuestConfiguration.ConfigurationforLinux-<version>/GCAgent/logs/dsc.log`
214+
Linux: `/var/lib/GuestConfig/gc_agent_logs/gc_agent.log`
215215

216216
Where `<version>` refers to the current version number.
217217

@@ -231,8 +231,8 @@ machines, the following example PowerShell script can be helpful. For more infor
231231
```powershell
232232
$linesToIncludeBeforeMatch = 0
233233
$linesToIncludeAfterMatch = 10
234-
$latestVersion = Get-ChildItem -Path 'C:\Packages\Plugins\Microsoft.GuestConfiguration.ConfigurationforWindows\' | ForEach-Object {$_.FullName} | Sort-Object -Descending | Select-Object -First 1
235-
Select-String -Path "$latestVersion\dsc\logs\dsc.log" -pattern 'DSCEngine','DSCManagedEngine' -CaseSensitive -Context $linesToIncludeBeforeMatch,$linesToIncludeAfterMatch | Select-Object -Last 10
234+
$logPath = 'C:\ProgramData\GuestConfig\gc_agent_logs\gc_agent.log'
235+
Select-String -Path $logPath -pattern 'DSCEngine','DSCManagedEngine' -CaseSensitive -Context $linesToIncludeBeforeMatch,$linesToIncludeAfterMatch | Select-Object -Last 10
236236
```
237237

238238
#### Linux
@@ -244,8 +244,8 @@ the following example Bash script can be helpful. For more information, see
244244
```Bash
245245
linesToIncludeBeforeMatch=0
246246
linesToIncludeAfterMatch=10
247-
latestVersion=$(find /var/lib/waagent/ -type d -name "Microsoft.GuestConfiguration.ConfigurationforLinux-*" -maxdepth 1 -print | sort -z | sed -n 1p)
248-
egrep -B $linesToIncludeBeforeMatch -A $linesToIncludeAfterMatch 'DSCEngine|DSCManagedEngine' "$latestVersion/GCAgent/logs/dsc.log" | tail
247+
logPath=/var/lib/GuestConfig/gc_agent_logs/gc_agent.log
248+
egrep -B $linesToIncludeBeforeMatch -A $linesToIncludeAfterMatch 'DSCEngine|DSCManagedEngine' $logPath | tail
249249
```
250250

251251
## Guest Configuration samples

articles/notification-hubs/notification-hubs-tags-segment-push-message.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The only way to target specific notification registrations is to associate tags
3535

3636
## Tags
3737

38-
A tag can be any string, up to 120 characters, containing alphanumeric and the following non-alphanumeric characters: `_`’, ‘`@`’, ‘`#`’, ‘`.`’, ‘`:`’, ‘`-`. The following example shows an application from which you can receive toast notifications about specific music groups. In this scenario, a simple way to route notifications is to label registrations with tags that represent the different bands, as in the following figure:
38+
A tag can be any string, up to 120 characters, containing alphanumeric and the following non-alphanumeric characters: '`_`', '`@`', '`#`', '`.`', '`:`', '`-`'. The following example shows an application from which you can receive toast notifications about specific music groups. In this scenario, a simple way to route notifications is to label registrations with tags that represent the different bands, as in the following figure:
3939

4040
![Tags overview](./media/notification-hubs-tags-segment-push-message/notification-hubs-tags.png)
4141

@@ -63,7 +63,7 @@ Tags must not be pre-provisioned, and can refer to multiple app-specific concept
6363

6464
![Tags friends](./media/notification-hubs-tags-segment-push-message/notification-hubs-tags2.png)
6565

66-
In this example, Alice is interested in updates for the Beatles, and Bob is interested in updates for the Wailers. Bob is also interested in Charlies comments, and Charlie is interested in the Wailers. When a notification is sent for Charlies comment on the Beatles, Notification Hubs sends it to both Alice and Bob.
66+
In this example, Alice is interested in updates for the Beatles, and Bob is interested in updates for the Wailers. Bob is also interested in Charlie's comments, and Charlie is interested in the Wailers. When a notification is sent for Charlie's comment on the Beatles, Notification Hubs sends it to both Alice and Bob.
6767

6868
While you can encode multiple concerns in tags (for example, `band_Beatles` or `follows_Charlie`), tags are simple strings and not properties with values. A registration matches only on the presence or absence of a specific tag.
6969

@@ -92,7 +92,7 @@ Consider a sports application that sends a reminder to everyone in Boston about
9292

9393
![Tag expressions](./media/notification-hubs-tags-segment-push-message/notification-hubs-tags4.png)
9494

95-
Tag expressions support common Boolean operators such as `AND` (`&&`), `OR` (`||`), and `NOT` (`!`); they can also contain parentheses. Tag expressions using only `OR` operators can reference 20 tags; otherwise tag expressions are limited to 6 tags.
95+
Tag expressions support common Boolean operators such as `AND` (`&&`), `OR` (`||`), and `NOT` (`!`); they can also contain parentheses. Tag expressions using only `OR` operators can reference 20 tags; expression with `AND` operators but no `OR` operators can reference 10 tags; otherwise, tag expressions are limited to 6 tags.
9696

9797
Here's an example for sending notifications with tag expressions using the SDK:
9898

articles/service-bus-messaging/TOC.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
items:
1414
- name: Create a Service Bus queue
1515
items:
16-
- name: Azure portal
17-
href: service-bus-quickstart-portal.md
16+
- name: Azure portal
17+
href: service-bus-quickstart-portal.md
1818
- name: Azure PowerShell
1919
href: service-bus-quickstart-powershell.md
2020
- name: Azure CLI
2121
href: service-bus-quickstart-cli.md
22-
- name: Azure Resource Manager template
22+
- name: ARM template
2323
href: service-bus-resource-manager-namespace-queue.md
2424
- name: Send and receive messages
25-
items:
25+
items:
2626
- name: .NET
2727
href: service-bus-dotnet-get-started-with-queues.md
2828
- name: Java
2929
href: service-bus-java-how-to-use-queues.md
3030
- name: Node.js
31-
href: service-bus-nodejs-how-to-use-queues-new-package.md
31+
href: service-bus-nodejs-how-to-use-queues-new-package.md
3232
- name: PHP
3333
href: service-bus-php-how-to-use-queues.md
3434
- name: Python
@@ -37,14 +37,14 @@
3737
href: service-bus-ruby-how-to-use-queues.md
3838
- name: Services Bus topics and subscriptions
3939
items:
40-
- name: Create topics and subscriptions
40+
- name: Create topics and subscriptions
4141
items:
4242
- name: Azure portal
4343
href: service-bus-quickstart-topics-subscriptions-portal.md
44-
- name: Azure Resource Manager template
44+
- name: ARM template
4545
href: service-bus-resource-manager-namespace-topic.md
4646
- name: Publish and subscribe for messages
47-
items:
47+
items:
4848
- name: .NET
4949
href: service-bus-dotnet-how-to-use-topics-subscriptions.md
5050
- name: Java
@@ -56,7 +56,7 @@
5656
- name: Python
5757
href: service-bus-python-how-to-use-topics-subscriptions.md
5858
- name: Ruby
59-
href: service-bus-ruby-how-to-use-topics-subscriptions.md
59+
href: service-bus-ruby-how-to-use-topics-subscriptions.md
6060
- name: Tutorials
6161
items:
6262
- name: Update inventory - PowerShell
@@ -87,7 +87,7 @@
8787
href: service-bus-outages-disasters.md
8888
- name: Throttling
8989
href: service-bus-throttling.md
90-
- name: Security
90+
- name: Security
9191
items:
9292
- name: Authentication and authorization
9393
href: service-bus-authentication-and-authorization.md
@@ -99,11 +99,11 @@
9999
- name: Authentication with Shared Access Signatures
100100
href: service-bus-sas.md
101101
- name: Use Azure Active Directory
102-
items:
103-
- name: Authenticate with managed identities for Azure resources
102+
items:
103+
- name: Authenticate with managed identities for Azure resources
104104
href: service-bus-managed-service-identity.md
105-
- name: Authenticate from an application
106-
href: authenticate-application.md
105+
- name: Authenticate from an application
106+
href: authenticate-application.md
107107
- name: Built-in security controls
108108
href: service-bus-messaging-security-controls.md
109109
- name: Network security
@@ -113,7 +113,7 @@
113113
- name: Migrate from Azure Service Manager (classic) APIs to Resource Manager APIs
114114
href: deprecate-service-bus-management.md
115115
- name: Create a namespace
116-
href: service-bus-create-namespace-portal.md
116+
href: service-bus-create-namespace-portal.md
117117
- name: Develop
118118
items:
119119
- name: Message handling
@@ -190,7 +190,7 @@
190190
href: service-bus-diagnostic-logs.md
191191
- name: Suspend and reactivate messaging entities
192192
href: entity-suspend.md
193-
- name: Use Azure Resource Manager templates
193+
- name: Use ARM templates
194194
href: service-bus-resource-manager-overview.md
195195
items:
196196
- name: Create a namespace

articles/service-bus-messaging/service-bus-resource-manager-namespace-queue.md

Lines changed: 25 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ms.assetid: a6bfb5fd-7b98-4588-8aa1-9d5f91b599b6
1111
ms.service: service-bus-messaging
1212
ms.devlang: tbd
1313
ms.topic: quickstart
14+
ms.custom: subject-armqs
1415
ms.tgt_pltfrm: dotnet
1516
ms.workload: na
1617
ms.date: 12/20/2019
@@ -21,23 +22,38 @@ ms.author: spelluru
2122

2223
This article shows how to use an Azure Resource Manager template that creates a Service Bus namespace and a queue within that namespace. The article explains how to specify which resources are deployed and how to define parameters that are specified when the deployment is executed. You can use this template for your own deployments, or customize it to meet your requirements.
2324

24-
For more information about creating templates, please see [Authoring Azure Resource Manager templates][Authoring Azure Resource Manager templates].
25+
[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
2526

26-
For the complete template, see the [Service Bus namespace and queue template][Service Bus namespace and queue template] on GitHub.
27+
If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/) before you begin.
28+
29+
## Prerequisites
30+
31+
None
32+
33+
## Create a Service Bus namespace and a queue
34+
35+
### Review the template
36+
37+
The template used in this quickstart is from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/201-servicebus-create-queue).
38+
39+
:::code language="json" source="~/quickstart-templates/201-servicebus-create-queue/azuredeploy.json" range="1-75" highlight="31-63":::
40+
41+
The resources defined in the template include:
42+
43+
- [**Microsoft.ServiceBus/namespaces**](/azure/templates/microsoft.servicebus/namespaces)
44+
- [**Microsoft.ServiceBus/namespaces/queues**](/azure/templates/microsoft.servicebus/namespaces/queues)
2745

2846
> [!NOTE]
2947
> The following Azure Resource Manager templates are available for download and deployment.
30-
>
48+
>
3149
> * [Create a Service Bus namespace with queue and authorization rule](service-bus-resource-manager-namespace-auth-rule.md)
3250
> * [Create a Service Bus namespace with topic and subscription](service-bus-resource-manager-namespace-topic.md)
3351
> * [Create a Service Bus namespace](service-bus-resource-manager-namespace.md)
3452
> * [Create a Service Bus namespace with topic, subscription, and rule](service-bus-resource-manager-namespace-topic-with-rule.md)
35-
>
36-
> To check for the latest templates, visit the [Azure Quickstart Templates][Azure Quickstart Templates] gallery and search for **Service Bus**.
3753
38-
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
54+
You can find more template from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/?resourceType=Microsoft.Servicebus&pageNumber=1&sort=Popular)
3955

40-
## What will you deploy?
56+
### Deploy the template
4157

4258
With this template, you deploy a Service Bus namespace with a queue.
4359

@@ -47,95 +63,9 @@ To run the deployment automatically, click the following button:
4763

4864
[![Deploy to Azure](./media/service-bus-resource-manager-namespace-queue/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F201-servicebus-create-queue%2Fazuredeploy.json)
4965

50-
## Parameters
51-
52-
With Azure Resource Manager, you define parameters for values you want to specify when the template is deployed. The template includes a section called `Parameters` that contains all of the parameter values. You should define a parameter for those values that will vary based on the project you are deploying or based on the environment you are deploying to. Do not define parameters for values that will always stay the same. Each parameter value is used in the template to define the resources that are deployed.
53-
54-
The template defines the following parameters.
55-
56-
### serviceBusNamespaceName
57-
The name of the Service Bus namespace to create.
58-
59-
```json
60-
"serviceBusNamespaceName": {
61-
"type": "string",
62-
"metadata": {
63-
"description": "Name of the Service Bus namespace"
64-
}
65-
}
66-
```
67-
68-
### serviceBusQueueName
69-
The name of the queue created in the Service Bus namespace.
70-
71-
```json
72-
"serviceBusQueueName": {
73-
"type": "string"
74-
}
75-
```
76-
77-
### serviceBusApiVersion
78-
The Service Bus API version of the template.
79-
80-
```json
81-
"serviceBusApiVersion": {
82-
"type": "string",
83-
"defaultValue": "2017-04-01",
84-
"metadata": {
85-
"description": "Service Bus ApiVersion used by the template"
86-
}
87-
```
88-
89-
## Resources to deploy
90-
Creates a standard Service Bus namespace of type **Messaging**, with a queue.
91-
92-
```json
93-
{
94-
"resources": [{
95-
"apiVersion": "2017-04-01",
96-
"name": "[parameters('serviceBusNamespaceName')]",
97-
"type": "Microsoft.ServiceBus/namespaces",
98-
"location": "[parameters('location')]",
99-
"sku": {
100-
"name": "Standard"
101-
},
102-
"properties": {},
103-
"resources": [{
104-
"apiVersion": "[variables('sbVersion')]",
105-
"name": "[parameters('serviceBusQueueName')]",
106-
"type": "Queues",
107-
"dependsOn": [
108-
"[concat('Microsoft.ServiceBus/namespaces/', parameters('serviceBusNamespaceName'))]"
109-
],
110-
"properties": {
111-
"path": "[parameters('serviceBusQueueName')]"
112-
}
113-
}]
114-
}]
115-
}
116-
```
117-
118-
For JSON syntax and properties, see [namespaces](/azure/templates/microsoft.servicebus/namespaces) and [queues](/azure/templates/microsoft.servicebus/namespaces/queues).
119-
120-
## Commands to run deployment
121-
[!INCLUDE [app-service-deploy-commands](../../includes/app-service-deploy-commands.md)]
122-
123-
## PowerShell
124-
125-
```powershell
126-
New-AzResourceGroupDeployment -ResourceGroupName \<resource-group-name\> -TemplateFile <https://raw.githubusercontent.com/azure/azure-quickstart-templates/master/201-servicebus-create-queue/azuredeploy.json>
127-
```
128-
129-
## Azure CLI
130-
131-
```azurecli
132-
azure config mode arm
133-
134-
azure group deployment create \<my-resource-group\> \<my-deployment-name\> --template-uri <https://raw.githubusercontent.com/azure/azure-quickstart-templates/master/201-servicebus-create-queue/azuredeploy.json>
135-
```
136-
13766
## Next steps
138-
See the following topic that shows how to create an authorization rule for the namespace/queue:
67+
68+
See the following topic that shows how to create an authorization rule for the namespace/queue:
13969
[Create a Service Bus authorization rule for namespace and queue using an Azure Resource Manager template](service-bus-resource-manager-namespace-auth-rule.md)
14070

14171
Learn how to manage these resources by viewing these articles:

articles/storage/common/storage-use-azcopy-v10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ The URL appears in the output of this command. Your script can then download AzC
283283

284284
### Escape special characters in SAS tokens
285285

286-
In batch files that have the `.cmd` extension, you'll have to escape the `%` characters that appear in SAS tokens. You can do that by adding an addition `%` character next to existing `%` characters in the SAS token string.
286+
In batch files that have the `.cmd` extension, you'll have to escape the `%` characters that appear in SAS tokens. You can do that by adding an additional `%` character next to existing `%` characters in the SAS token string.
287287

288288
### Run scripts by using Jenkins
289289

0 commit comments

Comments
 (0)