Skip to content

Commit 5a64aa7

Browse files
authored
Merge pull request #273849 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 5b9a779 + ff9810c commit 5a64aa7

File tree

10 files changed

+39
-15
lines changed

10 files changed

+39
-15
lines changed

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,17 @@ DELETE https://management.azure.com/providers/Microsoft.Insights/monitoredObject
291291
```PowerShell
292292
$TenantID = "xxxxxxxxx-xxxx-xxx" #Your Tenant ID
293293
$SubscriptionID = "xxxxxx-xxxx-xxxxx" #Your Subscription ID
294-
$ResourceGroup = "rg-yourResourseGroup" #Your resroucegroup
294+
$ResourceGroup = "rg-yourResourceGroup" #Your resourcegroup
295295
296-
Connect-AzAccount -Tenant $TenantID
296+
#If cmdlet below produces an error stating 'Interactive authentication is not supported in this session, please run cmdlet 'Connect-AzAccount -UseDeviceAuthentication
297+
#uncomment next to -UseDeviceAuthentication below
298+
Connect-AzAccount -Tenant $TenantID #-UseDeviceAuthentication
297299
298300
#Select the subscription
299301
Select-AzSubscription -SubscriptionId $SubscriptionID
300302
301303
#Grant Access to User at root scope "/"
302-
$user = Get-AzADUser -UserPrincipalName (Get-AzContext).Account
304+
$user = Get-AzADUser -SignedIn
303305
304306
New-AzRoleAssignment -Scope '/' -RoleDefinitionName 'Owner' -ObjectId $user.Id
305307
@@ -336,7 +338,7 @@ Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -B
336338
#2. Create a monitored object
337339
338340
# "location" property value under the "body" section should be the Azure region where the MO object would be stored. It should be the "same region" where you created the Data Collection Rule. This is the location of the region from where agent communications would happen.
339-
$Location = "eastus" #Use your own loacation
341+
$Location = "eastus" #Use your own location
340342
$requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
341343
$body = @"
342344
{
@@ -368,8 +370,9 @@ $body = @"
368370
369371
Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body
370372
371-
#(Optional example). Associate another DCR to monitored object
373+
#(Optional example). Associate another DCR to monitored object. Remove comments around text below to use.
372374
#See reference documentation https://learn.microsoft.com/en-us/rest/api/monitor/data-collection-rule-associations/create?tabs=HTTP
375+
<#
373376
$associationName = "assoc02" #You must change the association name to a unique name, if you want to associate multiple DCR to monitored object
374377
$DCRName = "dcr-PAW-WindowsClientOS" #Your Data collection rule name
375378
@@ -388,7 +391,7 @@ Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -B
388391
#4. (Optional) Get all the associatation.
389392
$requestURL = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations?api-version=2021-09-01-preview"
390393
(Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method get).value
391-
394+
#>
392395
393396
```
394397
## Verify successful setup

articles/azure-monitor/essentials/edge-pipeline-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The pipeline configuration file defines the data flows and cache properties for
1919
:::image type="content" source="media/edge-pipeline/edge-pipeline-configuration.png" lightbox="media/edge-pipeline/edge-pipeline-configuration.png" alt-text="Overview diagram of the dataflow for Azure Monitor edge pipeline." border="false":::
2020

2121
> [!NOTE]
22-
> Private link is support by edge pipeline for the connection to the cloud pipeline.
22+
> Private link is supported by edge pipeline for the connection to the cloud pipeline.
2323
2424
The following components and configurations are required to enable the Azure Monitor edge pipeline. If you use the Azure portal to configure the edge pipeline, then each of these components is created for you. With other methods, you need to configure each one.
2525

articles/azure-monitor/logs/private-link-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ To create and manage Private Link Scopes, use the [REST API](/rest/api/monitor/p
125125
The following CLI command creates a new AMPLS resource named `"my-scope"`, with both query and ingestion access modes set to `Open`.
126126

127127
```
128-
az resource create -g "my-resource-group" --name "my-scope" --api-version "2021-07-01-preview" --resource-type Microsoft.Insights/privateLinkScopes --properties "{\"accessModeSettings\":{\"queryAccessMode\":\"Open\", \"ingestionAccessMode\":\"Open\"}}"
128+
az resource create -g "my-resource-group" --name "my-scope" -l global --api-version "2021-07-01-preview" --resource-type Microsoft.Insights/privateLinkScopes --properties "{\"accessModeSettings\":{\"queryAccessMode\":\"Open\", \"ingestionAccessMode\":\"Open\"}}"
129129
```
130130

131131
#### Create an AMPLS with mixed access modes: PowerShell example

articles/container-apps/opentelemetry-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Before you deploy this template, replace placeholders surrounded by `<>` with yo
7373
"destinations": ["appInsights"]
7474
},
7575
"logsConfiguration": {
76-
"destinations": ["apInsights"]
76+
"destinations": ["appInsights"]
7777
}
7878
}
7979
}

