Gangams/cost optimizations public preview

.trivyignore

@@ -9,3 +9,6 @@ CVE-2022-32149
 
 #dpkg vulnerability in ubuntu
 CVE-2022-2526
+
+#https://avd.aquasec.com/nvd/cve-2021-33621
+CVE-2021-33621

scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json

@@ -49,6 +49,30 @@
             "metadata": {
                 "description": "Array of allowed syslog facilities"
             }
+        },
+        "dataCollectionInterval": {
+            "type": "string",
+            "metadata": {
+                "description": "Data collection interval e.g. \"5m\" for metrics and inventory. Supported value range from 1m to 30m"
+            }
+        },
+        "namespaceFilteringModeForDataCollection": {
+            "type": "string",
+            "metadata": {
+                "description": "Data collection Filtering Mode for the namespaces"
+            },
+            "allowedValues": [
+              "Off",
+              "Include",
+              "Exclude"
+            ],
+            "defaultValue": "Off"
+        },
+        "namespacesForDataCollection": {
+            "type": "array",
+            "metadata": {
+                "description": "An array of Kubernetes namespaces for the data collection of inventory, events and metrics"
+            }
         }
     },
     "variables": {
@@ -80,6 +104,13 @@
                                         "streams": [
                                            "Microsoft-ContainerInsights-Group-Default"
                                         ],
+                                        "extensionSettings": {
+                                            "dataCollectionSettings" : {
+                                                "interval": "[parameters('dataCollectionInterval')]",
+                                                 "namespaceFilteringMode": "[parameters('namespaceFilteringModeForDataCollection')]",
+                                                 "namespaces": "[parameters('namespacesForDataCollection')]"
+                                            }
+                                        },
                                         "extensionName": "ContainerInsights"
                                     }
                                 ]

scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json

@@ -59,6 +59,15 @@
           "<existingOrnew-tag-name2>": "<existingOrnew-tag-value2>",
           "<existingOrnew-tag-nameN>": "<existingOrnew-tag-valueN>"
         }
+      },
+      "dataCollectionInterval":  {
+        "value" : "1m"
+      },
+      "namespaceFilteringModeForDataCollection": {
+        "value": "Off"
+      },
+      "namespacesForDataCollection": {
+        "value": [ "kube-system", "gatekeeper-system", "azure-arc" ]
       }
     }
   }

scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json

@@ -63,6 +63,30 @@
       "metadata": {
         "description": "Array of allowed syslog facilities"
       }
+    },
+    "dataCollectionInterval": {
+      "type": "string",
+      "metadata": {
+          "description": "Data collection interval e.g. \"5m\" for metrics and inventory. Supported value range from 1m to 30m"
+      }
+    },
+    "namespaceFilteringModeForDataCollection": {
+      "type": "string",
+      "metadata": {
+          "description": "Data collection Filtering Mode for the namespaces"
+      },
+      "allowedValues": [
+        "Off",
+        "Include",
+        "Exclude"
+      ],
+      "defaultValue": "Off"
+    },
+    "namespacesForDataCollection": {
+      "type": "array",
+      "metadata": {
+          "description": "An array of Kubernetes namespaces for the data collection of inventory, events and metrics"
+    }
     }
   },
   "variables": {
@@ -94,6 +118,13 @@
                                         "streams": [
                                            "Microsoft-ContainerInsights-Group-Default"
                                         ],
+                                        "extensionSettings": {
+                                          "dataCollectionSettings" : {
+                                            "interval": "[parameters('dataCollectionInterval')]",
+                                             "namespaceFilteringMode": "[parameters('namespaceFilteringModeForDataCollection')]",
+                                             "namespaces": "[parameters('namespacesForDataCollection')]"
+                                          }
+                                        },
                                         "extensionName": "ContainerInsights"
                                     }
                                 ]

scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterParam.json

@@ -62,6 +62,15 @@
         "<existingOrnew-tag-name2>": "<existingOrnew-tag-value2>",
         "<existingOrnew-tag-nameN>": "<existingOrnew-tag-valueN>"
       }
