Skip to content

Commit 55e49b1

Browse files
Merge pull request #209857 from v-jbasden/jbasden-container-insights-freshness-1
Freshness updates
2 parents 05607fe + 72b2a1f commit 55e49b1

10 files changed

+34
-197
lines changed

articles/azure-monitor/containers/container-insights-deployment-hpa-metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Deployment & HPA metrics with Container insights | Microsoft Docs
33
description: This article describes what deployment & HPA (Horizontal pod autoscaler) metrics are collected with Container insights.
44
ms.topic: conceptual
5-
ms.date: 08/09/2020
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77
---
88

99
# Deployment & HPA metrics with Container insights

articles/azure-monitor/containers/container-insights-enable-aks-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Enable AKS Monitoring Addon using Azure Policy
33
description: Describes how to enable AKS Monitoring Addon using Azure Custom Policy.
44
ms.topic: conceptual
5-
ms.date: 02/04/2021
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77
---
88

99
# Enable AKS monitoring addon using Azure Policy

articles/azure-monitor/containers/container-insights-hybrid-setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Configure Hybrid Kubernetes clusters with Container insights | Microsoft Docs
33
description: This article describes how you can configure Container insights to monitor Kubernetes clusters hosted on Azure Stack or other environment.
44
ms.topic: conceptual
5-
ms.date: 06/30/2020
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77
---
88

99
# Configure hybrid Kubernetes clusters with Container insights
@@ -317,7 +317,7 @@ Supported API definitions for the Azure Stack Hub cluster can be found in this e
317317

318318
## Configure agent data collection
319319

320-
Staring with chart version 1.0.0, the agent data collection settings are controlled from the ConfigMap. Refer to documentation about agent data collection settings [here](container-insights-agent-config.md).
320+
Starting with chart version 1.0.0, the agent data collection settings are controlled from the ConfigMap. Refer to documentation about agent data collection settings [here](container-insights-agent-config.md).
321321

322322
After you have successfully deployed the chart, you can review the data for your hybrid Kubernetes cluster in Container insights from the Azure portal.
323323

@@ -366,4 +366,4 @@ To execute with Azure PowerShell, use the following commands in the folder that
366366

367367
## Next steps
368368

369-
With monitoring enabled to collect health and resource utilization of your hybrid Kubernetes cluster and workloads running on them, learn [how to use](container-insights-analyze.md) Container insights.
369+
With monitoring enabled to collect health and resource utilization of your hybrid Kubernetes cluster and workloads running on them, learn [how to use](container-insights-analyze.md) Container insights.

articles/azure-monitor/containers/container-insights-log-alerts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Log alerts from Container insights | Microsoft Docs
33
description: This article describes how to create custom log alerts for memory and CPU utilization from Container insights.
44
ms.topic: conceptual
5-
ms.date: 07/29/2021
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77

88
---
99

@@ -37,7 +37,7 @@ To create resource-centric alerts at scale for a subscription or resource group,
3737

3838
You may also decide not to split when you want a condition on multiple resources in the scope. For example, if you want to create an alert if at least five machines in the resource group scope have CPU usage over 80%.
3939

40-
:::image type="content" source="../vm/media/monitor-virtual-machines/log-alert-rule.png" alt-text="Screenshot of a new log alert rule with split by dimensions.":::
40+
:::image type="content" source="../vm/media/monitor-virtual-machines/log-alert-rule.png" alt-text="Screenshot of a new log alert rule with split by dimensions." lightbox="../vm/media/monitor-virtual-machines/log-alert-rule.png":::
4141

4242
You might want to see a list of the alerts by affected computer. You can use a custom workbook that uses a custom [Resource Graph](../../governance/resource-graph/overview.md) to provide this view. Use the following query to display alerts, and use the data source **Azure Resource Graph** in the workbook.
4343
## Create a log query alert rule

articles/azure-monitor/containers/container-insights-log-query.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Query logs from Container insights
33
description: Container insights collects metrics and log data, and this article describes the records and includes sample queries.
44
ms.topic: conceptual
5-
ms.date: 07/19/2021
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77

88
---
99

@@ -309,7 +309,7 @@ KubeMonAgentEvents | where Level != "Info"
309309

310310
The output shows results similar to the following example:
311311

312-
![Screenshot that shows log query results of informational events from an agent.](./media/container-insights-log-query/log-query-example-kubeagent-events.png)
312+
:::image type="content" source="./media/container-insights-log-query/log-query-example-kubeagent-events.png" alt-text="Screenshot that shows log query results of informational events from an agent." lightbox="media/container-insights-log-query/log-query-example-kubeagent-events.png":::
313313

