Skip to content

Commit 1e32287

Browse files
Merge pull request #274992 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 b095e6c + e8f29e0 commit 1e32287

File tree

8 files changed

+22
-15
lines changed

8 files changed

+22
-15
lines changed

articles/api-center/enable-api-center-portal.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ Follow these steps to build and test the API Center portal locally.
8585
```bash
8686
git checkout main
8787
```
88-
1. To configure the service, edit the `public/config.json` file to point to your service. Update the values in the file as follows:
88+
1. To configure the service, copy or rename the `public/config.example` file to `public/config.json`.
89+
1. Then edit the `public/config.json` file to point to your service. Update the values in the file as follows:
8990
* Replace `<service name>` and `<region>` with the name of your API center and the region where it's deployed
9091
* Replace `<client ID>` and `<tenant ID>` with the **Application (client) ID** and **Directory (tenant) ID** of the app registration you created in the previous section.
9192
* Update the value of `title` to a name that you want to appear on the portal.

articles/azure-functions/analyze-telemetry-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To open Application Insights from a function app in the [Azure portal](https://p
5252

5353
![Open Application Insights from the function app Overview page](media/functions-monitoring/ai-link.png)
5454

55-
For information about how to use Application Insights, see the [Application Insights documentation](/azure/application-insights/). This section shows some examples of how to view data in Application Insights. If you're already familiar with Application Insights, you can go directly to [the sections about how to configure and customize the telemetry data](configure-monitoring.md#configure-log-levels).
55+
For information about how to use Application Insights, see the [Application Insights documentation](../azure-monitor/app/app-insights-overview.md). This section shows some examples of how to view data in Application Insights. If you're already familiar with Application Insights, you can go directly to [the sections about how to configure and customize the telemetry data](configure-monitoring.md#configure-log-levels).
5656

5757
![Application Insights Overview tab](media/functions-monitoring/metrics-explorer.png)
5858

articles/azure-functions/configure-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,6 @@ For more information about monitoring, see:
477477

478478
+ [Monitor Azure Functions](functions-monitoring.md)
479479
+ [Analyze Azure Functions telemetry data in Application Insights](analyze-telemetry-data.md)
480-
+ [Application Insights](/azure/application-insights/)
480+
+ [Application Insights](../azure-monitor/app/app-insights-overview.md)
481481

482482
[host.json]: functions-host-json.md

articles/azure-functions/functions-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,5 @@ To report an issue with Application Insights integration in Functions, or to mak
165165

166166
For more information, see the following resources:
167167

168-
* [Application Insights](/azure/application-insights/)
168+
* [Application Insights](../azure-monitor/app/app-insights-overview.md)
169169
* [ASP.NET Core logging](/aspnet/core/fundamentals/logging/)

articles/azure-monitor/logs/logs-dedicated-clusters.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ You need 'write' permissions to both the workspace and the cluster resource for
239239
- In the cluster resource: *Microsoft.OperationalInsights/clusters/write*
240240

241241
Once Log Analytics workspace linked to a dedicated cluster, new data sent to workspace is ingested to your dedicated cluster, while previously ingested data remains in Log Analytics cluster. Linking a workspace has no effect on workspace operation, including ingestion and query experiences. Log Analytics query engine stitches data from old and new clusters automatically, and the results of queries are complete.
242-
243-
When dedicated cluster is configured with customer-managed key (CMK), new ingested data is encrypted with your key, while older data remains encrypted with Microsoft-managed key (MMK). The key configuration is abstracted by Log Analytics and the query across old and new data encryptions is performed seamlessly.
244242

245-
A cluster can be linked to up to 1,000 workspaces located in the same region with cluster. A workspace can't be linked to a cluster more than twice a month, to prevent data fragmentation.
243+
Clusters are regional and can be linked to up to 1,000 workspaces located in the same region as the cluster. A workspace can't be linked to a cluster more than twice a month, to prevent data fragmentation.
244+
245+
Linked workspaces can be in different subscriptions than the subscription the cluster is located in. The workspace and cluster can be in different tenants if Azure Lighthouse is used to map both of them to a single tenant.
246246

247-
The workspace and the cluster can be in different subscriptions. It's possible for the workspace and cluster to be in different tenants if Azure Lighthouse is used to map both of them to a single tenant.
247+
When a dedicated cluster is configured with a customer-managed key (CMK), the newly ingested data is encrypted with your key, while older data remains encrypted with a Microsoft-managed key (MMK). The key configuration is abstracted by Log Analytics and the query across old and new data encryptions is performed seamlessly.
248248

249249
Use the following steps to link a workspace to a cluster. You can use automation for linking multiple workspaces:
250250

articles/azure-vmware/enable-sql-azure-hybrid-benefit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To enable through the Azure CLI, reference [az vmware placement-policy vm-host](
2626

2727
For the Azure portal step-by-step see:
2828

29-
1. From your Azure VMware Solution private cloud, select Azure Hybrid Benefit, then Create VM-Host placement policy.
29+
1. From your Azure VMware Solution private cloud, select Azure Hybrid Benefit, then Create VM-Host affinity placement policy.
3030
:::image type="content" source="media/sql-azure-hybrid-benefit/azure-hybrid-benefit.png" alt-text="Diagram that shows how to create a host new virtual machine placement policy.":::
3131

3232
1. Fill in the required fields for creating the placement policy.

articles/trusted-signing/how-to-signing-integrations.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ To download and install SignTool:
5353

5454
1. Install SignTool from the Windows SDK (minimum version: 10.0.2261.755).
5555

56-
Another option is to use the latest *nuget.exe* file to download and extract the latest SDK Build Tools NuGet package by using PowerShell:
56+
Another option is to use the latest *nuget.exe* file to download and extract the latest Windows SDK Build Tools NuGet package by using PowerShell:
5757

5858
1. Download *nuget.exe* by running the following download command:
5959

6060
```powershell
6161
Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile .\nuget.exe
6262
```
6363

64-
1. Install *nuget.exe* by running the following installation command:
64+
1. Download and extract Windows SDK Build Tools NuGet package by running the following installation command:
6565

6666
```powershell
67-
.\nuget.exe install Microsoft.Windows.SDK.BuildTools -Version 10.0.2261.755
67+
.\nuget.exe install Microsoft.Windows.SDK.BuildTools -Version 10.0.22621.3233 -x
6868
```
69-
69+
7070
### Download and install .NET 8.0 Runtime
7171

7272
The components that SignTool uses to interface with Trusted Signing require the installation of [.NET 8.0 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0) You need only the core .NET 8.0 Runtime. Make sure that you install the correct platform runtime depending on the version of SignTool you intend to run. Or, you can simply install both
@@ -84,12 +84,18 @@ To download and install the Trusted Signing dlib package (a .zip file):
8484

8585
1. Extract the Trusted Signing dlib zipped content and install it on your signing node in your choice of directory. The node must be the node where you'll use SignTool to sign files.
8686

87+
Another option is to download the [Trusted Signing dlib package](https://www.nuget.org/packages/Microsoft.Trusted.Signing.Client) via NuGet similar like the Windows SDK Build Tools NuGet package:
88+
89+
```powershell
90+
.\nuget.exe install Microsoft.Trusted.Signing.Client -Version 1.0.53 -x
91+
```
92+
8793
### Create a JSON file
8894

8995
To sign by using Trusted Signing, you need to provide the details of your Trusted Signing account and certificate profile that were created as part of the prerequisites. You provide this information on a JSON file by completing these steps:
9096

9197
1. Create a new JSON file (for example, *metadata.json*).
92-
1. Add the specific values for your Trusted Signing account and certificate profile to the JSON file. The Trusted Signing account is interchangeably called *code signing account*. For more information, see the *metadata.sample.json* file that’s included in the Trusted Signing dlib package or use the following example:
98+
1. Add the specific values for your Trusted Signing account and certificate profile to the JSON file. For more information, see the *metadata.sample.json* file that’s included in the Trusted Signing dlib package or use the following example:
9399

94100
```json
95101
{

articles/virtual-machines/workloads/oracle/oracle-third-party-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following table provides other inputs to help you to determine the appropria
4242
| Other | Flexible model at TiB granularity |
4343
| Provisioning Model | Incremental snapshot for fast restore; Snapshot export for hardening. |
4444
| [BCDR](/azure/cloud-adoption-framework/scenarios/oracle-iaas/oracle-disaster-recovery-oracle-landing-zone) | See redundancy capabilities of Lightbits in redundancy requirements. |
45-
| Redundancy & Scale Targets | Encryption at rest is supported. |
45+
| Redundancy & Scale Targets | Built-in multi availability zone support via synchronous replication, and automatic cluster expansion based on storage usage. |
4646
| Encryption | Encryption at rest is supported. |
4747
## Tessel: Performance best practices for Oracle on Azure VMs 
4848

0 commit comments

Comments
 (0)