Disable custom metrics for Arc (#1481)

* Disable custom metrics

* Disable custom metrics

* Remove custom metrics env variable

Author: suyadav1

charts/azuremonitor-containers/values.yaml

@@ -66,8 +66,8 @@ amalogs:
   # This flag to enable and disable service account timebound token and default is enabled
   enableServiceAccountTimeBoundToken: true
 
-  # This flag to enable and disable custom metrics and default is enabled
-  enableCustomMetrics: true
+  # This flag to enable and disable custom metrics. Custom metrics is getting deprecated so default is disabled
+  enableCustomMetrics: false
 
   # This flag to enable and disable Telegraf livenessprobe and default is disabled
   enableTelegrafLivenessprobe: false

kubernetes/ama-logs.yaml

@@ -437,9 +437,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
-            # Update this with the user assigned msi client id for ama-logs
-            - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
-              value: "VALUE_USER_ASSIGNED_IDENTITY_CLIENT_ID_VALUE"
             - name: AZMON_CONTAINERLOGS_ONEAGENT_REGIONS
               value: "koreacentral,norwayeast,eastus2"
             # Uncomment below lines for MSI Auth Mode  testing
@@ -572,9 +569,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            # Update this with the user assigned msi client id for ama-logs
-            - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
-              value: "VALUE_USER_ASSIGNED_IDENTITY_CLIENT_ID_VALUE"
             # Uncomment below lines for MSI Auth Mode  testing
             # - name: USING_AAD_MSI_AUTH
             #   value: "true"
@@ -1088,9 +1082,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            # Update this with the user assigned msi client id for ama-logs
-            - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
-              value: "VALUE_USER_ASSIGNED_IDENTITY_CLIENT_ID_VALUE"
             # Add the below environment variable to true only in sidecar enabled regions, else set it to false
             - name: SIDECAR_SCRAPING_ENABLED
               value: "true"
@@ -1355,9 +1346,6 @@ spec:
                  fieldPath: status.hostIP
           - name: SIDECAR_SCRAPING_ENABLED
             value: "true"
-          # Update this with the user assigned msi client id for ama-logs
-          - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
-            value: "VALUE_USER_ASSIGNED_IDENTITY_CLIENT_ID_VALUE"
           # Add this only for clouds that require cert bootstrapping
           # - name: REQUIRES_CERT_BOOTSTRAP
           #   value: "true"