Skip to content

Commit 88545a7

Browse files
authored
Merge pull request #232240 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 e2a9565 + 8d6ff11 commit 88545a7

File tree

8 files changed

+46
-13
lines changed

8 files changed

+46
-13
lines changed

articles/azure-cache-for-redis/cache-private-link.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ You can restrict public access to the private endpoint of your cache by disablin
2121
>[!Important]
2222
> There is a `publicNetworkAccess` flag which is `Disabled` by default.
2323
> You can set the value to `Disabled` or `Enabled`. When set to enabled, this flag allows both public and private endpoint access to the cache. When set to `Disabled`, it allows only private endpoint access. For more information on how to change the value, see the [FAQ](#how-can-i-change-my-private-endpoint-to-be-disabled-or-enabled-from-public-network-access).
24+
25+
>[!Important]
26+
> Private endpoint is supported on cache tiers Basic, Standard, Premium, and Enterprise. We recommend using private endpoint instead of VNets. Private endpoints are easy to set up or remove, are supported on all tiers, and can connect your cache to multiple different VNets at once.
2427
>
2528
>
2629

articles/cost-management-billing/manage/ea-portal-administration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Make sure that you have the user's email address and preferred authentication me
5050

5151
#### If you're not an enterprise administrator
5252

53-
If you're not an enterprise administrator, contact an enterprise administrator to request that they add you to an enrollment. The enterprise administrator uses the preceding steps to add you as an enterprise administrator. After you're added to an enrollment, you receive an activation email.
53+
If you're not an enterprise administrator, contact an enterprise administrator to request that they add you to an enrollment. The enterprise administrator uses the preceding steps to add you as an enterprise administrator. After you're added to an enrollment, you receive an activation email. After the account is registered, it's activated in about 5 to 10 minutes.
5454

5555
#### If your enterprise administrator can't help you
5656

articles/cost-management-billing/manage/understand-ea-roles.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ Each account requires a unique work, school, or Microsoft account. For more info
138138

139139
There can be only one account owner per account. However, there can be multiple accounts in an EA enrollment. Each account has a unique account owner.
140140

141+
For different Azure AD accounts, it can take more than 30 minutes for permission settings to take effect.
142+
141143
### Service administrator
142144

143145
The service administrator role has permissions to manage services in the Azure portal and assign users to the coadministrator role.

articles/postgresql/single-server/quickstart-create-postgresql-server-database-using-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Create an Azure DB for PostgreSQL - Bicep'
2+
title: 'Quickstart: Create an Azure Database for PostgreSQL - Bicep'
33
description: In this quickstart, learn how to create an Azure Database for PostgreSQL single server using Bicep.
44
ms.service: postgresql
55
ms.subservice: single-server

articles/sap/workloads/sap-hana-high-availability.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,14 +477,15 @@ With susChkSrv implemented, an immediate and configurable action is executed, wh
477477

478478
Configuration pointing to the standard location /usr/share/SAPHanaSR, brings a benefit, that the python hook code is automatically updated through OS or package updates and it gets used by HANA at next restart. With an optional, own path, such as /hana/shared/myHooks you can decouple OS updates with the used hook version.
479479

480-
2. **[A]** The cluster requires sudoers configuration on each cluster node for <sid\>adm. In this example that is achieved by creating a new file. Execute the command as `root` and adapt the bold values of hn1/HN1 with correct SID.
481-
<pre><code>
480+
2. **[A]** The cluster requires sudoers configuration on each cluster node for <sid\>adm. In this example that is achieved by creating a new file. Execute the command as `root` and adapt the values of hn1/HN1 with correct SID.
481+
482+
```bash
482483
cat << EOF > /etc/sudoers.d/20-saphana
483484
# Needed for SAPHanaSR and susChkSrv Python hooks
484-
<b>hn1</b>adm ALL=(ALL) NOPASSWD: /usr/sbin/crm_attribute -n hana_<b>hn1</b>_site_srHook_*
485-
<b>hni</b>adm ALL=(ALL) NOPASSWD: /usr/sbin/SAPHanaSR-hookHelper --sid=<b>HN1</b> --case=fenceMe
485+
hn1adm ALL=(ALL) NOPASSWD: /usr/sbin/crm_attribute -n hana_hn1_site_srHook_*
486+
hn1adm ALL=(ALL) NOPASSWD: /usr/sbin/SAPHanaSR-hookHelper --sid=HN1 --case=fenceMe
486487
EOF
487-
</code></pre>
488+
```
488489
For more details on the implementation of the SAP HANA system replication hook see [Set up HANA HA/DR providers](https://documentation.suse.com/sbp/all/html/SLES4SAP-hana-sr-guide-PerfOpt-15/index.html#_set_up_sap_hana_hadr_providers).
489490
490491
3. **[A]** Start SAP HANA on both nodes. Execute as <sid\>adm.
@@ -1277,4 +1278,4 @@ NOTE: The following tests are designed to be run in sequence and depend on the e
12771278
12781279
* [Azure Virtual Machines planning and implementation for SAP][planning-guide]
12791280
* [Azure Virtual Machines deployment for SAP][deployment-guide]
1280-
* [Azure Virtual Machines DBMS deployment for SAP][dbms-guide]
1281+
* [Azure Virtual Machines DBMS deployment for SAP][dbms-guide]

articles/storage/blobs/upgrade-to-data-lake-storage-gen2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Renaming a blob is far more efficient because client applications can rename a b
8080
8181
## Impact on costs
8282

83-
Storage costs aren't impacted, but transactions costs are impacted. Use these pages to assess compare costs.
83+
There is no cost to perform the upgrade. After you upgrade, the cost to store your data doesn't change, but the cost of a transaction does change. Use these pages to assess compare costs.
8484

8585
- [Block blob pricing](https://azure.microsoft.com/pricing/details/storage/blobs/).
8686

@@ -158,4 +158,4 @@ As you move between content sets, you'll notice some slight terminology differen
158158

159159
When you are ready to upgrade your storage account to include Data Lake Storage Gen2 capabilities, see this step-by-step guide.
160160
> [!div class="nextstepaction"]
161-
> [Upgrade Azure Blob Storage with Azure Data Lake Storage Gen2 capabilities](upgrade-to-data-lake-storage-gen2-how-to.md)
161+
> [Upgrade Azure Blob Storage with Azure Data Lake Storage Gen2 capabilities](upgrade-to-data-lake-storage-gen2-how-to.md)

articles/stream-analytics/stream-analytics-javascript-user-defined-functions.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,40 @@ Samstag, 28. Dezember 2019
211211
```
212212

213213
## User Logging
214-
The logging mechanism allows you to capture custom information while a job is running. You can use log data to debug or assess the correctness of the custom code in real time. This mechanism is available through the Console.Log() method.
214+
The logging mechanism allows users to capture custom information while a job is running. Log data can be used to debug or assess the correctness of the custom code in real time. This mechanism is available through three different methods.
215+
216+
### Console.Info()
217+
Console.Info method is used to log general information during code execution. This method will log data without interrupting computation. The message logged will be marked as Event Level Informational.
218+
219+
```javascript
220+
console.info('my info message');
221+
```
222+
223+
### Console.Warn()
224+
Console.Warn method is used to log data that might not be correct or expected but is still accepted for computation. This method will not interrupt computation and will resume running after the method is returned. The message logged will be marked as Event Level Warning.
225+
226+
```javascript
227+
console.warn('my warning message');
228+
```
229+
230+
### Console.Error() and Console.Log()
231+
Console.Error method is only used to log error cases where code cannot continue to run. This method will throw an exception with the error information provided as the input parameter and job will stop running. The error message logged will be marked as Event Level Error.
215232

216233
```javascript
217-
console.log('my error message');
234+
console.error('my error message');
218235
```
219236

220237
You can access log messages through the [diagnostic logs](data-errors.md).
238+
239+
## atob() and btoa()
240+
The method btoa() can be used to encode an ASCII string into Base64. This is usually done to transfer data in a binary format. The atob() method can be used to decode a string of data encoded in Base64 to an ASCII string format.
241+
242+
```javascript
243+
var myAsciiString = 'ascii string';
244+
var encodedString = btoa(myAsciiString);
245+
var decodedString = atob(encodedString);
246+
```
247+
221248
## Next steps
222249

223250
* [Machine Learning UDF](./machine-learning-udf.md)

articles/virtual-network/virtual-networks-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ No. Multicast and broadcast are not supported.
102102
You can use TCP, UDP, and ICMP TCP/IP protocols within VNets. Unicast is supported within VNets. Multicast, broadcast, IP-in-IP encapsulated packets, and Generic Routing Encapsulation (GRE) packets are blocked within VNets. You cannot use Dynamic Host Configuration Protocol (DHCP) via Unicast (source port UDP/68 / destination port UDP/67). UDP source port 65330 which is reserved for the host. See ["Can I deploy a DHCP server in a VNet"](#can-i-deploy-a-dhcp-server-in-a-vnet) for more detail what is and is not supported for DHCP.
103103

104104
### Can I deploy a DHCP server in a VNet?
105-
Azure VNets provide DHCP service and DNS to VMs and client/server DHCP (source port UDP/68, destination port UDP/67) not supported in a VNet. You cannot deploy your own DHCP service to receive and provide unicast/broadcast client/server DHCP traffic for endpoints inside a VNet. You can deploy a DHCP server on a VM with the intent to receive unicast DHCP relay (source port UDP/67, destination port UDP/67) DHCP traffic. A possible scenario is configuring DHCP relay from devices on-premises to an Azure VM running a DHCP server. Customer is responsible for configuring on-premise devices (for example, router configuration) to create this DHCP relay traffic to the VM's IP in Azure.
105+
Azure VNets provide DHCP service and DNS to VMs and client/server DHCP (source port UDP/68, destination port UDP/67) not supported in a VNet. You cannot deploy your own DHCP service to receive and provide unicast/broadcast client/server DHCP traffic for endpoints inside a VNet. It is also an *unsupported* scenario to deploy a DHCP server VM with the intent to receive unicast DHCP relay (source port UDP/67, destination port UDP/67) DHCP traffic.
106106

107107
### Can I ping default gateway within a VNet?
108108
No. Azure provided default gateway does not respond to ping. But you can use ping in your VNets to check connectivity and troubleshooting between VMs.

0 commit comments

Comments
 (0)