articles/defender-for-cloud/faq-defender-for-storage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ sections:
6060
- question: |
6161
How can I calculate the cost Defender for Storage?
6262
answer: |
63-
To estimate the cost of Defender for Storage, we've provided a [pricing estimation workbook](https://github.com/Azure/Microsoft-Defender-for-Cloud/tree/main/Workbooks/Microsoft%20Defender%20for%20Storage%20Price%20Estimation) that you can run in your environment. For more information about how this workbook works, visit this [Blog Post](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/microsoft-defender-for-storage-price-estimation-dashboard/ba-p/2429724). You can also check out the Defender for Cloud [pricing page](https://azure.microsoft.com/pricing/details/defender-for-cloud/) for more information.
63+
To estimate the cost of Defender for Storage and add-ons like Malware Scanning, we've provided a [pricing estimation workbook](https://github.com/Azure/Microsoft-Defender-for-Cloud/tree/main/Workbooks/Microsoft%20Defender%20for%20Storage%20Price%20Estimation) that you can deploy in your environment. This workbook also provides visibility into your Defender for Storage and add-ons - Malware Scanning and Sensitivity Data Discovery - enablement status across subscriptions. For more information about how this workbook works, visit this [Blog Post](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/microsoft-defender-for-storage-price-estimation-dashboard/ba-p/2429724). You can also check out the Defender for Cloud [pricing page](https://azure.microsoft.com/pricing/details/defender-for-cloud/) for more information.
6464
6565
6666
additionalContent: |

