Skip to content

Commit a5a0877

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into appgw-freshness
2 parents 4d4d116 + d286686 commit a5a0877

30 files changed

+154
-278
lines changed

.openpublishing.redirection.education.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
55
"redirect_url": "/articles/education-hub/about-education-hub.md",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/education-hub/it-admin-allocate-credit.md",
10+
"redirect_url": "/articles/education-hub/about-education-hub.md",
11+
"redirect_document_id": false
712
}
813
]
914
}

articles/azure-functions/functions-add-output-binding-storage-queue-vs-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ You've updated your HTTP triggered function to write data to a Storage queue. No
296296
* [Azure Functions Python developer guide](functions-reference-python.md)
297297
::: zone-end
298298
::: zone pivot="programming-language-powershell"
299-
* [Examples of complete Function projects in PowerShell](/samples/browse/?products=azure-functions&languages=azurepowershell).
299+
* [Examples of complete Function projects in PowerShell](/samples/browse/?products=azure-functions&languages=powershell).
300300

301301
* [Azure Functions PowerShell developer guide](functions-reference-powershell.md)
302302
::: zone-end

articles/azure-monitor/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ Visualizations such as charts and tables are effective tools for summarizing mon
177177
|[Power BI](logs/log-powerbi.md)|Power BI is a business analytics service that provides interactive visualizations across various data sources. It's an effective means of making data available to others within and outside your organization. You can configure Power BI to automatically import log data from Azure Monitor to take advantage of these visualizations. |
178178
|[Grafana](visualize/grafana-plugin.md)|Grafana is an open platform that excels in operational dashboards. All versions of Grafana include the Azure Monitor data source plug-in to visualize your Azure Monitor metrics and logs. Azure Managed Grafana also optimizes this experience for Azure-native data stores such as Azure Monitor and Azure Data Explorer. In this way, you can easily connect to any resource in your subscription and view all resulting monitoring data in a familiar Grafana dashboard. It also supports pinning charts from Azure Monitor metrics and logs to Grafana dashboards. <br/><br/> Grafana has popular plug-ins and dashboard templates for non-Microsoft APM tools such as Dynatrace, New Relic, and AppDynamics as well. You can use these resources to visualize Azure platform data alongside other metrics from higher in the stack collected by these other tools. It also has AWS CloudWatch and GCP BigQuery plug-ins for multicloud monitoring in a single pane of glass.|
179179

180+
For a more extensive discussion of the recommended visualization tools and when to use them, see [Analyze and visualize monitoring data](best-practices-analysis.md)
181+
180182
### Analyze
181183

182184
The Azure portal contains built-in tools that allow you to analyze monitoring data.

articles/education-hub/it-admin-allocate-credit.md

Lines changed: 0 additions & 69 deletions
This file was deleted.

articles/education-hub/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
href: get-started-education-hub.md
2929
- name: Set up a lab
3030
href: set-up-lab.md
31-
- name: Allocate credit to an educator
32-
href: it-admin-allocate-credit.md
3331
- name: Azure Dev Tools for Teaching
3432
items:
3533
- name: Enroll or renew a subscription

articles/healthcare-apis/fhir/convert-data-configuration.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: jasteppe
1313

1414
[!INCLUDE [Converter redirect statement](../includes/converter-redirect-statement.md)]
1515

