Longw/containerlogv2 telemetry dcr (#1487)

* update telemetry.go add containerlogver conf and dcr

Author: wanlonghenry

source/plugins/go/input/lib/cadvisor.go

@@ -1065,9 +1065,6 @@ func getContainerCpuMetricItems(metricInfo map[string]interface{}, hostName, met
 						if len(os.Getenv("TELEMETRY_SUBNET_IP_USAGE_INTEGRATION_METRICS")) > 0 {
 							telemetryProps["int-int-ipsubnetusage"] = "1"
 						}
-						if len(os.Getenv("AZMON_CONTAINER_LOG_SCHEMA_VERSION")) > 0 {
-							telemetryProps["containerLogVer"] = os.Getenv("AZMON_CONTAINER_LOG_SCHEMA_VERSION")
-						}
 						if len(os.Getenv("AZMON_MULTILINE_ENABLED")) > 0 {
 							telemetryProps["multilineEnabled"] = os.Getenv("AZMON_MULTILINE_ENABLED")
 						}

source/plugins/go/src/telemetry.go

@@ -312,6 +312,8 @@ func SendContainerLogPluginMetrics(telemetryPushIntervalProperty string) {
 				telemetryDimensions["PromFbitBufferSize"] = os.Getenv("AZMON_FBIT_BUFFER_SIZE")
 				telemetryDimensions["PromFbitMemBufLimit"] = os.Getenv("AZMON_FBIT_MEM_BUF_LIMIT")
 
+				telemetryDimensions["containerLogVer"] = strconv.FormatBool(ContainerLogSchemaV2)
+
 				if IsNetworkFlowLogsEnabled {
 					telemetryDimensions["nflEnabled"] = "true"
 					IsNetworkFlowLogsThrottleEnabled := os.Getenv("NETWORKFLOW_LOGS_THROTTLE_ENABLED")

source/plugins/ruby/CAdvisorMetricsAPIClient.rb

@@ -303,10 +303,6 @@ def getContainerCpuMetricItems(metricJSON, hostName, cpuMetricNameToCollect, met
                     if (!@subnetIpUsageMetrics.nil? && !@subnetIpUsageMetrics.empty?)
                       telemetryProps["int-ipsubnetusage"] = "1"
                     end
-                    #telemetry for Container log schema version clusterContainerLogSchemaVersion
-                    if (!@clusterContainerLogSchemaVersion.nil? && !@clusterContainerLogSchemaVersion.empty?)
-                      telemetryProps["containerLogVer"] = @clusterContainerLogSchemaVersion
-                    end
                     if (!@clusterMultilineEnabled.nil? && !@clusterMultilineEnabled.empty?)
                       telemetryProps["multilineEnabled"] = @clusterMultilineEnabled
                       if (!@clusterMultilineLanguages.nil? && !@clusterMultilineLanguages.empty?)