From 540f8ac3550353c05d0a6643ab311af4a7912ac1 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 7 Jul 2021 22:04:53 -0700 Subject: [PATCH 1/6] fix issue in dcr template --- src/aks-preview/azext_aks_preview/custom.py | 24 +++++++++++++++++++++ src/aks-preview/setup.py | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 5e5d4336899..065ccd9a7ad 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2797,12 +2797,36 @@ def _ensure_container_insights_for_monitoring(cmd, # create the DCR dcr_creation_body = json.dumps({"location": location, "properties": { + "dataSources": { + "extensions": [ + { + "name": "ContainerInsightsExtension", + "streams": [ + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" + ], + "extensionName": "ContainerInsights" + } + ] + }, "dataFlows": [ { "streams": [ "Microsoft-Perf", "Microsoft-ContainerInventory", "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", "Microsoft-ContainerNodeInventory", "Microsoft-KubeEvents", "Microsoft-KubeHealth", diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index fa4e30ceeb1..f009d863709 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -8,7 +8,7 @@ from codecs import open as open1 from setuptools import setup, find_packages -VERSION = "0.5.21" +VERSION = "0.5.22" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', From 70508a2cf042d4c129bb0564577afe317396654d Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 7 Jul 2021 22:58:16 -0700 Subject: [PATCH 2/6] fix indention issue --- src/aks-preview/azext_aks_preview/custom.py | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 065ccd9a7ad..bbb5837e1cd 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2798,27 +2798,27 @@ def _ensure_container_insights_for_monitoring(cmd, dcr_creation_body = json.dumps({"location": location, "properties": { "dataSources": { - "extensions": [ - { - "name": "ContainerInsightsExtension", - "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeHealth", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" - ], - "extensionName": "ContainerInsights" - } - ] + "extensions": [ + { + "name": "ContainerInsightsExtension", + "streams": [ + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" + ], + "extensionName": "ContainerInsights" + } + ] }, "dataFlows": [ { From ada5676376da62dab22bbb29a371d09df46cf770 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 7 Jul 2021 23:11:39 -0700 Subject: [PATCH 3/6] Update src/aks-preview/azext_aks_preview/custom.py Co-authored-by: Xing Zhou --- src/aks-preview/azext_aks_preview/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index bbb5837e1cd..9361eef04f4 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2801,7 +2801,7 @@ def _ensure_container_insights_for_monitoring(cmd, "extensions": [ { "name": "ContainerInsightsExtension", - "streams": [ + "streams": [ "Microsoft-Perf", "Microsoft-ContainerInventory", "Microsoft-ContainerLog", From a2b7acef8c4f5acbeca21d33d48f703f50c25d27 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 7 Jul 2021 23:11:44 -0700 Subject: [PATCH 4/6] Update src/aks-preview/azext_aks_preview/custom.py Co-authored-by: Xing Zhou --- src/aks-preview/azext_aks_preview/custom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 9361eef04f4..221fb1343ef 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2815,8 +2815,8 @@ def _ensure_container_insights_for_monitoring(cmd, "Microsoft-KubePVInventory", "Microsoft-KubeServices", "Microsoft-InsightsMetrics" - ], - "extensionName": "ContainerInsights" + ], + "extensionName": "ContainerInsights" } ] }, From 2d40dd84e880cc80c500271b9d0895143d3d1a81 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 7 Jul 2021 23:23:41 -0700 Subject: [PATCH 5/6] Update src/aks-preview/azext_aks_preview/custom.py Co-authored-by: Xing Zhou --- src/aks-preview/azext_aks_preview/custom.py | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 221fb1343ef..44d5607ed82 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2802,19 +2802,19 @@ def _ensure_container_insights_for_monitoring(cmd, { "name": "ContainerInsightsExtension", "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeHealth", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" ], "extensionName": "ContainerInsights" } From aaf168263dff3ba94d3d39bd26583a43ff652c3d Mon Sep 17 00:00:00 2001 From: Xing Zhou Date: Thu, 8 Jul 2021 14:40:28 +0800 Subject: [PATCH 6/6] Update src/aks-preview/azext_aks_preview/custom.py --- src/aks-preview/azext_aks_preview/custom.py | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 44d5607ed82..57cda86167d 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -2800,23 +2800,23 @@ def _ensure_container_insights_for_monitoring(cmd, "dataSources": { "extensions": [ { - "name": "ContainerInsightsExtension", - "streams": [ - "Microsoft-Perf", - "Microsoft-ContainerInventory", - "Microsoft-ContainerLog", - "Microsoft-ContainerLogV2", - "Microsoft-ContainerNodeInventory", - "Microsoft-KubeEvents", - "Microsoft-KubeHealth", - "Microsoft-KubeMonAgentEvents", - "Microsoft-KubeNodeInventory", - "Microsoft-KubePodInventory", - "Microsoft-KubePVInventory", - "Microsoft-KubeServices", - "Microsoft-InsightsMetrics" - ], - "extensionName": "ContainerInsights" + "name": "ContainerInsightsExtension", + "streams": [ + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" + ], + "extensionName": "ContainerInsights" } ] },