articles/defender-for-cloud/support-matrix-defender-for-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Following are the features for each of the domains in Defender for Containers:
3535
| Comprehensive inventory capabilities | Enables you to explore resources, pods, services, repositories, images, and configurations through [security explorer](how-to-manage-cloud-security-explorer.md#build-a-query-with-the-cloud-security-explorer) to easily monitor and manage your assets. | ACR, AKS | GA | GA | Enable **Agentless discovery on Kubernetes** toggle | Agentless| Defender for Containers **OR** Defender CSPM | Azure commercial clouds |
3636
| Attack path analysis | A graph-based algorithm that scans the cloud security graph. The scans expose exploitable paths that attackers might use to breach your environment. | ACR, AKS | GA | GA | Activated with plan | Agentless | Defender CSPM (requires Agentless discovery for Kubernetes to be enabled) | Azure commercial clouds |
3737
| Enhanced risk-hunting | Enables security admins to actively hunt for posture issues in their containerized assets through queries (built-in and custom) and [security insights](attack-path-reference.md#insights) in the [security explorer](how-to-manage-cloud-security-explorer.md). | ACR, AKS | GA | GA | Enable **Agentless discovery on Kubernetes** toggle | Agentless | Defender for Containers **OR** Defender CSPM | Azure commercial clouds |
38-
| [Control plane hardening](defender-for-containers-architecture.md) | Continuously assesses the configurations of your clusters and compares them with the initiatives applied to your subscriptions. When it finds misconfigurations, Defender for Cloud generates security recommendations that are available on Defender for Cloud's Recommendations page. The recommendations let you investigate and remediate issues. | ACR, AKS | GA | Preview | Activated with plan | Agentless | Free | Commercial clouds<br><br> National clouds: Azure Government, Azure operated by 21Vianet |
38+
| [Control plane hardening](defender-for-containers-architecture.md) | Continuously assesses the configurations of your clusters and compares them with the initiatives applied to your subscriptions. When it finds misconfigurations, Defender for Cloud generates security recommendations that are available on Defender for Cloud's Recommendations page. The recommendations let you investigate and remediate issues. | ACR, AKS | GA | GA | Activated with plan | Agentless | Free | Commercial clouds<br><br> National clouds: Azure Government, Azure operated by 21Vianet |
3939
| [Kubernetes data plane hardening](kubernetes-workload-protections.md) |Protect workloads of your Kubernetes containers with best practice recommendations. |AKS | GA | - | Enable **Azure Policy for Kubernetes** toggle | Azure Policy | Free | Commercial clouds<br><br> National clouds: Azure Government, Azure operated by 21Vianet |
4040
| Docker CIS | Docker CIS benchmark | VM, Virtual Machine Scale Set | GA | - | Enabled with plan | Log Analytics agent | Defender for Servers Plan 2 | Commercial clouds<br><br> National clouds: Azure Government, Microsoft Azure operated by 21Vianet |
4141

articles/event-grid/communication-services-chat-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Azure Communication Services emits the following chat event types:
3131
| [Microsoft.Communication.ChatThreadCreated](#microsoftcommunicationchatthreadcreated-event) | `Thread` |Published when a chat thread is created |
3232
| [Microsoft.Communication.ChatThreadDeleted](#microsoftcommunicationchatthreaddeleted-event)| `Thread` | Published when a chat thread is deleted |
3333
| [Microsoft.Communication.ChatThreadParticipantAdded](#microsoftcommunicationchatthreadparticipantadded-event) | `Thread` | Published when a new participant is added to a chat thread |
34-
| [Microsoft.Communication.ChatThreadParticipantRemoved](#microsoftcommunicationchatthreadparticipantremoved-event) | `Thread` | Published when a new participant is added to a chat thread. |
34+
| [Microsoft.Communication.ChatThreadParticipantRemoved](#microsoftcommunicationchatthreadparticipantremoved-event) | `Thread` | Published when a participant is removed from a chat thread |
3535
| [Microsoft.Communication.ChatMessageReceivedInThread](#microsoftcommunicationchatmessagereceivedinthread-event) | `Thread` |Published when a message is received in a chat thread |
3636
| [Microsoft.Communication.ChatThreadPropertiesUpdated](#microsoftcommunicationchatthreadpropertiesupdated-event)| `Thread` | Published when a chat thread's properties are updated.|
3737
| [Microsoft.Communication.ChatMessageEditedInThread](#microsoftcommunicationchatmessageeditedinthread-event) | `Thread` |Published when a message is edited in a chat thread |

articles/postgresql/flexible-server/how-to-create-users.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ When you first created your Azure Database for PostgreSQL flexible server instan
2626
The Azure Database for PostgreSQL flexible server instance is created with the three default roles defined. You can see these roles by running the command: `SELECT rolname FROM pg_roles;`
2727

2828
- azure_pg_admin
29-
- azure_superuser
29+
- azuresu
3030
- your server admin user
3131

32-
Your server admin user is a member of the azure_pg_admin role. However, the server admin account isn't part of the azure_superuser role. Since this service is a managed PaaS service, only Microsoft is part of the super user role.
32+
Your server admin user is a member of the azure_pg_admin role. However, the server admin account isn't part of the azuresu role. Since this service is a managed PaaS service, only Microsoft is part of the super user role.
3333

3434
The PostgreSQL engine uses privileges to control access to database objects, as discussed in the [PostgreSQL product documentation](https://www.postgresql.org/docs/current/static/sql-createrole.html). In Azure Database for PostgreSQL flexible server, the server admin user is granted these privileges:
3535

articles/storage/common/storage-redundancy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Unmanaged disks don't support ZRS or GZRS.
247247
For pricing information for each redundancy option, see [Azure Storage pricing](https://azure.microsoft.com/pricing/details/storage/).
248248

249249
> [!NOTE]
250-
Block blob storage accounts support locally redundant storage (LRS) and zone redundant storage (ZRS) in certain regions.
250+
> Block blob storage accounts support locally redundant storage (LRS) and zone redundant storage (ZRS) in certain regions.
251251
252252
## Data integrity
253253

articles/synapse-analytics/troubleshoot/troubleshoot-synapse-studio.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,27 @@ ms.reviewer: sngun, wiassaf
1414

1515
This trouble-shooting guide provides instruction on what information to provide when opening a support ticket on network connectivity issues. With the proper information, we can possibly resolve the issue more quickly.
1616

17+
## Publish fails when session remains idle
18+
19+
### Symptom
20+
21+
In some cases, if your browser session has been inactive for an extended period, your attempt to publish might fail due to a message about token expiration:
22+
23+
`ERROR: Unauthorized Inner error code: ExpiredAuthenticationToken Message: Token Authentication failed with SecurityTokenExpiredException - MISE12034: AuthenticationTicketProvider Name:AuthenticationTicketProvider, GetVersion:1.9.2.0.;`
24+
25+
### Root cause and mitigation
26+
27+
Handling token expiration in Synapse Studio requires careful consideration, especially when working in a live workspace without Git integration. Here’s how to manage your session to avoid losing work:
28+
- **With Git integration:**
29+
- Regularly commit your changes. This ensures that even if you need to refresh your browser to renew your session, your work is safely stored.
30+
- After committing, you can refresh your browser to reset the session and then continue to publish your changes.
31+
- **Without Git integration:**
32+
- Before taking breaks or periods of inactivity, attempt to publish your changes. It is critical to remember that if your session has been idle for a long time, you might encounter a token expiration error when you try to publish upon returning.
33+
- If you're concerned about the risk of losing unsaved changes due to a required refresh, consider structuring your work periods to include frequent save and publish actions and avoid leaving the session idle for extended periods.
34+
35+
> [!IMPORTANT]
36+
> In a live workspace without Git, if you find that your session has been idle and you face a token expiration, you face a dilemma: refresh the page and risk losing unsaved changes, or attempt to publish if the token hasn't expired yet. To minimize this risk, try to keep active sessions or save frequently, depending on the nature of your work and the environment setup.
37+
1738
## Serverless SQL pool service connectivity issue
1839

1940
### Symptom 1

0 commit comments

Comments
 (0)