Skip to content

Commit a17af8f

Browse files
authored
Merge pull request #256174 from MicrosoftDocs/main
10/25/2023 AM Publish
2 parents 12b0a33 + 396dbb8 commit a17af8f

File tree

43 files changed

+400
-151
lines changed

Some content is hidden

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

43 files changed

+400
-151
lines changed

articles/aks/network-observability-managed-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ az aks get-credentials --name myAKSCluster --resource-group myResourceGroup
223223
ama-metrics-win-node-tkrm8 2/2 Running 0 (26h ago) 26h
224224
```
225225
226-
1. Use the ID [18814]( https://grafana.com/grafana/dashboards/18814/) to import the dashboard from Grafana's public dashboard repo.
226+
1. Select **Dashboards** from the left navigation menu, open **Kubernetes / Networking** dashboard under **Managed Prometheus** folder.
227227
228-
1. Verify the Grafana dashboard is visible.
228+
1. Check if the Metrics in **Kubernetes / Networking** Grafana dashboard are visible. If metrics aren't shown, change the time range to the last 15 minutes in the top right.
229229
230230
# [**Cilium**](#tab/cilium)
231231

articles/app-service/configure-custom-container.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to configure a custom container in Azure App Service. Thi
44
author: msangapu-msft
55
ms.author: msangapu
66
ms.topic: how-to
7-
ms.date: 10/12/2023
7+
ms.date: 10/25/2023
88
ms.custom: devx-track-azurepowershell, devx-track-azurecli
99
zone_pivot_groups: app-service-containers-windows-linux
1010
---
@@ -268,19 +268,19 @@ App Service logs actions by the Docker host as well as activities from within t
268268
There are several ways to access Docker logs:
269269

270270
- [In the Azure portal](#in-azure-portal)
271-
- [From the Kudu console](#from-the-kudu-console)
271+
- [From Kudu](#from-kudu)
272272
- [With the Kudu API](#with-the-kudu-api)
273273
- [Send logs to Azure monitor](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor)
274274

275275
### In Azure portal
276276

277277
Docker logs are displayed in the portal, in the **Container Settings** page of your app. The logs are truncated, but you can download all the logs clicking **Download**.
278278

279-
### From the Kudu console
279+
### From Kudu
280280

281281
Navigate to `https://<app-name>.scm.azurewebsites.net/DebugConsole` and click the **LogFiles** folder to see the individual log files. To download the entire **LogFiles** directory, click the **Download** icon to the left of the directory name. You can also access this folder using an FTP client.
282282

283-
In the console terminal, you can't access the `C:\home\LogFiles` folder by default because persistent shared storage is not enabled. To enable this behavior in the console terminal, [enable persistent shared storage](#use-persistent-shared-storage).
283+
In the SSH terminal, you can't access the `C:\home\LogFiles` folder by default because persistent shared storage is not enabled. To enable this behavior in the console terminal, [enable persistent shared storage](#use-persistent-shared-storage).
284284

285285
If you try to download the Docker log that is currently in use by using an FTP client, you might get an error because of a file lock.
286286

@@ -336,7 +336,7 @@ Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WE
336336
> [!NOTE]
337337
> Updating the app setting triggers automatic restart, causing minimal downtime. For a production app, consider swapping it into a staging slot, change the app setting in the staging slot, and then swap it back into production.
338338
339-
Verify your adjusted number by going to the Kudu Console (`https://<app-name>.scm.azurewebsites.net`) and typing in the following commands using PowerShell. Each command outputs a number.
339+
Verify your adjusted number by opening an SSH session from the portal or via the Kudu portal (`https://<app-name>.scm.azurewebsites.net/webssh/host`) and typing in the following commands using PowerShell. Each command outputs a number.
340340

