diff --git a/CHANGELOG.md b/CHANGELOG.md index db68048089..c72d76cbd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ v1.9.2 `where_clause`, and `use_api` attributes in the `service` block. This made it difficult for users to upgrade, so those attributes have now been made a no-op instead of being removed. +- Update import path(s) for [yet-another-cloudwatch-exporter](github.com/prometheus-community/yet-another-cloudwatch-exporter) - updating version to v0.62.0. (@boweflex) + v1.9.1 ----------------- diff --git a/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md b/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md index 3af60be7d8..a924f6851b 100644 --- a/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md +++ b/docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md @@ -17,7 +17,7 @@ The `prometheus.exporter.cloudwatch` component embeds [`yet-another-cloudwatch-e This component lets you scrape CloudWatch metrics in a set of configurations called _jobs_. There are two kinds of jobs: [discovery][] and [static][]. -[`yet-another-cloudwatch-exporter`]: https://github.com/nerdswords/yet-another-cloudwatch-exporter +[`yet-another-cloudwatch-exporter`]: https://github.com/prometheus-community/yet-another-cloudwatch-exporter [Amazon CloudWatch metrics]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/WhatIsCloudWatch.html ## Authentication diff --git a/go.mod b/go.mod index 031c3e3836..68bbd84667 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/grafana/pyroscope-go/godeltaprof v0.1.8 github.com/grafana/pyroscope/api v1.2.0 github.com/grafana/pyroscope/ebpf v0.4.11 - github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc + github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da github.com/grafana/snowflake-prometheus-exporter v0.0.0-20250507154309-83bcbaac6b04 github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329 @@ -107,7 +107,7 @@ require ( github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/natefinch/atomic v1.0.1 github.com/ncabatoff/process-exporter v0.7.10 - github.com/nerdswords/yet-another-cloudwatch-exporter v0.61.0 + github.com/prometheus-community/yet-another-cloudwatch-exporter v0.62.0 github.com/oklog/run v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/oliver006/redis_exporter v1.54.0 @@ -173,6 +173,7 @@ require ( github.com/prometheus-community/postgres_exporter v0.11.1 github.com/prometheus-community/stackdriver_exporter v0.18.0 github.com/prometheus-community/windows_exporter v0.30.7 // if you update the windows_exporter version, make sure to update the PROM_WIN_EXP_VERSION in _index + github.com/prometheus-community/yet-another-cloudwatch-exporter v0.62.0 github.com/prometheus-operator/prometheus-operator v0.82.2 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.82.2 github.com/prometheus-operator/prometheus-operator/pkg/client v0.82.2 @@ -468,25 +469,25 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.6 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.44.4 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.34.6 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect github.com/aws/smithy-go v1.22.3 // indirect github.com/axiomhq/hyperloglog v0.0.0-20240507144631-af9851f82b27 // indirect diff --git a/go.sum b/go.sum index b60cbd682b..9c276d9f21 100644 --- a/go.sum +++ b/go.sum @@ -606,25 +606,25 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 h1:svGkgUKZDc5SNSiP6BgcOe/6sPmwBniltU6uHmxrjqo= -github.com/aws/aws-sdk-go-v2/service/amp v1.26.1/go.mod h1:mBtHxQRTrzQB0G5oap7IcgP9Ny5p9BJSGhWnuQ+35EY= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 h1:20jy3+l7bQA6tJ1nJxg8+l+1Xm9KrDslNVvc8HvLoEI= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1/go.mod h1:gcUX4UmbhON3+0ij28aojD7vaMPqsRYFefqwxCLbUnw= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 h1:qbbxz47vQdGzvLeHS8xmvp3shV0n8cAnmred+Ehj6qQ= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1/go.mod h1:3tgssMs7RA6rZoI6K9w6Nc6gCmhadTFAOU+OXh4tPkQ= +github.com/aws/aws-sdk-go-v2/service/amp v1.30.3 h1:28FOQuvHpWMdEYK9x89FszjBmwGfhkWYIc45DQcLhsk= +github.com/aws/aws-sdk-go-v2/service/amp v1.30.3/go.mod h1:QbCuQItcTOX7oQR9Nn9nGveBCqSad391I5ReOyQmtag= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.0 h1:BkESaUndLOn3ZFTq4Eho347yvtiJxEQf1HWxgVu2RVI= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.0/go.mod h1:WP+ceHdK5RAijZxABi1mH1kCZmQKRJNKwV+cj0iVr44= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.6 h1:wNUMxMjviF0fbO1pWKVFT1xDRa+BY2qwW6+YJkgIRvI= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.24.6/go.mod h1:pCq9ErKoUWYFfmpENhlWuhBF+NNNwVOXNrZA5C480eM= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 h1:ZNokD9M3On22Qscssyi3iQAzkoeOJxnE5NANNCzPzIA= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1/go.mod h1:5XY8CFGBv6dZp/thbk8FRIAWjqNckM7PsL848KHdzjI= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 h1:U2qFeD0atfYsNMX7pVPvTG+vI7jCoelcWomOK7F8b34= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1/go.mod h1:6cstKfQIguQDuWrHKYhjod025+J7n0AR+azv5t9HYBY= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.0 h1:1KzQVZi7OTixxaVJ8fWaJAUBjme+iQ3zBOCZhE4RgxQ= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.0/go.mod h1:I1+/2m+IhnK5qEbhS3CrzjeiVloo9sItE/2K+so0fkU= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.1 h1:FbjhJTRoTujDYDwTnnE46Km5Qh1mMSH+BwTL4ODFifg= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.1/go.mod h1:OwyCzHw6CH8pkLqT8uoCkOgUsgm11LTfexLZyRy6fBg= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.50.0 h1:t/xT0VNZUj9oQmzQjq7qoQYlX9Mz6a37O3PG0STymFM= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.50.0/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.39.1 h1:4NU35PwZufWYLQV1JD43Z2ZGmTSv35250dNYEgrZaRs= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.39.1/go.mod h1:vKjaBNIcIPOlhBc4+lei/hFnPl7GNDCnkSnGFuKQ0Xg= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.44.4 h1:WK5CyygA6+yzm8Zlx4W5u9b06uepMDJz+Hahpdmg25k= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.44.4/go.mod h1:7TP5GpEyyLYic8kVFHJu/OK0bk9X2uKcvPqLw90CMok= github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0 h1:i7FB/N5pSvEzNOGHm7n6KQiBx2/X8UkrE/Ppb5Bh3QQ= github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 h1:0dcMo3330L9LIckl+4iujMoq0AdR8LMK0TtgrjHUi6M= -github.com/aws/aws-sdk-go-v2/service/iam v1.33.1/go.mod h1:sX/naR5tYtlGFN0Bjg9VPNgYNg/rqiDUuKTW9peFnZk= +github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 h1:hfkzDZHBp9jAT4zcd5mtqckpU4E3Ax0LQaEWWk1VgN8= +github.com/aws/aws-sdk-go-v2/service/iam v1.38.1/go.mod h1:u36ahDtZcQHGmVm/r+0L1sfKX4fzLEMdCqiKRKkUMVM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 h1:BCG7DCXEXpNCcpwCxg1oi9pkJWH2+eZzTn9MY56MbVw= @@ -634,23 +634,23 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 h1:73im9DnuBD4+G8hHsbqb0NSA+n6QJ5ApFk6/YeOz8k8= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1/go.mod h1:p5FuKT8Rj4fnlT84Pzy7itV11NZ39Fwm/Y52S8Lg1Oc= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.6 h1:I+a2rKx253mIClu5QtBkYWtko1k3nC+SvAtWTomengI= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.6/go.mod h1:hmJ9BhvEvDx0TrC16/p9UdoBRyCD2+k23ritPq5ctdM= github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0 h1:fV4XIU5sn/x8gjRouoJpDVHj+ExJaUk4prYF+eb6qTs= github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 h1:64jRTsqBcIqlA4N7ZFYy+ysGPE7Rz/nJgU2fwv2cymk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0/go.mod h1:JsJDZFHwLGZu6dxhV9EV1gJrMnCeE4GEXubSZA59xdA= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.35.4 h1:zZvziql5vgfDs2hTfF8fRF4pySG7A28/qNJQihJvpwc= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.35.4/go.mod h1:IbC8X3WZvsN+w48OrHBDUKcVnhhzO1YpXkCkFlr0qs8= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 h1:vlqoPRFrhs/djRKnrPNJvzzVLIsMWITGgP4gHIzprSU= -github.com/aws/aws-sdk-go-v2/service/shield v1.26.1/go.mod h1:1aUTOI7FTFp3ng7NH3C0UqDkbofoLb7NLcd/ufvlHdY= +github.com/aws/aws-sdk-go-v2/service/shield v1.29.6 h1:6Gyhego+FPrK45FxaQ0wRm4EpovxHc51M4WFaQdGJz0= +github.com/aws/aws-sdk-go-v2/service/shield v1.29.6/go.mod h1:KYGAHKJFsHD+QVZ08NHHjAtA0FBrfm5YVSGe7eV4AH0= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8= github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.30.1 h1:/teUr5AA4/AUaw8A1wF6wcki4oc//lxonloUq1bl1VU= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.30.1/go.mod h1:LigoGatDhnWionzCxyHIQ96cQhwmLgTEkQDOzZg1Q3E= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.34.6 h1:6TACV9Oz/QFABh6zqHCRt6/3TCCTN2yu/Vk/d2QiMCo= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.34.6/go.mod h1:9Zh7Q083SlzjsH5+Ay1MUsPwDBFdpQWd8C2k3LYiIZ0= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY= github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4= @@ -1437,8 +1437,8 @@ github.com/grafana/pyroscope/api v1.2.0 h1:SfHDZcEZ4Vbj/Jj3bTOSpm4IDB33wLA2xBYxR github.com/grafana/pyroscope/api v1.2.0/go.mod h1:CCWrMnwvTB5O+VBZfT+jO2RAvgm0GxdG2//kAWuMDhA= github.com/grafana/pyroscope/ebpf v0.4.11 h1:QpXj3xIWveFy1Zx7M9YzCq7z+d70LQ2pF/qEzD/tXWo= github.com/grafana/pyroscope/ebpf v0.4.11/go.mod h1:LhmNuYZpxlmjsLK36j1nD+eJ/CNebBRDPCzRJPVHZbI= -github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248= -github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= +github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da h1:BML5sNe+bw2uO8t8cQSwe5QhvoP04eHPF7bnaQma0Kw= +github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3 h1:UPkAxuhlAcRmJT3/qd34OMTl+ZU7BLLfOO2+NXBlJpY= github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3/go.mod h1:iZiiwNT4HbtGRVqCQu7uJPEZCuEE5sfSSttcnePkDl4= github.com/grafana/snowflake-prometheus-exporter v0.0.0-20250507154309-83bcbaac6b04 h1:5tc0sUd4Py49jkO3H2e4g5D9bnu+K70lB+/5bLTM4is= @@ -2129,8 +2129,6 @@ github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 h1:t4WWQ9I797y7QU github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833/go.mod h1:0CznHmXSjMEqs5Tezj/w2emQoM41wzYM9KpDKUHPYag= github.com/ncabatoff/process-exporter v0.7.10 h1:+Ere7+3se6QqP54gg7aBRagWcL8bq3u5zNi/GRSWeKQ= github.com/ncabatoff/process-exporter v0.7.10/go.mod h1:DHZRZjqxw9LCOpLlX0DjBuyn6d5plh41Jv6Tmttj7Ek= -github.com/nerdswords/yet-another-cloudwatch-exporter v0.61.0 h1:aZIz1Dh+dXoesIvv56uReOpvDE21RvRgADhyTgEdNXw= -github.com/nerdswords/yet-another-cloudwatch-exporter v0.61.0/go.mod h1:n/wLEzpw3i44nWQ5UydQBEvPMxeKd2kYqfGt1GFcuKk= github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk= @@ -2490,6 +2488,8 @@ github.com/prometheus-community/stackdriver_exporter v0.18.0 h1:nB7JwloiBziunauj github.com/prometheus-community/stackdriver_exporter v0.18.0/go.mod h1:f7T7XXRVc390sVc7rk2yNflf+RkClE4mlfsaSsW2K5Q= github.com/prometheus-community/windows_exporter v0.30.7 h1:p+T2O7XthamlSpeQtKmBylA2sQVGcWKMCwD+qnkZwcE= github.com/prometheus-community/windows_exporter v0.30.7/go.mod h1:qn12efWBV5wguLBvQ2soKdgP5pTgVHx3ec4Di0bWb7M= +github.com/prometheus-community/yet-another-cloudwatch-exporter v0.62.0 h1:+cIcrNMaGA0UQj9eUIzyZiLBl5VdW6J/mmt3sZ8vXtU= +github.com/prometheus-community/yet-another-cloudwatch-exporter v0.62.0/go.mod h1:t5SyhZwRpSBn25LLyNAeihORl5DjNe/CjZCVAwK5xdM= github.com/prometheus-operator/prometheus-operator v0.82.2 h1:qalPLM8wkvCtu9aHcoSKGDpCZR3aWRMKeHev5WomTBQ= github.com/prometheus-operator/prometheus-operator v0.82.2/go.mod h1:y3t/ppLWBbUYDB9SLuLb8ShcJjdzXSV6eEmnsG4kLbk= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.82.2 h1:XXoaK87apyXqLm7xVEQ63pk8+GDupbVtHaBiW8IxPow= @@ -2554,6 +2554,8 @@ github.com/protocolbuffers/protoscope v0.0.0-20221109213918-8e7a6aafa2c9 h1:arwj github.com/protocolbuffers/protoscope v0.0.0-20221109213918-8e7a6aafa2c9/go.mod h1:SKZx6stCn03JN3BOWTwvVIO2ajMkb/zQdTceXYhKw/4= github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg= github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= +github.com/r3labs/diff/v3 v3.0.1 h1:CBKqf3XmNRHXKmdU7mZP1w7TV0pDyVCis1AUHtA4Xtg= +github.com/r3labs/diff/v3 v3.0.1/go.mod h1:f1S9bourRbiM66NskseyUdo0fTmEE0qKrikYJX63dgo= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= diff --git a/internal/component/loki/source/aws_firehose/internal/handler.go b/internal/component/loki/source/aws_firehose/internal/handler.go index 5159ea1a03..e43e4ee67b 100644 --- a/internal/component/loki/source/aws_firehose/internal/handler.go +++ b/internal/component/loki/source/aws_firehose/internal/handler.go @@ -16,7 +16,7 @@ import ( "github.com/go-kit/log" "github.com/grafana/loki/v3/pkg/logproto" - yacepromutil "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/promutil" + yacepromutil "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/promutil" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" diff --git a/internal/component/prometheus/exporter/cloudwatch/config.go b/internal/component/prometheus/exporter/cloudwatch/config.go index d19b27cb3d..1f829f461f 100644 --- a/internal/component/prometheus/exporter/cloudwatch/config.go +++ b/internal/component/prometheus/exporter/cloudwatch/config.go @@ -6,9 +6,9 @@ import ( "time" "github.com/go-kit/log" - yaceConf "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/config" - "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/logging" - yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + yaceConf "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/config" + "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/logging" + yaceModel "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "github.com/grafana/alloy/internal/runtime/logging/level" "github.com/grafana/alloy/internal/static/integrations/cloudwatch_exporter" @@ -231,7 +231,7 @@ func (tags Tags) toYACE() []yaceConf.Tag { func toYACERoles(rs []Role) []yaceConf.Role { yaceRoles := []yaceConf.Role{} // YACE defaults to an empty role, which means the environment configured role is used - // https://github.com/nerdswords/yet-another-cloudwatch-exporter/blob/30aeceb2324763cdd024a1311045f83a09c1df36/pkg/config/config.go#L111 + // https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/30aeceb2324763cdd024a1311045f83a09c1df36/pkg/config/config.go#L111 if len(rs) == 0 { yaceRoles = append(yaceRoles, yaceConf.Role{}) } diff --git a/internal/component/prometheus/exporter/cloudwatch/config_test.go b/internal/component/prometheus/exporter/cloudwatch/config_test.go index 3d772da794..07f30f05e7 100644 --- a/internal/component/prometheus/exporter/cloudwatch/config_test.go +++ b/internal/component/prometheus/exporter/cloudwatch/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/regexp" - yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + yaceModel "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "github.com/stretchr/testify/require" "github.com/grafana/alloy/internal/runtime/logging" diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go index 2ff546c9f6..93c9b03b87 100644 --- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go +++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go @@ -4,14 +4,14 @@ import ( "context" "net/http" - yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + yaceModel "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "github.com/go-kit/log" - yace "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg" - yaceClients "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients" - yaceClientsV1 "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/v1" - yaceClientsV2 "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/v2" - yaceLog "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/logging" + yace "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg" + yaceClients "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/clients" + yaceClientsV1 "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/clients/v1" + yaceClientsV2 "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/clients/v2" + yaceLog "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/logging" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go index 3028ff484d..45f72d90d0 100644 --- a/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go +++ b/internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter_decoupled.go @@ -6,10 +6,10 @@ import ( "time" "github.com/go-kit/log" - yace "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg" - yaceClientsV1 "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/v1" - yaceClientsV2 "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/v2" - yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + yace "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg" + yaceClientsV1 "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/clients/v1" + yaceClientsV2 "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/clients/v2" + yaceModel "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/atomic" diff --git a/internal/static/integrations/cloudwatch_exporter/config.go b/internal/static/integrations/cloudwatch_exporter/config.go index ecbe0d4856..404cb4e935 100644 --- a/internal/static/integrations/cloudwatch_exporter/config.go +++ b/internal/static/integrations/cloudwatch_exporter/config.go @@ -9,9 +9,9 @@ import ( "github.com/grafana/alloy/internal/runtime/logging/level" "github.com/go-kit/log" - yaceConf "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/config" - "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/logging" - yaceModel "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + yaceConf "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/config" + "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/logging" + yaceModel "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "gopkg.in/yaml.v2" "github.com/grafana/alloy/internal/static/integrations" @@ -240,7 +240,7 @@ func toYACEConfig(c *Config) (yaceModel.JobsConfig, bool, error) { func PatchYACEDefaults(yc *yaceModel.JobsConfig) { // YACE doesn't allow during validation a zero-delay in each metrics scrape. Override this behaviour since it's taken // into account by the rounding period. - // https://github.com/nerdswords/yet-another-cloudwatch-exporter/blob/7e5949124bb5f26353eeff298724a5897de2a2a4/pkg/config/config.go#L320 + // https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/7e5949124bb5f26353eeff298724a5897de2a2a4/pkg/config/config.go#L320 for _, job := range yc.DiscoveryJobs { for _, metric := range job.Metrics { metric.Delay = 0 @@ -342,7 +342,7 @@ func toYACEMetrics(metrics []Metric, jobNilToZero *bool) []*yaceConf.Metric { func toYACERoles(roles []Role) []yaceConf.Role { yaceRoles := []yaceConf.Role{} // YACE defaults to an empty role, which means the environment configured role is used - // https://github.com/nerdswords/yet-another-cloudwatch-exporter/blob/30aeceb2324763cdd024a1311045f83a09c1df36/pkg/config/config.go#L111 + // https://github.com/prometheus-community/yet-another-cloudwatch-exporter/blob/30aeceb2324763cdd024a1311045f83a09c1df36/pkg/config/config.go#L111 if len(roles) == 0 { yaceRoles = append(yaceRoles, yaceConf.Role{}) } diff --git a/internal/static/integrations/cloudwatch_exporter/config_test.go b/internal/static/integrations/cloudwatch_exporter/config_test.go index dce3369d3b..5dc5cbd9cd 100644 --- a/internal/static/integrations/cloudwatch_exporter/config_test.go +++ b/internal/static/integrations/cloudwatch_exporter/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/regexp" - "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model" + "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" diff --git a/internal/static/integrations/cloudwatch_exporter/docs/doc.go b/internal/static/integrations/cloudwatch_exporter/docs/doc.go index 726eaf6a7f..96b79630b0 100644 --- a/internal/static/integrations/cloudwatch_exporter/docs/doc.go +++ b/internal/static/integrations/cloudwatch_exporter/docs/doc.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - yaceConf "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/config" + yaceConf "github.com/prometheus-community/yet-another-cloudwatch-exporter/pkg/config" ) //go:embed template.md