Merge pull request #227334 from cebundy/aca-logging-ui-changes

[Container Apps] Update log stream to include both system logs for env and app

Author: JamesJBarnett

articles/container-apps/log-options.md

@@ -17,6 +17,7 @@ Container Apps application logs consist of two different categories:
 
 - Container console output (`stdout`/`stderr`) messages.
 - System logs generated by Azure Container Apps.
+- Spring App console logs.
 
 You can choose between these logs destinations:
 

articles/container-apps/log-streaming.md

@@ -4,47 +4,72 @@ description: View your container app's log stream.
 services: container-apps
 author: cebundy
 ms.service: container-apps
-ms.custom: event-tier1-build-2022
 ms.topic: how-to
-ms.date: 08/30/2022
+ms.date: 03/24/2023
 ms.author: v-bcatherine
 ---
 
 # View log streams in Azure Container Apps
 
-While developing and troubleshooting your container app, it's important to see a container's logs in real-time.  Container Apps lets you view a stream of your container's `stdout` and `stderr` log messages through the Azure portal or the Azure CLI.
+While developing and troubleshooting your container app, it's essential to see the [logs](logging.md) for your container app in real time. Azure Container Apps lets you stream:
 
-## Azure portal
+- [system logs](logging.md#system-logs) from the Container Apps environment and your container app.
+- container [console logs](logging.md#container-console-logs) from your container app.
 
-View a container app's log stream in the Azure portal with these steps.
+Log streams are accessible through the Azure portal or the Azure CLI.
 
-1. Navigate to your container app in the Azure portal.
+## View log streams via the Azure portal
+
+You can view system logs and console logs in the Azure portal. System logs are generated by the container app's runtime. Console logs are generated by your container app.
+
+### Environment system log stream
+
+To troubleshoot issues in your container app environment, you can view the system log stream from your environment page. The log stream displays the system logs for the Container Apps service and the apps actively running in the environment:
+
+1. Go to your environment in the Azure portal.
 1. Select **Log stream** under the *Monitoring* section on the sidebar menu.
-1. If you have multiple revisions, replicas, or containers, you can select from the pull-down menus to choose a container.  If your app has only one container, you can skip this step.
 
-After a container is selected, the log stream is displayed in the viewing pane.
+    :::image type="content" source="media/observability/system-log-streaming-env.png" alt-text="Screenshot of Container Apps environment system log stream page.":::
 
-:::image type="content" source="media/observability/log-stream.png" alt-text="Screenshot of Azure Container Apps Log stream page.":::
+### Container app log stream
+
+You can view a log stream of your container app's system or console logs from your container app page.
+
+1. Go to your container app in the Azure portal.
+1. Select **Log stream** under the *Monitoring* section on the sidebar menu.
+1. To view the console log stream, select **Console**.
+    1. If you have multiple revisions, replicas, or containers, you can select from the drop-down menus to choose a container. If your app has only one container, you can skip this step.
 
-## Azure CLI
+    :::image type="content" source="media/observability/screenshot-log-stream-console-app.png" alt-text="Screenshot of Container Apps console log stream from app page.":::
 
-You can view a container's log stream from the Azure CLI with the `az containerapp logs show` command.  You can use these arguments to:
+1. To view the system log stream, select **System**. The system log stream displays the system logs for all running containers in your container app.
 
-- View previous log entries with the  `--tail` argument.
-- View a live stream with the `--follow`argument. 
+    :::image type="content" source="media/observability/screenshot-log-stream-system-app.png" alt-text="Screenshot of Container Apps system log stream from app page.":::
 
-Use `Ctrl/Cmd-C` to stop the live stream.
+## View log streams via the Azure CLI
 
-For example, you can list the last 50 container log entries in a container app with a single container using the following command.
+You can view your container app's log streams from the Azure CLI with the `az containerapp logs show` command or your container app's environment system log stream with the `az containerapp env logs show` command.
 
-This example live streams a container's log entries.
+Control the log stream with the following arguments:
+
+- `--tail` (Default) View the last n log messages. Values are 0-300 messages. The default is 20.
+- `--follow` View a continuous live stream of the log messages.
+
+### Stream Container app logs
+
+You can stream the system or console logs for your container app. To stream the container app system logs, use the `--type` argument with the value `system`. To stream the container console logs, use the `--type` argument with the value `console`. The default is `console`.
+
+#### View container app system log stream
+
+This example uses the `--tail` argument to display the last 50 system log messages from the container app. Replace the \<placeholders\> with your container app's values.
 
 # [Bash](#tab/bash)
 
 ```azurecli
 az containerapp logs show \
   --name <ContainerAppName> \
   --resource-group <ResourceGroup> \
+  --type system \
   --tail 50
 ```
 
@@ -54,20 +79,49 @@ az containerapp logs show \
 az containerapp logs show `
   --name <ContainerAppName> `
   --resource-group <ResourceGroup> `
+  --type system `
   --tail 50
 ```
 
 ---
 
-To connect to a container console in a container app with multiple revisions, replicas, and containers include the  following parameters in the `az containerapp logs show` command.
+This example displays a continuous live stream of system log messages from the container app using the `--follow` argument. Replace the \<placeholders\> with your container app's values.
+
+# [Bash](#tab/bash)
+
+```azurecli
+az containerapp logs show \
+  --name <ContainerAppName> \
+  --resource-group <ResourceGroup> \
+  --type system \
+  --follow
+```
+
+# [PowerShell](#tab/powershell)
+
+```azurecli
+az containerapp logs show `
+  --name <ContainerAppName> `
+  --resource-group <ResourceGroup> `
+  --type system `
+  --follow
+```
+
+---
+
+Use `Ctrl-C` or `Cmd-C` to stop the live stream.
+
+### View container console log stream
+
+To connect to a container's console log stream in a container app with multiple revisions, replicas, and containers, include the following parameters in the `az containerapp logs show` command.
 
 | Argument | Description |
 |----------|-------------|
-| `--revision` | The revision name of the container to connect to. |
-| `--replica` | The replica name of the container to connect to. |
-| `--container` | The container name of the container to connect to. |
+| `--revision` | The revision name. |
+| `--replica` | The replica name in the revision. |
+| `--container` | The container name to connect to. |
 
-You can get the revision names with the `az containerapp revision list` command.  Replace the \<placeholders\> with your container app's values.
+You can get the revision names with the `az containerapp revision list` command. Replace the \<placeholders\> with your container app's values.
 
 # [Bash](#tab/bash)
 
@@ -113,8 +167,7 @@ az containerapp replica list `
 
 ---
 
-Stream the container logs with the `az container app show` command. Replace the \<placeholders\> with your container app's values.
-
+Live stream the container console using the `az container app show` command with the `--follow` argument. Replace the \<placeholders\> with your container app's values.
 
 # [Bash](#tab/bash)
 
@@ -125,6 +178,7 @@ az containerapp logs show \
   --revision <RevisionName> \
   --replica <ReplicaName> \
   --container <ContainerName> \
+  --type console \
   --follow
 ```
 
@@ -137,13 +191,91 @@ az containerapp logs show  `
   --revision <RevisionName> `
   --replica <ReplicaName> `
   --container <ContainerName> `
+  --type console `
+  --follow
+```
+
+---
+
+Use `Ctrl-C` or `Cmd-C` to stop the live stream.
+
+View the last 50 console log messages using the `az containerapp logs show` command with the `--tail` argument. Replace the \<placeholders\> with your container app's values.
+
+# [Bash](#tab/bash)
+
+```azurecli
+az containerapp logs show \
+  --name <ContainerAppName> \
+  --resource-group <ResourceGroup> \
+  --revision <RevisionName> \
+  --replica <ReplicaName> \
+  --container <ContainerName> \
+  --type console \
+  --tail 50
+```
+
+# [PowerShell](#tab/powershell)
+
+```azurecli
+az containerapp logs show  `
+  --name <ContainerAppName> `
+  --resource-group <ResourceGroup> `
+  --revision <RevisionName> `
+  --replica <ReplicaName> `
+  --container <ContainerName> `
+  --type console `
+  --tail 50
+```
+
+---
+
+### View environment system log stream
+
+Use the following command with the `--follow` argument to view the live system log stream from the Container Apps environment. Replace the \<placeholders\> with your environment values.
+
+# [Bash](#tab/bash)
+
+```azurecli
+az containerapp env logs show \
+  --name <ContainerAppEnvironmentName> \
+  --resource-group <ResourceGroup> \
+  --follow
+```
+
+# [PowerShell](#tab/powershell)
+
+```azurecli
+az containerapp env logs show  `
+  --name <ContainerAppEnvironmentName> `
+  --resource-group <ResourceGroup> `
   --follow
 ```
 
 ---
 
+Use `Ctrl-C` or `Cmd-C` to stop the live stream.
 
-Enter **Ctrl-C** to stop the log stream.
+This example uses the `--tail` argument to display the last 50 environment system log messages. Replace the \<placeholders\> with your environment values.
+
+# [Bash](#tab/bash)
+
+```azurecli
+az containerapp env logs show \
+  --name <ContainerAppName> \
+  --resource-group <ResourceGroup> \
+  --tail 50
+```
+
+# [PowerShell](#tab/powershell)
+
+```azurecli
+az containerapp env logs show `
+  --name <ContainerAppName> `
+  --resource-group <ResourceGroup> `
+  --tail 50
+```
+
+---
 
 > [!div class="nextstepaction"]
-> [View log streams from the Azure portal](log-streaming.md)
+> [Log storage and monitoring options in Azure Container Apps](log-monitoring.md)

articles/container-apps/logging.md

@@ -14,36 +14,34 @@ ms.author: v-bcatherine
 
 Azure Container Apps provides two types of application logging categories:
 
--  [Container console logs](#container-console-logs): Log streams from your container console.
--  [System logs](#system-logs): Logs generated by the Azure Container Apps service.
+- [Container console logs](#container-console-logs): Log streams from your container console.
+- [System logs](#system-logs): Logs generated by the Azure Container Apps service.
 
+You can view the [log streams](log-streaming.md) in near real-time in the Azure portal or CLI. For more options to store and monitor your logs, see [Logging options](log-options.md).
 
 ## Container console Logs
 
-Container console logs are written by your application to the `stdout` and `stderr` output streams of the application's container. By implementing detailed logging in your application, you'll be able to troubleshoot issues and monitor the health of your application. 
-
-You can view your container console logs through [Logs streaming](log-streaming.md).  For other options to store and monitoring your log data, see [Logging options](log-options.md).
+Container Apps captures the `stdout` and `stderr` output streams from your application containers and displays them as console logs. When you implement logging in your application, you can troubleshoot problems and monitor the health of your app.  
 
 ## System logs
 
-System logs are generated by the Azure Container Apps to inform you for the status of service level events.  Log messages include the following information:
+Container Apps generates system logs to inform you of the status of service level events.  Log messages include the following information:
 
 - Successfully created dapr component
 - Successfully updated dapr component
 - Error creating dapr component
 - Successfully mounted volume
 - Error mounting volume
 - Successfully bound Domain
-- Auth enabled on app. Creating authentication config
+- Auth enabled on app
+- Creating authentication config
 - Auth config created successfully
-- Setting a traffic weight 
+- Setting a traffic weight
 - Creating a new revision:
 - Successfully provisioned revision
 - Deactivating Old revisions
 - Error provisioning revision
 
-The system log data can be stored and monitored through the Container Apps logging options.  For more information, see [Logging options](log-options.md).
-
 ## Next steps
 
 > [!div class="nextstepaction"]

articles/container-apps/media/observability/log-stream.png

@@ -18,7 +18,7 @@ These features include:
 
 |Feature  |Description  |
 |---------|---------|
-|[Log streaming](log-streaming.md) | View streaming console logs from a container in near real-time. |
+|[Log streaming](log-streaming.md) | View streaming system and console logs from a container in near real-time. |
 |[Container console](container-console.md) | Connect to the Linux console in your containers to debug your application from inside the container. |
 |[Azure Monitor metrics](metrics.md)| View and analyze your application's compute and network usage through metric data. |
 |[Application logging](logging.md) | Monitor, analyze and debug your app using log data.|