From 5aa2a7ca4ef19e8cb4432575a37204172c7a3c22 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Tue, 7 Jun 2022 09:32:06 -0700 Subject: [PATCH 1/2] update to use stream group --- .../existingClusterOnboarding.json | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index c42a1d074..0107dca96 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -72,18 +72,7 @@ { "name": "ContainerInsightsExtension", "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" + "Microsoft-ContainerInsights-Group-Default" ], "extensionName": "ContainerInsights" } @@ -100,18 +89,7 @@ "dataFlows": [ { "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" + "Microsoft-ContainerInsights-Group-Default" ], "destinations": [ "ciworkspace" From c420a60fc9e3de7a02ab55e3ff9235c14a81abe3 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Mon, 20 Jun 2022 22:45:36 -0700 Subject: [PATCH 2/2] update DCR api version & stream group --- .../existingClusterOnboarding.json | 2 +- .../existingClusterOnboarding.json | 28 ++----------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index 0107dca96..7664e7705 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -61,7 +61,7 @@ "resources": [ { "type": "Microsoft.Insights/dataCollectionRules", - "apiVersion": "2019-11-01-preview", + "apiVersion": "2021-09-01-preview", "name": "[variables('dcrName')]", "location": "[parameters('workspaceLocation')]", "tags": "[parameters('resourceTagValues')]", diff --git a/scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json index a4a4e3453..3010226f9 100644 --- a/scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/templates/arc-k8s-extension-msi-auth/existingClusterOnboarding.json @@ -75,7 +75,7 @@ "resources": [ { "type": "Microsoft.Insights/dataCollectionRules", - "apiVersion": "2019-11-01-preview", + "apiVersion": "2021-09-01-preview", "name": "[variables('dcrName')]", "location": "[parameters('workspaceRegion')]", "tags": "[parameters('resourceTagValues')]", @@ -86,18 +86,7 @@ { "name": "ContainerInsightsExtension", "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" + "Microsoft-ContainerInsights-Group-Default" ], "extensionName": "ContainerInsights" } @@ -114,18 +103,7 @@ "dataFlows": [ { "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" + "Microsoft-ContainerInsights-Group-Default" ], "destinations": [ "ciworkspace"