Skip to content

Commit a2a0de8

Browse files
authored
Merge pull request #215279 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 47d7d94 + c4e6a27 commit a2a0de8

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

articles/azure-monitor/app/live-stream.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ Live Metrics custom filters allow you to control which of your application's tel
174174
- Recommended: Secure Live Metrics channel using [Azure AD authentication](./azure-ad-authentication.md#configuring-and-enabling-azure-ad-based-authentication)
175175
- Legacy (no longer recommended): Set up an authenticated channel by configuring a secret API key as explained below
176176

177+
> [!NOTE]
178+
> On 30 September 2025, API keys used to stream live metrics telemetry into application insights will be retired. After that date, applications which use API keys will no longer be able to send live metrics data to your application insights resource. Authenticated telemetry ingestion for live metrics streaming to application insights will need to be done with [Azure AD authentication for application insights](./azure-ad-authentication.md).
179+
177180
It's possible to try custom filters without having to set up an authenticated channel. Simply click on any of the filter icons and authorize the connected servers. Notice that if you choose this option, you'll have to authorize the connected servers once every new session or when a new server comes online.
178181

179182
> [!WARNING]

articles/purview/create-microsoft-purview-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ For more information about the governance capabilities of Microsoft Purview, for
106106
while (getattr(pa,'provisioning_state')) != "Succeeded" :
107107
pa = (purview_client.accounts.get(rg_name, purview_name))
108108
print(getattr(pa,'provisioning_state'))
109-
if getattr(pa,'provisioning_state') != "Failed" :
109+
if getattr(pa,'provisioning_state') == "Failed" :
110110
print("Error in creating Microsoft Purview account")
111111
break
112112
time.sleep(30)
@@ -165,7 +165,7 @@ Here’s the full Python code:
165165
while (getattr(pa,'provisioning_state')) != "Succeeded" :
166166
pa = (purview_client.accounts.get(rg_name, purview_name))
167167
print(getattr(pa,'provisioning_state'))
168-
if getattr(pa,'provisioning_state') != "Failed" :
168+
if getattr(pa,'provisioning_state') == "Failed" :
169169
print("Error in creating Microsoft Purview account")
170170
break
171171
time.sleep(30)

articles/security/fundamentals/encryption-atrest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Microsoft Azure Services each support one or more of the encryption at rest mode
110110

111111
### Azure disk encryption
112112

113-
Any customer using Azure Infrastructure as a Service (IaaS) features can achieve encryption at rest for their IaaS VMs and disks through Azure Disk Encryption. For more information on Azure Disk encryption, see [Azure Disk Encryption for Linux VMs](../../virtual-machines/linux/disk-encryption-overview.md) or [Azure Disk Encryption for Windows VMs](../../virtual-machines/linux/disk-encryption-overview.md).
113+
Any customer using Azure Infrastructure as a Service (IaaS) features can achieve encryption at rest for their IaaS VMs and disks through Azure Disk Encryption. For more information on Azure Disk encryption, see [Azure Disk Encryption for Linux VMs](../../virtual-machines/linux/disk-encryption-overview.md) or [Azure Disk Encryption for Windows VMs](../../virtual-machines/windows/disk-encryption-overview.md).
114114

115115
#### Azure storage
116116

0 commit comments

Comments
 (0)