314314
## Next steps
315315

articles/azure-monitor/containers/container-insights-manage-agent.md

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: How to manage the Container insights agent | Microsoft Docs
33
description: This article describes managing the most common maintenance tasks with the containerized Log Analytics agent used by Container insights.
44
ms.topic: conceptual
5-
ms.date: 07/21/2020
6-
ms.reviewer: aul
5+
ms.date: 08/29/2022
6+
ms.reviewer: viviandiec
77
---
88

99
# How to manage the Container insights agent
@@ -12,9 +12,9 @@ Container insights uses a containerized version of the Log Analytics agent for L
1212

1313
## How to upgrade the Container insights agent
1414

15-
Container insights uses a containerized version of the Log Analytics agent for Linux. When a new version of the agent is released, the agent is automatically upgraded on your managed Kubernetes clusters hosted on Azure Kubernetes Service (AKS) and Azure Red Hat OpenShift version 3.x. For a [hybrid Kubernetes cluster](container-insights-hybrid-setup.md) and Azure Red Hat OpenShift version 4.x, the agent is not managed, and you need to manually upgrade the agent.
15+
Container insights uses a containerized version of the Log Analytics agent for Linux. When a new version of the agent is released, the agent is automatically upgraded on your managed Kubernetes clusters hosted on Azure Kubernetes Service (AKS). For a [hybrid Kubernetes cluster](container-insights-hybrid-setup.md), the agent is not managed, and you need to manually upgrade the agent.
1616

17-
If the agent upgrade fails for a cluster hosted on AKS or Azure Red Hat OpenShift version 3.x, this article also describes the process to manually upgrade the agent. To follow the versions released, see [agent release announcements](https://github.com/microsoft/docker-provider/tree/ci_feature_prod).
17+
If the agent upgrade fails for a cluster hosted on AKS, this article also describes the process to manually upgrade the agent. To follow the versions released, see [agent release announcements](https://github.com/microsoft/docker-provider/tree/ci_feature_prod).
1818

1919
### Upgrade agent on AKS cluster
2020

@@ -59,20 +59,6 @@ If the Log Analytics workspace is in Azure US Government, run the following comm
5959
$ helm upgrade --set omsagent.domain=opinsights.azure.us,omsagent.secret.wsid=<your_workspace_id>,omsagent.secret.key=<your_workspace_key>,omsagent.env.clusterName=<your_cluster_name> incubator/azuremonitor-containers
6060
```
6161

62-
### Upgrade agent on Azure Red Hat OpenShift v4
63-
64-
Perform the following steps to upgrade the agent on a Kubernetes cluster running on Azure Red Hat OpenShift version 4.x.
65-
66-
>[!NOTE]
67-
>Azure Red Hat OpenShift version 4.x only supports running in the Azure commercial cloud.
68-
>
69-
70-
```console
71-
curl -o upgrade-monitoring.sh -L https://aka.ms/upgrade-monitoring-bash-script
72-
export azureAroV4ClusterResourceId="/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.RedHatOpenShift/OpenShiftClusters/<clusterName>"
73-
bash upgrade-monitoring.sh --resource-id $ azureAroV4ClusterResourceId
74-
```
75-
7662
## How to disable environment variable collection on a container
7763

7864
Container insights collects environmental variables from the containers running in a pod and presents them in the property pane of the selected container in the **Containers** view. You can control this behavior by disabling collection for a specific container either during deployment of the Kubernetes cluster, or after by setting the environment variable *AZMON_COLLECT_ENV*. This feature is available from the agent version – ciprod11292018 and higher.
@@ -84,13 +70,7 @@ To disable collection of environmental variables on a new or existing container,
8470
value: "False"
8571
```
8672
87-
Run the following command to apply the change to Kubernetes clusters other than Azure Red Hat OpenShift): `kubectl apply -f <path to yaml file>`. To edit ConfigMap and apply this change for Azure Red Hat OpenShift clusters, run the command:
88-
89-
```bash
90-
oc edit configmaps container-azm-ms-agentconfig -n openshift-azure-logging
91-
```
92-
93-
This opens your default text editor. After setting the variable, save the file in the editor.
73+
Run the following command to apply the change to Kubernetes clusters: `kubectl apply -f <path to yaml file>`.
9474

9575
To verify the configuration change took effect, select a container in the **Containers** view in Container insights, and in the property panel, expand **Environment Variables**. The section should show only the variable created earlier - **AZMON_COLLECT_ENV=FALSE**. For all other containers, the Environment Variables section should list all the environment variables discovered.
9676

0 commit comments

Comments
 (0)