Skip to content

Commit 9e47bc9

Browse files
committed
2 parents 2518cae + 383750d commit 9e47bc9

27 files changed

+200
-214
lines changed

articles/ai-services/openai/concepts/models.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn about the different model capabilities that are available wit
55
ms.service: cognitive-services
66
ms.subservice: openai
77
ms.topic: conceptual
8-
ms.date: 07/12/2023
8+
ms.date: 07/20/2023
99
ms.custom: event-tier1-build-2022, references_regions, build-2023, build-2023-dataai
1010
manager: nitinme
1111
author: mrbullwinkle #ChrisHMSFT
@@ -65,11 +65,10 @@ Currently, we offer three families of Embeddings models for different functional
6565

6666
The DALL-E models, currently in preview, generate images from text prompts that the user provides.
6767

68-
6968
## Model summary table and region availability
7069

7170
> [!IMPORTANT]
72-
> South Central US is temporarily unavailable for creating new resources due to high demand.
71+
> South Central US and East US are temporarily unavailable for creating new resources and deployments due to high demand.
7372
7473
### GPT-4 models
7574

@@ -92,8 +91,8 @@ GPT-3.5 Turbo is used with the Chat Completion API. GPT-3.5 Turbo (0301) can als
9291
| Model ID | Base model Regions | Fine-Tuning Regions | Max Request (tokens) | Training Data (up to) |
9392
| --------- | --------------------- | ------------------- | -------------------- | ---------------------- |
9493
| `gpt-35-turbo`<sup>1</sup> (0301) | East US, France Central, South Central US, UK South, West Europe | N/A | 4,096 | Sep 2021 |
95-
| `gpt-35-turbo` (0613) | East US, France Central, UK South | N/A | 4,096 | Sep 2021 |
96-
| `gpt-35-turbo-16k` (0613) | East US, France Central, UK South | N/A | 16,384 | Sep 2021 |
94+
| `gpt-35-turbo` (0613) | East US, France Central, Japan East, North Central US, UK South | N/A | 4,096 | Sep 2021 |
95+
| `gpt-35-turbo-16k` (0613) | East US, France Central, Japan East, North Central US, UK South | N/A | 16,384 | Sep 2021 |
9796

