Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-device-settings-fix

Author: PatAltimore

.openpublishing.redirection.json

@@ -22547,6 +22547,11 @@
             "source_path_from_root": "/articles/principles-for-ai-generated-content.md",
             "redirect_url": "https://aka.ms/ai-content-principles",
             "redirect_document_id": false
-        } 
+        },
+        {
+          "source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
+          "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
+          "redirect_document_id": true
+        }
     ]
 }

articles/automation/automation-hybrid-runbook-worker.md

@@ -3,7 +3,7 @@ title: Azure Automation Hybrid Runbook Worker overview
 description: Know about Hybrid Runbook Worker. How to install and run the  runbooks on machines in your local datacenter or cloud provider.
 services: automation
 ms.subservice: process-automation
-ms.date: 03/21/2023
+ms.date: 04/20/2023
 ms.topic: conceptual 
 ---
 
@@ -68,7 +68,11 @@ For machines hosting the system Hybrid Runbook worker managed by Update Manageme
 
 :::image type="content" source="./media/automation-hybrid-runbook-worker/system-hybrid-runbook-worker.png" alt-text="System Hybrid Runbook Worker technical diagram":::
 
-When you start a runbook on a user Hybrid Runbook Worker, you specify the group that it runs on. Each worker in the group polls Azure Automation to see if any jobs are available. If a job is available, the first worker to get the job takes it. The processing time of the jobs queue depends on the hybrid worker hardware profile and load. You can't specify a particular worker. Hybrid worker works on a polling mechanism (every 30 secs) and follows an order of first-come, first-serve. Depending on when a job was pushed, whichever hybrid worker pings the Automation service picks up the job. A single hybrid worker can generally pick up four jobs per ping (that is, every 30 seconds). If your rate of pushing jobs is higher than four per 30 seconds, then there's a high possibility another hybrid worker in the Hybrid Runbook Worker group picked up the job.
+A Hybrid Worker group with Hybrid Runbook Workers is designed for high availability and load balancing by allocating jobs across multiple Workers. For a successful execution of runbooks, Hybrid Workers must be healthy and give a heartbeat. The Hybrid worker works on a polling mechanism to pick up jobs. If none of the Workers within the Hybrid Worker group has pinged Automation service in the last 30 minutes, it implies that the group did not have any active Workers. In this scenario, jobs will get suspended after three retry attempts. 
+
+When you start a runbook on a user Hybrid Runbook Worker, you specify the group it runs on and can't specify a particular worker. Each active Hybrid Worker in the group will poll for jobs every 30 seconds to see if any jobs are available. The worker picks jobs on a first-come, first-serve basis. Depending on when a job was pushed, whichever Hybrid worker within the Hybrid Worker Group pings the Automation service first picks up the job. The processing time of the jobs queue also depends on the Hybrid worker hardware profile and load. 
+
+­­A single hybrid worker can generally pick up 4 jobs per ping (that is, every 30 seconds). If your rate of pushing jobs is higher than 4 per 30 seconds and no other Worker picks up the job, the job might get suspended with an error. 
 
 A Hybrid Runbook Worker doesn't have many of the [Azure sandbox](automation-runbook-execution.md#runbook-execution-environment) resource [limits](../azure-resource-manager/management/azure-subscription-service-limits.md#automation-limits) on disk space, memory, or network sockets. The limits on a hybrid worker are only related to the worker's own resources, and they aren't constrained by the [fair share](automation-runbook-execution.md#fair-share) time limit that Azure sandboxes have.
 

articles/azure-monitor/app/java-standalone-arguments.md renamed to articles/azure-monitor/app/java-get-started-supplemental.md

@@ -1,14 +1,16 @@
 ---
-title: Add the JVM arg - Application Insights for Java
-description: Learn how to add the JVM arg that enables Application Insights for Java.
+title: Application Insights with containers
+description: This article shows you how to set-up Application Insights
 ms.topic: conceptual