341341
```PowerShell
342342
Get-ComputerInfo | ft CsNumberOfLogicalProcessors # Total number of enabled logical processors. Disabled processors are excluded.

articles/azure-monitor/app/java-standalone-profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The ApplicationInsights Java Agent monitors CPU, memory, and request duration su
6060

6161
#### Profile now
6262

63-
Within the profiler user interface (see [profiler settings](../profiler/profiler-settings.md)) there's a **Profile now** button. Selecting this button immediately requests a profile in all agents that are attached to the Application Insights instance.
63+
Within the profiler user interface (see [profiler settings](../profiler/profiler-settings.md)) there's a **Profile now** button. Selecting this button immediately requests a profile in all agents that are attached to the Application Insights instance. The default profiling duration is two minutes. You can change it by overriding `periodicRecordingDurationSeconds` (see [Configuration file](#configuration-file)).
6464

6565
> [!WARNING]
6666
> Invoking Profile now will enable the profiler feature, and Application Insights will apply default CPU and memory SLA triggers. When your application breaches those SLAs, Application Insights will gather Java profiles. If you wish to disable profiling later on, you can do so within the trigger menu shown in [Installation](#installation).
-76.5 KB
Loading

articles/azure-netapp-files/backup-configure-policy-based.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
1212
ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.topic: how-to
15-
ms.date: 06/14/2023
15+
ms.date: 10/25/2023
1616
ms.author: anfdocs
1717
---
1818
# Configure policy-based backups for Azure NetApp Files
@@ -78,6 +78,9 @@ Every Azure NetApp Files volume must have the backup functionality enabled befor
7878

7979
After you enable the backup functionality, you need to assign a backup policy to a volume for policy-based backups to take effects. (For manual backups, a backup policy is optional.)
8080

81+
>[!NOTE]
82+
>The active and most current snapshot is required for transferring the backup. As a result, you may see 1 extra snapshot beyond the number of snapshots to keep per the backup policy configuration. If your number of daily backups to keep is set to 2, you may see 3 snapshots related to the backup in the volumes the policy is applied to.
83+
8184
To enable the backup functionality for a volume:
8285

8386
1. Go to **Volumes** and select the volume for which you want to enable backup.

articles/bastion/bastion-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Azure Bastion offers multiple SKU tiers. The following table shows features and
3737

3838
[!INCLUDE [Azure Bastion SKUs](../../includes/bastion-sku.md)]
3939

40-
For more information about SKUs, including how to upgrade a SKU and information about the new Developer SKU, see the [Configuration settings](configuration-settings.md#skus) article.
40+
For more information about SKUs, including how to upgrade a SKU and information about the new Developer SKU (currently in Preview), see the [Configuration settings](configuration-settings.md#skus) article.
4141

4242
## <a name="architecture"></a>Architecture
4343

@@ -77,7 +77,7 @@ For frequently asked questions, see the Bastion [FAQ](bastion-faq.md).
7777

7878
## Next steps
7979

80-
* [Quickstart: Quickstart: Deploy Bastion automatically - Basic SKU](quickstart-host-portal.md)
80+
* [Quickstart: Deploy Bastion automatically - Basic SKU](quickstart-host-portal.md)
8181
* [Quickstart: Deploy Bastion automatically - Developer SKU](quickstart-developer-sku.md)
8282
* [Tutorial: Deploy Bastion using specified settings](tutorial-create-host-portal.md)
8383
* [Learn module: Introduction to Azure Bastion](/training/modules/intro-to-azure-bastion/)

articles/cloud-shell/quickstart-deploy-vnet.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,14 @@ To see all resource providers, and the registration status for your subscription
4242
1. On the Azure portal menu, search for **Subscriptions**. Select it from the available options.
4343
1. Select the subscription you want to view.
4444
1. On the left menu, under **Settings**, select **Resource providers**.
45-
1. On the left menu, under **Settings**, select **Resource providers**.
4645
1. In the search box, enter `cloudshell` to search for the resource provider.
4746
1. Select the **Microsoft.CloudShell** resource provider register from the provider list.
4847
1. Select **Register** to change the status from **unregistered** to **Registered**.
49-
50-
[![Screenshot of selecting resource providers in the Azure portal.][98]][98a]
51-
5248
1. Repeat the previous steps for the **Microsoft.ContainerInstances** and **Microsoft.Relay**
5349
resource providers.
5450

51+
[![Screenshot of selecting resource providers in the Azure portal.][98]][98a]
52+
5553
## 2. Collect the required information
5654

5755
There are several pieces of information that you need to collect before you can deploy Azure Cloud.

articles/cost-management-billing/manage/pay-by-invoice.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ Occasionally Microsoft needs legal documentation if the information you provided
157157
* Name difference between Account name and Company name
158158
* Change in name
159159

160+
## Need help? Contact us.
161+
162+
If you have questions or need help, [create a support request](https://go.microsoft.com/fwlink/?linkid=2083458).
163+
160164
## Next steps
161165

162166
* If needed, update your billing contact information at the [Azure portal](https://portal.azure.com).

articles/event-grid/includes/schema-app-configuration.md

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Event Grid uses [event subscriptions](../concepts.md#event-subscriptions) to rou
1818
| ---------- | ----------- |
1919
| Microsoft.AppConfiguration.KeyValueModified | Raised when a key-value is created or replaced. |
2020
| Microsoft.AppConfiguration.KeyValueDeleted | Raised when a key-value is deleted. |
21+
| Microsoft.AppConfiguration.SnapshotCreated | Raised when a snapshot is created. |
22+
| Microsoft.AppConfiguration.SnapshotModified | Raised when a snapshot is modified. |
2123

2224
## Event schema
2325

@@ -54,11 +56,22 @@ An event has the following top-level data:
5456

5557
The data object has the following properties:
5658

59+
### Key-value event
60+
5761
| Property | Type | Description |
5862
| -------- | ---- | ----------- |
5963
| `key` | string | The key of the key-value that was modified or deleted. |
6064
| `label` | string | The label, if any, of the key-value that was modified or deleted. |
6165
| `etag` | string | For `KeyValueModified` the etag of the new key-value. For `KeyValueDeleted` the etag of the key-value that was deleted. |
66+
| `syncToken` | string | The sync token representing the server state after the key-value event. |
67+
68+
### Snapshot event
69+
70+
| Property | Type | Description |
71+
| -------- | ---- | ----------- |
72+
| `name` | string | The name of the snapshot that was created or modified. |
73+
| `etag` | string | For `SnapshotCreated` the etag of the new snapshot. For `SnapshotModified` the etag of the snapshot that was modified. |
74+
| `syncToken` | string | The sync token representing the server state after the snapshot event. |
6275

6376
## Example event
6477

@@ -82,7 +95,7 @@ The following example shows the schema of a key-value modified event:
8295
}]
8396
```
8497

