Skip to content

Commit de5f84a

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents b12e366 + 5a8317c commit de5f84a

9 files changed

+43
-95
lines changed

articles/confidential-computing/quick-create-confidential-vm-arm.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
216216
217217
1. Create a new key using Azure Key Vault. For how to use an Azure Managed HSM instead, see the next step.
218218
219-
1. Prepare and download the [key release policy](https://cvmprivatepreviewsa.blob.core.windows.net/cvmpublicpreviewcontainer/skr-policy.json) to your local disk.
219+
1. Prepare and download the key release policy to your local disk.
220220
1. Create a new key.
221221
222222
```azurecli-interactive
@@ -232,7 +232,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
232232
$encryptionKeyURL= ((az keyvault key show --vault-name $KeyVault --name $KeyName) | ConvertFrom-Json).key.kid
233233
```
234234
235-
1. Deploy a Disk Encryption Set (DES) using a [DES ARM template](https://cvmprivatepreviewsa.blob.core.windows.net/cvmpublicpreviewcontainer/deploymentTemplate/deployDES.json) (`deployDES.json`).
235+
1. Deploy a Disk Encryption Set (DES) using a DES ARM template (`deployDES.json`).
236236
237237
```azurecli-interactive
238238
$desName = <name of DES>
@@ -260,7 +260,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
260260
```
261261
262262
1. (Optional) Create a new key from an Azure Managed HSM.
263-
1. Prepare and download the [key release policy](https://cvmprivatepreviewsa.blob.core.windows.net/cvmpublicpreviewcontainer/skr-policy.json) to your local disk.
263+
1. Prepare and download the key release policy to your local disk.
264264
1. Create the new key.
265265
266266
```azurecli-interactive
@@ -302,7 +302,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
302302
$desID = (az disk-encryption-set show -n $desName -g $resourceGroup --query [id] -o tsv)
303303
```
304304
305-
1. Deploy your confidential VM using a confidential VM ARM template for [AMD SEV-SNP](https://cvmprivatepreviewsa.blob.core.windows.net/cvmpublicpreviewcontainer/deploymentTemplate/deployCPSCVM_cmk.json) or Intel TDX and a [deployment parameter file](#example-windows-parameter-file) (for example, `azuredeploy.parameters.win2022.json`) with the customer-managed key.
305+
1. Deploy your confidential VM using a confidential VM ARM template for Intel TDX and a [deployment parameter file](#example-windows-parameter-file) (for example, `azuredeploy.parameters.win2022.json`) with the customer-managed key.
306306
307307
```azurecli-interactive
308308
$deployName = <name of deployment>

articles/operator-nexus/.openpublishing.redirection.operator-nexus.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
{
4444
"source_path": "howto-use-azure-policy-for-aks-cluster-security.md",
4545
"redirect_url": "howto-use-azure-policy",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "troubleshoot-enable-node-down-cleaner.md",
50+
"redirect_url": "concepts-storage",
51+
4652
"redirect_document_id": false
4753
}
4854
]

articles/operator-nexus/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,6 @@
302302
- name: Storage Array
303303
expanded: false
304304
items:
305-
- name: Enable node down cleaner
306-
href: troubleshoot-enable-node-down-cleaner.md
307305
- name: Tenant Workload
308306
expanded: false
309307
items:

articles/operator-nexus/concepts-storage.md

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ status:
5353

5454
### StorageClass: nexus-shared
5555

56-
In situations where a shared file system is required, the *nexus-shared* storage class is available. This storage class provides a highly available shared storage solution by enabling multiple pods in the same Nexus Kubernetes cluster to concurrently access and share the same volume. The *nexus-shared* storage class is backed by a highly available NFS storage service. This NFS storage service (storage pool currently limited to a maximum size of 1TiB) is available per Cloud Service Network (CSN). The NFS storage service is deployed automatically on creation of a CSN resource. Any Nexus Kubernetes cluster attached to the CSN can provision persistent volumes from this shared storage pool. Nexus-shared supports both Read Write Once (RWO) and Read Write Many (RWX) access modes. What that means is that the workload applications can make use of either of these access modes to access the shared storage.
56+
In situations where a shared file system is required, the *nexus-shared* storage class is available. This storage class provides a highly available shared storage solution by enabling multiple pods in the same Nexus Kubernetes cluster to concurrently access and share the same volume. The *nexus-shared* storage class is backed by a highly available NFS storage service. This NFS storage service (storage pool currently limited to a maximum size of 1 TiB) is available per Cloud Service Network (CSN). The NFS storage service is deployed automatically on creation of a CSN resource. Any Nexus Kubernetes cluster attached to the CSN can provision persistent volumes from this shared storage pool. Nexus-shared supports both Read Write Once (RWO) and Read Write Many (RWX) access modes. What that means is that the workload applications can make use of either of these access modes to access the shared storage.
5757

5858
<!--- IMG ![Nexus Shared Volume](Docs/media/nexus-shared-volume.png) IMG --->
5959
:::image type="content" source="media/nexus-shared-volume.png" alt-text="Diagram depicting how nexus-shared provisions a volume for a workload in Nexus Kubernetes Cluster":::
@@ -64,7 +64,7 @@ Although the performance and availability of *nexus-shared* are sufficient for m
6464

6565
#### Read Write Once (RWO)
6666

67-
In Read Write Once (RWO) mode, the nexus-shared volume can be mounted by only one node or claimant at a time. ReadWriteOnce access mode still allows multiple pods to access the volume when the pods are running on the same node.
67+
In Read Write Once (RWO) mode, only one node or claimant can mount the nexus-shared volume at a time. ReadWriteOnce access mode still allows multiple pods to access the volume when the pods are running on the same node.
6868
```
6969
apiVersion: v1
7070
items:
@@ -92,7 +92,7 @@ items:
9292

9393
#### Read Write Many (RWX)
9494

95-
In Read Write Many (RWX) mode, the nexus-shared volume can be mounted by multiple nodes or claimants at the same time.
95+
In the Read Write Many (RWX) mode, multiple nodes or claimants can mount the nexus-shared volume at the same time.
9696
```
9797
apiVersion: v1
9898
items:
@@ -119,7 +119,7 @@ items:
119119
```
120120
### Examples
121121
#### Read Write Once (RWO) with nexus-volume storage class
122-
The below manifest creates a StatefulSet with PersistentVolumeClaimTemplate using nexus-volume storage class in ReadWriteOnce mode.
122+
This example manifest creates a StatefulSet with PersistentVolumeClaimTemplate using nexus-volume storage class in ReadWriteOnce mode.
123123
```
124124
apiVersion: apps/v1
125125
kind: StatefulSet
@@ -158,7 +158,7 @@ spec:
158158
storage: 10Gi
159159
storageClassName: nexus-volume
160160
```
161-
Each pod of the StatefulSet will have one PersistentVolumeClaim created.
161+
Each pod of the StatefulSet has one PersistentVolumeClaim created.
162162
```
163163
# kubectl get pvc
164164
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
@@ -247,7 +247,7 @@ spec:
247247
claimName: test-volume-rwx
248248
...
249249
```
250-
Once applied, there will be three replicas of the deployment sharing the same PVC.
250+
Once applied, there are three replicas of the deployment sharing the same PVC.
251251
```
252252
# kubectl get pvc
253253
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
@@ -281,6 +281,25 @@ Thu Nov 9 21:51:41 UTC 2023 -- test-deploy-rwx-fdb8f49c-wdgw7
281281
Thu Nov 9 21:51:42 UTC 2023 -- test-deploy-rwx-fdb8f49c-86pv4
282282
```
283283

284+
## Volume size limits and capacity management
285+
286+
PVCs created using the nexus-volume and nexus-shared have minimum and maximum claim sizes.
287+
288+
| Storage Class | Minimum PVC Size | Maximum PVC Size |
289+
|---------------|------------------|------------------|
290+
| nexus-volume | 1 MiB | 12 TiB |
291+
| nexus-shared | None | 1 TiB |
292+
293+
> [!IMPORTANT]
294+
> Volumes that reach their consumption limit will cause out of disk space errors on the workloads that consume them. You must make sure that you provision suitable volume sizes for your workload requirements. You must monitor both the storage appliance and all NFS servers for their percentage storage consumption. You can do this using the metrics documented in the [list of available metrics](./list-of-metrics-collected.md).
295+
296+
- Both nexus-volume and nexus-shared PVCs have their requested storage capacity enforced as a consumption limit. A volume can't consume more storage than the associated PVC request.
297+
- All physical volumes are thin-provisioned. You must monitor the total storage consumption on your storage appliance and perform maintenance operations to free up storage space if necessary.
298+
- A nexus-volume PVC provisioning request fails if the requested size is less than the minimum or more than the maximum supported volume size.
299+
- Nexus-shared volumes are logically thin-provisioned on the backing NFS server. This NFS server has a fixed capacity of 1 TiB.
300+
- A nexus-shared PVC can be provisioned despite requesting more than 1 TiB of storage, however, only 1 TiB can be consumed.
301+
- It is possible to provision a set of PVCs where the sum of capacity requests is greater than 1 TiB. However, the consumption limit of 1 TiB applies; the set of associated PVs may not consume more than 1 TiB of storage.
302+
284303
## Storage appliance status
285304

286305
The following properties reflect the operational state of a storage appliance:

articles/operator-nexus/reference-nexus-kubernetes-cluster-supported-versions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ Note the following important changes to make before you upgrade to any of the av
9999
|--------------------|----------------|-----------------|
100100
| Volume orchestration connectivity is TLS encrypted | Beginning from 1.28.9-1, 1.28.0-5, 1.27.9-1, 1.27.3-5, 1.26.12-1, 1.26.6-5, 1.25.11-5 and 1.25.6-7 | |
101101
| Cluster nodes are Azure Arc-enabled | Beginning from 1.25.6-4, 1.25.11-2, 1.26.3-4, 1.26.6-2, 1.27.1-4, 1.27.3-2 and 1.28.0-2 | |
102+
| nexus-shared volumes have their capacity attribute enforced as a volume size limit | Beginning from v1.27.13-3, v1.27.9-5, v1.28.11-4, v1.28.12-3, v1.29.6-4, v1.29.7-3, v1.30.3-1 | |
102103

103104
## Upgrading Kubernetes versions
104105

@@ -233,7 +234,7 @@ Nexus Kubernetes clusters don't support direct upgrades between LTS versions. To
233234

234235
### How does Microsoft notify me of new Kubernetes versions?
235236

236-
This document is updated periodically with planned dates of the new Kubernetes versions.
237+
This document is updated periodically with planned dates of the new Kubernetes versions.
237238

238239
### How often should I expect to upgrade Kubernetes versions to stay in support?
239240

articles/operator-nexus/troubleshoot-enable-node-down-cleaner.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

articles/sentinel/unified-connector-syslog-device.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This data connector was developed using Cisco Stealthwatch version 7.3.2
6868
>
6969
> Update the parser and specify the hostname of the source machines transmitting the logs in the parser's first line.
7070
>
71-
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **CiscoUCS**. Alternatively, directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Cisco%20UCS/Parsers/CiscoUCS.txt). It might take about 15-minutes post-installation to update.
71+
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **CiscoUCS**. Alternatively, directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Cisco%20UCS/Parsers/CiscoUCS.yaml). It might take about 15-minutes post-installation to update.
7272
7373
## Cisco Web Security Appliance (WSA)
7474

@@ -90,7 +90,7 @@ Configure Citrix ADC (former NetScaler) to forward logs via Syslog.
9090
5. For more information, see the [Citrix ADC (former NetScaler) documentation](https://docs.netscaler.com/).
9191

9292
> [!NOTE]
93-
> The functionality of this data connector is reliant on a Kusto Function-based parser, which is integral to its operation. This parser is deployed as part of the solution installation. To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **CitrixADCEvent**. Alternatively, you can directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Citrix%20ADC/Parsers/CitrixADCEvent.txt). It might take about 15 minutes post-installation to update.
93+
> The functionality of this data connector is reliant on a Kusto Function-based parser, which is integral to its operation. This parser is deployed as part of the solution installation. To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **CitrixADCEvent**. Alternatively, you can directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Citrix%20ADC/Parsers/CitrixADCEvent.yaml). It might take about 15 minutes post-installation to update.
9494
>
9595
> This parser requires a watchlist named `Sources_by_SourceType`.
9696
>
@@ -161,7 +161,7 @@ This data connector was developed using Forescout Syslog Plugin version: v3.6
161161
> [!NOTE]
162162
> The functionality of this data connector is reliant on a Kusto Function-based parser, which is integral to its operation. This parser is deployed as part of the solution installation.
163163
>
164-
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **Infoblox**. Alternatively, you can directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Infoblox%20NIOS/Parser/Infoblox.txt). It might take about 15 minutes post-installation to update.
164+
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **Infoblox**. Alternatively, you can directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Infoblox%20NIOS/Parsers/Infoblox.yaml). It might take about 15 minutes post-installation to update.
165165
>
166166
> This parser requires a watchlist named **`Sources_by_SourceType`**.
167167
>
@@ -315,7 +315,7 @@ This data connector was developed using RSA SecurID Authentication Manager versi
315315
>
316316
> Update the parser and specify the hostname of the source machines transmitting the logs in the parser's first line.
317317
>
318-
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **SymantecVIP**. Alternatively, directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Symantec%20VIP/Parsers/SymantecVIP.txt). It might take about 15 minutes post-installation to update.
318+
> To access the function code within Log Analytics, navigate to the Log Analytics/Microsoft Sentinel Logs section, select Functions, and search for the alias **SymantecVIP**. Alternatively, directly load the [function code](https://github.com/Azure/Azure-Sentinel/blob/master/Solutions/Symantec%20VIP/Parsers/SymantecVIP.yaml). It might take about 15 minutes post-installation to update.
319319
320320
## VMware ESXi
321321

articles/virtual-desktop/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@
434434
href: apply-windows-license.md
435435
- name: Session host update
436436
items:
437-
- name: Update session hosts using a session host configuration
437+
- name: Update session hosts
438438
displayName: session host update, shc, shu
439439
href: session-host-update-configure.md
440440
- name: Session host update diagnostic queries

articles/virtual-desktop/session-host-update-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: daknappe
77
ms.date: 10/01/2024
88
---
99

10-
# Update session hosts in host pool with a session host configuration using session host update in Azure Virtual Desktop (preview)
10+
# Update session hosts using session host update in Azure Virtual Desktop (preview)
1111

1212
> [!IMPORTANT]
1313
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This limited preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability. To register for the limited preview, complete this form: [https://forms.office.com/r/ZziQRGR1Lz](https://forms.office.com/r/ZziQRGR1Lz).

0 commit comments

Comments
 (0)