-ms.date: 03/31/2023
+ms.date: 04/06/2023
 ms.devlang: java
 ms.custom: devx-track-java
 ms.reviewer: mmcc
 ---
 
-# Update your JVM args: Application Insights for Java
+# Get Started (Supplemental)
+
+In the following sections, you will find information on how to get Java auto-instrumentation for specific technical environments.
 
 ## Azure App Service
 
@@ -18,26 +20,63 @@ For more information, see [Application monitoring for Azure App Service and Java
 
 For more information, see [Monitoring Azure Functions with Azure Monitor Application Insights](./monitor-functions.md#distributed-tracing-for-java-applications-preview).
 
-## Spring Boot
+## Containers
 
-For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
+### Docker entry point
+
+If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
+
+```
+ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.11.jar", "-jar", "<myapp.jar>"]
+```
+
+If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` somewhere before `-jar`, for example:
+
+```
+ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.11.jar" -jar <myapp.jar>
+```
+
+
+### Docker file
+
+A Dockerfile example:
+
+```
+FROM ...
+
+COPY target/*.jar app.jar
+
+COPY agent/applicationinsights-agent-3.4.11.jar applicationinsights-agent-3.4.11.jar 
+
+COPY agent/applicationinsights.json applicationinsights.json
 
-## Third-party container images
+ENV APPLICATIONINSIGHTS_CONNECTION_STRING="CONNECTION-STRING"
+        
+ENTRYPOINT["java", "-javaagent:applicationinsights-agent-3.4.11.jar", "-jar", "app.jar"]
+```
+
+### Third-party container images
 
 If you're using a third-party container image that you can't modify, mount the Application Insights Java agent jar into the container from outside. Set the environment variable for the container
 `JAVA_TOOL_OPTIONS=-javaagent:/path/to/applicationinsights-agent.jar`.
 
-## Tomcat 8 (Linux)
+## Spring Boot
 
-### Tomcat installed via apt-get or yum
+For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
+
+## Java Application servers
+
+### Tomcat 8 (Linux)
+
+#### Tomcat installed via apt-get or yum
 
 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:
 
 ```
 JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.11.jar"
 ```
 
-### Tomcat installed via download and unzip
+#### Tomcat installed via download and unzip
 
 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:
 
@@ -47,9 +86,9 @@ CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.1
 
 If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to `CATALINA_OPTS`.
 
-## Tomcat 8 (Windows)
+### Tomcat 8 (Windows)
 
-### Run Tomcat from the command line
+#### Run Tomcat from the command line
 
 Locate the file `<tomcat>/bin/catalina.bat`. Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
 
@@ -65,13 +104,13 @@ set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-
 
 If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to `CATALINA_OPTS`.
 
-### Run Tomcat as a Windows service
+#### Run Tomcat as a Windows service
 
 Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the `Java Options` under the `Java` tab.
 
-## JBoss EAP 7
+### JBoss EAP 7
 
-### Standalone server
+#### Standalone server
 
 Add `-javaagent:path/to/applicationinsights-agent-3.4.11.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):
 
@@ -80,7 +119,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `J
     ...
 ```
 
-### Domain server
+#### Domain server
 
 Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
 
@@ -125,7 +164,7 @@ If you're running multiple managed servers on a single host, you'll need to add
 
 The specified `applicationinsights.agent.id` value must be unique. It's used to create a subdirectory under the Application Insights directory. Each JVM process needs its own local Application Insights config and local Application Insights log file. Also, if reporting to the central collector, the `applicationinsights.properties` file is shared by the multiple managed servers, so the specified `applicationinsights.agent.id` is needed to override the `agent.id` setting in that shared file. The `applicationinsights.agent.rollup.id` can be similarly specified in the server's `system-properties` if you need to override the `agent.rollup.id` setting per managed server.
 
-## Jetty 9
+### Jetty 9
 
 Add these lines to `start.ini`:
 
@@ -134,7 +173,7 @@ Add these lines to `start.ini`:
 -javaagent:path/to/applicationinsights-agent-3.4.11.jar
 ```
 
-## Payara 5
+### Payara 5
 
 Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
 
@@ -150,31 +189,32 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.11.jar` to the existing `j
 ...
 ```
 
-## WebSphere 8
+### WebSphere 8
 
 1. Open Management Console.
 1. Go to **Servers** > **WebSphere application servers** > **Application servers**. Choose the appropriate application servers and select:
-    
+
     ```
     Java and Process Management > Process definition >  Java Virtual Machine
     ```
-    
+
 1. In `Generic JVM arguments`, add the following JVM argument:
-    
+
     ```
     -javaagent:path/to/applicationinsights-agent-3.4.11.jar
     ```
 
 1. Save and restart the application server.
 
-## OpenLiberty 18
+### OpenLiberty 18
 
 Create a new file `jvm.options` in the server directory (for example, `<openliberty>/usr/servers/defaultServer`), and add this line:
 
 ```
 -javaagent:path/to/applicationinsights-agent-3.4.11.jar
 ```
 
-## Others
+### Others
 
 See your application server documentation on how to add JVM args.
+

articles/azure-monitor/app/opentelemetry-enable.md

@@ -184,9 +184,10 @@ Java auto-instrumentation is enabled through configuration changes; no code chan
 Point the JVM to the jar file by adding `-javaagent:"path/to/applicationinsights-agent-3.4.11.jar"` to your application's JVM args.
 
 > [!TIP]
-> For help with configuring your application's JVM args, see [Tips for updating your JVM args](./java-standalone-arguments.md).
-    
-If you develop a Spring Boot application, you can optionally replace the JVM argument by a programmatic configuration. For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
+> For scenario-specific guidance, see [Get Started (Supplemental)](./java-get-started-supplemental.md).
+
+> [!TIP]
+> If you develop a Spring Boot application, you can optionally replace the JVM argument by a programmatic configuration. For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
 
 ##### [Node.js](#tab/nodejs)
 

articles/azure-monitor/toc.yml

@@ -734,6 +734,8 @@ items:
             href: app/java-spring-boot.md
           - name: Profiler
             href: app/java-standalone-profiler.md
+          - name: Get started (supplemental)
+            href: app/java-get-started-supplemental.md
           - name: Configuration
             items:
             - name: General
@@ -748,8 +750,6 @@ items:
                   href: app/java-standalone-telemetry-processors.md
                 - name: Examples
                   href: app/java-standalone-telemetry-processors-examples.md
-          - name: JVM arguments setup
-            href: app/java-standalone-arguments.md
           - name: Upgrade from 2.x
             href: app/java-standalone-upgrade-from-2x.md
         - name: FAQ

articles/container-registry/container-registry-authentication.md

@@ -79,7 +79,7 @@ TOKEN=$(az acr login --name <acrName> --expose-token --output tsv --query access
 Then, run `docker login`, passing `00000000-0000-0000-0000-000000000000` as the username and using the access token as password:
 
 ```console
-docker login myregistry.azurecr.io --username 00000000-0000-0000-0000-000000000000 --password $TOKEN
+•	docker login myregistry.azurecr.io --username 00000000-0000-0000-0000-000000000000 --password-stdin <<< $TOKEN
 ```
 Likewise, you can use the token returned by `az acr login` with the `helm registry login` command to authenticate with the registry:
 

articles/container-registry/container-registry-delete.md

@@ -184,21 +184,28 @@ As mentioned in the [Manifest digest](container-registry-concepts.md#manifest-di
    ```output
    [
      {
-       "digest": "sha256:7ca0e0ae50c95155dbb0e380f37d7471e98d2232ed9e31eece9f9fb9078f2728",
-       "tags": [
-         "latest"
-       ],
-       "timestamp": "2018-07-11T21:38:35.9170967Z"
-     },
-     {
-       "digest": "sha256:d2bdc0c22d78cde155f53b4092111d7e13fe28ebf87a945f94b19c248000ceec",
-       "tags": [],
-       "timestamp": "2018-07-11T21:32:21.1400513Z"
+    "architecture": "amd64",
+    "changeableAttributes": {
+      "deleteEnabled": true,
+      "listEnabled": true,
+      "quarantineDetails": "{\"state\":\"Scan Passed\",\"link\":\"https://aka.ms/test\",\"scanner\":\"Azure Security Monitoring-Qualys Scanner\",\"result\":{\"version\":\"2020-05-13T00:23:31.954Z\",\"summary\":[{\"severity\":\"High\",\"count\":2},{\"severity\":\"Medium\",\"count\":0},{\"severity\":\"Low\",\"count\":0}]}}",
+      "quarantineState": "Passed",
+      "readEnabled": true,
+      "writeEnabled": true
+    },
+    "configMediaType": "application/vnd.docker.container.image.v1+json",
+    "createdTime": "2020-05-16T04:25:14.3112885Z",
+    "digest": "sha256:eef2ef471f9f9d01fd2ed81bd2492ddcbc0f281b0a6e4edb700fbf9025448388",
+    "imageSize": 22906605,
+    "lastUpdateTime": "2020-05-16T04:25:14.3112885Z",
+    "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+    "os": "linux",
+    "timestamp": "2020-05-16T04:25:14.3112885Z"
      }
    ]
    ```
 
-As you can see in the output of the last step in the sequence, there is now an orphaned manifest whose `"tags"` property is an empty list. This manifest still exists within the registry, along with any unique layer data that it references. **To delete such orphaned images and their layer data, you must delete by manifest digest**.
+The tags array is removed from meta-data when an image is **untagged**. This manifest still exists within the registry, along with any unique layer data that it references. **To delete such orphaned images and their layer data, you must delete by manifest digest**.
 
 ## Automatically purge tags and manifests
 

articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json

@@ -568,6 +568,11 @@
         {
             "source_path_from_root": "/articles/billing/billing-understand-reservation-charges-postgresql.md",
             "redirect_url": "/azure/cost-management-billing/reservations/understand-reservation-charges-postgresql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/cost-management-billing/reservations/understand-reservation-charges-postgresql.md",
+            "redirect_url": "/azure/postgresql/single-server/concept-reserved-pricing",
             "redirect_document_id": true
         },
         {

articles/cost-management-billing/reservations/reservation-discount-application.md

@@ -50,7 +50,7 @@ Read the following articles that apply to you to learn how discounts apply to a
 - [Azure SQL Edge](discount-sql-edge.md)
 - [Database for MariaDB](understand-reservation-charges-mariadb.md)
 - [Database for MySQL](understand-reservation-charges-mysql.md)
-- [Database for PostgreSQL](understand-reservation-charges-postgresql.md)
+- [Database for PostgreSQL](../../postgresql/single-server/concept-reserved-pricing.md)
 - [Databricks](reservation-discount-databricks.md)
 - [Data Explorer](understand-azure-data-explorer-reservation-charges.md)
 - [Dedicated Hosts](billing-understand-dedicated-hosts-reservation-charges.md)

articles/cost-management-billing/reservations/toc.yml

@@ -29,14 +29,14 @@
       href: understand-cosmosdb-reservation-charges.md
     - name: Azure Cosmos DB for PostgreSQL
       href: ../../cosmos-db/postgresql/resources-pricing.md?toc=/azure/cost-management-billing/reservations/toc.json
+    - name: Azure Database for PostgreSQL
+      href: ../../postgresql/single-server/concept-reserved-pricing.md?toc=/azure/cost-management-billing/reservations/toc.json
     - name: Azure SQL Edge
       href: discount-sql-edge.md
     - name: Database for MariaDB
       href: understand-reservation-charges-mariadb.md
     - name: Database for MySQL
       href: understand-reservation-charges-mysql.md
-    - name: Database for PostgreSQL - Single Server
-      href: understand-reservation-charges-postgresql.md
     - name: Databricks
       href: reservation-discount-databricks.md
     - name: Data Explorer