From f0fbeddf3619163dd45d696af67b491039a16d04 Mon Sep 17 00:00:00 2001 From: rashmy Date: Mon, 26 Nov 2018 18:22:40 -0800 Subject: [PATCH 1/2] environment variable fix --- source/code/plugin/in_containerinventory.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/code/plugin/in_containerinventory.rb b/source/code/plugin/in_containerinventory.rb index 43811e1e1..f501421a2 100644 --- a/source/code/plugin/in_containerinventory.rb +++ b/source/code/plugin/in_containerinventory.rb @@ -56,6 +56,11 @@ def obtainContainerConfig(instance, container) envValue = configValue['Env'] envValueString = (envValue.nil?) ? "" : envValue.to_s + # Skip environment variable processing if it contains the flag AZMON_COLLECT_ENV=FALSE + if /AZMON_COLLECT_ENV=FALSE/i.match(envValueString) + envValueString = ["AZMON_COLLECT_ENV=FALSE"] + $log.warn("Environment Variable collection for container: #{container['Id']} skipped because AZMON_COLLECT_ENV is set to false") + end # Restricting the ENV string value to 200kb since the size of this string can go very high if envValueString.length > 200000 envValueStringTruncated = envValueString.slice(0..200000) From 965f423bb435110d76e4ddf4be44945e4460da1a Mon Sep 17 00:00:00 2001 From: rashmy Date: Mon, 26 Nov 2018 18:32:51 -0800 Subject: [PATCH 2/2] updating agent version --- installer/conf/td-agent-bit.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/conf/td-agent-bit.conf b/installer/conf/td-agent-bit.conf index 2a6199987..fe174f9a5 100644 --- a/installer/conf/td-agent-bit.conf +++ b/installer/conf/td-agent-bit.conf @@ -28,4 +28,4 @@ EnableTelemetry true TelemetryPushIntervalSeconds 300 Match oms.container.log.* - AgentVersion ciprod10162018-2 + AgentVersion internaltest1126