From 277e58b9a9b158898be5fc3ae1ddfad82360f550 Mon Sep 17 00:00:00 2001 From: Zhihong Lin Date: Fri, 15 Sep 2023 05:56:31 +0000 Subject: [PATCH] Fix tag issues for EMF --- go.mod | 26 +++++----- go.sum | 52 +++++++++---------- .../base_container_insights_config.yaml | 2 - .../sampleConfig/complete_darwin_config.yaml | 1 - .../sampleConfig/complete_linux_config.yaml | 1 - .../sampleConfig/complete_windows_config.yaml | 2 +- .../sampleConfig/config_with_env.yaml | 1 - .../emf_and_kubernetes_config.yaml | 2 - .../kubernetes_on_prem_config.yaml | 1 - .../sampleConfig/log_ecs_metric_only.yaml | 2 - .../logs_and_kubernetes_config.yaml | 2 - .../sampleConfig/prometheus_config_linux.yaml | 1 - .../prometheus_config_windows.yaml | 1 - 13 files changed, 40 insertions(+), 54 deletions(-) diff --git a/go.mod b/go.mod index 27b92de95d..8eed2832f8 100644 --- a/go.mod +++ b/go.mod @@ -6,32 +6,32 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2022 // 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/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230906164155-ced73ba61d63 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230915052257-a8b455b434b5 // Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519 -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230915052257-a8b455b434b5 -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230914042854-9a58d068af49 +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230915052257-a8b455b434b5 -replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230914042854-9a58d068af49 +replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230915052257-a8b455b434b5 // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957 replace github.com/shirou/gopsutil/v3 => github.com/aws/telegraf/patches/gopsutil/v3 v3.0.0-20230914154850-08ba2b71c53c // indirect diff --git a/go.sum b/go.sum index e9ed5ad87d..246cfea2d4 100644 --- a/go.sum +++ b/go.sum @@ -142,32 +142,32 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230914042854-9a58d068af49 h1:sgQNT9yzpf4BbiCXI7ugR8MXIyyCswqHvL0FRRErhFI= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230914042854-9a58d068af49/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230914042854-9a58d068af49 h1:NPi0r5BsElAmvaXpW47e0Q0saxQj4ObGxiu9JxOM4M8= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230914042854-9a58d068af49/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230914042854-9a58d068af49 h1:3SAPp9fq8+nHcd4d1TwHQtvOl54KnrJRlDuoN9Ag9Mk= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230914042854-9a58d068af49/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230914042854-9a58d068af49 h1:SsHXROtqzeWoQA2dJ2vVMLQ/pkOysfUUjIsQOBnbunw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230914042854-9a58d068af49/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230914042854-9a58d068af49 h1:yBfPfsCwJRfMryiZIH+B4b6TeUHQkYzzQgUuBRzHWl0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230914042854-9a58d068af49/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230914042854-9a58d068af49 h1:aXnOjUFRZkyDE6Fo3RkZLapvUGC2/8peKVutGDHUlxc= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230914042854-9a58d068af49/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230914042854-9a58d068af49 h1:QcdD5GShfdKEJu6hsMcyQ7VC+CiI9+JTR03JDLNbuG8= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230914042854-9a58d068af49/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230906164155-ced73ba61d63 h1:5FfYxob/XVnS17giNnSiYtyFFyXHdVdJjImiOdzKj+o= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230906164155-ced73ba61d63/go.mod h1:6Vwl/+yXrD21CtE1emsNFeaAW0cq5GbY+HlXaILADh4= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230914042854-9a58d068af49 h1:pb5eL15JtU4aWLKIiWSDv6zws3VnPg/y8i8vdAlOgyM= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230914042854-9a58d068af49/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230914042854-9a58d068af49 h1:t8JTX1BOkaZ/CB4EUUEm+ShkuSl7oDlqBdtUWgQIkx8= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230914042854-9a58d068af49/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230914042854-9a58d068af49 h1:CsJLaHU8QQuFeyGNZJly4BG4ElE3hwLKBB/eSXZ5N/Y= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230914042854-9a58d068af49/go.mod h1:Jrzo8K02XnTkPGlWAsA2MoKNVcvQp4I/SRMOWryz+V8= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230914042854-9a58d068af49 h1:gr/2iC6jREHzQnFtQl0l1dwuSqe2xqDAXZzuqZMKdOc= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230914042854-9a58d068af49/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230914042854-9a58d068af49 h1:N6/y5H8q6hWSSbfJdcbftOoSg7KwhgSDW3ZiNw/vQyY= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230914042854-9a58d068af49/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230915052257-a8b455b434b5 h1:wuGJKjUkgvoM0KesSBPee01lQZxSjSgwuxsL9mpuvws= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230915052257-a8b455b434b5/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230915052257-a8b455b434b5 h1:Y6nVR42Dvbz2tLKmZE5d2RbtVvfGsx5khvrF0ynOXyY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230915052257-a8b455b434b5/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230915052257-a8b455b434b5 h1:uCzFr3xRd11YDs0+lNs9BnvK0B1vm01fViwhxzyksnU= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230915052257-a8b455b434b5/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230915052257-a8b455b434b5 h1:EVP2QSecLEeB8A02yrU0qZad1D61SXYbuTtaGzgtkYA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230915052257-a8b455b434b5/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230915052257-a8b455b434b5 h1:j0uiwKN9+8U1gHfZ3yqrbk85R3GugY0+X4NBIl1ZHnk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230915052257-a8b455b434b5/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230915052257-a8b455b434b5 h1:biFUU2bJTAlDCsBhGuqeKtaeKOp6vyFgG13e2z3QNJw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230915052257-a8b455b434b5/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230915052257-a8b455b434b5 h1:qhBXUwuPDkpia5PdLAYUy9qkc6jOu275cFlraz81gMM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230915052257-a8b455b434b5/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230915052257-a8b455b434b5 h1:tIVIrrfOzbEKPqiaGsy4m96eo96noLUXoliT/rOHOno= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230915052257-a8b455b434b5/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230915052257-a8b455b434b5 h1:tKdtLtZTaNw9MwWrzhYs5GYGga/NDYvWFZKqfKILZfs= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230915052257-a8b455b434b5/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230915052257-a8b455b434b5 h1:fJPxOQ4tiC1EsboKAadSp7KQ2Q4bWvYWPBaYlCnLkI8= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230915052257-a8b455b434b5/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230915052257-a8b455b434b5 h1:xVHyfr4VlQFowVq2tMxTJ0yq0UtJxF24wqfec6yiDEM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230915052257-a8b455b434b5/go.mod h1:Jrzo8K02XnTkPGlWAsA2MoKNVcvQp4I/SRMOWryz+V8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230915052257-a8b455b434b5 h1:JBfD41nmGy1jAao3CsJwOZ7bGNxytNxNND7StQvGx1U= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230915052257-a8b455b434b5/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230915052257-a8b455b434b5 h1:PMpKhWS237FIHptZBif8DyuDBjhUm19AB6eVGqScK/Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230915052257-a8b455b434b5/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE= diff --git a/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml b/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml index c4555a3a42..361591d9db 100644 --- a/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_container_insights_config.yaml @@ -29,7 +29,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [] - tags: {} awsemf/containerinsights: namespace: ContainerInsights log_group_name: '/aws/containerinsights/{ClusterName}/performance' @@ -120,7 +119,6 @@ exporters: role_arn: "" profile: "" shared_credentials_file: [ ] - tags: {} extensions: {} processors: batch/emf_logs: diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index 3bca4689cc..797d6850d8 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -45,7 +45,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [ ] - tags: {} awsxray: aws_log_groups: [] certificate_file_path: "" diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index 5ca7bf5e2b..e64f5f29f5 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -48,7 +48,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [ ] - tags: {} awsxray: aws_log_groups: [] certificate_file_path: "" diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index e925155cc5..dcab30f132 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -45,7 +45,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [ ] - tags: {} awsxray: aws_log_groups: [] certificate_file_path: "" @@ -144,6 +143,7 @@ receivers: endpoint: 0.0.0.0:2222 include_metadata: false max_request_body_size: 0 + response_headers: {} tls: null telegraf_nvidia_smi: collection_interval: 1m0s diff --git a/translator/tocwconfig/sampleConfig/config_with_env.yaml b/translator/tocwconfig/sampleConfig/config_with_env.yaml index 34402c8177..227fcbfac4 100644 --- a/translator/tocwconfig/sampleConfig/config_with_env.yaml +++ b/translator/tocwconfig/sampleConfig/config_with_env.yaml @@ -29,7 +29,6 @@ exporters: sending_queue: queue_size: 1000 shared_credentials_file: [] - tags: {} extensions: {} processors: batch/emf_logs: diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml index 0136eff153..efc671621b 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml @@ -29,7 +29,6 @@ exporters: sending_queue: queue_size: 1000 shared_credentials_file: [ "/root/.aws/credentials" ] - tags: {} awsemf/containerinsights: detailed_metrics: false dimension_rollup_option: NoDimensionRollup @@ -234,7 +233,6 @@ exporters: role_arn: "" profile: "default" shared_credentials_file: [ "/root/.aws/credentials" ] - tags: {} version: "0" extensions: {} processors: diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml index 742ccd236a..9d9cf38de7 100644 --- a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml +++ b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml @@ -204,7 +204,6 @@ exporters: role_arn: "" profile: "AmazonCloudWatchAgent" shared_credentials_file: ["fake-path"] - tags: {} version: "0" extensions: {} processors: diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index 36c5328d24..7fc58646b2 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -29,7 +29,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [ ] - tags: {} awsemf/containerinsights: detailed_metrics: false dimension_rollup_option: NoDimensionRollup @@ -90,7 +89,6 @@ exporters: role_arn: "" profile: "" shared_credentials_file: [ ] - tags: {} version: "0" extensions: {} processors: diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml index 1746a52fc5..13421cbf89 100644 --- a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml @@ -29,7 +29,6 @@ exporters: queue_size: 1000 profile: "" shared_credentials_file: [ ] - tags: {} awsemf/containerinsights: certificate_file_path: "" detailed_metrics: false @@ -234,7 +233,6 @@ exporters: role_arn: "" profile: "" shared_credentials_file: [ ] - tags: {} version: "0" extensions: {} processors: diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml index 735af2e72d..75b0e082e3 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml @@ -69,7 +69,6 @@ exporters: role_arn: "" profile: "" shared_credentials_file: [ ] - tags: {} extensions: {} diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml index 30a5e37ac8..cf1f191a3b 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml @@ -52,7 +52,6 @@ exporters: role_arn: "" profile: "" shared_credentials_file: [ ] - tags: {} extensions: {}