Skip to content

Commit 4c0b61f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-peer-update
2 parents 8537f0d + bb23133 commit 4c0b61f

36 files changed

+1847
-1655
lines changed

articles/ai-services/document-intelligence/containers/install-run.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ The host is a x64-based computer that runs the Docker container. It can be a com
6666
* [Azure Container Instances](../../../container-instances/index.yml).
6767
* A [Kubernetes](https://kubernetes.io/) cluster deployed to [Azure Stack](/azure-stack/operator). For more information, see [Deploy Kubernetes to Azure Stack](/azure-stack/user/azure-stack-solution-template-kubernetes-deploy).
6868

69+
> [!NOTE]
70+
>
71+
> Note that Studio container cannot be deployed and run in Azure Kubernetes Service. Studio container is only supported to be run on local machine.
72+
6973
### Container requirements and recommendations
7074

7175
#### Required supporting containers

articles/aks/start-stop-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Stop and start an Azure Kubernetes Service (AKS) cluster
33
description: Learn how to stop and start an Azure Kubernetes Service (AKS) cluster.
44
ms.topic: article
5-
ms.date: 03/14/2023
5+
ms.date: 07/01/2024
66
author: palma21
77
---
88

@@ -100,7 +100,7 @@ When using the cluster stop/start feature, the following conditions apply:
100100
## Start an AKS cluster
101101
102102
> [!CAUTION]
103-
> Don't repeatedly stop and start your clusters. This can result in errors. Once your cluster is stopped, you should wait at least 15-30 minutes before starting it again.
103+
> After utilizing the start/stop feature on AKS, it is essential to wait 15-30 minutes before restarting your AKS cluster. This waiting period is necessary because it takes several minutes for the relevant services to fully stop. Attempting to restart your cluster during this process can disrupt the shutdown process and potentially cause issues with the cluster or its workloads.
104104
105105
### [Azure CLI](#tab/azure-cli)
106106

articles/application-gateway/ingress-controller-migration.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 07/28/2023
8+
ms.date: 07/01/2024
99
ms.author: greglin
1010
---
1111

@@ -40,6 +40,9 @@ You can now enable the AGIC add-on in your AKS cluster to target your existing A
4040
```azurecli-interactive
4141
az aks enable-addons -n myCluster -g myResourceGroup -a ingress-appgw --appgw-id $appgwId
4242
```
43+
Alternatively, you can navigate to your [AKS cluster in the Azure portal](https://portal.azure.com/?feature.aksagic=true) and enable the AGIC add-on in the **Virtual network integration** tab of your cluster. Select your existing Application Gateway when you choose which Application Gateway that the add-on should target.
44+
45+
![Application Gateway Ingress Controller Portal](./media/tutorial-ingress-controller-add-on-existing/portal-ingress-controller-add-on.png)
4346

4447
## Next Steps
4548
- [**Application Gateway Ingress Controller Troubleshooting**](ingress-controller-troubleshoot.md): Troubleshooting guide for AGIC
Loading

articles/application-gateway/tutorial-ingress-controller-add-on-existing.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: tutorial
8-
ms.date: 11/28/2023
8+
ms.date: 07/01/2024
99
ms.author: greglin
1010
ms.custom: template-tutorial, devx-track-azurecli
1111
---
@@ -78,9 +78,14 @@ If you'd like to continue using Azure CLI, you can continue to enable the AGIC a
7878
appgwId=$(az network application-gateway show --name myApplicationGateway --resource-group myResourceGroup -o tsv --query "id")
7979
az aks enable-addons --name myCluster --resource-group myResourceGroup --addon ingress-appgw --appgw-id $appgwId
8080
```
81+
## Enable the AGIC add-on in existing AKS cluster through Azure portal
82+
83+
If you'd like to use Azure portal to enable AGIC add-on, go to [(https://aka.ms/azure/portal/aks/agic)](https://aka.ms/azure/portal/aks/agic) and navigate to your AKS cluster through the portal link. Select the **Networking** menu item under **Settings**. From there, go to the **Virtual network integration** tab within your AKS cluster. You'll see an **Application gateway ingress controller** section, which allows you to enable and disable the ingress controller add-on. Select the **Manage** button, then the checkbox next to **Enable ingress controller**. Select the application gateway you created, **myApplicationGateway** and then select **Save**.
84+
85+
:::image type="content" source="./media/tutorial-ingress-controller-add-on-existing/portal-ingress-controller-add-on.png" alt-text="Screenshot showing how to enable application gateway ingress controller from the networking page of the Azure Kubernetes Service.":::
8186

8287
> [!IMPORTANT]
83-
> When you use an application gateway in a different resource group than the AKS cluster resource group, the managed identity **_ingressapplicationgateway-{AKSNAME}_** that is created must have **Network Contributor** and **Reader** roles set in the application gateway resource group.
88+
> If you use an application gateway in a different resource group than the AKS cluster resource group, the managed identity **_ingressapplicationgateway-{AKSNAME}_** that is created must have **Network Contributor** and **Reader** roles set in the application gateway resource group.
8489
8590
## Peer the two virtual networks together
8691

articles/azure-app-configuration/quickstart-feature-flag-python.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
title: Quickstart for adding feature flags to Python with Azure App Configuration (Preview)
2+
title: Quickstart for adding feature flags to Python with Azure App Configuration
33
description: Add feature flags to Python apps and manage them using Azure App Configuration.
44
author: mrm9084
55
ms.service: azure-app-configuration
66
ms.devlang: python
77
ms.topic: quickstart
8-
ms.date: 05/29/2024
8+
ms.date: 07/01/2024
99
ms.author: mametcal
1010
ms.custom: devx-track-python, mode-other
1111
#Customer intent: As an Python developer, I want to use feature flags to control feature availability quickly and confidently.
1212
---
1313

14-
# Quickstart: Add feature flags to a Python app (preview)
14+
# Quickstart: Add feature flags to a Python app
1515

1616
In this quickstart, you'll create a feature flag in Azure App Configuration and use it to dynamically control Python apps to create an end-to-end implementation of feature management.
1717

228 KB
Loading
146 KB
Loading

articles/azure-netapp-files/TOC.yml

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,48 @@
172172
- name: Azure Application Consistent Snapshot (AzAcSnap) tool
173173
items:
174174
- name: What is AzAcSnap?
175-
href: azacsnap-introduction.md
176-
- name: Release Notes for AzAcSnap
177-
href: azacsnap-release-notes.md
175+
items:
176+
- name: Introduction to AzAcSnap
177+
href: azacsnap-introduction.md
178+
- name: Release Notes for AzAcSnap
179+
href: azacsnap-release-notes.md
178180
- name: Get started with AzAcSnap
179-
href: azacsnap-get-started.md
180-
- name: Install AzAcSnap
181-
href: azacsnap-installation.md
181+
items:
182+
- name: Overall workflow
183+
href: azacsnap-get-started.md
184+
- name: Install AzAcSnap
185+
href: azacsnap-installation.md
186+
- name: Configure Database
187+
items:
188+
- name: All databases
189+
href: azacsnap-configure-database.md
190+
- name: SAP HANA
191+
href: azacsnap-configure-database.md?tabs=sap-hana
192+
- name: Oracle Database
193+
href: azacsnap-configure-database.md?tabs=oracle
194+
- name: IBM Db2
195+
href: azacsnap-configure-database.md?tabs=db2
196+
- name: Microsoft SQL Server (PREVIEW)
197+
href: azacsnap-preview.md?tabs=mssql#microsoft-sql-server
198+
- name: Configure Storage
199+
items:
200+
- name: All storage
201+
href: azacsnap-configure-storage.md
202+
- name: Azure NetApp Files
203+
href: azacsnap-configure-storage.md?tabs=azure-netapp-files
204+
- name: Azure Large Instance
205+
href: azacsnap-configure-storage.md?tabs=azure-large-instance
206+
- name: Azure Managed Disk (PREVIEW)
207+
href: azacsnap-preview.md?tabs=mssql#azure-managed-disks
208+
- name: Configure AzAcSnap
209+
href: azacsnap-cmd-ref-configure.md
210+
- name: Test configuration of AzAcSnap
211+
href: azacsnap-cmd-ref-test.md
212+
- name: Backup your database with AzAcSnap
213+
href: azacsnap-cmd-ref-backup.md
182214
- name: Disaster recovery using AzAcSnap
183215
href: azacsnap-disaster-recovery.md
184-
- name: Tips and tricks for using AzAcSnap
216+
- name: Tips for using AzAcSnap
185217
href: azacsnap-tips.md
186218
- name: Troubleshoot AzAcSnap
187219
href: azacsnap-troubleshoot.md

articles/azure-netapp-files/azacsnap-cmd-ref-backup.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: Phil-Jensen
66
ms.service: azure-netapp-files
77
ms.topic: reference
8-
ms.date: 07/29/2022
8+
ms.date: 05/15/2024
99
ms.author: phjensen
1010
---
1111

@@ -15,9 +15,9 @@ This article provides a guide for running the backup command of the Azure Applic
1515

1616
## Introduction
1717

18-
A storage snapshot based backup is run using the `azacsnap -c backup` command. This command performs the orchestration of a database consistent storage snapshot on the DATA volumes, and a storage snapshot (without any database consistency setup) on the OTHER volumes.
18+
A storage snapshot based backup is run using the `azacsnap -c backup` command. This command performs the orchestration of a database consistent storage snapshot on the DATA volumes, and a storage snapshot (without any database consistency setup) on the OTHER volumes.
1919

20-
For DATA volumes `azacsnap` will prepare the database for a storage snapshot, then it will take the storage snapshot for all configured volumes, finally it will advise the database the snapshot is complete. It will also manage any database entries which record snapshot backup activity (e.g. SAP HANA backup catalog).
20+
For DATA volumes `azacsnap` prepares the database for a storage snapshot, then it takes a storage snapshot for all configured volumes, finally it tells the database the snapshot is complete. It also manages any database entries which record snapshot backup activity (for example, SAP HANA backup catalog).
2121

2222
## Command options
2323

@@ -27,36 +27,36 @@ The `-c backup` command takes the following arguments:
2727
- `data` snapshots the volumes within the `dataVolume` stanza of the configuration file.
2828
1. **data** Volume Snapshot process
2929
1. put the database into *backup-mode*.
30-
1. take snapshots of the Volume(s) listed in the configuration file's `"dataVolume"` stanza.
30+
1. take snapshots of the Volumes listed in the configuration file's `"dataVolume"` stanza.
3131
1. take the database out of *backup-mode*.
3232
1. perform snapshot management.
3333
- `other` snapshots the volumes within the `otherVolume` stanza of the configuration file.
3434
1. **other** Volume Snapshot process
35-
1. take snapshots of the Volume(s) listed in the configuration file's `"otherVolume"` stanza.
35+
1. take snapshots of the Volumes listed in the configuration file's `"otherVolume"` stanza.
3636
1. perform snapshot management.
37-
- `all` snapshots all the volumes in the `dataVolume` stanza and then all the volumes in the `otherVolume` stanza of the configuration file. The
37+
- `all` snapshots all the volumes in the `dataVolume` stanza and then all the volumes in the `otherVolume` stanza of the configuration file. The
3838
processing is handled in the order outlined as follows:
3939
1. **all** Volumes Snapshot process
4040
1. **data** Volume Snapshot (same as the normal `--volume data` option)
4141
1. put the database into *backup-mode*.
42-
1. take snapshots of the Volume(s) listed in the configuration file's `"dataVolume"` stanza.
42+
1. take snapshots of the Volumes listed in the configuration file's `"dataVolume"` stanza.
4343
1. take the database out of *backup-mode*.
4444
1. perform snapshot management.
4545
1. **other** Volume Snapshot (same as the normal `--volume other` option)
46-
1. take snapshots of the Volume(s) listed in the configuration file's `"otherVolume"` stanza.
46+
1. take snapshots of the Volumes listed in the configuration file's `"otherVolume"` stanza.
4747
1. perform snapshot management.
4848

4949
> [!NOTE]
5050
> By creating a separate config file with the boot volume as the otherVolume, it's possible for `boot` snapshots to be taken on an entirely different schedule (for example, daily).
5151
52-
- `--prefix=` the customer snapshot prefix for the snapshot name. This parameter has two purposes. Firstly purpose is to provide a unique name for grouping of snapshots. Secondly to determine the `--retention` number of storage snapshots that are kept for the specified `--prefix`.
52+
- `--prefix=` the customer snapshot prefix for the snapshot name. This parameter has two purposes. Firstly provide a unique name for grouping of snapshots. Secondly to determine the `--retention` number of storage snapshots that are kept for the specified `--prefix`.
5353

5454
> [!IMPORTANT]
5555
> Only alpha numeric ("A-Z,a-z,0-9"), underscore ("_") and dash ("-") characters are allowed.
5656
57-
- `--retention` the number of snapshots of the defined `--prefix` to be kept. Any additional snapshots are removed after a new snapshot is taken for this `--prefix`.
57+
- `--retention` the number of snapshots of the defined `--prefix` to be kept. Any extra snapshots are removed after a new snapshot is taken for this `--prefix`.
5858

59-
- `--trim` available for SAP HANA v2 and later, this option maintains the backup catalog and on disk catalog and log backups. The number of entries to keep in the backup catalog is determined by the `--retention` option above, and deletes older entries for the defined prefix (`--prefix`) from the backup catalog, and the related physical logs backup. It also deletes any log backup entries that are older than the oldest non-log backup entry. This operations helps to prevent the log backups from using up all available disk space.
59+
- `--trim` available for SAP HANA v2 and later, this option maintains the backup catalog and on disk catalog and log backups. The number of entries to keep in the backup catalog is determined by the `--retention` option above, and deletes older entries for the defined prefix (`--prefix`) from the backup catalog, and the related physical logs backup. It also deletes any log backup entries that are older than the oldest non-log backup entry. This `--trim` operation helps to prevent the log backups from using up all available disk space.
6060

6161
> [!NOTE]
6262
> The following example command will keep 9 storage snapshots and ensure the backup catalog is continuously trimmed to match the 9 storage snapshots being retained.
@@ -68,7 +68,7 @@ The `-c backup` command takes the following arguments:
6868
- `[--ssl=]` an optional parameter that defines the encryption method used to communicate
6969
with SAP HANA, either `openssl` or `commoncrypto`. If defined, then the `azacsnap -c backup`
7070
command expects to find two files in the same directory, these files must be named after
71-
the corresponding SID. Refer to [Using SSL for communication with SAP HANA](azacsnap-installation.md#using-ssl-for-communication-with-sap-hana). The following example takes a `hana` type snapshot with a prefix of `hana_TEST` and will keep `9` of them communicating with SAP HANA using SSL (`openssl`).
71+
the corresponding SID. Refer to [Using SSL for communication with SAP HANA](azacsnap-configure-database.md#using-ssl-for-communication-with-sap-hana). The following example takes a `hana` type snapshot with a prefix of `hana_TEST` and keeps `9` of them communicating with SAP HANA using SSL (`openssl`).
7272

7373
```bash
7474
azacsnap -c backup --volume data --prefix hana_TEST --retention 9 --trim --ssl=openssl
@@ -79,13 +79,13 @@ The `-c backup` command takes the following arguments:
7979
## Snapshot backups are fast
8080

8181
The duration of a snapshot backup is independent of the volume size, with a 10-TB volume being snapped
82-
within the same approximate time as a 10-GB volume.
82+
within the same approximate time as a 10-GB volume.
8383

8484
The primary factors impacting overall execution time are the number of volumes to be snapshot and any
8585
changes in the `--retention` parameter (where a reduction can increase the execution time as excess
8686
snapshots are removed).
8787

88-
In the example configuration above (for **Azure Large Instance**), snapshots for the
88+
In the example configuration provided for **Azure Large Instance**, snapshots for the
8989
two volumes took less than 5 seconds to complete. For **Azure NetApp Files**, snapshots for the two volumes
9090
would take about 60 seconds.
9191

@@ -100,15 +100,15 @@ needs to remove the extra snapshots.
100100
azacsnap -c backup --volume data --prefix hana_TEST --retention 9 --trim
101101
```
102102

103-
The command does not output to the console, but does write to a log file, a result file,
103+
The command doesn't output to the console, but does write to a log file, a result file,
104104
and `/var/log/messages`.
105105
106-
In this example the *log file* name is `azacsnap-backup-azacsnap.log` (see [Log files](#log-files))
106+
In this example, the *log file* name is `azacsnap-backup-azacsnap.log` (see [Log files](#log-files)).
107107
108-
When running the `-c backup` with the `--volume data` option a result file is also generated as a file to allow
109-
for quickly checking the result of a backup. The *result* file has the same base name as the log file, with `.result` as its suffix.
108+
When running the command `-c backup` with the `--volume data` option, a result file is also generated as a file to allow
109+
for quickly checking the result of a backup. The *result* file has the same base name as the log file, with `.result` as its suffix.
110110
111-
In this example the *result file* name is `azacsnap-backup-azacsnap.result` and contains the following output:
111+
In this example, the *result file* name is `azacsnap-backup-azacsnap.result` and contains the following output:
112112
113113
```bash
114114
cat logs/azacsnap-backup-azacsnap.result
@@ -144,10 +144,10 @@ Jul 2 06:02:06 server01 azacsnap[114280]: Database # 1 (H80) : completed ok
144144
azacsnap -c backup --volume other --prefix logs_TEST --retention 9
145145
```
146146
147-
The command does not output to the console, but does write to a log file only. It does _not_ write
147+
The command doesn't output to the console, but does write to a log file only. It does _not_ write
148148
to a result file or `/var/log/messages`.
149149

150-
In this example the *log file* name is `azacsnap-backup-azacsnap.log` (see [Log files](#log-files)).
150+
In this example, the *log file* name is `azacsnap-backup-azacsnap.log` (see [Log files](#log-files)).
151151

152152
## Example with `other` parameter (to backup host OS)
153153

@@ -163,14 +163,14 @@ azacsnap -c backup --volume other --prefix boot_TEST --retention 9 --configfile
163163
> For Azure Large Instance, the configuration file volume parameter for the boot volume might not be visible at the host operating system level.
164164
> This value can be provided by Microsoft Operations.
165165

166-
The command does not output to the console, but does write to a log file only. It does _not_ write
166+
The command doesn't output to the console, but does write to a log file only. It does _not_ write
167167
to a result file or `/var/log/messages`.
168168
169-
In this example the *log file* name is `azacsnap-backup-bootVol.log` (see [Log files](#log-files)).
169+
In this example, the *log file* name is `azacsnap-backup-bootVol.log` (see [Log files](#log-files)).
170170
171171
## Log files
172172
173-
The log file name is constructed from the following "(command name)-(the `-c` option)-(the config filename)". For example, if running the command `azacsnap -c backup --configfile h80.json --retention 5 --prefix one-off` then the log file will be called `azacsnap-backup-h80.log`. Or if using the `-c test` option with the same configuration file (e.g. `azacsnap -c test --configfile h80.json`) then the log file will be called `azacsnap-test-h80.log`.
173+
The log file name is constructed from the following "(command name)-(the `-c` option)-(the config filename)". For example, if running the command `azacsnap -c backup --configfile h80.json --retention 5 --prefix one-off` then the log file is called `azacsnap-backup-h80.log`. Or if using the `-c test` option with the same configuration file (e.g. `azacsnap -c test --configfile h80.json`) then the log file is called `azacsnap-test-h80.log`.
174174
175175
> [!NOTE]
176176
> Log files can be automatically maintained using [this guide](azacsnap-tips.md#manage-azacsnap-log-files).

0 commit comments

Comments
 (0)