Skip to content

Commit 4f7e368

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-retire-emulator-articles
2 parents 9c3d2d7 + 9ad5bc6 commit 4f7e368

File tree

16 files changed

+1444
-69
lines changed

16 files changed

+1444
-69
lines changed

.openpublishing.publish.config.json

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,12 +974,90 @@
974974
"branch": "main",
975975
"branch_mapping": {}
976976
},
977+
{
978+
"path_to_root": "cosmos-db-nosql-javascript-samples",
979+
"url": "https://github.com/azure-samples/cosmos-db-nosql-javascript-samples",
980+
"branch": "main",
981+
"branch_mapping": {}
982+
},
977983
{
978984
"path_to_root": "cosmos-db-nosql-python-samples",
979985
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
980986
"branch": "main",
981987
"branch_mapping": {}
982988
},
989+
{
990+
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
991+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
992+
"branch": "main",
993+
"branch_mapping": {}
994+
},
995+
{
996+
"path_to_root": "cosmos-db-mongodb-javascript-samples",
997+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-javascript-samples",
998+
"branch": "main",
999+
"branch_mapping": {}
1000+
},
1001+
{
1002+
"path_to_root": "cosmos-db-mongodb-python-samples",
1003+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-python-samples",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
1007+
{
1008+
"path_to_root": "cosmos-db-apache-cassandra-dotnet-samples",
1009+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-dotnet-samples",
1010+
"branch": "main",
1011+
"branch_mapping": {}
1012+
},
1013+
{
1014+
"path_to_root": "cosmos-db-apache-cassandra-javascript-samples",
1015+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-javascript-samples",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-apache-cassandra-python-samples",
1021+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-python-samples",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-apache-gremlin-dotnet-samples",
1027+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-dotnet-samples",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
1031+
{
1032+
"path_to_root": "cosmos-db-apache-gremlin-javascript-samples",
1033+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-javascript-samples",
1034+
"branch": "main",
1035+
"branch_mapping": {}
1036+
},
1037+
{
1038+
"path_to_root": "cosmos-db-apache-gremlin-python-samples",
1039+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-python-samples",
1040+
"branch": "main",
1041+
"branch_mapping": {}
1042+
},
1043+
{
1044+
"path_to_root": "cosmos-db-table-dotnet-samples",
1045+
"url": "https://github.com/azure-samples/cosmos-db-table-dotnet-samples",
1046+
"branch": "main",
1047+
"branch_mapping": {}
1048+
},
1049+
{
1050+
"path_to_root": "cosmos-db-table-javascript-samples",
1051+
"url": "https://github.com/azure-samples/cosmos-db-table-javascript-samples",
1052+
"branch": "main",
1053+
"branch_mapping": {}
1054+
},
1055+
{
1056+
"path_to_root": "cosmos-db-table-python-samples",
1057+
"url": "https://github.com/azure-samples/cosmos-db-table-python-samples",
1058+
"branch": "main",
1059+
"branch_mapping": {}
1060+
},
9831061
{
9841062
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
9851063
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",

articles/ai-services/language-service/key-phrase-extraction/language-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: conceptual
11-
ms.date: 07/28/2022
11+
ms.date: 09/18/2023
1212
ms.author: jboback
1313
ms.custom: language-service-key-phrase, ignite-fall-2021, ignite-2022
1414
---
1515

1616
# Language support for Key Phrase Extraction
1717

18-
Use this article to find the natural languages supported by Key Phrase Analysis.
18+
Use this article to find the natural languages supported by Key Phrase Extraction. Both the cloud-based API and [Docker containers](./how-to/use-containers.md) support the same languages.
1919

2020
## Supported languages
2121

articles/ai-services/language-service/sentiment-opinion-mining/how-to/use-containers.md

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: how-to
11-
ms.date: 07/19/2023
11+
ms.date: 09/18/2023
1212
ms.author: aahi
1313
ms.custom: language-service-sentiment-opinion-mining, ignite-fall-2021
1414
keywords: on-premises, Docker, container, sentiment analysis, natural language processing
@@ -47,34 +47,14 @@ CPU core and memory correspond to the `--cpus` and `--memory` settings, which ar
4747

4848
The Sentiment Analysis container image can be found on the `mcr.microsoft.com` container registry syndicate. It resides within the `azure-cognitive-services/textanalytics/` repository and is named `sentiment`. The fully qualified container image name is, `mcr.microsoft.com/azure-cognitive-services/textanalytics/sentiment`
4949

50-
To use the latest version of the container, you can use the `latest` tag. You can also find a full list of [tags on the MCR](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/sentiment/tags).
50+
To use the latest version of the container, you can use the `latest` tag, which is for english. You can also find a full list of containers for supported languages using the [tags on the MCR](https://mcr.microsoft.com/product/azure-cognitive-services/textanalytics/sentiment/tags).
5151

5252
The sentiment analysis container v3 container is available in several languages. To download the container for the English container, use the command below.
5353

5454
```
5555
docker pull mcr.microsoft.com/azure-cognitive-services/textanalytics/sentiment:3.0-en
5656
```
5757

58-
To download the container for another language, replace `3.0-en` with one of the image tags below.
59-
60-
| Sentiment Analysis Container | Image tag |
61-
|--|--|
62-
| Chinese-Simplified | `3.0-zh-hans` |
63-
| Chinese-Traditional | `3.0-zh-hant` |
64-
| Dutch | `3.0-nl` |
65-
| English | `3.0-en` |
66-
| French | `3.0-fr` |
67-
| German | `3.0-de` |
68-
| Hindi | `3.0-hi` |
69-
| Italian | `3.0-it` |
70-
| Japanese | `3.0-ja` |
71-
| Korean | `3.0-ko` |
72-
| Norwegian (Bokmål) | `3.0-no` |
73-
| Portuguese (Brazil) | `3.0-pt-BR` |
74-
| Portuguese (Portugal) | `3.0-pt-PT` |
75-
| Spanish | `3.0-es` |
76-
| Turkish | `3.0-tr` |
77-
7858
[!INCLUDE [Tip for using docker list](../../../../../includes/cognitive-services-containers-docker-list-tip.md)]
7959

8060
## Run the container with `docker run`

articles/ai-services/language-service/sentiment-opinion-mining/language-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-service
1010
ms.topic: conceptual
11-
ms.date: 07/19/2023
11+
ms.date: 09/18/2023
1212
ms.author: aahi
1313
ms.custom: language-service-sentiment-opinion-mining, ignite-fall-2021, ignite-2022
1414
---
1515

1616
# Sentiment Analysis and Opinion Mining language support
1717

18-
Use this article to learn which languages are supported by Sentiment Analysis and Opinion Mining.
18+
Use this article to learn which languages are supported by Sentiment Analysis and Opinion Mining. Both the cloud-based API and [Docker containers](./how-to/use-containers.md) support the same languages.
1919

2020
> [!NOTE]
2121
> Languages are added as new [model versions](../concepts/model-lifecycle.md) are released.

articles/azure-monitor/app/opentelemetry-add-modify.md

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Dependencies
152152
- [Redis-4](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis-4)
153153
- [Azure SDK](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/instrumentation/opentelemetry-instrumentation-azure-sdk)
154154

155-
Auto instrumentation of Logs are currently only supported when using `applicationinsights` v3 Beta package. (https://www.npmjs.com/package/applicationinsights/v/beta)
155+
Auto instrumentation of Logs is currently only supported when using `applicationinsights` v3 Beta package. (https://www.npmjs.com/package/applicationinsights/v/beta)
156156
Logs
157157
- [Node.js console](https://nodejs.org/api/console.html)
158158
- [Bunyan](https://github.com/trentm/node-bunyan#readme)
@@ -324,6 +324,7 @@ The following table represents the currently supported custom telemetry types:
324324
| **Python** | | | | | | | |
325325
|    OpenTelemetry API | | Yes | Yes | Yes | | Yes | |
326326
|    Python Logging Module | | | | | | | Yes |
327+
|    Events Extension | Yes | | | | | | Yes |
327328

328329
> [!NOTE]
329330
> Application Insights Java 3.x listens for telemetry that's sent to the Application Insights [Classic API](api-custom-events-metrics.md). Similarly, Application Insights Node.js 3.x collects events created with the Application Insights [Classic API](api-custom-events-metrics.md). This makes upgrading easier and fills a gap in our custom telemetry support until all custom telemetry types are supported via the OpenTelemetry API.
@@ -1327,7 +1328,7 @@ Not available in .NET.
13271328
#### [Node.js](#tab/nodejs)
13281329

13291330

1330-
You need to use `applicationinsights` v3 Beta package to achieve this. (https://www.npmjs.com/package/applicationinsights/v/beta)
1331+
You need to use `applicationinsights` v3 Beta package to send custom telemetry using the Application Insights Classic API. (https://www.npmjs.com/package/applicationinsights/v/beta)
13311332

13321333
```javascript
13331334
const { TelemetryClient } = require("applicationinsights");
@@ -1372,7 +1373,31 @@ Then use the `TelemetryClient` to send custom telemetry:
13721373

13731374
#### [Python](#tab/python)
13741375

1375-
It isn't available in Python.
1376+
Unlike other languages, Python doesn't have an Application Insights SDK. You can meet all your monitoring needs with the Azure Monitor OpenTelemetry Distro, except for sending `customEvents`. Until the OpenTelemetry Events API stabilizes, use the [Azure Monitor Events Extension](https://pypi.org/project/azure-monitor-events-extension/0.1.0/) with the Azure Monitor OpenTelemetry Distro to send `customEvents` to Application Insights.
1377+
1378+
Install the distro and the extension:
1379+
1380+
```console
1381+
pip install azure-monitor-opentelemetry
1382+
pip install azure-monitor-events-extension
1383+
```
1384+
1385+
Use the `track_event` API offered in the extension to send customEvents.
1386+
1387+
```python
1388+
...
1389+
from azure.monitor.events.extension import track_event
1390+
from azure.monitor.opentelemetry import configure_azure_monitor
1391+
1392+
configure_azure_monitor()
1393+
1394+
# Use the track_event() api to send custom event telemetry
1395+
# Takes event name and custom dimensions
1396+
track_event("Test event", {"key1": "value1", "key2": "value2"})
1397+
1398+
input()
1399+
...
1400+
```
13761401

13771402
---
13781403

@@ -2063,7 +2088,7 @@ Get the request trace ID and the span ID in your code:
20632088

20642089
- To further configure the OpenTelemetry distro, see [Azure Monitor OpenTelemetry configuration](opentelemetry-configuration.md)
20652090
- To review the source code, see the [Azure Monitor AspNetCore GitHub repository](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore).
2066-
- To install the NuGet package, check for updates, or view release notes, see the [Azure Monitor AspNetCore NuGet Package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore) page.
2091+
- To install the Nuget package, check for updates, or view release notes, see the [Azure Monitor AspNetCore Nuget Package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.AspNetCore) page.
20672092
- To become more familiar with Azure Monitor and OpenTelemetry, see the [Azure Monitor Example Application](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Demo).
20682093
- To learn more about OpenTelemetry and its community, see the [OpenTelemetry .NET GitHub repository](https://github.com/open-telemetry/opentelemetry-dotnet).
20692094
- To enable usage experiences, [enable web or browser user monitoring](javascript.md).
@@ -2072,7 +2097,7 @@ Get the request trace ID and the span ID in your code:
20722097

20732098
- To further configure the OpenTelemetry distro, see [Azure Monitor OpenTelemetry configuration](opentelemetry-configuration.md)
20742099
- To review the source code, see the [Azure Monitor Exporter GitHub repository](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter).
2075-
- To install the NuGet package, check for updates, or view release notes, see the [Azure Monitor Exporter NuGet Package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter) page.
2100+
- To install the Nuget package, check for updates, or view release notes, see the [Azure Monitor Exporter Nuget Package](https://www.nuget.org/packages/Azure.Monitor.OpenTelemetry.Exporter) page.
20762101
- To become more familiar with Azure Monitor and OpenTelemetry, see the [Azure Monitor Example Application](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Demo).
20772102
- To learn more about OpenTelemetry and its community, see the [OpenTelemetry .NET GitHub repository](https://github.com/open-telemetry/opentelemetry-dotnet).
20782103
- To enable usage experiences, [enable web or browser user monitoring](javascript.md).

articles/cosmos-db/cassandra/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@
293293
href: migrate-data-striim.md
294294
- name: Migrate - Oracle DB to API for Apache Cassandra using Arcion
295295
href: oracle-migrate-cosmos-db-arcion.md
296+
- name: Develop with the emulator
297+
href: ../how-to-develop-emulator.md?pivots=api-apache-cassandra
296298
- name: Use developer tools
297299
items:
298300
- name: Set up CI/CD with Azure Pipelines

articles/cosmos-db/emulator.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,7 @@ Every request made against the emulator must be authenticated using a key over T
5151
5252
## Import emulator certificate
5353

54-
In some cases, you may wish to manually import the TLS/SS certificate from the emulator's running container into your host machine. This step avoids bad practices like disabling TLS/SSL validation in the SDK.
55-
56-
### [Docker (container)](#tab/docker)
57-
58-
The certificate for the emulator is available in the `_explorer/emulator.pem` path on the running container. Use `curl` to download the certificate from the running container to your local machine.
59-
60-
```bash
61-
curl -k https://localhost:8081/_explorer/emulator.pem > ~/emulatorcert.crt
62-
```
63-
64-
> [!NOTE]
65-
> You may need to change the host (or IP address) and port number if you have previously modified those values.
66-
67-
Install the certificate according to the process typically used for your operating system. For example, in Linux you would copy the certificate to the `/usr/local/share/ca-certificats/` path.
68-
69-
```bash
70-
cp ~/emulatorcert.crt /usr/local/share/ca-certificates/
71-
```
72-
73-
### [Windows (local)](#tab/windows)
74-
75-
The Windows local installation of the emulator automatically imports the TLS/SSL certificates. No further action is necessary.
76-
77-
---
54+
In some cases, you may wish to manually import the TLS/SS certificate from the emulator's running container into your host machine. This step avoids bad practices like disabling TLS/SSL validation in the SDK. For more information, see [import certificate](how-to-develop-emulator.md#export-the-emulators-tlsssl-certificate).
7855

7956
## Next step
8057

articles/cosmos-db/gremlin/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@
256256
href: headers.md
257257
- name: Limits
258258
href: limits.md
259+
- name: Develop with the emulator
260+
href: ../how-to-develop-emulator.md?pivots=api-apache-gremlin
259261
- name: Use developer tools
260262
items:
261263
- name: Set up CI/CD with Azure Pipelines

0 commit comments

Comments
 (0)