9897
<sup>1</sup> Version `0301` of gpt-35-turbo will be retired on January 4, 2024. See [model updates](#model-updates) for model upgrade behavior.
9998

articles/ai-services/openai/how-to/quota.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: openai
1010
ms.topic: how-to
11-
ms.date: 07/18/2023
11+
ms.date: 07/20/2023
1212
ms.author: mbullwin
1313
---
1414

1515
# Manage Azure OpenAI Service quota
1616

1717
Quota provides the flexibility to actively manage the allocation of rate limits across the deployments within your subscription. This article walks through the process of managing your Azure OpenAI quota.
1818

19+
## Prerequisites
20+
21+
> [!IMPORTANT]
22+
> Quota requires the **Cognitive Services Usages Reader** role. This role provides the minimal access necessary to view quota usage across an Azure subscription. This role can be found in the Azure portal under **Subscriptions** > **Access control (IAM)** > **Add role assignment** > search for **Cognitive Services Usages Reader**.
23+
1924
## Introduction to quota
2025

2126
Azure OpenAI's quota feature enables assignment of rate limits to your deployments, up-to a global limit called your “quota.” Quota is assigned to your subscription on a per-region, per-model basis in units of **Tokens-per-Minute (TPM)**. When you onboard a subscription to Azure OpenAI, you'll receive default quota for most available models. Then, you'll assign TPM to each deployment as it is created, and the available quota for that model will be reduced by that amount. You can continue to create deployments and assign them TPM until you reach your quota limit. Once that happens, you can only create new deployments of that model by reducing the TPM assigned to other deployments of the same model (thus freeing TPM for use), or by requesting and being approved for a model quota increase in the desired region.

articles/api-management/cosmosdb-data-source-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: api-management
88
ms.custom: devx-track-azurecli
9-
ms.topic: reference
9+
ms.topic: article
1010
ms.date: 06/07/2023
1111
ms.author: danlep
1212
---

articles/api-management/http-data-source-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: api-management
55
author: dlepow
66

77
ms.service: api-management
8-
ms.topic: reference
8+
ms.topic: article
99
ms.date: 03/07/2023
1010
ms.author: danlep
1111
---

articles/api-management/publish-event-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: api-management
55
author: dlepow
66

77
ms.service: api-management
8-
ms.topic: reference
8+
ms.topic: article
99
ms.date: 05/24/2023
1010
ms.author: danlep
1111
---

articles/api-management/set-graphql-resolver-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: api-management
55
author: dlepow
66

77
ms.service: api-management
8-
ms.topic: reference
8+
ms.topic: article
99
ms.date: 03/07/2023
1010
ms.author: danlep
1111
---

articles/api-management/sql-data-source-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: api-management
55
author: dlepow
66

77
ms.service: api-management
8-
ms.topic: reference
8+
ms.topic: article
99
ms.date: 06/07/2023
1010
ms.author: danlep
1111
---

articles/azure-monitor/app/java-get-started-supplemental.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Application Insights with containers
33
description: This article shows you how to set-up Application Insights
44
ms.topic: conceptual
5-
ms.date: 07/10/2023
5+
ms.date: 07/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
@@ -28,16 +28,16 @@ For more information, see [Use Application Insights Java In-Process Agent in Azu
2828

2929
### Docker entry point
3030

31-
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.14.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
31+
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.15.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
3232

3333
```
34-
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.14.jar", "-jar", "<myapp.jar>"]
34+
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.15.jar", "-jar", "<myapp.jar>"]
3535
```
3636

37-
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.14.jar"` somewhere before `-jar`, for example:
37+
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.15.jar"` somewhere before `-jar`, for example:
3838

3939
```
40-
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.14.jar" -jar <myapp.jar>
40+
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.15.jar" -jar <myapp.jar>
4141
```
4242

4343

@@ -50,16 +50,16 @@ FROM ...
5050
5151
COPY target/*.jar app.jar
5252
53-
COPY agent/applicationinsights-agent-3.4.14.jar applicationinsights-agent-3.4.14.jar
53+
COPY agent/applicationinsights-agent-3.4.15.jar applicationinsights-agent-3.4.15.jar
5454
5555
COPY agent/applicationinsights.json applicationinsights.json
5656
5757
ENV APPLICATIONINSIGHTS_CONNECTION_STRING="CONNECTION-STRING"
5858
59-
ENTRYPOINT["java", "-javaagent:applicationinsights-agent-3.4.14.jar", "-jar", "app.jar"]
59+
ENTRYPOINT["java", "-javaagent:applicationinsights-agent-3.4.15.jar", "-jar", "app.jar"]
6060
```
6161

62-
In this example we have copied the `applicationinsights-agent-3.4.14.jar` and `applicationinsights.json` files from an `agent` folder (you can choose any folder of your machine). These two files have to be in the same folder in the Docker container.
62+
In this example we have copied the `applicationinsights-agent-3.4.15.jar` and `applicationinsights.json` files from an `agent` folder (you can choose any folder of your machine). These two files have to be in the same folder in the Docker container.
6363

6464
### Third-party container images
6565

@@ -81,18 +81,18 @@ The following sections show how to set the Application Insights Java agent path
8181
If you installed Tomcat via `apt-get` or `yum`, you should have a file `/etc/tomcat8/tomcat8.conf`. Add this line to the end of that file:
8282

8383
```
84-
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.14.jar"
84+
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.15.jar"
8585
```
8686

8787
#### Tomcat installed via download and unzip
8888

8989
If you installed Tomcat via download and unzip from [https://tomcat.apache.org](https://tomcat.apache.org), you should have a file `<tomcat>/bin/catalina.sh`. Create a new file in the same directory named `<tomcat>/bin/setenv.sh` with the following content:
9090

9191
```
92-
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.14.jar"
92+
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.15.jar"
9393
```
9494

95-
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to `CATALINA_OPTS`.
95+
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to `CATALINA_OPTS`.
9696

9797
### Tomcat 8 (Windows)
9898

@@ -101,35 +101,35 @@ If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-
101101
Locate the file `<tomcat>/bin/catalina.bat`. Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
102102

103103
```
104-
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.14.jar
104+
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.15.jar
105105
```
106106

107107
Quotes aren't necessary, but if you want to include them, the proper placement is:
108108

109109
```
110-
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.14.jar"
110+
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.15.jar"
111111
```
112112

113-
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to `CATALINA_OPTS`.
113+
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to `CATALINA_OPTS`.
114114

115115
#### Run Tomcat as a Windows service
116116

117-
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the `Java Options` under the `Java` tab.
117+
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to the `Java Options` under the `Java` tab.
118118

119119
### JBoss EAP 7
120120

121121
#### Standalone server
122122

123-
Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
123+
Add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
124124

125125
```java ...
126-
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.14.jar -Xms1303m -Xmx1303m ..."
126+
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.15.jar -Xms1303m -Xmx1303m ..."
127127
...
128128
```
129129

130130
#### Domain server
131131

132-
Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
132+
Add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
133133

134134
```xml
135135
...
@@ -139,7 +139,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `j
139139
<jvm-options>
140140
<option value="-server"/>
141141
<!--Add Java agent jar file here-->
142-
<option value="-javaagent:path/to/applicationinsights-agent-3.4.14.jar"/>
142+
<option value="-javaagent:path/to/applicationinsights-agent-3.4.15.jar"/>
143143
<option value="-XX:MetaspaceSize=96m"/>
144144
<option value="-XX:MaxMetaspaceSize=256m"/>
145145
</jvm-options>
@@ -178,19 +178,19 @@ Add these lines to `start.ini`:
178178

179179
```
180180
--exec
181-
-javaagent:path/to/applicationinsights-agent-3.4.14.jar
181+
-javaagent:path/to/applicationinsights-agent-3.4.15.jar
182182
```
183183

184184
### Payara 5
185185

186-
Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
186+
Add `-javaagent:path/to/applicationinsights-agent-3.4.15.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
187187

188188
```xml
189189
...
190190
<java-config ...>
191191
<!--Edit the JVM options here-->
192192
<jvm-options>
193-
-javaagent:path/to/applicationinsights-agent-3.4.14.jar>
193+
-javaagent:path/to/applicationinsights-agent-3.4.15.jar>
194194
</jvm-options>
195195
...
196196
</java-config>
@@ -209,7 +209,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `j
209209
1. In `Generic JVM arguments`, add the following JVM argument:
210210
211211
```
212-
-javaagent:path/to/applicationinsights-agent-3.4.14.jar
212+
-javaagent:path/to/applicationinsights-agent-3.4.15.jar
213213
```
214214
215215
1. Save and restart the application server.
@@ -219,7 +219,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.14.jar` to the existing `j
219219
Create a new file `jvm.options` in the server directory (for example, `<openliberty>/usr/servers/defaultServer`), and add this line:
220220
221221
```
222-
-javaagent:path/to/applicationinsights-agent-3.4.14.jar
222+
-javaagent:path/to/applicationinsights-agent-3.4.15.jar
223223
```
224224
225225
### Others

articles/azure-monitor/app/java-spring-boot.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Monitor Application Insights for Spring Boot
33
description: How to configure Azure Monitor Application Insights for Spring Boot applications
44
ms.topic: conceptual
5-
ms.date: 06/19/2023
5+
ms.date: 07/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
---
@@ -13,24 +13,24 @@ There are two options for enabling Application Insights Java with Spring Boot: J
1313

1414
## Enabling with JVM argument
1515

16-
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.14.jar"` somewhere before `-jar`, for example:
16+
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.15.jar"` somewhere before `-jar`, for example:
1717

1818
```
19-
java -javaagent:"path/to/applicationinsights-agent-3.4.14.jar" -jar <myapp.jar>
19+
java -javaagent:"path/to/applicationinsights-agent-3.4.15.jar" -jar <myapp.jar>
2020
```
2121

2222
### Spring Boot via Docker entry point
2323

24-
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.14.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
24+
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.15.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
2525

2626
```
27-
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.14.jar", "-jar", "<myapp.jar>"]
27+
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.15.jar", "-jar", "<myapp.jar>"]
2828
```
2929

30-
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.14.jar"` somewhere before `-jar`, for example:
30+
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.15.jar"` somewhere before `-jar`, for example:
3131

3232
```
33-
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.14.jar" -jar <myapp.jar>
33+
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.15.jar" -jar <myapp.jar>
3434
```
3535

3636
### Configuration
@@ -45,7 +45,7 @@ To enable Application Insights Java programmatically, you must add the following
4545
<dependency>
4646
<groupId>com.microsoft.azure</groupId>
4747
<artifactId>applicationinsights-runtime-attach</artifactId>
48-
<version>3.4.14</version>
48+
<version>3.4.15</version>
4949
</dependency>
5050
```
5151

articles/azure-monitor/app/java-standalone-config.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configuration options - Azure Monitor Application Insights for Java
33
description: This article shows you how to configure Azure Monitor Application Insights for Java.
44
ms.topic: conceptual
5-
ms.date: 07/10/2023
5+
ms.date: 07/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
@@ -31,14 +31,14 @@ More information and configuration options are provided in the following section
3131

3232
## Configuration file path
3333

34-
By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.4.14.jar`.
34+
By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.4.15.jar`.
3535

3636
You can specify your own configuration file path by using one of these two options:
3737

3838
* `APPLICATIONINSIGHTS_CONFIGURATION_FILE` environment variable
3939
* `applicationinsights.configuration.file` Java system property
4040

41-
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.14.jar` is located.
41+
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.15.jar` is located.
4242

4343
Alternatively, instead of using a configuration file, you can specify the entire _content_ of the JSON configuration via the environment variable `APPLICATIONINSIGHTS_CONFIGURATION_CONTENT`.
4444

@@ -61,7 +61,7 @@ Or you can set the connection string by using the Java system property `applicat
6161

6262
You can also set the connection string by specifying a file to load the connection string from.
6363

64-
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.14.jar` is located.
64+
If you specify a relative path, it's resolved relative to the directory where `applicationinsights-agent-3.4.15.jar` is located.
6565

6666
```json
6767
{
@@ -328,7 +328,7 @@ and add `applicationinsights-core` to your application:
328328
<dependency>
329329
<groupId>com.microsoft.azure</groupId>
330330
<artifactId>applicationinsights-core</artifactId>
331-
<version>3.4.14</version>
331+
<version>3.4.15</version>
332332
</dependency>
333333
```
334334

@@ -851,7 +851,7 @@ In the preceding configuration example:
851851

852852
* `level` can be one of `OFF`, `ERROR`, `WARN`, `INFO`, `DEBUG`, or `TRACE`.
853853
* `path` can be an absolute or relative path. Relative paths are resolved against the directory where
854-
`applicationinsights-agent-3.4.14.jar` is located.
854+
`applicationinsights-agent-3.4.15.jar` is located.
855855

856856
Starting from version 3.0.2, you can also set the self-diagnostics `level` by using the environment variable
857857
`APPLICATIONINSIGHTS_SELF_DIAGNOSTICS_LEVEL`. It then takes precedence over the self-diagnostics level specified in the JSON configuration.

0 commit comments

Comments
 (0)