Update log stream to include both system logs for env and app

Author: cebundy

articles/container-apps/log-streaming.md

@@ -16,35 +16,58 @@ While developing and troubleshooting your container app, it's important to see a
 
 ## Azure portal
 
-View a container app's log stream in the Azure portal with these steps.
+You can view system logs and application logs in the Azure portal.  System logs are generated by the container app's runtime.  Application logs are generated by your container app's application.
 
-1. Navigate to your container app in the Azure portal.
+### Environment system log stream
+
+To troubleshoot issues with 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 your environment page in the Azure portal.
+1. Select **Log stream** under the *Monitoring* section on the sidebar menu.
+
+:::image type="content" source="media/observability/system-log-streaming-env.png" alt-text="Screenshot of Container Apps environment system log stream page.":::
+
+### Container app log stream
+
+You can view a log stream of your container apps system or application 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. 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.
+1. To view the console log stream, select **Console**. 
+    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/screenshot-log-stream-console-app.png" alt-text="Screenshot of Container Apps console log stream from app page.":::
 
-:::image type="content" source="media/observability/log-stream.png" alt-text="Screenshot of Azure Container Apps Log stream page.":::
+1. To view the system log stream, select **System**.  The system log stream displays the system logs for all running containers in the environment.
+
+:::image type="content" source="media/observability/screenshot-log-stream-system-app.png" alt-text="Screenshot of Container Apps system log stream from app page.":::
 
 ## Azure CLI
 
-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:
+You can view an active container's log stream 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.  The environment system log stream displays the system logs for the Container Apps service and the apps running in the environment.  
+
+ You can use these arguments to:
 
-- View previous log entries with the  `--tail` argument.
+- View previous log entries with the  `--tail` argument. (Values: 0-300)
 - View a live stream with the `--follow`argument. 
 
 Use `Ctrl/Cmd-C` to stop the live stream.
 
 For example, you can list the last 50 container log entries in a container app with a single container using the following command.
 
-This example live streams a container's log entries.
+### View container app log stream from the CLI
+
+Use the `--type` argument to specify the log type.  Valid values are `console` and `system`.  The default is `console`.
+
+This example displays the last 50 system log entries for the container app.
 
 # [Bash](#tab/bash)
 
 ```azurecli
 az containerapp logs show \
   --name <ContainerAppName> \
   --resource-group <ResourceGroup> \
+  --type system \
   --tail 50
 ```
 
@@ -54,12 +77,13 @@ 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.
+To connect to a container live 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 |
 |----------|-------------|
@@ -113,8 +137,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.
-
+Stream the container console logs with the `az container app show` command. Replace the \<placeholders\> with your container app's values.
 
 # [Bash](#tab/bash)
 
@@ -125,6 +148,7 @@ az containerapp logs show \
   --revision <RevisionName> \
   --replica <ReplicaName> \
   --container <ContainerName> \
+  --type console \
   --follow
 ```
 
@@ -137,13 +161,64 @@ az containerapp logs show  `
   --revision <RevisionName> `
   --replica <ReplicaName> `
   --container <ContainerName> `
+  --type console `
   --follow
 ```
 
 ---
 
+Enter **Ctrl-C** to stop the log stream.
+
+### View environment system log stream from the CLI
+
+Using the following command, you can view the system log stream for the Container Apps service and the apps running in the environment.
+
+Stream the container logs with the `az container app env logs show` command. Replace the \<placeholders\> with your container app's 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
+```
+
+---
 
 Enter **Ctrl-C** to stop the log stream.
 
+This example displays the last 50 environment system log entries.
+
+# [Bash](#tab/bash)
+
+```azurecli
+az containerapp logs show \
+  --name <ContainerAppName> \
+  --resource-group <ResourceGroup> \
+  --tail 50
+```
+
+# [PowerShell](#tab/powershell)
+
+```azurecli
+az containerapp logs show `
+  --name <ContainerAppName> `
+  --resource-group <ResourceGroup> `
+  --tail 50
+```
+
+---
+
 > [!div class="nextstepaction"]
 > [View log streams from the Azure portal](log-streaming.md)