16-
In this article, learn how to configure settings for `$convert-data` using the Azure portal to convert health data into [FHIR&reg; R4](https://www.hl7.org/fhir/R4/index.html).
16+
This article illustrates how to configure settings for `$convert-data` using the Azure portal to convert health data into [FHIR&reg; R4](https://www.hl7.org/fhir/R4/index.html).
1717

1818
## Default templates
1919

@@ -30,7 +30,7 @@ To access and use the default templates for your conversion requests, ensure tha
3030
> [!WARNING]
3131
> Default templates are released under the MIT License and are *not* supported by Microsoft Support.
3232
>
33-
> The default templates are provided only to help you get started with your data conversion workflow. These default templates are not intended for production and might change when Microsoft releases updates for the FHIR service. To have consistent data conversion behavior across different versions of the FHIR service, you must do the following:
33+
> The default templates are provided to help you get started with your data conversion workflow. These default templates are _not_ intended for production and might change when Microsoft releases updates for the FHIR service. To have consistent data conversion behavior across different versions of the FHIR service, you must do the following.
3434
>
3535
> 1. Host your own copy of the templates in an [Azure Container Registry (ACR)](../../container-registry/container-registry-intro.md) instance.
3636
> 2. Register the templates to the FHIR service.
@@ -46,7 +46,9 @@ You can use the [FHIR Converter Visual Studio Code extension](https://marketplac
4646
> [!NOTE]
4747
> The FHIR Converter extension for Visual Studio Code is available for HL7v2, C-CDA, and JSON Liquid templates. FHIR STU3 to FHIR R4 Liquid templates are currently not supported.
4848
49-
The provided default templates can be used as a base starting point if needed, on top of which your customizations can be added. When making updates to the templates, consider following these guidelines to avoid unintended conversion results. The template should be authored in a way such that it yields a valid structure for a FHIR bundle resource.
49+
The provided default templates can be used as a starting point if needed, on top of which your customizations can be added. When making updates to the templates, consider following these guidelines to avoid unintended conversion results.
50+
51+
The template should be authored in a way such that it yields a valid structure for a FHIR bundle resource.
5052

5153
For instance, the Liquid templates should have a format such as the following code:
5254

@@ -71,7 +73,7 @@ For instance, the Liquid templates should have a format such as the following co
7173
}
7274
```
7375

74-
The overall template follows the structure and expectations for a FHIR bundle resource, with the FHIR bundle JSON being at the root of the file. If you choose to add custom fields to the template that aren’t part of the FHIR specification for a bundle resource, the conversion request could still succeed. However, the converted result could potentially have unexpected output and wouldn't yield a valid FHIR bundle resource that can be persisted in the FHIR service as is.
76+
The overall template follows the structure and expectations for a FHIR bundle resource, with the FHIR bundle JSON being at the root of the file. If you choose to add custom fields to the template that aren’t part of the FHIR specification for a bundle resource, the conversion request could. However, the converted result could potentially have unexpected output, and wouldn't yield a valid FHIR bundle resource that can be persisted in the FHIR service as is.
7577

7678
For example, consider the following code:
7779

@@ -99,13 +101,13 @@ For example, consider the following code:
99101
}
100102
```
101103

102-
In the example code, two example custom fields `customfield_message` and `customfield_data` that aren't FHIR properties per the specification and the FHIR bundle resource seem to be nested under `customfield_data` (that is, the FHIR bundle JSON isn't at the root of the file). This template doesn’t align with the expected structure around a FHIR bundle resource. As a result, the conversion request might succeed using the provided template. However, the returned converted result could potentially have unexpected output (due to certain post conversion processing steps being skipped). It wouldn't be considered a valid FHIR bundle (since it's nested and has non FHIR specification properties) and attempting to persist the result in your FHIR service fails.
104+
In the example code, two example custom fields `customfield_message` and `customfield_data` aren't FHIR properties per the specification, and the FHIR bundle resource seem to be nested under `customfield_data` (that is, the FHIR bundle JSON isn't at the root of the file). This template doesn’t align with the expected structure around a FHIR bundle resource. The conversion request might succeed using the provided template. However, the returned converted result could potentially have unexpected output (due to certain post conversion processing steps being skipped). It wouldn't be considered a valid FHIR bundle (since it's nested and has non FHIR specification properties) and attempting to persist the result in your FHIR service fails.
103105

104106
## Host your own templates
105107

106108
We recommend that you host your own copy of templates in an [Azure Container Registry (ACR)](../../container-registry/container-registry-intro.md) instance. ACR can be used to host your custom templates and support with versioning.
107109

108-
Hosting your own templates and using them for `$convert-data` operations involves the following seven steps:
110+
Hosting your own templates and using them for `$convert-data` operations involves the following seven steps.
109111

