From b2a1974a7398d269b31a121a34c766e0277b4ebe Mon Sep 17 00:00:00 2001 From: Auston Li Date: Tue, 17 May 2022 14:54:00 -0700 Subject: [PATCH 1/2] Adding v2 schema options Adding commented out section in log collection settings for v2 schema --- kubernetes/container-azm-ms-agentconfig.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubernetes/container-azm-ms-agentconfig.yaml b/kubernetes/container-azm-ms-agentconfig.yaml index 328acb201..0ed3655b6 100644 --- a/kubernetes/container-azm-ms-agentconfig.yaml +++ b/kubernetes/container-azm-ms-agentconfig.yaml @@ -42,6 +42,12 @@ data: # When the setting is set to false, only the kube events with !normal event type will be collected enabled = false # When this is enabled (enabled = true), all kube events including normal events will be collected + #[log_collection_settings.schema] + # In the absense of this configmap, default value for containerlog_schema_version is "v1" + # Supported values for this setting are "v1","v2" + # See documentation for benefits of v2 schema over v1 schema before opting for "v2" schema + # containerlog_schema_version = "v2" + prometheus-data-collection-settings: |- # Custom Prometheus metrics data collection settings From 056afb079c9b18bc96464edebf25fa8d67784b5c Mon Sep 17 00:00:00 2001 From: Auston Li Date: Thu, 19 May 2022 12:49:58 -0700 Subject: [PATCH 2/2] adding documentation link --- kubernetes/container-azm-ms-agentconfig.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/container-azm-ms-agentconfig.yaml b/kubernetes/container-azm-ms-agentconfig.yaml index 0ed3655b6..5e8aa187a 100644 --- a/kubernetes/container-azm-ms-agentconfig.yaml +++ b/kubernetes/container-azm-ms-agentconfig.yaml @@ -43,9 +43,9 @@ data: enabled = false # When this is enabled (enabled = true), all kube events including normal events will be collected #[log_collection_settings.schema] - # In the absense of this configmap, default value for containerlog_schema_version is "v1" + # In the absence of this configmap, default value for containerlog_schema_version is "v1" # Supported values for this setting are "v1","v2" - # See documentation for benefits of v2 schema over v1 schema before opting for "v2" schema + # See documentation at https://aka.ms/ContainerLogv2 for benefits of v2 schema over v1 schema before opting for "v2" schema # containerlog_schema_version = "v2"