Skip to content

Longw/containerlogv2 telemetry dcr #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wanlonghenry merged 4 commits into from
Jun 18, 2025
Merged

Longw/containerlogv2 telemetry dcr #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24cc81c
update telemetry.go add containerlogver conf and dcr
wanlonghenry Jun 13, 2025
3b89523
Merge branch 'ci_prod' of https://github.com/microsoft/Docker-Provide…
wanlonghenry Jun 16, 2025
3d3874f
address comments
wanlonghenry Jun 17, 2025
ca6c5e7
Merge branch 'ci_prod' of https://github.com/microsoft/Docker-Provide…
wanlonghenry Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions source/plugins/go/input/lib/cadvisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 2 additions & 0 deletions source/plugins/go/src/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 0 additions & 4 deletions source/plugins/ruby/CAdvisorMetricsAPIClient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?)
Expand Down
Loading