110112
1. [Create an Azure Container Registry instance](#step-1-create-an-azure-container-registry-instance)
111113
2. [Push the templates to your Azure Container Registry instance](#step-2-push-the-templates-to-your-azure-container-registry-instance)
@@ -147,7 +149,7 @@ To reference specific template versions in the API, be sure to use the exact ima
147149

148150
:::image type="content" source="~/reusable-content/ce-skilling/azure/media/role-based-access-control/add-role-assignment-page.png" alt-text="Screenshot showing the add role assignment pane." lightbox="~/reusable-content/ce-skilling/azure/media/role-based-access-control/add-role-assignment-page.png":::
149151

150-
4. On the **Members** tab, select **Managed identity**, and then select **Select members**.
152+
4. On the **Members** tab, select **Managed identity**, and then **Select members**.
151153

152154
5. Select your Azure subscription.
153155

@@ -191,7 +193,7 @@ There are many methods for securing ACR using the built-in firewall depending on
191193

192194
Make a call to the `$convert-data` operation by specifying your template reference in the `templateCollectionReference` parameter:
193195

194-
`<RegistryServer>/<imageName>@<imageDigest>`
196+
`<RegistryServer>/<imageName>@<imageDigest>`.
195197

196198
You should receive a `bundle` response that contains the health data converted into the FHIR format.
197199

articles/healthcare-apis/fhir/convert-data-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For more information, see [Access the FHIR service in Azure Health Data Services
4444

4545
## What's the difference between the $convert-data endpoint in Azure API for FHIR versus the FHIR service in Azure Health Data Services?
4646

47-
The experience and core `$convert-data` operation functionality is similar for both Azure API for FHIR and the FHIR service in Azure Health Data Services(../../healthcare-apis/fhir/overview.md). The only difference exists in the setup for the Azure API for FHIR version of the `$convert-data` operation, which requires assigning permissions to the right resources.
47+
The experience and core `$convert-data` operation functionality is similar for both Azure API for FHIR and the FHIR service in [Azure Health Data Services](../../healthcare-apis/fhir/overview.md). The only difference exists in the setup for the Azure API for FHIR version of the `$convert-data` operation, which requires assigning permissions to the right resources.
4848

4949
Learn more:
5050

@@ -72,7 +72,7 @@ Yes. It’s possible to store and reference custom templates. For more informati
7272

7373
## Why are my dates being converted when transforming JSON data?
7474

75-
It's possible for dates supplied within JSON data to be returned in a different format than what was supplied. During deserialization of the JSON payload strings that are identified as dates get converted into .NET DateTime objects. These objects then get converted back to strings before going through the Liquid template engine. This conversion can cause the date value to be reformatted and represented in the local timezone of the FHIR service.
75+
It's possible for dates supplied within JSON data to be returned in a different format than what was supplied. During deserialization of the JSON payload, strings that are identified as dates get converted into .NET DateTime objects. These objects then get converted back to strings before going through the Liquid template engine. This conversion can cause the date value to be reformatted and represented in the local timezone of the FHIR service.
7676

7777
The coercion of strings to .NET DateTime objects can be disabled using the boolean parameter `jsonDeserializationTreatDatesAsStrings`. When set to `true`, the supplied data is treated as a string and won't be modified before being supplied to the Liquid engine.
7878

articles/healthcare-apis/fhir/convert-data-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The health data for conversion is delivered to the FHIR service in the body of t
3535

3636
## Parameters
3737

38-
A `$convert-data` operation call packages the health data for conversion inside a JSON-formatted [parameters](http://hl7.org/fhir/parameters.html) in the body of the request. The parameters are described in the following table:
38+
A `$convert-data` operation call packages the health data for conversion inside JSON-formatted [parameters](http://hl7.org/fhir/parameters.html) in the body of the request. The parameters are described in the following table.
3939

4040
| Parameter name | Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | Accepted values |
4141
| -------------- | ----------------------------------------------------------------------- | --------------- |
@@ -48,7 +48,7 @@ A `$convert-data` operation call packages the health data for conversion inside
4848

4949
- **FHIR STU3 to FHIR R4 templates are Liquid templates** that provide mappings of field differences only between a FHIR STU3 resource and its equivalent resource in the FHIR R4 specification. Some of the FHIR STU3 resources are renamed or removed from FHIR R4. For more information about the resource differences and constraints for FHIR STU3 to FHIR R4 conversion, see [Resource differences and constraints for FHIR STU3 to FHIR R4 conversion](https://github.com/microsoft/FHIR-Converter/blob/main/docs/Stu3R4-resources-differences.md).
5050

51-
- **JSON templates are sample templates for use in building your own conversion mappings.** They aren't default templates that adhere to any predefined health data message types. JSON itself isn't specified as a health data format, unlike HL7v2 or C-CDA. Therefore, instead of providing default JSON templates, we provide some sample JSON templates as a starting point for your own customized mappings.
51+
- **JSON templates are sample templates for use in building your own conversion mappings.** They aren't default templates that adhere to any predefined health data message types. JSON itself isn't specified as a health data format, unlike HL7v2 or C-CDA. As a result, instead of providing default JSON templates, we provide some sample JSON templates as a starting point for your own customized mappings.
5252

5353
> [!WARNING]
5454
> Default templates are released under the MIT License and aren't supported by Microsoft.

0 commit comments

Comments
 (0)