+    },
+    "dataCollectionInterval":  {
+      "value" : "1m"
+    },
+    "namespaceFilteringModeForDataCollection": {
+      "value": "Off"
+    },
+    "namespacesForDataCollection": {
+      "value": [ "kube-system", "gatekeeper-system", "azure-arc" ]
     }
   }
 }

scripts/onboarding/templates/arc-k8s-extension-provisionedcluster-msi-auth/existingClusterOnboarding.json

@@ -63,6 +63,30 @@
       "metadata": {
         "description": "Array of allowed syslog facilities"
       }
+    },
+    "dataCollectionInterval": {
+      "type": "string",
+      "metadata": {
+          "description": "Data collection interval e.g. \"5m\" for metrics and inventory. Supported value range from 1m to 30m"
+      }
+    },
+    "namespaceFilteringModeForDataCollection": {
+      "type": "string",
+      "metadata": {
+          "description": "Data collection Filtering Mode for the namespaces"
+      },
+      "allowedValues": [
+        "Off",
+        "Include",
+        "Exclude"
+      ],
+      "defaultValue": "Off"
+    },
+    "namespacesForDataCollection": {
+      "type": "array",
+      "metadata": {
+          "description": "An array of Kubernetes namespaces for the data collection of inventory, events and metrics"
+      }
     }
   },
   "variables": {
@@ -94,6 +118,13 @@
                                         "streams": [
                                            "Microsoft-ContainerInsights-Group-Default"
                                         ],
+                                        "extensionSettings": {
+                                          "dataCollectionSettings" : {
+                                            "interval": "[parameters('dataCollectionInterval')]",
+                                             "namespaceFilteringMode": "[parameters('namespaceFilteringModeForDataCollection')]",
+                                             "namespaces": "[parameters('namespacesForDataCollection')]"
+                                          }
+                                        },
                                         "extensionName": "ContainerInsights"
                                     }
                                 ]

scripts/onboarding/templates/arc-k8s-extension-provisionedcluster-msi-auth/existingClusterParam.json

@@ -62,6 +62,15 @@
         "<existingOrnew-tag-name2>": "<existingOrnew-tag-value2>",
         "<existingOrnew-tag-nameN>": "<existingOrnew-tag-valueN>"
       }
+    },
+    "dataCollectionInterval":  {
+      "value" : "1m"
+    },
+    "namespaceFilteringModeForDataCollection": {
+      "value": "Off"
+    },
+    "namespacesForDataCollection": {
+      "value": [ "kube-system", "gatekeeper-system", "azure-arc" ]
     }
   }
 }

source/plugins/ruby/ApplicationInsightsUtility.rb

@@ -92,10 +92,15 @@ def initializeUtility()
         if !aadAuthMSIMode.nil? && !aadAuthMSIMode.empty? && aadAuthMSIMode.downcase == "true".downcase
           @@CustomProperties["aadAuthMSIMode"] = "true"
           begin
-            if Dir.exist?('/etc/mdsd.d/config-cache/configchunks')
-              Dir.glob('/etc/mdsd.d/config-cache/configchunks/*.json') { |file|
-                if File.file?(file) && File.exist?(file) && File.foreach(file).grep(/LINUX_SYSLOGS_BLOB/).any?
-                  @@CustomProperties["syslogEnabled"] = "true"
+            if Dir.exist?("/etc/mdsd.d/config-cache/configchunks")
+              Dir.glob("/etc/mdsd.d/config-cache/configchunks/*.json") { |file|
+                if File.file?(file) && File.exist?(file)
+                  if File.foreach(file).grep(/LINUX_SYSLOGS_BLOB/).any?
+                    @@CustomProperties["syslogEnabled"] = "true"
+                  end
+                  if File.foreach(file).grep(/ContainerInsightsExtension/).any? && File.foreach(file).grep(/dataCollectionSettings/).any?
+                    @@CustomProperties["dataCollectionSettingsEnabled"] = "true"
+                  end
                 end
               }
             end