From 335ee28de01fb2d050602ac1660bd8b83c9ecd63 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Mon, 16 Aug 2021 11:44:25 -0700 Subject: [PATCH 1/2] add telemetry to track fbit settings --- source/plugins/go/src/telemetry.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/source/plugins/go/src/telemetry.go b/source/plugins/go/src/telemetry.go index debe003e4..59a360285 100644 --- a/source/plugins/go/src/telemetry.go +++ b/source/plugins/go/src/telemetry.go @@ -145,8 +145,8 @@ func SendContainerLogPluginMetrics(telemetryPushIntervalProperty string) { ContainerLogTelemetryMutex.Unlock() if strings.Compare(strings.ToLower(os.Getenv("CONTROLLER_TYPE")), "daemonset") == 0 { + telemetryDimensions := make(map[string]string) if strings.Compare(strings.ToLower(os.Getenv("CONTAINER_TYPE")), "prometheussidecar") == 0 { - telemetryDimensions := make(map[string]string) telemetryDimensions["CustomPromMonitorPods"] = promMonitorPods if promMonitorPodsNamespaceLength > 0 { telemetryDimensions["CustomPromMonitorPodsNamespaceLength"] = strconv.Itoa(promMonitorPodsNamespaceLength) @@ -168,6 +168,22 @@ func SendContainerLogPluginMetrics(telemetryPushIntervalProperty string) { SendEvent(eventNameCustomPrometheusSidecarHeartbeat, telemetryDimensions) } else { + fbitFlushIntervalSecs := os.Getenv("FBIT_SERVICE_FLUSH_INTERVAL") + if fbitFlushIntervalSecs != "" { + telemetryDimensions["FbitServiceFlushIntervalSecs"] = fbitFlushIntervalSecs + } + fbitTailBufferChunkSizeMBs := os.Getenv("FBIT_TAIL_BUFFER_CHUNK_SIZE") + if fbitTailBufferChunkSizeMBs != "" { + telemetryDimensions["FbitBufferChunkSizeMBs"] = fbitTailBufferChunkSizeMBs + } + fbitTailBufferMaxSizeMBs := os.Getenv("FBIT_TAIL_BUFFER_MAX_SIZE") + if fbitTailBufferMaxSizeMBs != "" { + telemetryDimensions["FbitBufferMaxSizeMBs"] = fbitTailBufferMaxSizeMBs + } + fbitTailMemBufLimitMBs := os.Getenv("FBIT_TAIL_MEM_BUF_LIMIT") + if fbitTailMemBufLimitMBs != "" { + telemetryDimensions["FbitMemBufLimitSizeMBs"] = fbitTailMemBufLimitMBs + } SendEvent(eventNameDaemonSetHeartbeat, make(map[string]string)) flushRateMetric := appinsights.NewMetricTelemetry(metricNameAvgFlushRate, flushRate) TelemetryClient.Track(flushRateMetric) From 68857cf2bbbcabfb0f6b700c018d5985321e3c96 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Mon, 16 Aug 2021 11:54:48 -0700 Subject: [PATCH 2/2] add telemetry to track fbit settings --- source/plugins/go/src/telemetry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/plugins/go/src/telemetry.go b/source/plugins/go/src/telemetry.go index 59a360285..31818dbb3 100644 --- a/source/plugins/go/src/telemetry.go +++ b/source/plugins/go/src/telemetry.go @@ -184,7 +184,7 @@ func SendContainerLogPluginMetrics(telemetryPushIntervalProperty string) { if fbitTailMemBufLimitMBs != "" { telemetryDimensions["FbitMemBufLimitSizeMBs"] = fbitTailMemBufLimitMBs } - SendEvent(eventNameDaemonSetHeartbeat, make(map[string]string)) + SendEvent(eventNameDaemonSetHeartbeat, telemetryDimensions) flushRateMetric := appinsights.NewMetricTelemetry(metricNameAvgFlushRate, flushRate) TelemetryClient.Track(flushRateMetric) logRateMetric := appinsights.NewMetricTelemetry(metricNameAvgLogGenerationRate, logRate)