diff --git a/Makefile b/Makefile index da9c8294a0..03e22d2f20 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ WIN_BUILD = GOOS=windows GOARCH=amd64 go build -trimpath -buildmode=${CWAGENT_BU DARWIN_BUILD_AMD64 = CGO_ENABLED=1 GO111MODULE=on GOOS=darwin GOARCH=amd64 go build -trimpath -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/darwin_amd64 DARWIN_BUILD_ARM64 = CGO_ENABLED=1 GO111MODULE=on GOOS=darwin GOARCH=arm64 go build -trimpath -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/darwin_arm64 -IMAGE_REGISTRY = 730335384949.dkr.ecr.us-west-2.amazonaws.com -IMAGE_REPO = cwagent -IMAGE_TAG = latest +IMAGE_REGISTRY = amazon +IMAGE_REPO = cloudwatch-agent +IMAGE_TAG = $(VERSION) IMAGE = $(IMAGE_REGISTRY)/$(IMAGE_REPO):$(IMAGE_TAG) DOCKER_BUILD_FROM_SOURCE = docker build -t $(IMAGE) -f ./amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile DOCKER_WINDOWS_BUILD_FROM_SOURCE = docker build -t $(IMAGE) -f ./amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile.Windows diff --git a/go.mod b/go.mod index 7cad6d193e..d91df3986f 100644 --- a/go.mod +++ b/go.mod @@ -7,41 +7,43 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2024 // Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters // to be all replaced since there are some changes that will always be from upstream replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241216205413-8e059f1441db ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241206205307-66e9942f29e0 +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241216205413-8e059f1441db replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20241216205413-8e059f1441db + ) replace ( // For clear resource attributes after copy functionality https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/148 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241216205413-8e059f1441db // Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241216205413-8e059f1441db ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241206205307-66e9942f29e0 +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241216205413-8e059f1441db replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241206205307-66e9942f29e0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241216205413-8e059f1441db + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241216205413-8e059f1441db ) // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957 @@ -92,7 +94,7 @@ replace github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.48.6 require ( github.com/BurntSushi/toml v1.3.2 github.com/Jeffail/gabs v1.4.0 - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241206205307-66e9942f29e0 + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241216205413-8e059f1441db github.com/aws/aws-sdk-go v1.53.11 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.30.2 github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 @@ -144,7 +146,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.103.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.103.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241206205307-66e9942f29e0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241216205413-8e059f1441db github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.103.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.103.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0 @@ -232,7 +234,7 @@ require ( github.com/alecthomas/participle v0.4.1 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241206205307-66e9942f29e0 // indirect + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241216205413-8e059f1441db // indirect github.com/antchfx/jsonquery v1.1.5 // indirect github.com/antchfx/xmlquery v1.3.9 // indirect github.com/antchfx/xpath v1.2.0 // indirect diff --git a/go.sum b/go.sum index a048d204f0..15601b6998 100644 --- a/go.sum +++ b/go.sum @@ -180,54 +180,56 @@ github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241206205307-66e9942f29e0 h1:GgevwfZ41Fm8fGY941X3Vhwzj6AnOcyPjKfupOM/o6I= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241206205307-66e9942f29e0/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241206205307-66e9942f29e0 h1:9F7kOfAKeYFIiiiX8ojNvJYLtv0sJhSacgjJ+pghFVA= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241206205307-66e9942f29e0/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241206205307-66e9942f29e0 h1:i7NvWVLTk3CYyc9PoM4gCf4rVEbtjVV+kkRRE4hXq7c= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241206205307-66e9942f29e0/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241206205307-66e9942f29e0 h1:/60aJEsBjrvauK2A4uUfZxIo05Dqo+BqlhO/WbIHMoE= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241206205307-66e9942f29e0/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241206205307-66e9942f29e0 h1:UqVLY8i2UVctbr1YkId5ovbfE6uXSgXrBCQNZ9uvO0I= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241206205307-66e9942f29e0/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241206205307-66e9942f29e0 h1:A7oYZ8dU4oL/Su/YTUZXh9+CR9pxZ1YkexByDm1f51g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241206205307-66e9942f29e0/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241206205307-66e9942f29e0 h1:TivXmQKWMWMLM3eTCugdlkmlIDK6B/YT1IqnEFpNLKo= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241206205307-66e9942f29e0/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241206205307-66e9942f29e0 h1:W0VF6In6tZX2lhFuSi1/obfrABmMf9AfW48C8NVOBCM= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241206205307-66e9942f29e0/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241206205307-66e9942f29e0 h1:dGaKfBf8rQ38sPZ1GVdkwZAGcf3jLoNxqpLPACZ7FYA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241206205307-66e9942f29e0/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241206205307-66e9942f29e0 h1:BISMlS+cB5bustBU+OmIej5jzLUPWP9tE+OxAH2jxb4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241206205307-66e9942f29e0/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241206205307-66e9942f29e0 h1:O6uXxhlv21vBepDu1SKDmwDeVD0+XQwxaSVjaY/0g1Q= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241206205307-66e9942f29e0/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241206205307-66e9942f29e0 h1:WzxoCCMExJIZScglR8NFMiUa70ZlYpKhexdCbTZIfXA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241206205307-66e9942f29e0/go.mod h1:Ai4BsM7C05bEQYO2O272S1LmsyIhO5r0iLmXF5NN5so= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241206205307-66e9942f29e0 h1:KECRUpyad535mqD6j5y+AY2rp5qPOhau0EsGHbBCf54= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241206205307-66e9942f29e0/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241206205307-66e9942f29e0 h1:EO1aIMxxB3/74rkrQL6Jkg+VwVZdcCF3U+aCJTm+N60= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241206205307-66e9942f29e0/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241206205307-66e9942f29e0 h1:WMsFbb3M5xwS9ZAkF3O70DkWa/DCoren7Ib+RCDpF8w= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241206205307-66e9942f29e0/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241206205307-66e9942f29e0 h1:zv+JZpDFVgMHCFIOvjMvHRLMPUQXlN/rYNEuGGMmbmQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241206205307-66e9942f29e0/go.mod h1:Rr5b3hr6Jy9w/zTjsOl3vcyDDusc90P+iGdOd0UCYOo= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241206205307-66e9942f29e0 h1:ZZrn0V1pp5kdKHewBgblKxhEfcD4gz6pviu8qX5GbXs= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241206205307-66e9942f29e0/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241206205307-66e9942f29e0 h1:VJNqzoEwsRx3ZTcQMNv+Yiwa/wo7qcRSVDCJU/bedsw= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241206205307-66e9942f29e0/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241206205307-66e9942f29e0 h1:t7vnpLQ3CFntUBL1e4CDIY3gu+OkcwDd/yqwwO88ZdU= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241206205307-66e9942f29e0/go.mod h1:uzpU7Y6+oL6RdOv8IWi6fjT8LNV6FYX6CN6NATLJOiQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241206205307-66e9942f29e0 h1:1DyJ6QJ/dPlMI5fSqJK4Zp0ameSdEpR7dqtKQtHw3bQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241206205307-66e9942f29e0/go.mod h1:eafplURJOusRrEwH+/hjaiURS+OiKLEgaA4DGhp/rhk= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241206205307-66e9942f29e0 h1:IIIp7tjS49qYS8JoZaB/GnVFPE/CK/riTVgwyViE6fI= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241206205307-66e9942f29e0/go.mod h1:QWPqmqbzXUZtrh4I0uCJXzDnvUMdxDd9UGjdZLGxf68= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241206205307-66e9942f29e0 h1:JlwqDIMZy3PHbb281sQhTXDhreSLIheOWO1FvBSxuhk= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241206205307-66e9942f29e0/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241206205307-66e9942f29e0 h1:iGIXsNKYVSm8eBdsUb31IPKSclLWPR28HyMmnB7o4BY= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241206205307-66e9942f29e0/go.mod h1:hRUrYatVP/GFNxHn2yW1gJcnPyGtdlTXyebpzzzjZeU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241206205307-66e9942f29e0 h1:6vB4V36cZB6XAcx6napCBIjptTERfMR9rsPOA99WrZo= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241206205307-66e9942f29e0/go.mod h1:/R2tBPLPR8dLZA0BQI2ZA7IB/zU7Q+Ghp+ujiPacVkA= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241216205413-8e059f1441db h1:M3mCeHB5pVhpGdFkx9qJlBtUURxkg6fEQUNNJdYLk3I= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20241216205413-8e059f1441db/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241216205413-8e059f1441db h1:N0An6pXgyPzUIwzqyiO2u6U2SwedbIR25ntcf4KoU3g= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20241216205413-8e059f1441db/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241216205413-8e059f1441db h1:L+xPXimFZAtTgougLt59HvivqCyBgh066rv/XbenHUM= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20241216205413-8e059f1441db/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241216205413-8e059f1441db h1:rdQRfKoW60Aomz9Tc8fF0Ld5x/Q96vNz8idPQF/qG9Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20241216205413-8e059f1441db/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241216205413-8e059f1441db h1:hz8QaW7a5RhFo5/9XRACEcEtEp/D6xElN9jW092NU3o= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20241216205413-8e059f1441db/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241216205413-8e059f1441db h1:q+FeNooNk9UHEkwGqQB++KanhE0Plu9yDYtNxSN4i7w= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20241216205413-8e059f1441db/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241216205413-8e059f1441db h1:xnj2m4/8b/B84g6AkH5fxhuVvuyeCun7OohdcFd396U= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20241216205413-8e059f1441db/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241216205413-8e059f1441db h1:zlFQw3BjI/5iYOmfvec3tzD9uO7k5IcYSAYvJpD8iuU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20241216205413-8e059f1441db/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241216205413-8e059f1441db h1:hKeTI5bm2QKvFrsZDI4MNmj5Q86rGdxlucKwTF+2MzY= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20241216205413-8e059f1441db/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241216205413-8e059f1441db h1:TTp+wkHzVY6SHL6Cj4O7XnAxLL7iYf7rZ2pDx6ILQgk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20241216205413-8e059f1441db/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241216205413-8e059f1441db h1:zeZ/RfbeKYNUzglQs3JcXOkeHMndO8mCUfoNddTJnW0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20241216205413-8e059f1441db/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241216205413-8e059f1441db h1:y7Fd6vE3G6bxB/S6a1yli54aA2hLNk7SxzjJ6X3H9iU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20241216205413-8e059f1441db/go.mod h1:Ai4BsM7C05bEQYO2O272S1LmsyIhO5r0iLmXF5NN5so= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241216205413-8e059f1441db h1:GFcv7W5ZCkQ7JZd2rqGXmu8IQJNQux1L0e+NWETnk3c= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20241216205413-8e059f1441db/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241216205413-8e059f1441db h1:USnGN4kAHNum+M14jp7HOGe8IZIw+LrA668XyiL3UPk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20241216205413-8e059f1441db/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20241216205413-8e059f1441db h1:mYtRMWfhv2wGWFhA/3vsX1DwUKgrLSC21a/NZR69fTQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20241216205413-8e059f1441db/go.mod h1:l/vd01pHoBByPjOL0xXK7Qg3+qIpPb0RGcpORNciJJM= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241216205413-8e059f1441db h1:Lqq98S/zDfQ+y0OJu9EIwdmgFf5gCJ1chDZJWqpydVs= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241216205413-8e059f1441db/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241216205413-8e059f1441db h1:cHgCAM78RpGlltSVJ905LD/JZqYfEpc4Gb6xZvPh50U= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20241216205413-8e059f1441db/go.mod h1:Rr5b3hr6Jy9w/zTjsOl3vcyDDusc90P+iGdOd0UCYOo= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241216205413-8e059f1441db h1:eSQHA4NrEITpzRdsu5vDJO2Cuuu8Dn8dr0augxc+Oyk= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20241216205413-8e059f1441db/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241216205413-8e059f1441db h1:X6bJy+ZTMbyFx5+JlJ4OkIBhjN7byZ1FLz2BbxBVOGc= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20241216205413-8e059f1441db/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241216205413-8e059f1441db h1:hLUqHFJ1WXLugc2UaX921NREVt5Z97LtKhsCvbIp5M4= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20241216205413-8e059f1441db/go.mod h1:mwpBj24vuuuvs11sJpGWtWLtd9Ou7RizcuXc+Uofhi8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241216205413-8e059f1441db h1:kfh9b7QjmRIkT6ytj/GcpQXn+zQtIaxMtfzfyTiChr8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20241216205413-8e059f1441db/go.mod h1:dnULh8T9lt2RWMwLd3DdTPiTwniRrHlOQLcdVDn9/aQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241216205413-8e059f1441db h1:MLRpuOmiOtN/vzFQCSaO+HrcZPOi4GW2wZvRQonJsLo= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20241216205413-8e059f1441db/go.mod h1:QWPqmqbzXUZtrh4I0uCJXzDnvUMdxDd9UGjdZLGxf68= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241216205413-8e059f1441db h1:QMTBAyheWMMOEDzLd9srk9relhYBnGhr3gQCHX+g/AA= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20241216205413-8e059f1441db/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241216205413-8e059f1441db h1:v5kOaxE58eP9KZTl3YhbcHjkdDFRf3Sqjxl0HAT0HxE= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20241216205413-8e059f1441db/go.mod h1:hRUrYatVP/GFNxHn2yW1gJcnPyGtdlTXyebpzzzjZeU= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241216205413-8e059f1441db h1:LCYWqC+KCiq3gCRDGK0NAaQEoGWawghXcT6dkQLOYKs= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20241216205413-8e059f1441db/go.mod h1:/R2tBPLPR8dLZA0BQI2ZA7IB/zU7Q+Ghp+ujiPacVkA= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= @@ -1189,8 +1191,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.10 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.103.0/go.mod h1:hCzgpzXbUUDUlETMDKYOpPaOhPjR9T6M3W3nAW5cGX4= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.103.0 h1:gksMpwy9oZN14E4kRBfLtVkE8YJn++7woM1b3hQboJg= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.103.0/go.mod h1:OLpJzn4LgzICAnyu+7mJ33rM2WOgPWpjXvZ6YKrJ6yM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 h1:Q5b1ZIjQf5EGKAQSJa6XfHWt/TDaNs+qldqdpYK+ovo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0/go.mod h1:VDyjNiPEI3G3IJ7CwxU6zCTErB7KovQh6l51eePAPWc= github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 h1:5PHQ2a5VsqXDZBmso84fLDzT66GV0mqDT5JCB07W8Ws= github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0/go.mod h1:oU1oils/dQVq3E3h7e3afFEXfCSmwniEK/NlEByaJWY= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.103.0 h1:JjHxUTE7cbrqddMLueLhVcWbxxr9INLf5sIsRBcuPUE= diff --git a/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml b/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml index 6c425849d1..2edfbbded1 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml @@ -45,9 +45,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - ImageId - InstanceId - InstanceType - - ImageId imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s @@ -89,11 +89,11 @@ service: - awsentity/resource - ec2tagger receivers: + - telegraf_netstat - telegraf_swap - telegraf_cpu - telegraf_disk - telegraf_mem - - telegraf_netstat metrics/hostDeltaMetrics: exporters: - awscloudwatch diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index 5dddb3f844..ee0877d782 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -97,13 +97,13 @@ service: - awsentity/resource - ec2tagger receivers: + - telegraf_ethtool - telegraf_nvidia_smi - telegraf_cpu - telegraf_disk - telegraf_mem - telegraf_netstat - telegraf_swap - - telegraf_ethtool metrics/hostDeltaMetrics: exporters: - awscloudwatch diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index bd3e45ed9e..7e88397a2d 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -35,9 +35,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - InstanceType - ImageId - InstanceId - - InstanceType imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml index 269ffe1816..8ecedac6e1 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml @@ -999,6 +999,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml index 3ad6ee7be8..e8ce5d1bc7 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml @@ -1128,6 +1128,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: @@ -1215,6 +1216,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml index a9a5879fc2..bdca9dc8c9 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml @@ -1129,6 +1129,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: @@ -1216,6 +1217,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml index 3ad6ee7be8..e8ce5d1bc7 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml @@ -1128,6 +1128,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: @@ -1215,6 +1216,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml index 3ad6ee7be8..e8ce5d1bc7 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml @@ -1128,6 +1128,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: @@ -1215,6 +1216,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml index 2f8b79e011..a9e969978a 100644 --- a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml @@ -1009,6 +1009,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml index 0820331549..a1e35f125c 100644 --- a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml @@ -1005,6 +1005,7 @@ processors: faas.version: enabled: true max_idle_conns: 100 + middleware: agenthealth/statuscode openshift: address: "" resource_attributes: diff --git a/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml b/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml index 250e5a6de3..4df5992b20 100644 --- a/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml @@ -189,6 +189,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index caa5cfc15b..a2cc400a66 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -63,8 +63,8 @@ service: - awsentity/resource - ec2tagger receivers: - - telegraf_disk - telegraf_mem + - telegraf_disk telemetry: logs: development: false diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index 8f5d51fc73..9583912100 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -35,9 +35,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: - - InstanceType - ImageId - InstanceId + - InstanceType imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s diff --git a/translator/tocwconfig/sampleConfig/compass_linux_config.yaml b/translator/tocwconfig/sampleConfig/compass_linux_config.yaml index cdc02e2d2f..09c4ff3916 100644 --- a/translator/tocwconfig/sampleConfig/compass_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/compass_linux_config.yaml @@ -47,9 +47,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - ImageId - InstanceId - InstanceType - - ImageId imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index 4ad0290915..cb9b62b5d7 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -133,9 +133,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: - - ImageId - InstanceId - InstanceType + - ImageId imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s @@ -146,11 +146,11 @@ processors: metric_statements: - context: metric statements: - - set(unit, "unit") where name == "disk_free" - - set(name, "DISK_FREE") where name == "disk_free" - set(unit, "unit") where name == "cpu_usage_idle" - set(name, "CPU_USAGE_IDLE") where name == "cpu_usage_idle" - set(unit, "unit") where name == "cpu_usage_nice" + - set(unit, "unit") where name == "disk_free" + - set(name, "DISK_FREE") where name == "disk_free" trace_statements: [] receivers: awsxray: @@ -284,13 +284,13 @@ service: - ec2tagger - transform receivers: - - telegraf_swap - - telegraf_netstat - telegraf_disk + - telegraf_swap - telegraf_mem + - telegraf_cpu - telegraf_processes + - telegraf_netstat - telegraf_procstat/1917393364 - - telegraf_cpu metrics/hostCustomMetrics: exporters: - awscloudwatch @@ -299,8 +299,8 @@ service: - ec2tagger - transform receivers: - - telegraf_statsd - telegraf_socket_listener + - telegraf_statsd metrics/hostDeltaMetrics: exporters: - awscloudwatch @@ -310,8 +310,8 @@ service: - ec2tagger - transform receivers: - - telegraf_net - telegraf_diskio + - telegraf_net traces/xray: exporters: - awsxray diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index b9decbb138..6105f937bc 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -198,11 +198,11 @@ processors: metric_statements: - context: metric statements: + - set(unit, "unit") where name == "disk_free" + - set(name, "DISK_FREE") where name == "disk_free" - set(unit, "unit") where name == "cpu_usage_idle" - set(name, "CPU_USAGE_IDLE") where name == "cpu_usage_idle" - set(unit, "unit") where name == "cpu_usage_nice" - - set(unit, "unit") where name == "disk_free" - - set(name, "DISK_FREE") where name == "disk_free" trace_statements: [] transform/jmx/0: error_mode: propagate @@ -391,13 +391,13 @@ service: - ec2tagger - transform receivers: - - telegraf_processes - - telegraf_cpu - telegraf_swap - - telegraf_procstat/1917393364 - - telegraf_disk + - telegraf_cpu - telegraf_netstat + - telegraf_procstat/1917393364 - telegraf_mem + - telegraf_disk + - telegraf_processes metrics/hostCustomMetrics/cloudwatch: exporters: - awscloudwatch @@ -406,8 +406,8 @@ service: - ec2tagger - transform receivers: - - telegraf_socket_listener - telegraf_statsd + - telegraf_socket_listener metrics/hostDeltaMetrics/cloudwatch: exporters: - awscloudwatch diff --git a/translator/tocwconfig/sampleConfig/container_insights_jmx.yaml b/translator/tocwconfig/sampleConfig/container_insights_jmx.yaml index 77976a2761..0fa09f48e6 100644 --- a/translator/tocwconfig/sampleConfig/container_insights_jmx.yaml +++ b/translator/tocwconfig/sampleConfig/container_insights_jmx.yaml @@ -503,6 +503,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml index e9ed041ca5..57d9a066e2 100644 --- a/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml @@ -42,9 +42,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - ImageId - InstanceId - InstanceType - - ImageId imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml index 5f7b8e85e4..8a0d8fc3e2 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml @@ -451,6 +451,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: true max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml index 44fccdb2b6..d70f0580c3 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml @@ -692,9 +692,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED_PERCENT + include: DCGM_FI_DEV_POWER_USAGE match_type: "" - new_name: container_gpu_memory_utilization + new_name: container_gpu_power_draw operations: - action: add_label aggregation_type: "" @@ -703,19 +703,12 @@ processors: label_value: "" new_label: Type new_value: ContainerGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 100 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED_PERCENT + include: DCGM_FI_DEV_POWER_USAGE match_type: "" - new_name: pod_gpu_memory_utilization + new_name: pod_gpu_power_draw operations: - action: add_label aggregation_type: "" @@ -724,19 +717,12 @@ processors: label_value: "" new_label: Type new_value: PodGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 100 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED_PERCENT + include: DCGM_FI_DEV_POWER_USAGE match_type: "" - new_name: node_gpu_memory_utilization + new_name: node_gpu_power_draw operations: - action: add_label aggregation_type: "" @@ -745,19 +731,12 @@ processors: label_value: "" new_label: Type new_value: NodeGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 100 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED + include: DCGM_FI_DEV_GPU_UTIL match_type: "" - new_name: container_gpu_memory_used + new_name: container_gpu_utilization operations: - action: add_label aggregation_type: "" @@ -766,19 +745,12 @@ processors: label_value: "" new_label: Type new_value: ContainerGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 1.048576e+06 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED + include: DCGM_FI_DEV_GPU_UTIL match_type: "" - new_name: pod_gpu_memory_used + new_name: pod_gpu_utilization operations: - action: add_label aggregation_type: "" @@ -787,19 +759,12 @@ processors: label_value: "" new_label: Type new_value: PodGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 1.048576e+06 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_USED + include: DCGM_FI_DEV_GPU_UTIL match_type: "" - new_name: node_gpu_memory_used + new_name: node_gpu_utilization operations: - action: add_label aggregation_type: "" @@ -808,19 +773,12 @@ processors: label_value: "" new_label: Type new_value: NodeGPU - - action: experimental_scale_value - aggregation_type: "" - experimental_scale: 1.048576e+06 - label: "" - label_value: "" - new_label: "" - new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_TOTAL + include: DCGM_FI_DEV_FB_USED_PERCENT match_type: "" - new_name: container_gpu_memory_total + new_name: container_gpu_memory_utilization operations: - action: add_label aggregation_type: "" @@ -831,7 +789,7 @@ processors: new_value: ContainerGPU - action: experimental_scale_value aggregation_type: "" - experimental_scale: 1.048576e+06 + experimental_scale: 100 label: "" label_value: "" new_label: "" @@ -839,9 +797,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_TOTAL + include: DCGM_FI_DEV_FB_USED_PERCENT match_type: "" - new_name: pod_gpu_memory_total + new_name: pod_gpu_memory_utilization operations: - action: add_label aggregation_type: "" @@ -852,7 +810,7 @@ processors: new_value: PodGPU - action: experimental_scale_value aggregation_type: "" - experimental_scale: 1.048576e+06 + experimental_scale: 100 label: "" label_value: "" new_label: "" @@ -860,9 +818,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_FB_TOTAL + include: DCGM_FI_DEV_FB_USED_PERCENT match_type: "" - new_name: node_gpu_memory_total + new_name: node_gpu_memory_utilization operations: - action: add_label aggregation_type: "" @@ -873,7 +831,7 @@ processors: new_value: NodeGPU - action: experimental_scale_value aggregation_type: "" - experimental_scale: 1.048576e+06 + experimental_scale: 100 label: "" label_value: "" new_label: "" @@ -881,9 +839,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_TEMP + include: DCGM_FI_DEV_FB_USED match_type: "" - new_name: container_gpu_temperature + new_name: container_gpu_memory_used operations: - action: add_label aggregation_type: "" @@ -892,12 +850,19 @@ processors: label_value: "" new_label: Type new_value: ContainerGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_TEMP + include: DCGM_FI_DEV_FB_USED match_type: "" - new_name: pod_gpu_temperature + new_name: pod_gpu_memory_used operations: - action: add_label aggregation_type: "" @@ -906,12 +871,19 @@ processors: label_value: "" new_label: Type new_value: PodGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_TEMP + include: DCGM_FI_DEV_FB_USED match_type: "" - new_name: node_gpu_temperature + new_name: node_gpu_memory_used operations: - action: add_label aggregation_type: "" @@ -920,12 +892,19 @@ processors: label_value: "" new_label: Type new_value: NodeGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_POWER_USAGE + include: DCGM_FI_DEV_FB_TOTAL match_type: "" - new_name: container_gpu_power_draw + new_name: container_gpu_memory_total operations: - action: add_label aggregation_type: "" @@ -934,12 +913,19 @@ processors: label_value: "" new_label: Type new_value: ContainerGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_POWER_USAGE + include: DCGM_FI_DEV_FB_TOTAL match_type: "" - new_name: pod_gpu_power_draw + new_name: pod_gpu_memory_total operations: - action: add_label aggregation_type: "" @@ -948,12 +934,19 @@ processors: label_value: "" new_label: Type new_value: PodGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_POWER_USAGE + include: DCGM_FI_DEV_FB_TOTAL match_type: "" - new_name: node_gpu_power_draw + new_name: node_gpu_memory_total operations: - action: add_label aggregation_type: "" @@ -962,12 +955,19 @@ processors: label_value: "" new_label: Type new_value: NodeGPU + - action: experimental_scale_value + aggregation_type: "" + experimental_scale: 1.048576e+06 + label: "" + label_value: "" + new_label: "" + new_value: "" submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_UTIL + include: DCGM_FI_DEV_GPU_TEMP match_type: "" - new_name: container_gpu_utilization + new_name: container_gpu_temperature operations: - action: add_label aggregation_type: "" @@ -979,9 +979,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_UTIL + include: DCGM_FI_DEV_GPU_TEMP match_type: "" - new_name: pod_gpu_utilization + new_name: pod_gpu_temperature operations: - action: add_label aggregation_type: "" @@ -993,9 +993,9 @@ processors: submatch_case: "" - action: insert aggregation_type: "" - include: DCGM_FI_DEV_GPU_UTIL + include: DCGM_FI_DEV_GPU_TEMP match_type: "" - new_name: node_gpu_utilization + new_name: node_gpu_temperature operations: - action: add_label aggregation_type: "" @@ -1005,13 +1005,6 @@ processors: new_label: Type new_value: NodeGPU submatch_case: "" - - action: update - aggregation_type: "" - include: execution_latency_seconds - match_type: "" - new_name: neuron_execution_latency - operations: [] - submatch_case: "" - action: update aggregation_type: "" include: execution_errors_total @@ -1021,23 +1014,16 @@ processors: submatch_case: "" - action: update aggregation_type: "" - include: execution_status_total - match_type: "" - new_name: neuron_execution_status - operations: [] - submatch_case: "" - - action: update - aggregation_type: "" - include: neuroncore_memory_usage_constants + include: neuroncore_memory_usage_model_code match_type: "" - new_name: neuroncore_memory_usage_constants + new_name: neuroncore_memory_usage_model_code operations: [] submatch_case: "" - action: update aggregation_type: "" - include: neuroncore_memory_usage_model_shared_scratchpad + include: neuroncore_memory_usage_runtime_memory match_type: "" - new_name: neuroncore_memory_usage_model_shared_scratchpad + new_name: neuroncore_memory_usage_runtime_memory operations: [] submatch_case: "" - action: update @@ -1061,6 +1047,13 @@ processors: new_name: neurondevice_hw_ecc_events operations: [] submatch_case: "" + - action: update + aggregation_type: "" + include: execution_status_total + match_type: "" + new_name: neuron_execution_status + operations: [] + submatch_case: "" - action: update aggregation_type: "" include: neuron_runtime_memory_used_bytes @@ -1070,16 +1063,16 @@ processors: submatch_case: "" - action: update aggregation_type: "" - include: neuroncore_memory_usage_model_code + include: neuroncore_memory_usage_constants match_type: "" - new_name: neuroncore_memory_usage_model_code + new_name: neuroncore_memory_usage_constants operations: [] submatch_case: "" - action: update aggregation_type: "" - include: neuroncore_memory_usage_runtime_memory + include: neuroncore_memory_usage_model_shared_scratchpad match_type: "" - new_name: neuroncore_memory_usage_runtime_memory + new_name: neuroncore_memory_usage_model_shared_scratchpad operations: [] submatch_case: "" - action: update @@ -1103,6 +1096,13 @@ processors: new_label: "" new_value: "" submatch_case: "" + - action: update + aggregation_type: "" + include: execution_latency_seconds + match_type: "" + new_name: neuron_execution_latency + operations: [] + submatch_case: "" receivers: awscontainerinsightreceiver: accelerated_compute_metrics: true @@ -1123,6 +1123,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: true max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_kueue_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_kueue_config.yaml index 37b6232c3f..f59e0a6639 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_kueue_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_kueue_config.yaml @@ -537,6 +537,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: true max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml b/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml index caa5cfc15b..ce52f0e9e5 100644 --- a/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml +++ b/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml @@ -35,9 +35,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - InstanceType - ImageId - InstanceId - - InstanceType imds_retries: 1 middleware: agenthealth/statuscode refresh_interval_seconds: 0s @@ -63,8 +63,8 @@ service: - awsentity/resource - ec2tagger receivers: - - telegraf_disk - telegraf_mem + - telegraf_disk telemetry: logs: development: false diff --git a/translator/tocwconfig/sampleConfig/jmx_config_linux.yaml b/translator/tocwconfig/sampleConfig/jmx_config_linux.yaml index 73562f67a1..9198fadc61 100644 --- a/translator/tocwconfig/sampleConfig/jmx_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/jmx_config_linux.yaml @@ -136,11 +136,11 @@ processors: metric_statements: - context: metric statements: - - set(unit, "unit") where name == "disk_free" - - set(name, "DISK_FREE") where name == "disk_free" - set(unit, "unit") where name == "cpu_usage_idle" - set(name, "CPU_USAGE_IDLE") where name == "cpu_usage_idle" - set(unit, "unit") where name == "cpu_usage_nice" + - set(unit, "unit") where name == "disk_free" + - set(name, "DISK_FREE") where name == "disk_free" trace_statements: [] transform/jmx: error_mode: propagate @@ -149,9 +149,9 @@ processors: metric_statements: - context: metric statements: + - set(name, "kafka.fetch-rate") where name == "kafka.consumer.fetch-rate" - set(unit, "unit") where name == "jvm.memory.heap.used" - set(name, "JVM_MEM_HEAP_USED") where name == "jvm.memory.heap.used" - - set(name, "kafka.fetch-rate") where name == "kafka.consumer.fetch-rate" trace_statements: [] receivers: jmx: diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml index 9ad8ccbacc..d8d8dbb5c2 100644 --- a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml +++ b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml @@ -413,6 +413,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: true max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/kueue_container_insights_config.yaml b/translator/tocwconfig/sampleConfig/kueue_container_insights_config.yaml index a34b9a9e58..afc2bc77ed 100644 --- a/translator/tocwconfig/sampleConfig/kueue_container_insights_config.yaml +++ b/translator/tocwconfig/sampleConfig/kueue_container_insights_config.yaml @@ -273,6 +273,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index 40a39cb624..1b0e0ee4c3 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -135,6 +135,7 @@ receivers: leader_lock_using_config_map_only: false local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: false diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml index 06827e3d55..46216e4031 100644 --- a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml @@ -445,6 +445,7 @@ receivers: leader_lock_using_config_map_only: true local_mode: false max_retries: 0 + middleware: agenthealth/statuscode no_verify_ssl: false num_workers: 0 prefer_full_pod_name: true diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index 0298016500..b8c154d320 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -84,10 +84,10 @@ service: - awsentity/resource - ec2tagger receivers: + - telegraf_mem - telegraf_swap - telegraf_cpu - telegraf_disk - - telegraf_mem metrics/hostDeltaMetrics: exporters: - awscloudwatch diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index 0148dbbc95..51e36adb81 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -79,11 +79,11 @@ service: - awsentity/resource - ec2tagger receivers: + - telegraf_win_perf_counters/3762679655 - telegraf_win_perf_counters/4283769065 - telegraf_win_perf_counters/1492679118 - telegraf_win_perf_counters/3610923661 - telegraf_win_perf_counters/3446270237 - - telegraf_win_perf_counters/3762679655 telemetry: logs: development: false diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index abe8393a44..7278578d40 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -39,9 +39,9 @@ processors: ec2_instance_tag_keys: - AutoScalingGroupName ec2_metadata_tags: + - InstanceType - ImageId - InstanceId - - InstanceType imds_retries: 2 middleware: agenthealth/statuscode profile: AmazonCloudWatchAgent @@ -86,11 +86,11 @@ service: - awsentity/resource - ec2tagger receivers: + - telegraf_win_perf_counters/3762679655 - telegraf_win_perf_counters/4283769065 - telegraf_win_perf_counters/1492679118 - telegraf_win_perf_counters/3610923661 - telegraf_win_perf_counters/3446270237 - - telegraf_win_perf_counters/3762679655 telemetry: logs: development: false diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index 7d3b509d17..7191631db6 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -27,7 +27,6 @@ import ( "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" "github.com/aws/amazon-cloudwatch-agent/internal/retryer" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" "github.com/aws/amazon-cloudwatch-agent/translator" "github.com/aws/amazon-cloudwatch-agent/translator/cmdutil" "github.com/aws/amazon-cloudwatch-agent/translator/config" @@ -406,52 +405,52 @@ func TestPrometheusConfigwithTargetAllocator(t *testing.T) { } -func TestOtelPrometheusConfig(t *testing.T) { - resetContext(t) - context.CurrentContext().SetRunInContainer(true) - context.CurrentContext().SetMode(config.ModeEC2) - testutil.SetPrometheusRemoteWriteTestingEnv(t) - t.Setenv(config.HOST_NAME, "host_name_from_env") - temp := t.TempDir() - prometheusConfigFileName := filepath.Join(temp, "prometheus.yaml") - ecsSdFileName := filepath.Join(temp, "ecs_sd_results.yaml") - expectedEnvVars := map[string]string{} - tokenReplacements := map[string]string{ - prometheusFileNameToken: strings.ReplaceAll(prometheusConfigFileName, "\\", "\\\\"), - ecsSdFileNameToken: strings.ReplaceAll(ecsSdFileName, "\\", "\\\\"), - } - // Load prometheus config and replace ecs sd results file name token with temp file name - testPrometheusConfig := strings.ReplaceAll(prometheusConfig, "{"+ecsSdFileNameToken+"}", ecsSdFileName) - // Write the modified prometheus config to temp prometheus config file - err := os.WriteFile(prometheusConfigFileName, []byte(testPrometheusConfig), os.ModePerm) - require.NoError(t, err) - // In the following checks, we first load the json and replace tokens with the temp files - // Additionally, before comparing with actual, we again replace tokens with temp files in the expected toml & yaml - checkTranslation(t, "prometheus_otel_config_linux", "linux", expectedEnvVars, "", tokenReplacements) -} - -func TestCombinedPrometheusConfig(t *testing.T) { - resetContext(t) - context.CurrentContext().SetMode(config.ModeEC2) - testutil.SetPrometheusRemoteWriteTestingEnv(t) - t.Setenv(config.HOST_NAME, "host_name_from_env") - temp := t.TempDir() - prometheusConfigFileName := filepath.Join(temp, "prometheus.yaml") - ecsSdFileName := filepath.Join(temp, "ecs_sd_results.yaml") - expectedEnvVars := map[string]string{} - tokenReplacements := map[string]string{ - prometheusFileNameToken: strings.ReplaceAll(prometheusConfigFileName, "\\", "\\\\"), - ecsSdFileNameToken: strings.ReplaceAll(ecsSdFileName, "\\", "\\\\"), - } - // Load prometheus config and replace ecs sd results file name token with temp file name - testPrometheusConfig := strings.ReplaceAll(prometheusConfig, "{"+ecsSdFileNameToken+"}", ecsSdFileName) - // Write the modified prometheus config to temp prometheus config file - err := os.WriteFile(prometheusConfigFileName, []byte(testPrometheusConfig), os.ModePerm) - require.NoError(t, err) - // In the following checks, we first load the json and replace tokens with the temp files - // Additionally, before comparing with actual, we again replace tokens with temp files in the expected toml & yaml - checkTranslation(t, "prometheus_combined_config_linux", "linux", expectedEnvVars, "", tokenReplacements) -} +//func TestOtelPrometheusConfig(t *testing.T) { +// resetContext(t) +// context.CurrentContext().SetRunInContainer(true) +// context.CurrentContext().SetMode(config.ModeEC2) +// testutil.SetPrometheusRemoteWriteTestingEnv(t) +// t.Setenv(config.HOST_NAME, "host_name_from_env") +// temp := t.TempDir() +// prometheusConfigFileName := filepath.Join(temp, "prometheus.yaml") +// ecsSdFileName := filepath.Join(temp, "ecs_sd_results.yaml") +// expectedEnvVars := map[string]string{} +// tokenReplacements := map[string]string{ +// prometheusFileNameToken: strings.ReplaceAll(prometheusConfigFileName, "\\", "\\\\"), +// ecsSdFileNameToken: strings.ReplaceAll(ecsSdFileName, "\\", "\\\\"), +// } +// // Load prometheus config and replace ecs sd results file name token with temp file name +// testPrometheusConfig := strings.ReplaceAll(prometheusConfig, "{"+ecsSdFileNameToken+"}", ecsSdFileName) +// // Write the modified prometheus config to temp prometheus config file +// err := os.WriteFile(prometheusConfigFileName, []byte(testPrometheusConfig), os.ModePerm) +// require.NoError(t, err) +// // In the following checks, we first load the json and replace tokens with the temp files +// // Additionally, before comparing with actual, we again replace tokens with temp files in the expected toml & yaml +// checkTranslation(t, "prometheus_otel_config_linux", "linux", expectedEnvVars, "", tokenReplacements) +//} +// +//func TestCombinedPrometheusConfig(t *testing.T) { +// resetContext(t) +// context.CurrentContext().SetMode(config.ModeEC2) +// testutil.SetPrometheusRemoteWriteTestingEnv(t) +// t.Setenv(config.HOST_NAME, "host_name_from_env") +// temp := t.TempDir() +// prometheusConfigFileName := filepath.Join(temp, "prometheus.yaml") +// ecsSdFileName := filepath.Join(temp, "ecs_sd_results.yaml") +// expectedEnvVars := map[string]string{} +// tokenReplacements := map[string]string{ +// prometheusFileNameToken: strings.ReplaceAll(prometheusConfigFileName, "\\", "\\\\"), +// ecsSdFileNameToken: strings.ReplaceAll(ecsSdFileName, "\\", "\\\\"), +// } +// // Load prometheus config and replace ecs sd results file name token with temp file name +// testPrometheusConfig := strings.ReplaceAll(prometheusConfig, "{"+ecsSdFileNameToken+"}", ecsSdFileName) +// // Write the modified prometheus config to temp prometheus config file +// err := os.WriteFile(prometheusConfigFileName, []byte(testPrometheusConfig), os.ModePerm) +// require.NoError(t, err) +// // In the following checks, we first load the json and replace tokens with the temp files +// // Additionally, before comparing with actual, we again replace tokens with temp files in the expected toml & yaml +// checkTranslation(t, "prometheus_combined_config_linux", "linux", expectedEnvVars, "", tokenReplacements) +//} func TestBasicConfig(t *testing.T) { testCases := map[string]testCase{ diff --git a/translator/translate/otel/processor/resourcedetection/translator.go b/translator/translate/otel/processor/resourcedetection/translator.go index 5113d8de24..76b146fd77 100644 --- a/translator/translate/otel/processor/resourcedetection/translator.go +++ b/translator/translate/otel/processor/resourcedetection/translator.go @@ -14,6 +14,7 @@ import ( "github.com/aws/amazon-cloudwatch-agent/translator/config" "github.com/aws/amazon-cloudwatch-agent/translator/context" "github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common" + "github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/extension/agenthealth" "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" ) @@ -63,10 +64,7 @@ func (t *translator) ID() component.ID { func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { cfg := t.factory.CreateDefaultConfig().(*resourcedetectionprocessor.Config) - // > [!WARNING] - // > Only uncomment the following line when this PR is merged: https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/265 - // > cfg.MiddlewareID = &agenthealth.StatusCodeID - // > This will be added when contrib changes are made. + cfg.MiddlewareID = &agenthealth.StatusCodeID mode := context.CurrentContext().KubernetesMode() if mode == "" { mode = context.CurrentContext().Mode() @@ -83,8 +81,5 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { default: return common.GetYamlFileToYamlConfig(cfg, appSignalsDefaultResourceDetectionConfig) } - // > [!WARNING] - // > Only uncomment the following line when this PR is merged: https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/265 - // > cfg.MiddlewareID = &agenthealth.StatusCodeID - // > This will be added when contrib changes are made. + } diff --git a/translator/translate/otel/processor/resourcedetection/translator_test.go b/translator/translate/otel/processor/resourcedetection/translator_test.go index 6de59538b0..0133c6a483 100644 --- a/translator/translate/otel/processor/resourcedetection/translator_test.go +++ b/translator/translate/otel/processor/resourcedetection/translator_test.go @@ -134,6 +134,8 @@ func TestTranslate(t *testing.T) { if err == nil { require.NotNil(t, got) gotCfg, ok := got.(*resourcedetectionprocessor.Config) + assert.NotNil(t, gotCfg.MiddlewareID) + gotCfg.MiddlewareID = nil require.True(t, ok) wantCfg := factory.CreateDefaultConfig() require.NoError(t, testCase.want.Unmarshal(&wantCfg)) diff --git a/translator/translate/otel/receiver/awscontainerinsight/translator.go b/translator/translate/otel/receiver/awscontainerinsight/translator.go index 88f50d249f..4769aa6aa5 100644 --- a/translator/translate/otel/receiver/awscontainerinsight/translator.go +++ b/translator/translate/otel/receiver/awscontainerinsight/translator.go @@ -22,6 +22,7 @@ import ( globallogs "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" "github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common" + "github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/extension/agenthealth" logsutil "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" ) @@ -119,12 +120,7 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { t.setHostIP(conf, cfg) cfg.RunOnSystemd = !context.CurrentContext().RunInContainer() } - - // > [!WARNING] - // > Only uncomment the following line when this PR is merged: https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/265 - // > cfg.MiddlewareID = &agenthealth.StatusCodeID - // > This will be added when contrib changes are made. - + cfg.MiddlewareID = &agenthealth.StatusCodeID cfg.PrefFullPodName = cfg.PrefFullPodName || common.GetOrDefaultBool(conf, common.ConfigKey(common.LogsKey, common.MetricsCollectedKey, common.KubernetesKey, common.PreferFullPodName), false) cfg.EnableAcceleratedComputeMetrics = cfg.EnableAcceleratedComputeMetrics || AcceleratedComputeMetricsEnabled(conf)