Merge pull request #209199 from v-jbasden/jbasden-retire-openshift-freshness

Content freshness updates to retire Openshift

Author: jborsecnik

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

@@ -2,7 +2,7 @@
 title: Configure Container insights agent data collection | Microsoft Docs
 description: This article describes how you can configure the Container insights agent to control stdout/stderr and environment variables log collection.
 ms.topic: conceptual
-ms.date: 10/09/2020
+ms.date: 08/25/2022
 ms.reviewer: aul
 ---
 
@@ -12,10 +12,6 @@ Container insights collects stdout, stderr, and environmental variables from con
 
 This article demonstrates how to create ConfigMap and configure data collection based on your requirements.
 
->[!NOTE]
->For Azure Red Hat OpenShift V3, a template ConfigMap file is created in the *openshift-azure-logging* namespace. 
->
-
 ## ConfigMap file settings overview
 
 A template ConfigMap file is provided that allows you to easily edit it with your customizations without having to create it from scratch. Before starting, you should review the Kubernetes documentation about [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) and familiarize yourself with how to create, configure, and deploy ConfigMaps. This will allow you to filter stderr and stdout per namespace or across the entire cluster, and environment variables for any container running across all pods/nodes in the cluster.
@@ -55,10 +51,7 @@ Perform the following steps to configure and deploy your ConfigMap configuration
 
 1. Download the [template ConfigMap YAML file](https://aka.ms/container-azm-ms-agentconfig) and save it as container-azm-ms-agentconfig.yaml. 
 
-   > [!NOTE]
-   > This step is not required when working with Azure Red Hat OpenShift V3 because the ConfigMap template already exists on the cluster.
-
-2. Edit the ConfigMap yaml file with your customizations to collect stdout, stderr, and/or environmental variables. If you are editing the ConfigMap yaml file for Azure Red Hat OpenShift V3, first run the command `oc edit configmaps container-azm-ms-agentconfig -n openshift-azure-logging` to open the file in a text editor.
+2. Edit the ConfigMap yaml file with your customizations to collect stdout, stderr, and/or environmental variables.
 
     - To exclude specific namespaces for stdout log collection, you configure the key/value using the following example: `[log_collection_settings.stdout] enabled = true exclude_namespaces = ["my-namespace-1", "my-namespace-2"]`.
 
@@ -68,15 +61,15 @@ Perform the following steps to configure and deploy your ConfigMap configuration
 
     Save your changes in the editor.
 
-3. For clusters other than Azure Red Hat OpenShift V3, create ConfigMap by running the following kubectl command: `kubectl apply -f <configmap_yaml_file.yaml>`. 
+3. Create ConfigMap by running the following kubectl command: `kubectl apply -f <configmap_yaml_file.yaml>`. 
 
     Example: `kubectl apply -f container-azm-ms-agentconfig.yaml`. 
 
 The configuration change can take a few minutes to finish before taking effect, and all omsagent pods in the cluster will restart. The restart is a rolling restart for all omsagent pods, not all restart at the same time. When the restarts are finished, a message is displayed that's similar to the following and includes the result: `configmap "container-azm-ms-agentconfig" created`.
 
 ## Verify configuration
 
-To verify the configuration was successfully applied to a cluster other than Azure Red Hat OpenShift V3, use the following command to review the logs from an agent pod: `kubectl logs omsagent-fdf58 -n kube-system`. If there are configuration errors from the omsagent pods, the output will show errors similar to the following:
+To verify the configuration was successfully applied to a cluster, use the following command to review the logs from an agent pod: `kubectl logs omsagent-fdf58 -n kube-system`. If there are configuration errors from the omsagent pods, the output will show errors similar to the following:
 
 ``` 
 ***************Start Config Processing******************** 
@@ -87,10 +80,6 @@ Errors related to applying configuration changes are also available for review.
 
 - From an agent pod logs using the same `kubectl logs` command. 
 
-    >[!NOTE]
-    >This command is not applicable to Azure Red Hat OpenShift V3 cluster.
-    > 
-
 - From Live logs. Live logs show errors similar to the following:
 
     ```
@@ -99,21 +88,11 @@ Errors related to applying configuration changes are also available for review.
 
 - From the **KubeMonAgentEvents** table in your Log Analytics workspace. Data is sent every hour with *Error* severity for configuration errors. If there are no errors, the entry in the table will have data with severity *Info*, which reports no errors. The **Tags** property contains more information about the pod and container ID on which the error occurred and also the first occurrence, last occurrence and count in the last hour.
 
-- With Azure Red Hat OpenShift V3, check the omsagent logs by searching the **ContainerLog** table to verify if log collection of openshift-azure-logging is enabled.
-
-After you correct the error(s) in ConfigMap on clusters other than Azure Red Hat OpenShift V3, save the yaml file and apply the updated ConfigMaps by running the command: `kubectl apply -f <configmap_yaml_file.yaml`. For Azure Red Hat OpenShift V3, edit and save the updated ConfigMaps by running the command:
-
-``` bash
-oc edit configmaps container-azm-ms-agentconfig -n openshift-azure-logging
-```
+After you correct the error(s) in ConfigMap, save the yaml file and apply the updated ConfigMaps by running the command: `kubectl apply -f <configmap_yaml_file.yaml`.
 
 ## Applying updated ConfigMap
 
-If you have already deployed a ConfigMap on clusters other than Azure Red Hat OpenShift V3 and you want to update it with a newer configuration, you can edit the ConfigMap file you've previously used and then apply using the same command as before, `kubectl apply -f <configmap_yaml_file.yaml`. For Azure Red Hat OpenShift V3, edit and save the updated ConfigMaps by running the command:
-
-``` bash
-oc edit configmaps container-azm-ms-agentconfig -n openshift-azure-logging
-```
+If you have already deployed a ConfigMap on clusters and you want to update it with a newer configuration, you can edit the ConfigMap file you've previously used and then apply using the same command as before, `kubectl apply -f <configmap_yaml_file.yaml`.
 
 The configuration change can take a few minutes to finish before taking effect, and all omsagent pods in the cluster will restart. The restart is a rolling restart for all omsagent pods, not all restart at the same time. When the restarts are finished, a message is displayed that's similar to the following and includes the result: `configmap "container-azm-ms-agentconfig" updated`.
 

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

@@ -1,6 +1,6 @@
 ---
 title: "Transition to using Container Insights on Azure Arc-enabled Kubernetes clusters"
-ms.date: 04/05/2021
+ms.date: 08/25/2022
 ms.topic: article
 author: austonli
 ms.author: aul
@@ -10,7 +10,7 @@ ms.reviewer: aul
 
 # Transition to using Container Insights on Azure Arc-enabled Kubernetes
 
-On May 31, 2022 Container Insights support for Azure Red Hat OpenShift v4.x will be retired. If you use the script-based model of Container Insights for Azure Red Hat OpenShift v4.x, make sure to transition to Container Insights on [Azure Arc enabled Kubernetes](./container-insights-enable-arc-enabled-clusters.md) prior to that date.
+On May 31, 2022 Container Insights support for Azure Red Hat OpenShift v4.x was retired. If you use the script-based model of Container Insights for Azure Red Hat OpenShift v4.x, make sure to transition to Container Insights on [Azure Arc enabled Kubernetes](./container-insights-enable-arc-enabled-clusters.md) prior to that date.
 
 ## Steps to complete the transition