From 60b8cdfb374b600848c3309c6ef873ad61861675 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Sat, 18 Jan 2025 02:07:44 -0500 Subject: [PATCH 1/7] inc. client.key and client.cert --- plugins/inputs/prometheus/target_allocator.go | 4 ++++ translator/translate/otel/receiver/prometheus/translator.go | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/inputs/prometheus/target_allocator.go b/plugins/inputs/prometheus/target_allocator.go index fc32931d27..a5d53e8dd3 100644 --- a/plugins/inputs/prometheus/target_allocator.go +++ b/plugins/inputs/prometheus/target_allocator.go @@ -31,6 +31,8 @@ import ( ) var DEFAULT_TLS_CA_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-cert", "tls-ca.crt") +var DEFAULT_TLS_CERT_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.crt") +var DEFAULT_TLS_KEY_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.key") const DEFAULT_TLS_RELOAD_INTERVAL_SECONDS = 10 * time.Second @@ -151,6 +153,8 @@ func (tam *TargetAllocatorManager) loadConfig(filename string) error { } //has target allocator tam.config.TargetAllocator.TLSSetting.CAFile = DEFAULT_TLS_CA_FILE_PATH + tam.config.TargetAllocator.TLSSetting.CertFile = DEFAULT_TLS_CERT_FILE_PATH + tam.config.TargetAllocator.TLSSetting.KeyFile = DEFAULT_TLS_KEY_FILE_PATH tam.config.TargetAllocator.TLSSetting.ReloadInterval = DEFAULT_TLS_RELOAD_INTERVAL_SECONDS return nil } diff --git a/translator/translate/otel/receiver/prometheus/translator.go b/translator/translate/otel/receiver/prometheus/translator.go index f0f9912586..10220b70d4 100644 --- a/translator/translate/otel/receiver/prometheus/translator.go +++ b/translator/translate/otel/receiver/prometheus/translator.go @@ -22,6 +22,8 @@ import ( const ( otelConfigParsingError = "has invalid keys: global" defaultTlsCaPath = "/etc/amazon-cloudwatch-observability-agent-cert/tls-ca.crt" + defaultTlsCertPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.crt" + defaultTlsKeyPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.key" ) var ( @@ -92,9 +94,11 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { cfg.PrometheusConfig.TracingConfig = promCfg.TracingConfig } else { // given prometheus config is in otel format so check if target allocator is being used - // then add the default cert for TargetAllocator + // then add the default ca, cert, and key for TargetAllocator if cfg.TargetAllocator != nil && len(cfg.TargetAllocator.CollectorID) > 0 { cfg.TargetAllocator.TLSSetting.Config.CAFile = defaultTlsCaPath + cfg.TargetAllocator.TLSSetting.Config.CertFile = defaultTlsCertPath + cfg.TargetAllocator.TLSSetting.Config.KeyFile = defaultTlsKeyPath cfg.TargetAllocator.TLSSetting.ReloadInterval = 10 * time.Second } } From f57c9a3b42d17939625483058d5f5051922b773a Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 12:52:00 -0500 Subject: [PATCH 2/7] update unit tests --- .../translate/otel/receiver/prometheus/translator_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translator/translate/otel/receiver/prometheus/translator_test.go b/translator/translate/otel/receiver/prometheus/translator_test.go index b5c5073db0..3f0f87b830 100644 --- a/translator/translate/otel/receiver/prometheus/translator_test.go +++ b/translator/translate/otel/receiver/prometheus/translator_test.go @@ -81,6 +81,8 @@ func TestTranslator(t *testing.T) { TLSSetting: configtls.ClientConfig{ Config: configtls.Config{ CAFile: defaultTlsCaPath, + CertFile: defaultTlsCertPath, + KeyFile: defaultTlsKeyPath, ReloadInterval: 10 * time.Second, }, }, From 3db1400dd556b1ab19fbe06051e49ecd1630d729 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 16:54:36 -0500 Subject: [PATCH 3/7] fix lint --- internal/tls/testdata/server.crt | 44 ++++++++-------- internal/tls/testdata/server.key | 52 +++++++++---------- internal/tls/testdata/tls-ca.crt | 50 +++++++++--------- .../prometheus/metrics_receiver_test.go | 2 +- plugins/inputs/prometheus/target_allocator.go | 14 ++--- .../otel/receiver/prometheus/translator.go | 12 ++--- 6 files changed, 88 insertions(+), 86 deletions(-) diff --git a/internal/tls/testdata/server.crt b/internal/tls/testdata/server.crt index 12424f7b27..9aa760ce91 100644 --- a/internal/tls/testdata/server.crt +++ b/internal/tls/testdata/server.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/internal/tls/testdata/server.key b/internal/tls/testdata/server.key index 0efcb40bb3..f36a56e08b 100644 --- a/internal/tls/testdata/server.key +++ b/internal/tls/testdata/server.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD9zHhy7+7K2oJM -w/Ijo++WAibzqMrOCMvhFcGYSwHbcfivPSDia+hCpJ6CNPxWaMIOcbs+LBN7CvLk -FQI7TdLuDLuqEJveLkgeUcRr5AVer5/tycVHQvn4/iok4NMfqRKA8VV0qy94Bdmb -b3zXQtOfhQpN/aXRD3ubW54fiD7XF0qlprVhAS4hz4UlNBzeSVrH0GdlZAfKxUrU -PAsBRtA1vYuhklbDdc5psy0HVTwMj+FM8vPOOP3HmbJpZCHurpNwYkUTU4VHCSpR -SSa6AgSfMuwCQPLN7Xi1rJES4pPtMYp7ZHnes3zGkEYMzkjw3NOtkEzgxwdiJEoV -WQHi4eznAgMBAAECggEAGv7z1O32jXc+ouG40NewNVmXQRW0NMQ0w4Vn6UYZNXlj -BWjQJaVquCQAhEMUkDBma9jnHM7dZ5obie0+Joa5p/6Mu6M2oSR1IVx7Myq284Jk -1Ys/w7u5ESYf33pWmqiGQlbpSxamXvLoWaM7OT5veilRlkgjqiAmerj9EceRP5mR -aheVE5ctY5oZmdnvA9OcN6B8Oxk59EWEOECs8qAF/ChYfC8pWKOp4U0RILQ/9jXD -lu4p0C2XyadrJReer3whudUADWa/WSxgVCrx85/g/RTKs38KTPy7W4g3bv8KBRhc -bjLzoYTl6esRAi8nMG5Fc/85t07hkVv+j5a1NccxgQKBgQD/y/tdH90C8CrAn9y5 -mgr+1QcqJeJWaBpNf+yBqtLbybl6uLY2OzbZtzllU+TDUVlKZB36t2GnG6EIRUcd -WTHUVq8zEIRtDBa12SZlJ08FrNFyKfBByehEOvMazTxb7rdGbiv5+XztCrcPUn1f -cu30v5nBRjqDxtiAbKccFcZPpwKBgQD+ABUQ0h3aX5qDqzhvSLNuqy+hOZPLsqva -VxsDsIlzzzGwmdf+m2Dn9JR/xJNMPf717LJs8IYIqW4KX/HW0pC3Y8fu/6h4fFM9 -ZpJkM2hjRu0uLxDWLc+AombMavFtkZ1tffKxv6mG7Ud163ulBIt24b701XfhR5UX -RWvWI50gwQKBgQCFa1i9luwJJ0m1VOyk5kML7gMhqcbneL8XYzzx2S7IMuyKpSNt -H++ZGWdXga2Vbq3bDmNQrSvDJLcWgEP6e9ZwwZH6WYgo9KA3036iTiF6fUx1doh5 -WB3M0M6SUTBFZzqzAq3vYYEWhns7A7Se/2w8N1+0HrRQnXu5aHK1RGo+iwKBgEST -hRx7fi/dK/xsl9oDyN4SPdPLlcmjPZ6/cb23RgUMZaAGiThmfu1hLU6pphMpkdKX -yzx6W9Wu2NTYPpT/WK8Ks4olYDjXaCnlrZR8BKz5E0Qq1OLej21ta0+5d+FbNSPA -o2u2EXEqUubVYxaUeYrpPAMiNzGNgAU+avTvvJaBAoGBAKely84irwZicpex79T/ -KYV3VOMYs6wETNSLdKkR9G2WEI4OsEw0qGm9pZXzS6lKOSXxW6fOzwI0/vhnmT4O -hBxeR+PriPFqD80ASXeVeVOEjMXQEjZ8Po+FfUvVu8zMNIPDwJ+hy94FE5kkDBte -vy6FnjMquTvekIsRwo/OOdz3 +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDjNYO8bkDeuSFr +ZW2lfh22JQcI1tckQu1xXo9MBSzFPXgGHcAGR37a7cQajYAkKHzpOhGUyj2bYxHM +t/crMzQ21xV2MnyQ1f7BxJCE0Y5KFqQoQTxKOep9udFycjrOtTU2UbNxLzJO/725 +6qL4GRaZa0KOfnMJcYAASHnmAW1RzAthOGdZ5ERuWq85i9Mxfe6TzW80wid23QQ/ +BHUisdvW6IPh7TEznvDCsK91QGiI3Isa7Ej3d+OsJE3KhV7vJ0oZYnZdsn8RuyQk +L0wSZ1u/YDf1rD0L/LrvnyM904+mhfcH8xYtT9hPopD++bvVb3cLahn5w2RAz++u +saTk+JOrAgMBAAECggEAb2zzKhm33oJUDWM0npB26bjG9mLGJ5Za89o31ERFbIV0 +sysr3Oh7Icqw/YSfbxwcBhTgQmPcSrQPKqKdqKX32V0pvUmNJUqNIWHQrhJHAbaQ +0t0LQCufAAF84e97P5xGeFkg80T+Gxf4Z5DWU22aU6ryfQcuS1dKOtlQTqgsgIvv +4mrB9LxSvfQRjBC4YSSE9l6CsHRWHOLgxNP5h1yp2qxbniL3x/82UYeVZr+nkLmG +6ZQmduRd2DjDDvCRD+JiDy9yPO++oCa2Ua8QIYXTNY/+g0xckQBcsxnFjdQLNuHO +BIjVY/+wkuoDVoS/HlEfIA6C0EgiEea1QWPPS++DQQKBgQD6L13gFmc169hJsJmP +AVOiNRBreq8podr9OxKcTo5U4HCmYnkCLc3nRrZW3JTXFZMTmZjdNbo2euND9pJ3 +IgrmLoN2tzonu5pKgxm8l5DN031RkbKAu0hFbCCV37QPl7rdbN0/I1/gqja98DHr +pfKcNd6zzipZ1UysBlLlT+2beQKBgQDofXAUQDh3Br2IrRcP04oN9sgHp2lghshA +PUmzJJHBVjEVpfPlyI5+X/042DlEBqpbmjdqRFjMyx668YS7QalTfyuUiCekR9gX +uO/Ss3h++9KurAV2HY+tqATOv7MJ1OT+2yqIuAPgLRAkvn25aaGkcE9ySXWoHSEj +7HrHvZQ7QwKBgCqWbZB7v835+7NvkHQ7cZUnG0hwdejMWI7Kw3xAExJ3sjVgheDN +E0PPUbKvkdabIZIwj0j4oF4txQoIqx4EeX59ZHuM7SVeVgFhF7x2wHuJCMgd2Rj4 +yHCo21Mn5WrSFUkkAvWAfA2ua+shPB40/XuB4AsTiToJiSevW+UVGglhAoGBALr3 +JYsjmkUeRo4DpOg1VnCkZXjCSRw3SBNhNkO6xPyWNCMUsm+4Od+nkhyExojOU3IX +MzlifYc0UiJE2Fk/FMzxGDr6w+Z5YG6zayom6mA0Y9nUvQ+f9kvRMwyRXYoqi33p +AuuwEG3Xz4O9LZ5ONI/pQfrG2Le5tU0OgC7hZrPBAoGBANKbyVDcaDzJ1Xd8f/3Z +umXhlvyJ6lmar8/JGvbZ5gmqyfBfgUWfb7T4ZrGpQgfi8GUeplLHQOHeQ1LwyCZY +fn5GzG/gjUiMvbK2ruZVSwuu66oLKSxBKL6JrRGv7efbR3rl7N9CF+wH37DyAtzm +CvGdXqPwTB9aWYvmOqlzmXd4 -----END PRIVATE KEY----- diff --git a/internal/tls/testdata/tls-ca.crt b/internal/tls/testdata/tls-ca.crt index 4b861f4f40..99f1e6999f 100644 --- a/internal/tls/testdata/tls-ca.crt +++ b/internal/tls/testdata/tls-ca.crt @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- MIIE9jCCAt6gAwIBAgIBATANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQKEwdSb290 -IENBMB4XDTI0MTAyMjIyMzYzOFoXDTM0MTAyMjIyMzYzOFowEjEQMA4GA1UEChMH -Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJrhBEDtGS+b -WAVvkFJuQAkDbCCToy39eJ+51ZS/wA1yuVde8JvtX95dZC0STNm7GnxfIwH8tOut -gc82vz2Bim2K1N9uzBDu6flGWXpzXZSSuMAj1q8MRhEs1OpfbLuqxMs/TAbGYGqa -6FPlUWCwMZvpiRpV+hGxRIp9OsAYn/oVUvuACXnADEwBUYnGL3c9FYPn+kkjpsfH -vaH5kY8uTpKNIbmerYBCIt7X0QXcLOxk2CdnapKuIjaTML8og1/rMPbRsnGvIebh -FZsA60QnhuNiL6MowdJn17/Stl6Rs7cNV5zq3/WmaiipOoTcrKIMgA5ci23A69Pz -0WRfomoFsstRWHhimGrKrT5ewznEitvnWWxfiblmy21LTTJf6nrf7cD1B7Xlrfq+ -BORuHwSxyTapXw0HKSYPwjiSiijywWInS3QR3b5uvpyFy8rGfXI2PSTpnAsK/nws -38jUO7qPsj3AnwHpgLZe0XpGFqmemSmlPif0VT3Pn6CwsCpnEf7vFNYu+rmVjrqT -sBXv7qJMryXL4MDQcTsrX0+XDVWGlKrhVemPI94go86IuqASx7BldMounk9Pra70 -oRUZXsEbzBMGOyF/U3ZmCyJSryV4S+tkUckb/VInpmex1pkx15Q3EGmpRwTQ4/M/ -hGz0foplN1HGRQsVxuPt58Wj7/EW6BDrAgMBAAGjVzBVMA4GA1UdDwEB/wQEAwIC +IENBMB4XDTI1MDEyMDE3NDc1MFoXDTM1MDEyMDE3NDc1MFowEjEQMA4GA1UEChMH +Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL6tUweg71Tn +KhK2A+msGHb2LsTNSxone22Zmc9ANCGHuiTIOwlztVgIxUp5JOnHu7Rc9kWulxWL +kiEZRJ/a5VaL5bhBSMeiwWrc8FJD1oWtiCoIpDlb3KFjxwJYjhu0GDDvcUTB0rUI +GquqlIFyRQ7vwTfyiDBT+LnosfQSCt0tjk/iDokuJa7ikCP9L/iuntKcluQxl/YO +YAQKOsgK3JgormDULGMPPCYYZGAkCk3+hvLT0dwvsUo9L7uoFBUXQ9owBzRlGTdC +TIFVU7oXjz+mHh4G8KcVqojP/uBSW6bEbnB0b3D6nysYnQegizAHK1Qvb7TNVPox +q6WI9fIxbFciCuBxnu7yEDwxNlAqwQFtrpEyn2etGmp5EQlkkcWSWq6yrs7ojCw3 +aX7bzm8unvZiQi3eMeVzBqO+HwMPAIAV0MILTnCdP8I2v4/LOqOTrcvzzGJYvSYd +lH0uJEyC6/h9X+YJEjj2Oh0STRz9gVrZkuiQEvSb3yUYtztPVM8Jwa6BV8O+biQV ++003Imz5q3Z04gjSmyHDbpoAWASKL3d152vZgipOouCdLUJOLRbtc+KwLWSHI0H/ +7cFgCpzbdAOiGKWzFG0D6lCy0XmEDPXnzBsZN1u+gsRE6IaaoeG8mQ2hZUFT/of1 +J+b4wDAbQiXjuoyv6JbVE5ci6niIS+sRAgMBAAGjVzBVMA4GA1UdDwEB/wQEAwIC hDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW -BBSWf0MJGMR6k7iAcZMQBOIFr+DoGjANBgkqhkiG9w0BAQsFAAOCAgEAHQib14b2 -y1b9Xa+lvvpyho887AF5LJMvcAaFA2qrZTgsct9YAUyP4jwHSMa82F34GF5zWm96 -wKGa2V7rykKPLtL2o0ilfnz3bJndL2MUjgVqK7GzkOGIhhXreG6/4WZ+oNReMzjw -uZ6zWKhUrTKfvt5J70Nzk+aPrwEzOOcb078QfrFvxElrkoyBz5LGF6HVdIVYUO94 -1DW1egaduIZCcmavO/CJ5QvzXMyiHkpuT0SoltvVFskoP9aS0OxnaQIrmNx+vajT -9zd/WMroxBh+z4Y6sQmy6zZF+rAPItgZNHncMt8AJBGUlAhjgtiP37v/+w5zKpOD -nXPKVf9mOPNdIDUBpzWxRXwkE1GI8kFjQsuiBD0RGNj1Db/m9lnxOX2B1vKOHRtg -Q3LQURMd3oNj2L4dnJG4SbfXi6CdxRPPtvAb2TJh8qIsL7WxDRey1uhmQWknYXso -kiQ1VgEBVwOXR3NGqlDboWYma/wDOtbaMSd0dl2m2PP7FXJNakUmrATNdwrWjuto -onSHblkkDI5NvA+xUPXm4n7os3DHl6upvToVRTIDaWDBJLGyWEVw87y8+VPR0l5g -XpYDatVLlgC/Nz3Ggn3vepGPV25d7COORXI1EXfjn2PUx7lEK0MbaPfkqPC43Q1g -qubuxdWE+FRLgfs3Ywv1JckNAec7Jg0FA2w= +BBRLcM275zz22ibYLHcomFW3HKngWDANBgkqhkiG9w0BAQsFAAOCAgEAr47/PXrX +4SLcA7BjQ8hqW5HDvNjDEx0csOsMTwAWWqi0BNcG1FV6fg6PtDV7ERScapfMKekm +JPjEDw37NiJOyuvXwg2el8AueV8ysl26UlVZJhMogROgyNcAZ+VwEbsCKF9jxIYM +ZCKILO+/VEXucR0NA0D8dYk6CpoyxsrZ6CAQegDR3eR+mgZlZfLXdpgsTY5nN3Bv +IOXjGs6OpvaurI6wNBLc02wna/VN3y8ERgLKANNLicJQ59d4gmn3SDflsI6+LDS/ +xsFcZ1RwOAr7ACPW/BcWw67b+DuAhFBC4qo+Im1oFGU528CaEwzDcEJpOfP8ugrP +3ACh1UZMAGxGLpWiD0ltzXBkrAt9HytmfCcKPjYVRwZUZH5QgOBHSrhPVoq5bjeY +x/m0UFS6n8WO06zT5CbThgp559JUG0XvehnxDaRlTqTw9T5dacZkBMm0TemGC91/ +CQaw/rOXEOx4o9mAIc0nFSBnV9b5QEa9MusK44gGS97eIKn7dxLN28pssBWWM8iD +ELSYc7hQROqrZNGOqe6Vxn/xMQm0YGmh/xOwANdMs4pcc0OPirZAaNIhDMfJFweo +GbtFeXdhHdANsAM5rcfzBldJEEN0m9rxvE+L5NYkvE5c661siGresgQE2ZzevwTM +F4UToHW/zhgrADoHv/S+FqJIWvswl7MYVEk= -----END CERTIFICATE----- diff --git a/plugins/inputs/prometheus/metrics_receiver_test.go b/plugins/inputs/prometheus/metrics_receiver_test.go index 8865798cb8..1053ba4c81 100644 --- a/plugins/inputs/prometheus/metrics_receiver_test.go +++ b/plugins/inputs/prometheus/metrics_receiver_test.go @@ -132,7 +132,7 @@ func Test_loadConfigFromFileWithTargetAllocator(t *testing.T) { assert.NoError(t, err) assert.True(t, taManager.enabled) assert.Equal(t, taManager.config.TargetAllocator.CollectorID, "collector-1") - assert.Equal(t, taManager.config.TargetAllocator.TLSSetting.CAFile, DEFAULT_TLS_CA_FILE_PATH) + assert.Equal(t, taManager.config.TargetAllocator.TLSSetting.CAFile, DefaultTlsCaFilePath) } diff --git a/plugins/inputs/prometheus/target_allocator.go b/plugins/inputs/prometheus/target_allocator.go index a5d53e8dd3..5e29371a6b 100644 --- a/plugins/inputs/prometheus/target_allocator.go +++ b/plugins/inputs/prometheus/target_allocator.go @@ -30,9 +30,11 @@ import ( "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" ) -var DEFAULT_TLS_CA_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-cert", "tls-ca.crt") -var DEFAULT_TLS_CERT_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.crt") -var DEFAULT_TLS_KEY_FILE_PATH = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.key") +var ( + DefaultTlsCaFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-cert", "tls-ca.crt") + DefaultTlsCertFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.crt") + DefaultTlsKeyFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.key") +) const DEFAULT_TLS_RELOAD_INTERVAL_SECONDS = 10 * time.Second @@ -152,9 +154,9 @@ func (tam *TargetAllocatorManager) loadConfig(filename string) error { return nil // no target allocator return } //has target allocator - tam.config.TargetAllocator.TLSSetting.CAFile = DEFAULT_TLS_CA_FILE_PATH - tam.config.TargetAllocator.TLSSetting.CertFile = DEFAULT_TLS_CERT_FILE_PATH - tam.config.TargetAllocator.TLSSetting.KeyFile = DEFAULT_TLS_KEY_FILE_PATH + tam.config.TargetAllocator.TLSSetting.CAFile = DefaultTlsCaFilePath + tam.config.TargetAllocator.TLSSetting.CertFile = DefaultTlsCertFilePath + tam.config.TargetAllocator.TLSSetting.KeyFile = DefaultTlsKeyFilePath tam.config.TargetAllocator.TLSSetting.ReloadInterval = DEFAULT_TLS_RELOAD_INTERVAL_SECONDS return nil } diff --git a/translator/translate/otel/receiver/prometheus/translator.go b/translator/translate/otel/receiver/prometheus/translator.go index 10220b70d4..ffa393c99c 100644 --- a/translator/translate/otel/receiver/prometheus/translator.go +++ b/translator/translate/otel/receiver/prometheus/translator.go @@ -21,9 +21,9 @@ import ( const ( otelConfigParsingError = "has invalid keys: global" - defaultTlsCaPath = "/etc/amazon-cloudwatch-observability-agent-cert/tls-ca.crt" - defaultTlsCertPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.crt" - defaultTlsKeyPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.key" + defaultTLSCaPath = "/etc/amazon-cloudwatch-observability-agent-cert/tls-ca.crt" + defaultTLSCertPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.crt" + defaultTLSKeyPath = "/etc/amazon-cloudwatch-observability-agent-outbound-cert/client.key" ) var ( @@ -96,9 +96,9 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { // given prometheus config is in otel format so check if target allocator is being used // then add the default ca, cert, and key for TargetAllocator if cfg.TargetAllocator != nil && len(cfg.TargetAllocator.CollectorID) > 0 { - cfg.TargetAllocator.TLSSetting.Config.CAFile = defaultTlsCaPath - cfg.TargetAllocator.TLSSetting.Config.CertFile = defaultTlsCertPath - cfg.TargetAllocator.TLSSetting.Config.KeyFile = defaultTlsKeyPath + cfg.TargetAllocator.TLSSetting.Config.CAFile = defaultTLSCaPath + cfg.TargetAllocator.TLSSetting.Config.CertFile = defaultTLSCertPath + cfg.TargetAllocator.TLSSetting.Config.KeyFile = defaultTLSKeyPath cfg.TargetAllocator.TLSSetting.ReloadInterval = 10 * time.Second } } From b41ddf8a9e83825827307762a937507e99d871f1 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 16:55:32 -0500 Subject: [PATCH 4/7] revert testdata --- internal/tls/testdata/server.crt | 44 +++++++++++++-------------- internal/tls/testdata/server.key | 52 ++++++++++++++++---------------- internal/tls/testdata/tls-ca.crt | 50 +++++++++++++++--------------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/internal/tls/testdata/server.crt b/internal/tls/testdata/server.crt index 9aa760ce91..12424f7b27 100644 --- a/internal/tls/testdata/server.crt +++ b/internal/tls/testdata/server.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/internal/tls/testdata/server.key b/internal/tls/testdata/server.key index f36a56e08b..0efcb40bb3 100644 --- a/internal/tls/testdata/server.key +++ b/internal/tls/testdata/server.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDjNYO8bkDeuSFr -ZW2lfh22JQcI1tckQu1xXo9MBSzFPXgGHcAGR37a7cQajYAkKHzpOhGUyj2bYxHM -t/crMzQ21xV2MnyQ1f7BxJCE0Y5KFqQoQTxKOep9udFycjrOtTU2UbNxLzJO/725 -6qL4GRaZa0KOfnMJcYAASHnmAW1RzAthOGdZ5ERuWq85i9Mxfe6TzW80wid23QQ/ -BHUisdvW6IPh7TEznvDCsK91QGiI3Isa7Ej3d+OsJE3KhV7vJ0oZYnZdsn8RuyQk -L0wSZ1u/YDf1rD0L/LrvnyM904+mhfcH8xYtT9hPopD++bvVb3cLahn5w2RAz++u -saTk+JOrAgMBAAECggEAb2zzKhm33oJUDWM0npB26bjG9mLGJ5Za89o31ERFbIV0 -sysr3Oh7Icqw/YSfbxwcBhTgQmPcSrQPKqKdqKX32V0pvUmNJUqNIWHQrhJHAbaQ -0t0LQCufAAF84e97P5xGeFkg80T+Gxf4Z5DWU22aU6ryfQcuS1dKOtlQTqgsgIvv -4mrB9LxSvfQRjBC4YSSE9l6CsHRWHOLgxNP5h1yp2qxbniL3x/82UYeVZr+nkLmG -6ZQmduRd2DjDDvCRD+JiDy9yPO++oCa2Ua8QIYXTNY/+g0xckQBcsxnFjdQLNuHO -BIjVY/+wkuoDVoS/HlEfIA6C0EgiEea1QWPPS++DQQKBgQD6L13gFmc169hJsJmP -AVOiNRBreq8podr9OxKcTo5U4HCmYnkCLc3nRrZW3JTXFZMTmZjdNbo2euND9pJ3 -IgrmLoN2tzonu5pKgxm8l5DN031RkbKAu0hFbCCV37QPl7rdbN0/I1/gqja98DHr -pfKcNd6zzipZ1UysBlLlT+2beQKBgQDofXAUQDh3Br2IrRcP04oN9sgHp2lghshA -PUmzJJHBVjEVpfPlyI5+X/042DlEBqpbmjdqRFjMyx668YS7QalTfyuUiCekR9gX -uO/Ss3h++9KurAV2HY+tqATOv7MJ1OT+2yqIuAPgLRAkvn25aaGkcE9ySXWoHSEj -7HrHvZQ7QwKBgCqWbZB7v835+7NvkHQ7cZUnG0hwdejMWI7Kw3xAExJ3sjVgheDN -E0PPUbKvkdabIZIwj0j4oF4txQoIqx4EeX59ZHuM7SVeVgFhF7x2wHuJCMgd2Rj4 -yHCo21Mn5WrSFUkkAvWAfA2ua+shPB40/XuB4AsTiToJiSevW+UVGglhAoGBALr3 -JYsjmkUeRo4DpOg1VnCkZXjCSRw3SBNhNkO6xPyWNCMUsm+4Od+nkhyExojOU3IX -MzlifYc0UiJE2Fk/FMzxGDr6w+Z5YG6zayom6mA0Y9nUvQ+f9kvRMwyRXYoqi33p -AuuwEG3Xz4O9LZ5ONI/pQfrG2Le5tU0OgC7hZrPBAoGBANKbyVDcaDzJ1Xd8f/3Z -umXhlvyJ6lmar8/JGvbZ5gmqyfBfgUWfb7T4ZrGpQgfi8GUeplLHQOHeQ1LwyCZY -fn5GzG/gjUiMvbK2ruZVSwuu66oLKSxBKL6JrRGv7efbR3rl7N9CF+wH37DyAtzm -CvGdXqPwTB9aWYvmOqlzmXd4 +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD9zHhy7+7K2oJM +w/Ijo++WAibzqMrOCMvhFcGYSwHbcfivPSDia+hCpJ6CNPxWaMIOcbs+LBN7CvLk +FQI7TdLuDLuqEJveLkgeUcRr5AVer5/tycVHQvn4/iok4NMfqRKA8VV0qy94Bdmb +b3zXQtOfhQpN/aXRD3ubW54fiD7XF0qlprVhAS4hz4UlNBzeSVrH0GdlZAfKxUrU +PAsBRtA1vYuhklbDdc5psy0HVTwMj+FM8vPOOP3HmbJpZCHurpNwYkUTU4VHCSpR +SSa6AgSfMuwCQPLN7Xi1rJES4pPtMYp7ZHnes3zGkEYMzkjw3NOtkEzgxwdiJEoV +WQHi4eznAgMBAAECggEAGv7z1O32jXc+ouG40NewNVmXQRW0NMQ0w4Vn6UYZNXlj +BWjQJaVquCQAhEMUkDBma9jnHM7dZ5obie0+Joa5p/6Mu6M2oSR1IVx7Myq284Jk +1Ys/w7u5ESYf33pWmqiGQlbpSxamXvLoWaM7OT5veilRlkgjqiAmerj9EceRP5mR +aheVE5ctY5oZmdnvA9OcN6B8Oxk59EWEOECs8qAF/ChYfC8pWKOp4U0RILQ/9jXD +lu4p0C2XyadrJReer3whudUADWa/WSxgVCrx85/g/RTKs38KTPy7W4g3bv8KBRhc +bjLzoYTl6esRAi8nMG5Fc/85t07hkVv+j5a1NccxgQKBgQD/y/tdH90C8CrAn9y5 +mgr+1QcqJeJWaBpNf+yBqtLbybl6uLY2OzbZtzllU+TDUVlKZB36t2GnG6EIRUcd +WTHUVq8zEIRtDBa12SZlJ08FrNFyKfBByehEOvMazTxb7rdGbiv5+XztCrcPUn1f +cu30v5nBRjqDxtiAbKccFcZPpwKBgQD+ABUQ0h3aX5qDqzhvSLNuqy+hOZPLsqva +VxsDsIlzzzGwmdf+m2Dn9JR/xJNMPf717LJs8IYIqW4KX/HW0pC3Y8fu/6h4fFM9 +ZpJkM2hjRu0uLxDWLc+AombMavFtkZ1tffKxv6mG7Ud163ulBIt24b701XfhR5UX +RWvWI50gwQKBgQCFa1i9luwJJ0m1VOyk5kML7gMhqcbneL8XYzzx2S7IMuyKpSNt +H++ZGWdXga2Vbq3bDmNQrSvDJLcWgEP6e9ZwwZH6WYgo9KA3036iTiF6fUx1doh5 +WB3M0M6SUTBFZzqzAq3vYYEWhns7A7Se/2w8N1+0HrRQnXu5aHK1RGo+iwKBgEST +hRx7fi/dK/xsl9oDyN4SPdPLlcmjPZ6/cb23RgUMZaAGiThmfu1hLU6pphMpkdKX +yzx6W9Wu2NTYPpT/WK8Ks4olYDjXaCnlrZR8BKz5E0Qq1OLej21ta0+5d+FbNSPA +o2u2EXEqUubVYxaUeYrpPAMiNzGNgAU+avTvvJaBAoGBAKely84irwZicpex79T/ +KYV3VOMYs6wETNSLdKkR9G2WEI4OsEw0qGm9pZXzS6lKOSXxW6fOzwI0/vhnmT4O +hBxeR+PriPFqD80ASXeVeVOEjMXQEjZ8Po+FfUvVu8zMNIPDwJ+hy94FE5kkDBte +vy6FnjMquTvekIsRwo/OOdz3 -----END PRIVATE KEY----- diff --git a/internal/tls/testdata/tls-ca.crt b/internal/tls/testdata/tls-ca.crt index 99f1e6999f..4b861f4f40 100644 --- a/internal/tls/testdata/tls-ca.crt +++ b/internal/tls/testdata/tls-ca.crt @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- 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 -F4UToHW/zhgrADoHv/S+FqJIWvswl7MYVEk= +BBSWf0MJGMR6k7iAcZMQBOIFr+DoGjANBgkqhkiG9w0BAQsFAAOCAgEAHQib14b2 +y1b9Xa+lvvpyho887AF5LJMvcAaFA2qrZTgsct9YAUyP4jwHSMa82F34GF5zWm96 +wKGa2V7rykKPLtL2o0ilfnz3bJndL2MUjgVqK7GzkOGIhhXreG6/4WZ+oNReMzjw +uZ6zWKhUrTKfvt5J70Nzk+aPrwEzOOcb078QfrFvxElrkoyBz5LGF6HVdIVYUO94 +1DW1egaduIZCcmavO/CJ5QvzXMyiHkpuT0SoltvVFskoP9aS0OxnaQIrmNx+vajT +9zd/WMroxBh+z4Y6sQmy6zZF+rAPItgZNHncMt8AJBGUlAhjgtiP37v/+w5zKpOD +nXPKVf9mOPNdIDUBpzWxRXwkE1GI8kFjQsuiBD0RGNj1Db/m9lnxOX2B1vKOHRtg +Q3LQURMd3oNj2L4dnJG4SbfXi6CdxRPPtvAb2TJh8qIsL7WxDRey1uhmQWknYXso +kiQ1VgEBVwOXR3NGqlDboWYma/wDOtbaMSd0dl2m2PP7FXJNakUmrATNdwrWjuto +onSHblkkDI5NvA+xUPXm4n7os3DHl6upvToVRTIDaWDBJLGyWEVw87y8+VPR0l5g +XpYDatVLlgC/Nz3Ggn3vepGPV25d7COORXI1EXfjn2PUx7lEK0MbaPfkqPC43Q1g +qubuxdWE+FRLgfs3Ywv1JckNAec7Jg0FA2w= -----END CERTIFICATE----- From 607bd6937b98d79155759d2886683e50cd992dd8 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 17:01:30 -0500 Subject: [PATCH 5/7] fix lint --- .../translate/otel/receiver/prometheus/translator_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translator/translate/otel/receiver/prometheus/translator_test.go b/translator/translate/otel/receiver/prometheus/translator_test.go index 3f0f87b830..bc1251124d 100644 --- a/translator/translate/otel/receiver/prometheus/translator_test.go +++ b/translator/translate/otel/receiver/prometheus/translator_test.go @@ -80,9 +80,9 @@ func TestTranslator(t *testing.T) { ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.ClientConfig{ Config: configtls.Config{ - CAFile: defaultTlsCaPath, - CertFile: defaultTlsCertPath, - KeyFile: defaultTlsKeyPath, + CAFile: defaultTLSCaPath, + CertFile: defaultTLSCertPath, + KeyFile: defaultTLSKeyPath, ReloadInterval: 10 * time.Second, }, }, From 17ab9dc1a82463696abb511b8041b13266a9e6a0 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 20:17:38 -0500 Subject: [PATCH 6/7] fix lint --- plugins/inputs/prometheus/target_allocator.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/inputs/prometheus/target_allocator.go b/plugins/inputs/prometheus/target_allocator.go index 5e29371a6b..e150a57598 100644 --- a/plugins/inputs/prometheus/target_allocator.go +++ b/plugins/inputs/prometheus/target_allocator.go @@ -31,9 +31,9 @@ import ( ) var ( - DefaultTlsCaFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-cert", "tls-ca.crt") - DefaultTlsCertFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.crt") - DefaultTlsKeyFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.key") + DefaultTLSCaFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-cert", "tls-ca.crt") + DefaultTLSCertFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.crt") + DefaultTLSKeyFilePath = filepath.Join("/etc", "amazon-cloudwatch-observability-agent-outbound-cert", "client.key") ) const DEFAULT_TLS_RELOAD_INTERVAL_SECONDS = 10 * time.Second @@ -154,9 +154,9 @@ func (tam *TargetAllocatorManager) loadConfig(filename string) error { return nil // no target allocator return } //has target allocator - tam.config.TargetAllocator.TLSSetting.CAFile = DefaultTlsCaFilePath - tam.config.TargetAllocator.TLSSetting.CertFile = DefaultTlsCertFilePath - tam.config.TargetAllocator.TLSSetting.KeyFile = DefaultTlsKeyFilePath + tam.config.TargetAllocator.TLSSetting.CAFile = DefaultTLSCaFilePath + tam.config.TargetAllocator.TLSSetting.CertFile = DefaultTLSCertFilePath + tam.config.TargetAllocator.TLSSetting.KeyFile = DefaultTLSKeyFilePath tam.config.TargetAllocator.TLSSetting.ReloadInterval = DEFAULT_TLS_RELOAD_INTERVAL_SECONDS return nil } From 9e91e555ccb7b7d8fa7accad60f2f0f53ced7ee8 Mon Sep 17 00:00:00 2001 From: musa-asad Date: Mon, 20 Jan 2025 22:50:32 -0500 Subject: [PATCH 7/7] fix lint --- plugins/inputs/prometheus/metrics_receiver_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/inputs/prometheus/metrics_receiver_test.go b/plugins/inputs/prometheus/metrics_receiver_test.go index 1053ba4c81..b3c683468d 100644 --- a/plugins/inputs/prometheus/metrics_receiver_test.go +++ b/plugins/inputs/prometheus/metrics_receiver_test.go @@ -132,7 +132,7 @@ func Test_loadConfigFromFileWithTargetAllocator(t *testing.T) { assert.NoError(t, err) assert.True(t, taManager.enabled) assert.Equal(t, taManager.config.TargetAllocator.CollectorID, "collector-1") - assert.Equal(t, taManager.config.TargetAllocator.TLSSetting.CAFile, DefaultTlsCaFilePath) + assert.Equal(t, taManager.config.TargetAllocator.TLSSetting.CAFile, DefaultTLSCaFilePath) }