Skip to content

Commit 0e7010b

Browse files
Merge branch 'MicrosoftDocs:main' into main
2 parents 54c1f72 + 92a3664 commit 0e7010b

20 files changed

+45
-48
lines changed

articles/energy-data-services/how-to-deploy-gcz.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ This guide shows you how to deploy the Geospatial Consumption Zone (GCZ) service
2121
To deploy the GCZ, you need to create an App Registration in Microsoft Entra ID. The App Registration is used to authenticate the GCZ APIs with Azure Data Manager for Energy to be able to generate the cache of the geospatial data.
2222

2323
1. See [Create an App Registration in Microsoft Entra ID](/azure/active-directory/develop/quickstart-register-app) for instructions on how to create an App Registration.
24+
2425
1. Grant the App Registration permission to read the relevant data in Azure Data Manager for Energy. See [How to add members to an OSDU group](./how-to-manage-users.md#add-members-to-an-osdu-group-in-a-data-partition) for further instructions.
2526

2627
## Setup
@@ -63,6 +64,7 @@ Through APIM we can add policies to secure, monitor, and manage the APIs.
6364
1. Download the two OpenAPI specification to your local computer.
6465
- [GCZ Provider](https://github.com/microsoft/adme-samples/blob/main/services/gcz/gcz-openapi-provider.yaml)
6566
- [GCZ Transformer](https://github.com/microsoft/adme-samples/blob/main/services/gcz/gcz-openapi-transformer.yaml)
67+
6668
1. Open each OpenAPI specification file in a text editor and replace the `servers` section with the corresponding IPs of the AKS GCZ Services' Load Balancer.
6769

6870
```yaml
@@ -82,8 +84,8 @@ Through APIM we can add policies to secure, monitor, and manage the APIs.
8284
8385
## Testing the GCZ service
8486
85-
1. Download the API client collection from the [OSDU GitLab](https://community.opengroup.org/osdu/platform/consumption/geospatial/-/blob/master/docs/test-assets/postman/Geospatial%20Consumption%20Zone%20-%20Provider%20Postman%20Tests.postman_collection.json?ref_type=heads) and import it into your API client of choice (that is, Bruno, Postman).
86-
1.
87+
1. Download the API client collection from the [OSDU GitLab](https://community.opengroup.org/osdu/platform/consumption/geospatial/-/blob/master/docs/test-assets/postman/Geospatial%20Consumption%20Zone%20-%20Provider%20Postman%20Tests.postman_collection.json?ref_type=heads) and import it into your API client of choice (i.e. Bruno, Postman).
88+
8789
1. Add the following environment variables to your API client:
8890
8991
- `PROVIDER_URL` - The URL to the GCZ Provider API.

articles/energy-data-services/includes/how-to/how-to-deploy-gcz/deploy-gcz-on-aks.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
115115
type: LoadBalancer
116116
configuration:
117117
privateNetwork: "$PRIVATE_NETWORK"
118-
configLoaderJs: "../../../../gcz-provider/gcz-provider-core/config/configLoader.js"
119118
transformer:
120119
namespace: $NAMESPACE
121120
image:
@@ -174,7 +173,6 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
174173
type: LoadBalancer
175174
configuration:
176175
privateNetwork: "$PRIVATE_NETWORK"
177-
configLoaderJs: "../../../../gcz-provider/gcz-provider-core/config/configLoader.js"
178176
transformer:
179177
namespace: $NAMESPACE
180178
image:
@@ -318,7 +316,7 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
318316
1. Deploy the GCZ HELM chart:
319317
320318
```bash
321-
helm upgrade -i $CHART . -n $NAMESPACE -f osdu_gcz_custom_values.yaml
319+
helm upgrade -i $CHART . -n $NAMESPACE -f osdu_gcz_custom_values.yaml --set-file global.provider.configLoaderJs="gcz-provider/gcz-provider-core/config/configLoader.js"
322320
```
323321
324322
1. Verify the deployment:

articles/migrate/vmware/agent-based-migration-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: vijain
66
ms.manager: kmadnani
77
ms.service: azure-migrate
88
ms.topic: conceptual
9-
ms.date: 12/12/2022
9+
ms.date: 09/26/2024
1010
ms.custom: vmware-scenario-422, engagement-fy23
1111
---
1212

articles/migrate/vmware/concepts-vmware-agentless-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: piyushdhore
66
ms.manager: vijain
77
ms.topic: conceptual
88
ms.service: azure-migrate
9-
ms.date: 10/18/2023
9+
ms.date: 11/26/2024
1010
ms.custom: vmware-scenario-422, engagement-fy24
1111
---
1212
# Agentless migration architecture

articles/migrate/vmware/how-to-automate-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: vijain
66
ms.manager: kmadnani
77
ms.service: azure-migrate
88
ms.topic: how-to
9-
ms.date: 05/11/2023
9+
ms.date: 08/20/2024
1010
ms.custom: vmware-scenario-422, engagement-fy23
1111
---
1212

articles/migrate/vmware/how-to-migrate-vmware-vms-with-cmk-disks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: Learn how to migrate VMware VMs to Azure with server-side encryptio
44
author: v-sreedevank
55
ms.author: v-sreedevank
66
ms.topic: how-to
7-
ms.date: 05/31/2023
8-
ms.custom: vmware-scenario-422, devx-track-azurepowershell, engagement-fy23
7+
ms.date: 10/20/2024
8+
ms.custom: vmware-scenario-422, devx-track-azurepowershell, engagement-fy25
99

1010
---
1111

articles/migrate/vmware/how-to-set-up-appliance-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: vibansa
66
ms.manager: abhemraj
77
ms.topic: how-to
88
ms.service: azure-migrate
9-
ms.date: 06/20/2024
9+
ms.date: 09/26/2024
1010
ms.custom: vmware-scenario-422, engagement-fy23
1111
---
1212

articles/migrate/vmware/migrate-support-matrix-vmware-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ms.author: piyushdhore
66
ms.manager: vijain
77
ms.topic: conceptual
88
ms.service: azure-migrate
9-
ms.date: 06/11/2024
10-
ms.custom: vmware-scenario-422, engagement-fy23
9+
ms.date: 10/16/2024
10+
ms.custom: vmware-scenario-422, engagement-fy25
1111
---
1212

1313
# Support matrix for VMware vSphere migration

articles/migrate/vmware/migrate-support-matrix-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: vibansa
66
ms.manager: abhemraj
77
ms.topic: conceptual
88
ms.service: azure-migrate
9-
ms.date: 11/04/2024
9+
ms.date: 11/06/2024
1010
ms.custom: vmware-scenario-422, engagement-fy24
1111
---
1212

articles/migrate/vmware/prepare-for-agentless-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: vijain
55
ms.author: vijain
66
ms.topic: conceptual
77
ms.service: azure-migrate
8-
ms.date: 06/19/2024
8+
ms.date: 10/25/2024
99
ms.custom: vmware-scenario-422, engagement-fy23, linux-related-content
1010
---
1111

0 commit comments

Comments
 (0)