85-
The schema for a key-value deleted event is similar:
98+
The following example shows the schema of a key-value deleted event:
8699

87100
```json
88101
[{
@@ -100,6 +113,45 @@ The schema for a key-value deleted event is similar:
100113
"metadataVersion": "1"
101114
}]
102115
```
116+
117+
The following example shows the schema of a snapshot created event:
118+
119+
```json
120+
[{
121+
"id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
122+
"topic": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
123+
"subject": "https://contoso.azconfig.io/snapshots/Foo",
124+
"data": {
125+
"Name": "Foo",
126+
"etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
127+
"syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
128+
},
129+
"eventType": "Microsoft.AppConfiguration.SnapshotCreated",
130+
"eventTime": "2023-09-02T20:05:03Z",
131+
"dataVersion": "1",
132+
"metadataVersion": "1"
133+
}]
134+
```
135+
136+
The following example shows the schema of a snapshot modified event:
137+
138+
```json
139+
[{
140+
"id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
141+
"topic": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
142+
"subject": "https://contoso.azconfig.io/snapshots/Foo",
143+
"data": {
144+
"name": "Foo",
145+
"label": "FizzBuzz",
146+
"etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
147+
"syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
148+
},
149+
"eventType": "Microsoft.AppConfiguration.SnapshotModified",
150+
"eventTime": "2023-09-03T20:05:03Z",
151+
"dataVersion": "1",
152+
"metadataVersion": "1"
153+
}]
154+
```
103155
# [Cloud event schema](#tab/cloud-event-schema)
104156

105157
The following example shows the schema of a key-value modified event:
@@ -120,7 +172,7 @@ The following example shows the schema of a key-value modified event:
120172
}]
121173
```
122174

123-
The schema for a key-value deleted event is similar:
175+
The following example shows the schema of a key-value deleted event:
124176

125177
```json
126178
[{
@@ -138,6 +190,41 @@ The schema for a key-value deleted event is similar:
138190
}]
139191
```
140192

193+
The following example shows the schema of a snapshot created event:
194+
195+
```json
196+
[{
197+
"source": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
198+
"subject": "https://contoso.azconfig.io/kvsnapshots/Foo",
199+
"type": "Microsoft.AppConfiguration.SnapshotCreated",
200+
"time": "2023-09-02T20:05:03.0000000Z",
201+
"id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
202+
"data": {
203+
"name": "Foo",
204+
"etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
205+
"syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
206+
},
207+
"specversion": "1.0"
208+
}]
209+
```
210+
211+
The following example shows the schema of a snapshot modified event:
212+
213+
```json
214+
[{
215+
"source": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
216+
"subject": "https://contoso.azconfig.io/snapshots/Foo",
217+
"type": "Microsoft.AppConfiguration.SnapshotModified",
218+
"time": "2023-09-03T20:05:03.0000000Z",
219+
"id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
220+
"data": {
221+
"name": "Foo",
222+
"etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
223+
"syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
224+
},
225+
"specversion": "1.0"
226+
}]
227+
```
141228
---
142229

143230

articles/event-grid/mqtt-routing-filtering.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ If you send a non-JSON payload that is still UFT-8, it will be serialized as a J
5959
You can use the following filter to filter all the messages that include the word “Contoso”:
6060
```azurecli-interactive
6161
"advancedFilters": [{
62-
"operatorType": "`StringContains` ",
62+
"operatorType": "StringContains",
6363
"key": "data",
64-
"value": Contoso
64+
"value": "Contoso"
6565
}]
6666
```
6767

@@ -82,9 +82,9 @@ You can use the following filter to filter all the messages coming from your cli
8282

8383
```azurecli-interactive
8484
"advancedFilters": [{"
85-
operatorType": "`StringContains` ",
86-
"key": "`clienttype`",
87-
"value": sensor
85+
operatorType": "StringContains",
86+
"key": "clienttype",
87+
"value": "sensor"
8888
}]
8989
```
9090

0 commit comments

Comments
 (0)