Skip to content

Commit 4d326aa

Browse files
authored
Merge pull request #230932 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 884a219 + 49038b6 commit 4d326aa

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

articles/active-directory-b2c/custom-policies-series-hello-world.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If you haven't already done so, create the following encryption keys. To automat
5959

6060
<BuildingBlocks>
6161
<!-- Building Blocks Here-->
62-
<BuildingBlocks>
62+
</BuildingBlocks>
6363

6464
<ClaimsProviders>
6565
<!-- Claims Providers Here-->
@@ -303,4 +303,4 @@ Next, learn:
303303

304304
- About custom policy [claims data type](claimsschema.md#datatype).
305305

306-
- About custom policy [user input types](claimsschema.md#userinputtype).
306+
- About custom policy [user input types](claimsschema.md#userinputtype).

articles/active-directory/devices/assign-local-admin.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ Device administrators are assigned to all Azure AD joined devices. You can’t s
5858

5959
- Upto 4 hours have passed for Azure AD to issue a new Primary Refresh Token with the appropriate privileges.
6060
- User signs out and signs back in, not lock/unlock, to refresh their profile.
61-
- Users won't be listed in the local administrator group, the permissions are received through the Primary Refresh Token.
61+
62+
Users won't be listed in the local administrator group, the permissions are received through the Primary Refresh Token.
6263

6364
> [!NOTE]
6465
> The above actions are not applicable to users who have not signed in to the relevant device previously. In this case, the administrator privileges are applied immediately after their first sign-in to the device.

articles/active-directory/devices/manage-stale-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ If your device is under control of Intune or any other MDM solution, retire the
9090

9191
### System-managed devices
9292

93-
Don't delete system-managed devices. These devices are generally devices such as Autopilot. Once deleted, these devices can't be reprovisioned. The new `Get-AzureADDevice` cmdlet excludes system-managed devices by default.
93+
Don't delete system-managed devices. These devices are generally devices such as Autopilot. Once deleted, these devices can't be reprovisioned.
9494

9595
### Hybrid Azure AD joined devices
9696

articles/active-directory/fundamentals/service-accounts-principal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
1717

1818
# Securing service principals in Azure Active Directory
1919

20-
An Azure Active Directory (Azure AD) service principals are the local representation of an application object in a tenant or directory. It's the identity of the application instance. Service principals define application access, and resources the application accesses. A service principal is created in each tenant where the application is used, and references the globally unique application object. The tenant secures the service principal sign-in and access to resources.
20+
An Azure Active Directory (Azure AD) service principal is the local representation of an application object in a tenant or directory. It's the identity of the application instance. Service principals define application access and resources the application accesses. A service principal is created in each tenant where the application is used and references the globally unique application object. The tenant secures the service principal sign-in and access to resources.
2121

2222
Learn more: [Application and service principal objects in Azure AD](../develop/app-objects-and-service-principals.md)
2323

articles/aks/azure-cni-overlay.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ location="westcentralus"
145145
az aks create -n $clusterName -g $resourceGroup --location $location --network-plugin azure --network-plugin-mode overlay --pod-cidr 192.168.0.0/16
146146
```
147147

148-
This will perform a rolling upgrade of nodes in **all** nodepools simultaneously to Azure CNI overlay and should be treated like a node image upgrade. During the upgrade, traffic from an Overlay pod to a CNI v1 pod will be SNATed(Source Network Address Translation)
149-
150148
## Next steps
151149

152150
To learn how to utilize AKS with your own Container Network Interface (CNI) plugin, see [Bring your own Container Network Interface (CNI) plugin](use-byo-cni.md).

articles/azure-monitor/essentials/data-collection-transformations.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ There are multiple methods to create transformations depending on the data colle
6969
| Transformation in workspace DCR | [Add workspace transformation to Azure Monitor Logs by using the Azure portal](../logs/tutorial-workspace-transformations-portal.md)<br>[Add workspace transformation to Azure Monitor Logs by using Resource Manager templates](../logs/tutorial-workspace-transformations-api.md)
7070

7171
## Cost for transformations
72-
There's no direct cost for transformations, but you might incur charges for the following changes:
72+
While transformations themselves don't incur direct costs, the following scenarios can result in additional charges:
7373

74-
- If your transformation increases the size of the incoming data, like by adding a calculated column, for example, you're charged at the normal rate for ingestion of that extra data.
75-
- If your transformation reduces the incoming data by more than 50%, you're charged for ingestion of the amount of filtered data above 50%.
74+
- If a transformation increases the size of the incoming data, such as by adding a calculated column, you'll be charged the standard ingestion rate for the extra data.
75+
- If a transformation reduces the incoming data by more than 50%, you'll be charged for the amount of filtered data above 50%.
7676

77-
The formula to determine the filter ingestion charge from transformations is `[GB filtered out by transformations] - ( [Total GB ingested] / 2 )`. For example, suppose that you ingest 100 GB on a particular day, and transformations remove 70 GB. You would be charged for 70 GB - (100 GB / 2) or 20 GB. To avoid this charge, you should use other methods to filter incoming data before the transformation is applied.
77+
To calculate the data processing charge resulting from transformations, use the following formula: [GB filtered out by transformations] - ([Total GB ingested] / 2). For example, if you ingest 100 GB of data and your transformations remove 70 GB, you'll be charged for 70 GB - (100 GB / 2), which is 20 GB. This calculation is done per data collection rule and per day basis. To avoid this charge, it's recommended to filter incoming data using alternative methods before applying transformations. By doing so, you can reduce the amount of data processed by transformations and, therefore, minimize any additional costs.
7878

7979
See [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor) for current charges for ingestion and retention of log data in Azure Monitor.
8080

articles/cognitive-services/Content-Moderator/language-support.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ms.author: pafarley
5454
| Lepcha | Filipino | | |
5555
| Limbu | Finnish | | |
5656
| Lu | French | | |
57-
| Lycian | Galician | | |
57+
| Lycian | | |
5858
| Lydian | Georgian | | |
5959
| Mycenaean (Greek) | German | | |
6060
| Nko | Greek | | |
@@ -107,7 +107,6 @@ ms.author: pafarley
107107
| | Quechua (Peru) | | |
108108
| | Romanian | | |
109109
| | Russian | | |
110-
| | Scottish Gaelic | | |
111110
| | Serbian (Cyrillic) | | |
112111
| | Serbian (Cyrillic, Bosnia and Herzegovina) | | |
113112
| | Serbian (Latin) | | |
@@ -134,6 +133,5 @@ ms.author: pafarley
134133
| | Uzbek | | |
135134
| | Valencian | | |
136135
| | Vietnamese | | |
137-
| | Welsh | | |
138136
| | Wolof | | |
139137
| | Yoruba | | |

articles/event-hubs/event-hubs-faq.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ sections:
150150
Is there a cost associated when I turn on the auto-inflate feature?
151151
answer: |
152152
There's **no cost** associated with this feature.
153+
154+
- question: |
155+
Can Zone Redundancy be enabled for an existing Event Hub Namespace?
156+
answer: |
157+
Currently, this isn't possible because old Event Hub Namespaces are in different clusters, and there's no way to migrate them to the new clusters that automatically enable zone redundancy when new Event Hub namespaces are created.
153158
154159
- question: |
155160
How are throughput limits enforced?

0 commit comments

Comments
 (0)