From af3c4be6956aa05f1958d9d9185f103f43735e7f Mon Sep 17 00:00:00 2001 From: andriikushch Date: Mon, 17 Jun 2024 09:28:34 +0200 Subject: [PATCH 01/18] Revert changes for dashboards uids (#1441) --- mixin/dashboards/all.libsonnet | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/mixin/dashboards/all.libsonnet b/mixin/dashboards/all.libsonnet index 1b4069132..8853c36fe 100644 --- a/mixin/dashboards/all.libsonnet +++ b/mixin/dashboards/all.libsonnet @@ -1,17 +1,7 @@ { - 'ebs.json': (import 'ebs.libsonnet') { - uid: "aws-ebs", - }, - 'ec2.json': (import 'ec2.libsonnet') { - uid: "aws-ec2", - }, - 'lambda.json': (import 'lambda.libsonnet') { - uid: "aws-lambda", - }, - 'rds.json': (import 'rds.libsonnet') { - uid: "aws-rds", - }, - 's3.json': (import 's3.libsonnet') { - uid: "aws-s3", - }, + 'ebs.json': import 'ebs.libsonnet', + 'ec2.json': import 'ec2.libsonnet', + 'lambda.json': import 'lambda.libsonnet', + 'rds.json': import 'rds.libsonnet', + 's3.json': import 's3.libsonnet', } From 26b520764142ac5a5a6a1f7c19e1fd45bb2a51ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:21:46 +0200 Subject: [PATCH 02/18] Bump github.com/aws/aws-sdk-go from 1.53.11 to 1.53.20 (#1440) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ba003c717..fdd1f70cd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/nerdswords/yet-another-cloudwatch-exporter go 1.22.0 require ( - github.com/aws/aws-sdk-go v1.53.11 + github.com/aws/aws-sdk-go v1.53.20 github.com/aws/aws-sdk-go-v2 v1.27.0 github.com/aws/aws-sdk-go-v2/config v1.27.16 github.com/aws/aws-sdk-go-v2/credentials v1.17.16 diff --git a/go.sum b/go.sum index a53a3afc8..1f3f25b6c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.53.11 h1:KcmduYvX15rRqt4ZU/7jKkmDxU/G87LJ9MUI0yQJh00= -github.com/aws/aws-sdk-go v1.53.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.53.20 h1:cYWPvZLP1gPj5CfUdnfjaaA7WFK3FGoJ/R9+Ks1inU4= +github.com/aws/aws-sdk-go v1.53.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go-v2 v1.27.0 h1:7bZWKoXhzI+mMR/HjdMx8ZCC5+6fY0lS5tr0bbgiLlo= github.com/aws/aws-sdk-go-v2 v1.27.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/config v1.27.16 h1:knpCuH7laFVGYTNd99Ns5t+8PuRjDn4HnnZK48csipM= From 15518ec1b5c25b05bfe8838d2cc1db840d56259a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:52:13 +0200 Subject: [PATCH 03/18] Bump github.com/prometheus/common from 0.53.0 to 0.54.0 (#1439) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cristian Greco --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index fdd1f70cd..6123b7fab 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/go-kit/log v0.2.1 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db github.com/prometheus/client_golang v1.19.1 - github.com/prometheus/common v0.53.0 + github.com/prometheus/common v0.54.0 github.com/stretchr/testify v1.9.0 github.com/urfave/cli/v2 v2.27.2 golang.org/x/sync v0.7.0 @@ -46,11 +46,11 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect - golang.org/x/sys v0.18.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/sys v0.19.0 // indirect + google.golang.org/protobuf v1.34.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1f3f25b6c..fe6d6a9be 100644 --- a/go.sum +++ b/go.sum @@ -76,10 +76,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= -github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= -github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= +github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -95,10 +95,10 @@ github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= +google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 0c898fa772d726fed4c1c6bdddfcf73426b46a1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:59:27 +0200 Subject: [PATCH 04/18] Bump the aws-sdk-v2 group across 1 directory with 14 updates (#1443) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cristian Greco --- go.mod | 40 ++++++++++++++--------------- go.sum | 80 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index 6123b7fab..e394ab4e1 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,20 @@ go 1.22.0 require ( github.com/aws/aws-sdk-go v1.53.20 - github.com/aws/aws-sdk-go-v2 v1.27.0 - github.com/aws/aws-sdk-go-v2/config v1.27.16 - github.com/aws/aws-sdk-go-v2/credentials v1.17.16 - github.com/aws/aws-sdk-go-v2/service/amp v1.25.8 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.10 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.8 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.9 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.4 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.8 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.162.0 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.8 - github.com/aws/aws-sdk-go-v2/service/shield v1.25.8 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.28.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 + github.com/aws/aws-sdk-go-v2 v1.27.2 + github.com/aws/aws-sdk-go-v2/config v1.27.18 + github.com/aws/aws-sdk-go-v2/credentials v1.17.18 + github.com/aws/aws-sdk-go-v2/service/amp v1.25.10 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10 + github.com/aws/aws-sdk-go-v2/service/shield v1.25.10 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 github.com/aws/smithy-go v1.20.2 github.com/go-kit/log v0.2.1 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db @@ -30,14 +30,14 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect diff --git a/go.sum b/go.sum index fe6d6a9be..6aabc2f5d 100644 --- a/go.sum +++ b/go.sum @@ -1,49 +1,49 @@ github.com/aws/aws-sdk-go v1.53.20 h1:cYWPvZLP1gPj5CfUdnfjaaA7WFK3FGoJ/R9+Ks1inU4= github.com/aws/aws-sdk-go v1.53.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go-v2 v1.27.0 h1:7bZWKoXhzI+mMR/HjdMx8ZCC5+6fY0lS5tr0bbgiLlo= -github.com/aws/aws-sdk-go-v2 v1.27.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= -github.com/aws/aws-sdk-go-v2/config v1.27.16 h1:knpCuH7laFVGYTNd99Ns5t+8PuRjDn4HnnZK48csipM= -github.com/aws/aws-sdk-go-v2/config v1.27.16/go.mod h1:vutqgRhDUktwSge3hrC3nkuirzkJ4E/mLj5GvI0BQas= -github.com/aws/aws-sdk-go-v2/credentials v1.17.16 h1:7d2QxY83uYl0l58ceyiSpxg9bSbStqBC6BeEeHEchwo= -github.com/aws/aws-sdk-go-v2/credentials v1.17.16/go.mod h1:Ae6li/6Yc6eMzysRL2BXlPYvnrLLBg3D11/AmOjw50k= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 h1:dQLK4TjtnlRGb0czOht2CevZ5l6RSyRWAnKeGd7VAFE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3/go.mod h1:TL79f2P6+8Q7dTsILpiVST+AL9lkF6PPGI167Ny0Cjw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 h1:lf/8VTF2cM+N4SLzaYJERKEWAXq8MOMpZfU6wEPWsPk= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7/go.mod h1:4SjkU7QiqK2M9oozyMzfZ/23LmUY+h3oFqhdeP5OMiI= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 h1:4OYVp0705xu8yjdyoWix0r9wPIRXnIzzOoUpQVHIJ/g= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7/go.mod h1:vd7ESTEvI76T2Na050gODNmNU7+OyKrIKroYTu4ABiI= +github.com/aws/aws-sdk-go-v2 v1.27.2 h1:pLsTXqX93rimAOZG2FIYraDQstZaaGVVN4tNw65v0h8= +github.com/aws/aws-sdk-go-v2 v1.27.2/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/config v1.27.18 h1:wFvAnwOKKe7QAyIxziwSKjmer9JBMH1vzIL6W+fYuKk= +github.com/aws/aws-sdk-go-v2/config v1.27.18/go.mod h1:0xz6cgdX55+kmppvPm2IaKzIXOheGJhAufacPJaXZ7c= +github.com/aws/aws-sdk-go-v2/credentials v1.17.18 h1:D/ALDWqK4JdY3OFgA2thcPO1c9aYTT5STS/CvnkqY1c= +github.com/aws/aws-sdk-go-v2/credentials v1.17.18/go.mod h1:JuitCWq+F5QGUrmMPsk945rop6bB57jdscu+Glozdnc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 h1:dDgptDO9dxeFkXy+tEgVkzSClHZje/6JkPW5aZyEvrQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5/go.mod h1:gjvE2KBUgUQhcv89jqxrIxH9GaKs1JbZzWejj/DaHGA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 h1:cy8ahBJuhtM8GTTSyOkfy6WVPV1IE+SS5/wfXUYuulw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9/go.mod h1:CZBXGLaJnEZI6EVNcPd7a6B5IC5cA/GkRWtu9fp3S6Y= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 h1:A4SYk07ef04+vxZToz9LWvAXl9LW0NClpPpMsi31cz0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9/go.mod h1:5jJcHuwDagxN+ErjQ3PU3ocf6Ylc/p9x+BLO/+X4iXw= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.8 h1:InFtjB9AUkpfa6MAgtZM4j8/N+uP8kWGfDtvaBSPQPI= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.8/go.mod h1:7XY8g6HBqt0ECYdrNZxanA/ZKRqLlD0dnCyMVxYGVOk= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.10 h1:STRfYExTMN9ZqP/6CcsZyhHLcBkkZXnlC5YmiYk+urc= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.10/go.mod h1:PWJYUBjDoJSXvnzA1ESP6CbQGf134zQgXeFUHAq5g+0= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.8 h1:XACFYYqzf9nSS7z7wInHZpZ+TcuoneUOwf4qflJ8LRI= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.8/go.mod h1:LioJIyezTw+4XlJTutCyyy28W+KraiIcEnmdRuRgKfk= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.9 h1:xcVQU7CdcjOdYZyIpPJx/DELxUH5j81ztG1s68HXCaQ= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.9/go.mod h1:ahp0q1k0plPD4+cLw+1Craujh+JmtGZwjhNSsb15qdU= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.4 h1:AE7G/bWe43uIxQHTzVpsIF2FnYzdUEKXsAiFeBNr0e8= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.4/go.mod h1:ECX6i01ws5YQ8L58dwwoexhCmDR6hAV/sv+Q8IQ+jj4= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.8 h1:NzIt3rr0vr24K6G22AgV9dRlgk8A/8UL7iUxPKk0KRU= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.8/go.mod h1:vWHsM18ZKqVgj2Vy0zt20fxmfC+0JN1XiLSdiMcVHoU= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.162.0 h1:A1YMX7uMzXhfIEL9zc5049oQgSaH4ZeXx/sOth0dk/I= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.162.0/go.mod h1:iJ2sQeUTkjNp3nL7kE/Bav0xXYhtiRCRP5ZXk4jFhCQ= +github.com/aws/aws-sdk-go-v2/service/amp v1.25.10 h1:aGSGpPg6aGoe/v42C2iSQqzDI778m0YpMolinM5SeIE= +github.com/aws/aws-sdk-go-v2/service/amp v1.25.10/go.mod h1:wyfNo2hj/f8yPSdberXMJv60eUG6xGr3cDLVF4jJivY= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12 h1:B9YQUaFlg5YAEukEogYG5E+C6GHHAMNbS1g82rgxRSg= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12/go.mod h1:zwkGhImFmKYyfIjJb2jBVd+cQ+pq+APQNryk9Tk57Ps= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10 h1:7rAYDeRvzVKJcnNDT/xOX1px9k/scn4Ya4NtonV6PWg= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10/go.mod h1:hYMrp35CMcqnG1/+ZuaqOCl8YoGdb0+OfB2o/CbT7AU= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11 h1:n0OjQw2HMbBr1g2M3XzzNTV8srYSoLkYgV48jiLkqbQ= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11/go.mod h1:qaQkZEptpHa0HhooCCONUjxvYbkgHtDuG/cCDvJt6UE= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6 h1:UVjxYe8VGpwXYcmBcciBHlQrNssdEvntXCPWmnRR15U= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6/go.mod h1:4V6VDA0kZavRn71+sLpVna75oobnlG+gwtnNcBwZhu4= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10 h1:bcYuU3gBKf/+L5uTXt0pLKOeU/RQN/wW3+cFCZrceYM= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10/go.mod h1:DVoTtZL/d4LdgM9YzPBD5owGBVMBiB9eBYtypEZgtRA= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1 h1:5A8xg0TsosvGeXZunZrBDDCcrbShR8rAkeqHMJS/mqU= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1/go.mod h1:gYk1NtyvkH1SxPcndDtfro3lwbiE5t0tW4eRki5YnOQ= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 h1:Wx0rlZoEJR7JwlSZcHnEa7CNjrSIyVxMFWGAaXy4fJY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9/go.mod h1:aVMHdE0aHO3v+f/iw01fmXV/5DbfQ3Bi9nN7nd9bE9Y= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.8 h1:EyNl0r9JoBteGwShVpEF+Oa3KGjM5SffXTVjo+U6tFM= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.8/go.mod h1:I3uJLgoT83sDh9YRQdcUDoauftf7ySq9hFB7Z6O7p2c= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.8 h1:n8dIWLkoKl+lW7CdoLLdCZlDPS4gVPry+lWGdrTr3WM= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.8/go.mod h1:f7CoPXas/zt/E9pwJ8bFas7WHz8e+PjQV0FXGH7zMuA= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 h1:aD7AGQhvPuAxlSUfo0CWU7s6FpkbyykMhGYMvlqTjVs= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.9/go.mod h1:c1qtZUWtygI6ZdvKppzCSXsDOq5I4luJPZ0Ud3juFCA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 h1:Pav5q3cA260Zqez42T9UhIlsd9QeypszRPwC9LdSSsQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3/go.mod h1:9lmoVDVLz/yUZwLaQ676TK02fhCu4+PgRSmMaKR1ozk= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.28.1 h1:VvtiRdE9DXQ6UugG1PN2VnvIeqTzaMu0rCvVLt35nBw= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.28.1/go.mod h1:cd5j+1GcFhtL0+quKsQAs+i+DBLgVJRr6wWz1CMCRqQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 h1:69tpbPED7jKPyzMcrwSvhWcJ9bPnZsZs18NT40JwM0g= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.10/go.mod h1:0Aqn1MnEuitqfsCNyKsdKLhDUOr4txD/g19EfiUqgws= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 h1:o4T+fKxA3gTMcluBNZZXE9DNaMkJuUL1O3mffCUjoJo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11/go.mod h1:84oZdJ+VjuJKs9v1UTC9NaodRZRseOXCTgku+vQJWR8= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10 h1:Lz66AebKV//iN8kelcsBe0fQekLmCkIzZSq/Yr/S+C4= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10/go.mod h1:6u29rN3TBB89EOtTnEsjywjOmjA4nmUV8elhfLwinaw= +github.com/aws/aws-sdk-go-v2/service/shield v1.25.10 h1:QTc2t3diE1+J1ESShBMZZetQQCJpr4DC6qGsJfpWrrQ= +github.com/aws/aws-sdk-go-v2/service/shield v1.25.10/go.mod h1:pQgQYgpvef5P1jqHjB5+q/ss21ndQ3QtcVbfzNk/GrU= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 h1:gEYM2GSpr4YNWc6hCd5nod4+d4kd9vWIAWrmGuLdlMw= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.11/go.mod h1:gVvwPdPNYehHSP9Rs7q27U1EU+3Or2ZpXvzAYJNh63w= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 h1:iXjh3uaH3vsVcnyZX7MqCoCfcyxIrVE9iOQruRaWPrQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5/go.mod h1:5ZXesEuy/QcO0WUnt+4sDkxhdXRHTu2yG0uCSH8B6os= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1 h1:qgGYa1JbjAIniU5awP4qzEE5bW8D106FakX83+ZZnTM= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1/go.mod h1:K6uvnCkG20WKq6AIqKR5lro6qX564ZThMW+PyJD26bI= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 h1:M/1u4HBpwLuMtjlxuI2y6HoVLzF5e2mfxHCg7ZVMYmk= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.12/go.mod h1:kcfd+eTdEi/40FIbLq4Hif3XMXnl5b/+t/KTfLt9xIk= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= From 55f265cba138acf1617796d98bc072a419efdddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:05:59 +0200 Subject: [PATCH 05/18] Bump the aws-sdk-v2 group with 14 updates (#1444) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 40 ++++++++++++++--------------- go.sum | 80 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index e394ab4e1..5a4e24bc9 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,20 @@ go 1.22.0 require ( github.com/aws/aws-sdk-go v1.53.20 - github.com/aws/aws-sdk-go-v2 v1.27.2 - github.com/aws/aws-sdk-go-v2/config v1.27.18 - github.com/aws/aws-sdk-go-v2/credentials v1.17.18 - github.com/aws/aws-sdk-go-v2/service/amp v1.25.10 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10 - github.com/aws/aws-sdk-go-v2/service/shield v1.25.10 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 + github.com/aws/aws-sdk-go-v2 v1.28.0 + github.com/aws/aws-sdk-go-v2/config v1.27.19 + github.com/aws/aws-sdk-go-v2/credentials v1.17.19 + github.com/aws/aws-sdk-go-v2/service/amp v1.25.11 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11 + github.com/aws/aws-sdk-go-v2/service/shield v1.25.11 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2 + github.com/aws/aws-sdk-go-v2/service/sts v1.28.13 github.com/aws/smithy-go v1.20.2 github.com/go-kit/log v0.2.1 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db @@ -30,14 +30,14 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.12 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect diff --git a/go.sum b/go.sum index 6aabc2f5d..a22f2419a 100644 --- a/go.sum +++ b/go.sum @@ -1,49 +1,49 @@ github.com/aws/aws-sdk-go v1.53.20 h1:cYWPvZLP1gPj5CfUdnfjaaA7WFK3FGoJ/R9+Ks1inU4= github.com/aws/aws-sdk-go v1.53.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go-v2 v1.27.2 h1:pLsTXqX93rimAOZG2FIYraDQstZaaGVVN4tNw65v0h8= -github.com/aws/aws-sdk-go-v2 v1.27.2/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= -github.com/aws/aws-sdk-go-v2/config v1.27.18 h1:wFvAnwOKKe7QAyIxziwSKjmer9JBMH1vzIL6W+fYuKk= -github.com/aws/aws-sdk-go-v2/config v1.27.18/go.mod h1:0xz6cgdX55+kmppvPm2IaKzIXOheGJhAufacPJaXZ7c= -github.com/aws/aws-sdk-go-v2/credentials v1.17.18 h1:D/ALDWqK4JdY3OFgA2thcPO1c9aYTT5STS/CvnkqY1c= -github.com/aws/aws-sdk-go-v2/credentials v1.17.18/go.mod h1:JuitCWq+F5QGUrmMPsk945rop6bB57jdscu+Glozdnc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 h1:dDgptDO9dxeFkXy+tEgVkzSClHZje/6JkPW5aZyEvrQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5/go.mod h1:gjvE2KBUgUQhcv89jqxrIxH9GaKs1JbZzWejj/DaHGA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9 h1:cy8ahBJuhtM8GTTSyOkfy6WVPV1IE+SS5/wfXUYuulw= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.9/go.mod h1:CZBXGLaJnEZI6EVNcPd7a6B5IC5cA/GkRWtu9fp3S6Y= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 h1:A4SYk07ef04+vxZToz9LWvAXl9LW0NClpPpMsi31cz0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9/go.mod h1:5jJcHuwDagxN+ErjQ3PU3ocf6Ylc/p9x+BLO/+X4iXw= +github.com/aws/aws-sdk-go-v2 v1.28.0 h1:ne6ftNhY0lUvlazMUQF15FF6NH80wKmPRFG7g2q6TCw= +github.com/aws/aws-sdk-go-v2 v1.28.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/config v1.27.19 h1:+DBS8gJP6VsxYkZ6UEV0/VsRM2rYpbQCYsosW9RRmeQ= +github.com/aws/aws-sdk-go-v2/config v1.27.19/go.mod h1:KzZcioJWzy9oV+oS5CobYXlDtU9+eW7bPG1g7gizTW4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.19 h1:R18G7nBBGLby51CFEqUBFF2IVl7LUdCtYj6iosUwh/0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.19/go.mod h1:xr9kUMnaLTB866HItT6pg58JgiBP77fSQLBwIa//zk8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6 h1:vVOuhRyslJ6T/HteG71ZWCTas1q2w6f0NKsNbkXHs/A= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6/go.mod h1:jimWaqLiT0sJGLh51dKCLLtExRYPtMU7MpxuCgtbkxg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10 h1:LZIUb8sQG2cb89QaVFtMSnER10gyKkqU1k3hP3g9das= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10/go.mod h1:BRIqay//vnIOCZjoXWSLffL2uzbtxEmnSlfbvVh7Z/4= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10 h1:HY7CXLA0GiQUo3WYxOP7WYkLcwvRX4cLPf5joUcrQGk= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10/go.mod h1:kfRBSxRa+I+VyON7el3wLZdrO91oxUxEwdAaWgFqN90= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.10 h1:aGSGpPg6aGoe/v42C2iSQqzDI778m0YpMolinM5SeIE= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.10/go.mod h1:wyfNo2hj/f8yPSdberXMJv60eUG6xGr3cDLVF4jJivY= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12 h1:B9YQUaFlg5YAEukEogYG5E+C6GHHAMNbS1g82rgxRSg= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.12/go.mod h1:zwkGhImFmKYyfIjJb2jBVd+cQ+pq+APQNryk9Tk57Ps= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10 h1:7rAYDeRvzVKJcnNDT/xOX1px9k/scn4Ya4NtonV6PWg= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.10/go.mod h1:hYMrp35CMcqnG1/+ZuaqOCl8YoGdb0+OfB2o/CbT7AU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11 h1:n0OjQw2HMbBr1g2M3XzzNTV8srYSoLkYgV48jiLkqbQ= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.11/go.mod h1:qaQkZEptpHa0HhooCCONUjxvYbkgHtDuG/cCDvJt6UE= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6 h1:UVjxYe8VGpwXYcmBcciBHlQrNssdEvntXCPWmnRR15U= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.6/go.mod h1:4V6VDA0kZavRn71+sLpVna75oobnlG+gwtnNcBwZhu4= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10 h1:bcYuU3gBKf/+L5uTXt0pLKOeU/RQN/wW3+cFCZrceYM= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.10/go.mod h1:DVoTtZL/d4LdgM9YzPBD5owGBVMBiB9eBYtypEZgtRA= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1 h1:5A8xg0TsosvGeXZunZrBDDCcrbShR8rAkeqHMJS/mqU= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.1/go.mod h1:gYk1NtyvkH1SxPcndDtfro3lwbiE5t0tW4eRki5YnOQ= +github.com/aws/aws-sdk-go-v2/service/amp v1.25.11 h1:c7NvqxFAXktCp3Z2Ypgk4a6XP8ibuqutgHsP1AFQpnY= +github.com/aws/aws-sdk-go-v2/service/amp v1.25.11/go.mod h1:E99igP+DszIQm5cHtfOokxXIwH3KOJYeYohOtWJhrY0= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13 h1:R1aOoz7ep8ALQfdjNaqFe0+L50ymLoGyQHTDeSBI8ds= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13/go.mod h1:8o0oTMAMbrpkgO+/YuYDuOrv3B4vnze4Wg4F0UtAnko= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11 h1:Zzu/FnLG4O30o/lkxa1iSoW1BA7MsJHod2o66MJscns= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11/go.mod h1:LwpjsYVYLx70GKgLi6E9uh1fNtBAlfwC4XqJ01S9anc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12 h1:8taAvIdV+Ci599cI1fU8O2MZsbGlAzRcY5vP3IKUr/c= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12/go.mod h1:wkL6X7IkZMh0yigm5wMCbnvjdtjRAmQ0yHDWco7j8F4= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7 h1:Tt1CrlmtcPROwUI1HNDDq0rklVWgD4tmtzLqZQjkwuQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7/go.mod h1:8dUb61YstV6fBlMTDZmPOLlPhNsOAX2yAIjpEl3dk2g= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 h1:OdHDbX7rzXjMqEX/JluI2FDuj0+eVzqpzrtGLnT4/h8= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11/go.mod h1:qiWXZTmOzpRkW6JMyWy+2n1PRnhqmh7T1bH/jdxbJag= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 h1:Rts0EZgdi3tneJMXp+uKrZHbMxQIu0y5O/2MG6a2+hY= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2/go.mod h1:j0V2ahvdX3mGIyXQSe9vjdIQvSxz3uaMM0bR7Y+0WCE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 h1:o4T+fKxA3gTMcluBNZZXE9DNaMkJuUL1O3mffCUjoJo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11/go.mod h1:84oZdJ+VjuJKs9v1UTC9NaodRZRseOXCTgku+vQJWR8= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10 h1:Lz66AebKV//iN8kelcsBe0fQekLmCkIzZSq/Yr/S+C4= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.10/go.mod h1:6u29rN3TBB89EOtTnEsjywjOmjA4nmUV8elhfLwinaw= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.10 h1:QTc2t3diE1+J1ESShBMZZetQQCJpr4DC6qGsJfpWrrQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.10/go.mod h1:pQgQYgpvef5P1jqHjB5+q/ss21ndQ3QtcVbfzNk/GrU= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.11 h1:gEYM2GSpr4YNWc6hCd5nod4+d4kd9vWIAWrmGuLdlMw= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.11/go.mod h1:gVvwPdPNYehHSP9Rs7q27U1EU+3Or2ZpXvzAYJNh63w= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5 h1:iXjh3uaH3vsVcnyZX7MqCoCfcyxIrVE9iOQruRaWPrQ= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.5/go.mod h1:5ZXesEuy/QcO0WUnt+4sDkxhdXRHTu2yG0uCSH8B6os= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1 h1:qgGYa1JbjAIniU5awP4qzEE5bW8D106FakX83+ZZnTM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.1/go.mod h1:K6uvnCkG20WKq6AIqKR5lro6qX564ZThMW+PyJD26bI= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.12 h1:M/1u4HBpwLuMtjlxuI2y6HoVLzF5e2mfxHCg7ZVMYmk= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.12/go.mod h1:kcfd+eTdEi/40FIbLq4Hif3XMXnl5b/+t/KTfLt9xIk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12 h1:kO2J7WMroF/OTHN9WTcUtMjPhJ7ZoNxx0dwv6UCXQgY= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12/go.mod h1:mrNxrjYvXaSjZe5fkKaWgDnOQ6BExLn/7Ru9OpRsMPY= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11 h1:7OSSqpvlgK6VCqvzmIOGIOZFU4g4pSw3TKmYnBalQTE= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11/go.mod h1:LWst3iIixiR2B6hce9lkCfWDXnLlL1k2HT7MMoldbVo= +github.com/aws/aws-sdk-go-v2/service/shield v1.25.11 h1:c70hsjmQ+xCxikdEm++giMgi8vsG7L/B9sJo/c+6630= +github.com/aws/aws-sdk-go-v2/service/shield v1.25.11/go.mod h1:lWVl2JiZxWTUAByPejH8djt+fZ+El2W7HSRLd64UDqw= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.12 h1:FsYii6U+2k8ynYBo+pywlCBY9HNAFRh+iICRHbn+Qyw= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.12/go.mod h1:j9Rps+Lcs2A0tYypWsNBeJOjgsIYUf1Styppo9Es0Wo= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6 h1:lEE+xEcq3lh9bk362tgErP1+n689q5ERdmTwmF1XT3M= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6/go.mod h1:2tR0x1DCL5IgnVZ1NQNFDNg5/XL/kiQgWI5l7I/N5Js= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2 h1:ympsCWU0bTbN0cS1zVPJ9DoOv8dYpqlxLIpfkoFomrs= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2/go.mod h1:wvF9ZwY7sm/+DuHM6HXO+SZEaRLL48CIrYM+7oj4Nzc= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.13 h1:TSzmuUeruVJ4XWYp3bYzKCXue70ECpJWmbP3UfEvhYY= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.13/go.mod h1:FppRtFjBA9mSWTj2cIAWCP66+bbBPMuPpBfWRXC5Yi0= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= From f462ae1246a08e7f344d6c8ca702f00ba2f0e733 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:09:53 +0200 Subject: [PATCH 06/18] Bump github.com/aws/aws-sdk-go from 1.53.20 to 1.54.3 (#1445) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5a4e24bc9..99b785a6e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/nerdswords/yet-another-cloudwatch-exporter go 1.22.0 require ( - github.com/aws/aws-sdk-go v1.53.20 + github.com/aws/aws-sdk-go v1.54.3 github.com/aws/aws-sdk-go-v2 v1.28.0 github.com/aws/aws-sdk-go-v2/config v1.27.19 github.com/aws/aws-sdk-go-v2/credentials v1.17.19 diff --git a/go.sum b/go.sum index a22f2419a..92c1981a9 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.53.20 h1:cYWPvZLP1gPj5CfUdnfjaaA7WFK3FGoJ/R9+Ks1inU4= -github.com/aws/aws-sdk-go v1.53.20/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.54.3 h1:Bk+EXoq6v5I1xmHR9GQGpsMWZZFXs+FD+5uPyEmfgX0= +github.com/aws/aws-sdk-go v1.54.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.28.0 h1:ne6ftNhY0lUvlazMUQF15FF6NH80wKmPRFG7g2q6TCw= github.com/aws/aws-sdk-go-v2 v1.28.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/config v1.27.19 h1:+DBS8gJP6VsxYkZ6UEV0/VsRM2rYpbQCYsosW9RRmeQ= From edb2c9bd8e72430c51e36c404adb0ef3a305c658 Mon Sep 17 00:00:00 2001 From: vainiusd Date: Mon, 24 Jun 2024 14:38:07 +0300 Subject: [PATCH 07/18] fix association with gwlb (#1376) Co-authored-by: Cristian Greco --- pkg/config/services.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/config/services.go b/pkg/config/services.go index c503334eb..37a323fb1 100644 --- a/pkg/config/services.go +++ b/pkg/config/services.go @@ -460,8 +460,7 @@ var SupportedServices = serviceConfigs{ Namespace: "AWS/GatewayELB", Alias: "gwlb", ResourceFilters: []*string{ - aws.String("elasticloadbalancing:loadbalancer/gwy"), - aws.String("elasticloadbalancing:targetgroup"), + aws.String("elasticloadbalancing:loadbalancer"), }, DimensionRegexps: []*regexp.Regexp{ regexp.MustCompile(":(?Ptargetgroup/.+)"), From 198d51dd41ac8f2bf5b6ff05861e82849672b65d Mon Sep 17 00:00:00 2001 From: theunissenne Date: Mon, 24 Jun 2024 13:44:46 +0200 Subject: [PATCH 08/18] Add support for MediaPackage metrics (#1046) Co-authored-by: Senne Theunis Co-authored-by: Cristian Greco --- pkg/config/services.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/config/services.go b/pkg/config/services.go index 37a323fb1..356f42d51 100644 --- a/pkg/config/services.go +++ b/pkg/config/services.go @@ -595,6 +595,18 @@ var SupportedServices = serviceConfigs{ regexp.MustCompile("(?P.*:.*:mediaconvert:.*:queues/.*)$"), }, }, + { + Namespace: "AWS/MediaPackage", + Alias: "mediapackage", + ResourceFilters: []*string{ + aws.String("mediapackage"), + aws.String("mediapackage-vod"), + }, + DimensionRegexps: []*regexp.Regexp{ + regexp.MustCompile(":channels/(?P.+)$"), + regexp.MustCompile(":packaging-configurations/(?P.+)$"), + }, + }, { Namespace: "AWS/MediaLive", Alias: "medialive", From 4e37085906680a64eb368ecb6d28707792d06852 Mon Sep 17 00:00:00 2001 From: Fabio Furushou Date: Mon, 24 Jun 2024 20:51:13 +0900 Subject: [PATCH 09/18] feat: add AWS/AppRunner as supported service (#1433) Co-authored-by: Cristian Greco --- README.md | 1 + examples/apprunner.yaml | 25 +++++++++++++++++++++++++ pkg/config/services.go | 4 ++++ 3 files changed, 30 insertions(+) create mode 100644 examples/apprunner.yaml diff --git a/README.md b/README.md index 74610e88e..c403b8c6c 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Only the latest version gets security updates. We won't support older versions. * `AmazonMWAA` - Managed Apache Airflow * `AWS/ACMPrivateCA` - ACM Private CA * `AWS/AmazonMQ` - Managed Message Broker Service + * `AWS/AppRunner` - Managed Container Apps Service * `AWS/AOSS` - OpenSearch Serverless * `AWS/ApiGateway` - ApiGateway (V1 and V2) * `AWS/ApplicationELB` - Application Load Balancer diff --git a/examples/apprunner.yaml b/examples/apprunner.yaml new file mode 100644 index 000000000..8cedcb232 --- /dev/null +++ b/examples/apprunner.yaml @@ -0,0 +1,25 @@ +apiVersion: v1alpha1 +discovery: + jobs: + - regions: + - us-east-1 + period: 300 + length: 300 + type: AWS/AppRunner + metrics: + - name: MemoryUtilization + statistics: [Average, Maximum] + - name: CPUUtilization + statistics: [Average, Maximum] + - name: 2xxStatusResponses + statistics: [Sum] + - name: Requests + statistics: [Sum] + - name: RequestLatency + statistics: [Average] + - name: ActiveInstances + statistics: [Maximum] + - name: 4xxStatusResponses + statistics: [Sum] + - name: Concurrency + statistics: [Maximum] diff --git a/pkg/config/services.go b/pkg/config/services.go index 356f42d51..de9d92eda 100644 --- a/pkg/config/services.go +++ b/pkg/config/services.go @@ -162,6 +162,10 @@ var SupportedServices = serviceConfigs{ regexp.MustCompile("broker:(?P[^:]+)"), }, }, + { + Namespace: "AWS/AppRunner", + Alias: "apprunner", + }, { Namespace: "AWS/AppSync", Alias: "appsync", From c4c2213f24517ea3eadf4544794679651dd3896d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:57:21 +0200 Subject: [PATCH 10/18] Bump goreleaser/goreleaser-action from 5 to 6 (#1437) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72f60b613..fa7b54b85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t ghcr.io/nerdswords/yet-another-cloudwatch-exporter:${{github.ref_name}} --build-arg VERSION=${{github.ref_name}} --push . - name: Build && release binaries - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 0baee8deb1828bbc689f8473728000e1b39db8ae Mon Sep 17 00:00:00 2001 From: Pablo <2617411+thepalbi@users.noreply.github.com> Date: Tue, 25 Jun 2024 06:16:57 -0300 Subject: [PATCH 11/18] Add support for AWS account aliases (#1434) Co-authored-by: Tristan Co-authored-by: Cristian Greco --- README.md | 8 ++++- go.mod | 1 + go.sum | 2 ++ pkg/clients/account/client.go | 4 +++ pkg/clients/account/v1/client.go | 24 +++++++++++++- pkg/clients/account/v2/client.go | 23 ++++++++++++- pkg/clients/v1/factory.go | 45 ++++++++++++++++++++++--- pkg/clients/v1/factory_test.go | 8 ++--- pkg/clients/v2/factory.go | 12 +++++-- pkg/clients/v2/factory_test.go | 4 +++ pkg/job/scrape.go | 36 +++++++++++++++----- pkg/model/model.go | 7 ++-- pkg/promutil/migrate.go | 4 +++ pkg/promutil/migrate_test.go | 57 ++++++++++++++++++++++++++++++++ 14 files changed, 210 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index c403b8c6c..e77d68fa0 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,8 @@ As a quick start, the following IAM policy can be used to grant the all permissi "ec2:DescribeSpotFleetRequests", "shield:ListProtections", "storagegateway:ListGateways", - "storagegateway:ListTagsForResource" + "storagegateway:ListTagsForResource", + "iam:ListAccountAliases" ], "Effect": "Allow", "Resource": "*" @@ -225,6 +226,11 @@ This permission is required to discover protected resources for the AWS/DDoSProt "shield:ListProtections" ``` +The AWS IAM API supports creating account aliases, which are human-friendly names that can be used to easily identify accounts. An account can have at most a single alias, see ([docs](https://docs.aws.amazon.com/IAM/latest/APIReference/API_ListAccountAliases.html)). Each alias must be unique across an AWS network partition ([docs](https://docs.aws.amazon.com/IAM/latest/UserGuide/console_account-alias.html#AboutAccountAlias)). The following permission is required to get the alias for an account, which is exported as a label in the `aws_account_info` metric: +```json +"iam:ListAccountAliases" +``` + If running YACE inside an AWS EC2 instance, the exporter will automatically attempt to assume the associated IAM Role. If this is undesirable behavior turn off the use the metadata endpoint by setting the environment variable `AWS_EC2_METADATA_DISABLED=true`. ## Configuration diff --git a/go.mod b/go.mod index 99b785a6e..5525296eb 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 + github.com/aws/aws-sdk-go-v2/service/iam v1.32.5 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11 github.com/aws/aws-sdk-go-v2/service/shield v1.25.11 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2 diff --git a/go.sum b/go.sum index 92c1981a9..49b0b4cb7 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 h1:OdHDbX github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11/go.mod h1:qiWXZTmOzpRkW6JMyWy+2n1PRnhqmh7T1bH/jdxbJag= github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 h1:Rts0EZgdi3tneJMXp+uKrZHbMxQIu0y5O/2MG6a2+hY= github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2/go.mod h1:j0V2ahvdX3mGIyXQSe9vjdIQvSxz3uaMM0bR7Y+0WCE= +github.com/aws/aws-sdk-go-v2/service/iam v1.32.5 h1:G2judWqHbm2bDrmJPj9W0nD3Pv8+WzhY+fAAEQMpLf4= +github.com/aws/aws-sdk-go-v2/service/iam v1.32.5/go.mod h1:RorjhuicJ7tEwun17BEeD//1JiPdvxPv15KOa9BKxS8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12 h1:kO2J7WMroF/OTHN9WTcUtMjPhJ7ZoNxx0dwv6UCXQgY= diff --git a/pkg/clients/account/client.go b/pkg/clients/account/client.go index fb1d8d2d0..c651890ba 100644 --- a/pkg/clients/account/client.go +++ b/pkg/clients/account/client.go @@ -3,5 +3,9 @@ package account import "context" type Client interface { + // GetAccount returns the AWS account ID for the configured authenticated client. GetAccount(ctx context.Context) (string, error) + + // GetAccountAlias returns the account alias if there's one set, otherwise an empty string. + GetAccountAlias(ctx context.Context) (string, error) } diff --git a/pkg/clients/account/v1/client.go b/pkg/clients/account/v1/client.go index ed562fba7..cc3a41881 100644 --- a/pkg/clients/account/v1/client.go +++ b/pkg/clients/account/v1/client.go @@ -6,6 +6,8 @@ import ( "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/account" + "github.com/aws/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/service/iam/iamiface" "github.com/aws/aws-sdk-go/service/sts" "github.com/aws/aws-sdk-go/service/sts/stsiface" @@ -15,12 +17,14 @@ import ( type client struct { logger logging.Logger stsClient stsiface.STSAPI + iamClient iamiface.IAMAPI } -func NewClient(logger logging.Logger, stsClient stsiface.STSAPI) account.Client { +func NewClient(logger logging.Logger, stsClient stsiface.STSAPI, iamClient iamiface.IAMAPI) account.Client { return &client{ logger: logger, stsClient: stsClient, + iamClient: iamClient, } } @@ -34,3 +38,21 @@ func (c client) GetAccount(ctx context.Context) (string, error) { } return *result.Account, nil } + +func (c client) GetAccountAlias(ctx context.Context) (string, error) { + acctAliasOut, err := c.iamClient.ListAccountAliasesWithContext(ctx, &iam.ListAccountAliasesInput{}) + if err != nil { + return "", err + } + + possibleAccountAlias := "" + + // Since a single account can only have one alias, and an authenticated SDK session corresponds to a single account, + // the output can have at most one alias. + // https://docs.aws.amazon.com/IAM/latest/APIReference/API_ListAccountAliases.html + if len(acctAliasOut.AccountAliases) > 0 { + possibleAccountAlias = *acctAliasOut.AccountAliases[0] + } + + return possibleAccountAlias, nil +} diff --git a/pkg/clients/account/v2/client.go b/pkg/clients/account/v2/client.go index fe9ae6e3c..ed5f79a57 100644 --- a/pkg/clients/account/v2/client.go +++ b/pkg/clients/account/v2/client.go @@ -4,6 +4,7 @@ import ( "context" "errors" + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/clients/account" @@ -13,12 +14,14 @@ import ( type client struct { logger logging.Logger stsClient *sts.Client + iamClient *iam.Client } -func NewClient(logger logging.Logger, stsClient *sts.Client) account.Client { +func NewClient(logger logging.Logger, stsClient *sts.Client, iamClient *iam.Client) account.Client { return &client{ logger: logger, stsClient: stsClient, + iamClient: iamClient, } } @@ -32,3 +35,21 @@ func (c client) GetAccount(ctx context.Context) (string, error) { } return *result.Account, nil } + +func (c client) GetAccountAlias(ctx context.Context) (string, error) { + acctAliasOut, err := c.iamClient.ListAccountAliases(ctx, &iam.ListAccountAliasesInput{}) + if err != nil { + return "", err + } + + possibleAccountAlias := "" + + // Since a single account can only have one alias, and an authenticated SDK session corresponds to a single account, + // the output can have at most one alias. + // https://docs.aws.amazon.com/IAM/latest/APIReference/API_ListAccountAliases.html + if len(acctAliasOut.AccountAliases) > 0 { + possibleAccountAlias = acctAliasOut.AccountAliases[0] + } + + return possibleAccountAlias, nil +} diff --git a/pkg/clients/v1/factory.go b/pkg/clients/v1/factory.go index 5dfa89fe0..1cce1eff5 100644 --- a/pkg/clients/v1/factory.go +++ b/pkg/clients/v1/factory.go @@ -21,6 +21,8 @@ import ( "github.com/aws/aws-sdk-go/service/databasemigrationservice/databasemigrationserviceiface" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" + "github.com/aws/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/service/iam/iamiface" "github.com/aws/aws-sdk-go/service/prometheusservice" "github.com/aws/aws-sdk-go/service/prometheusservice/prometheusserviceiface" "github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi" @@ -47,6 +49,7 @@ type CachingFactory struct { session *session.Session endpointResolver endpoints.ResolverFunc stscache map[model.Role]stsiface.STSAPI + iamcache map[model.Role]iamiface.IAMAPI clients map[model.Role]map[string]*cachedClients cleared bool refreshed bool @@ -71,6 +74,7 @@ var _ clients.Factory = &CachingFactory{} // NewFactory creates a new client factory to use when fetching data from AWS with sdk v1 func NewFactory(logger logging.Logger, jobsCfg model.JobsConfig, fips bool) *CachingFactory { stscache := map[model.Role]stsiface.STSAPI{} + iamcache := map[model.Role]iamiface.IAMAPI{} cache := map[model.Role]map[string]*cachedClients{} for _, discoveryJob := range jobsCfg.DiscoveryJobs { @@ -78,6 +82,9 @@ func NewFactory(logger logging.Logger, jobsCfg model.JobsConfig, fips bool) *Cac if _, ok := stscache[role]; !ok { stscache[role] = nil } + if _, ok := iamcache[role]; !ok { + iamcache[role] = nil + } if _, ok := cache[role]; !ok { cache[role] = map[string]*cachedClients{} } @@ -92,6 +99,9 @@ func NewFactory(logger logging.Logger, jobsCfg model.JobsConfig, fips bool) *Cac if _, ok := stscache[role]; !ok { stscache[role] = nil } + if _, ok := iamcache[role]; !ok { + iamcache[role] = nil + } if _, ok := cache[role]; !ok { cache[role] = map[string]*cachedClients{} @@ -113,6 +123,9 @@ func NewFactory(logger logging.Logger, jobsCfg model.JobsConfig, fips bool) *Cac if _, ok := stscache[role]; !ok { stscache[role] = nil } + if _, ok := iamcache[role]; !ok { + iamcache[role] = nil + } if _, ok := cache[role]; !ok { cache[role] = map[string]*cachedClients{} @@ -146,6 +159,7 @@ func NewFactory(logger logging.Logger, jobsCfg model.JobsConfig, fips bool) *Cac session: nil, endpointResolver: endpointResolver, stscache: stscache, + iamcache: iamcache, clients: cache, fips: fips, cleared: false, @@ -165,6 +179,10 @@ func (c *CachingFactory) Clear() { c.stscache[role] = nil } + for role := range c.iamcache { + c.iamcache[role] = nil + } + for role, regions := range c.clients { for region := range regions { cachedClient := c.clients[role][region] @@ -198,6 +216,10 @@ func (c *CachingFactory) Refresh() { c.stscache[role] = createStsSession(c.session, role, c.stsRegion, c.fips, c.logger.IsDebugEnabled()) } + for role := range c.iamcache { + c.iamcache[role] = createIamSession(c.session, role, c.fips, c.logger.IsDebugEnabled()) + } + for role, regions := range c.clients { for region := range regions { cachedClient := c.clients[role][region] @@ -209,7 +231,7 @@ func (c *CachingFactory) Refresh() { continue } cachedClient.tagging = createTaggingClient(c.logger, c.session, ®ion, role, c.fips) - cachedClient.account = createAccountClient(c.logger, c.stscache[role]) + cachedClient.account = createAccountClient(c.logger, c.stscache[role], c.iamcache[role]) } } @@ -242,8 +264,8 @@ func createTaggingClient(logger logging.Logger, session *session.Session, region ) } -func createAccountClient(logger logging.Logger, sts stsiface.STSAPI) account.Client { - return account_v1.NewClient(logger, sts) +func createAccountClient(logger logging.Logger, sts stsiface.STSAPI, iam iamiface.IAMAPI) account.Client { + return account_v1.NewClient(logger, sts, iam) } func (c *CachingFactory) GetCloudwatchClient(region string, role model.Role, concurrency cloudwatch_client.ConcurrencyConfig) cloudwatch_client.Client { @@ -281,7 +303,7 @@ func (c *CachingFactory) GetAccountClient(region string, role model.Role) accoun if client := c.clients[role][region].account; client != nil { return client } - c.clients[role][region].account = createAccountClient(c.logger, c.stscache[role]) + c.clients[role][region].account = createAccountClient(c.logger, c.stscache[role], c.iamcache[role]) return c.clients[role][region].account } @@ -349,6 +371,21 @@ func createStsSession(sess *session.Session, role model.Role, region string, fip return sts.New(sess, setSTSCreds(sess, config, role)) } +func createIamSession(sess *session.Session, role model.Role, fips bool, isDebugEnabled bool) *iam.IAM { + maxStsRetries := 5 + config := &aws.Config{MaxRetries: &maxStsRetries} + + if fips { + config.UseFIPSEndpoint = endpoints.FIPSEndpointStateEnabled + } + + if isDebugEnabled { + config.LogLevel = aws.LogLevel(aws.LogDebugWithHTTPBody) + } + + return iam.New(sess, setSTSCreds(sess, config, role)) +} + func createCloudwatchSession(sess *session.Session, region *string, role model.Role, fips bool, isDebugEnabled bool) *cloudwatch.CloudWatch { config := &aws.Config{Region: region, Retryer: getAwsRetryer()} diff --git a/pkg/clients/v1/factory_test.go b/pkg/clients/v1/factory_test.go index 89f2f2432..703db6cc7 100644 --- a/pkg/clients/v1/factory_test.go +++ b/pkg/clients/v1/factory_test.go @@ -495,7 +495,7 @@ func TestClear(t *testing.T) { "us-east-1": &cachedClients{ cloudwatch: createCloudWatchClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), tagging: createTaggingClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), - account: createAccountClient(logging.NewNopLogger(), nil), + account: createAccountClient(logging.NewNopLogger(), nil, nil), onlyStatic: true, }, }, @@ -634,7 +634,7 @@ func TestRefresh(t *testing.T) { "us-east-1": &cachedClients{ cloudwatch: createCloudWatchClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), tagging: createTaggingClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), - account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false)), + account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false), createIamSession(mock.Session, role, false, false)), }, }, }, @@ -752,7 +752,7 @@ func testGetAWSClient( "us-east-1": &cachedClients{ cloudwatch: createCloudWatchClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), tagging: createTaggingClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), - account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false)), + account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false), createIamSession(mock.Session, role, false, false)), }, }, }, @@ -774,7 +774,7 @@ func testGetAWSClient( "us-east-1": &cachedClients{ cloudwatch: createCloudWatchClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), tagging: createTaggingClient(logging.NewNopLogger(), mock.Session, ®ion, role, false), - account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false)), + account: createAccountClient(logging.NewNopLogger(), createStsSession(mock.Session, role, "", false, false), createIamSession(mock.Session, role, false, false)), }, }, }, diff --git a/pkg/clients/v2/factory.go b/pkg/clients/v2/factory.go index eb7cb2ee6..a98111c52 100644 --- a/pkg/clients/v2/factory.go +++ b/pkg/clients/v2/factory.go @@ -18,6 +18,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" "github.com/aws/aws-sdk-go-v2/service/shield" "github.com/aws/aws-sdk-go-v2/service/storagegateway" @@ -196,7 +197,10 @@ func (c *CachingFactory) GetAccountClient(region string, role model.Role) accoun if client := c.clients[role][region].account; client != nil { return client } - c.clients[role][region].account = account_v2.NewClient(c.logger, c.createStsClient(c.clients[role][region].awsConfig)) + + stsClient := c.createStsClient(c.clients[role][region].awsConfig) + iamClient := c.createIAMClient(c.clients[role][region].awsConfig) + c.clients[role][region].account = account_v2.NewClient(c.logger, stsClient, iamClient) return c.clients[role][region].account } @@ -231,7 +235,7 @@ func (c *CachingFactory) Refresh() { c.createShieldClient(cache.awsConfig), ) - cache.account = account_v2.NewClient(c.logger, c.createStsClient(cache.awsConfig)) + cache.account = account_v2.NewClient(c.logger, c.createStsClient(cache.awsConfig), c.createIAMClient(cache.awsConfig)) } } @@ -402,6 +406,10 @@ func (c *CachingFactory) createStsClient(awsConfig *aws.Config) *sts.Client { return sts.NewFromConfig(*awsConfig, c.stsOptions) } +func (c *CachingFactory) createIAMClient(awsConfig *aws.Config) *iam.Client { + return iam.NewFromConfig(*awsConfig) +} + func (c *CachingFactory) createShieldClient(awsConfig *aws.Config) *shield.Client { return shield.NewFromConfig(*awsConfig, func(options *shield.Options) { if c.logger.IsDebugEnabled() { diff --git a/pkg/clients/v2/factory_test.go b/pkg/clients/v2/factory_test.go index fba74fd7e..d47019fda 100644 --- a/pkg/clients/v2/factory_test.go +++ b/pkg/clients/v2/factory_test.go @@ -471,6 +471,10 @@ func (t testClient) GetAccount(_ context.Context) (string, error) { return "", nil } +func (t testClient) GetAccountAlias(_ context.Context) (string, error) { + return "", nil +} + func (t testClient) ListMetrics(_ context.Context, _ string, _ *model.MetricConfig, _ bool, _ func(page []*model.Metric)) error { return nil } diff --git a/pkg/job/scrape.go b/pkg/job/scrape.go index 1b05f45ab..17925ad8d 100644 --- a/pkg/job/scrape.go +++ b/pkg/job/scrape.go @@ -40,6 +40,11 @@ func ScrapeAwsData( } jobLogger = jobLogger.With("account", accountID) + accountAlias, err := factory.GetAccountClient(region, role).GetAccountAlias(ctx) + if err != nil { + jobLogger.Warn("Couldn't get account alias", "err", err) + } + cloudwatchClient := factory.GetCloudwatchClient(region, role, cloudwatchConcurrency) gmdProcessor := getmetricdata.NewDefaultProcessor(logger, cloudwatchClient, metricsPerQuery, cloudwatchConcurrency.GetMetricData) resources, metrics := runDiscoveryJob(ctx, jobLogger, discoveryJob, region, factory.GetTaggingClient(region, role, taggingAPIConcurrency), cloudwatchClient, gmdProcessor) @@ -49,9 +54,10 @@ func ScrapeAwsData( } if addDataToOutput { sc := &model.ScrapeContext{ - Region: region, - AccountID: accountID, - CustomTags: discoveryJob.CustomTags, + Region: region, + AccountID: accountID, + AccountAlias: accountAlias, + CustomTags: discoveryJob.CustomTags, } metricResult := model.CloudwatchMetricResult{ Context: sc, @@ -88,12 +94,18 @@ func ScrapeAwsData( } jobLogger = jobLogger.With("account", accountID) + accountAlias, err := factory.GetAccountClient(region, role).GetAccountAlias(ctx) + if err != nil { + jobLogger.Warn("Couldn't get account alias", "err", err) + } + metrics := runStaticJob(ctx, jobLogger, staticJob, factory.GetCloudwatchClient(region, role, cloudwatchConcurrency)) metricResult := model.CloudwatchMetricResult{ Context: &model.ScrapeContext{ - Region: region, - AccountID: accountID, - CustomTags: staticJob.CustomTags, + Region: region, + AccountID: accountID, + AccountAlias: accountAlias, + CustomTags: staticJob.CustomTags, }, Data: metrics, } @@ -119,14 +131,20 @@ func ScrapeAwsData( } jobLogger = jobLogger.With("account", accountID) + accountAlias, err := factory.GetAccountClient(region, role).GetAccountAlias(ctx) + if err != nil { + jobLogger.Warn("Couldn't get account alias", "err", err) + } + cloudwatchClient := factory.GetCloudwatchClient(region, role, cloudwatchConcurrency) gmdProcessor := getmetricdata.NewDefaultProcessor(logger, cloudwatchClient, metricsPerQuery, cloudwatchConcurrency.GetMetricData) metrics := runCustomNamespaceJob(ctx, jobLogger, customNamespaceJob, cloudwatchClient, gmdProcessor) metricResult := model.CloudwatchMetricResult{ Context: &model.ScrapeContext{ - Region: region, - AccountID: accountID, - CustomTags: customNamespaceJob.CustomTags, + Region: region, + AccountID: accountID, + AccountAlias: accountAlias, + CustomTags: customNamespaceJob.CustomTags, }, Data: metrics, } diff --git a/pkg/model/model.go b/pkg/model/model.go index 7cadfc33a..04d6bcfbd 100644 --- a/pkg/model/model.go +++ b/pkg/model/model.go @@ -134,9 +134,10 @@ type TaggedResourceResult struct { } type ScrapeContext struct { - Region string - AccountID string - CustomTags []Tag + Region string + AccountID string + AccountAlias string + CustomTags []Tag } // CloudwatchData is an internal representation of a CloudWatch diff --git a/pkg/promutil/migrate.go b/pkg/promutil/migrate.go index 004cbc7c7..781159713 100644 --- a/pkg/promutil/migrate.go +++ b/pkg/promutil/migrate.go @@ -245,6 +245,10 @@ func contextToLabels(context *model.ScrapeContext, labelsSnakeCase bool, logger labels := make(map[string]string, 2+len(context.CustomTags)) labels["region"] = context.Region labels["account_id"] = context.AccountID + // If there's no account alias, omit adding an extra label in the series, it will work either way query wise + if context.AccountAlias != "" { + labels["account_alias"] = context.AccountAlias + } for _, label := range context.CustomTags { ok, promTag := PromStringTag(label.Key, labelsSnakeCase) diff --git a/pkg/promutil/migrate_test.go b/pkg/promutil/migrate_test.go index 62f6d77c3..59a3331bd 100644 --- a/pkg/promutil/migrate_test.go +++ b/pkg/promutil/migrate_test.go @@ -886,6 +886,63 @@ func TestBuildMetrics(t *testing.T) { }, expectedErr: nil, }, + { + name: "scraping with aws account alias", + data: []model.CloudwatchMetricResult{{ + Context: &model.ScrapeContext{ + Region: "us-east-1", + AccountID: "123456789012", + AccountAlias: "billingacct", + }, + Data: []*model.CloudwatchData{ + { + MetricName: "CPUUtilization", + MetricMigrationParams: model.MetricMigrationParams{ + NilToZero: false, + AddCloudwatchTimestamp: false, + }, + Namespace: "AWS/ElastiCache", + GetMetricDataResult: &model.GetMetricDataResult{ + Statistic: "Average", + Datapoint: aws.Float64(1), + Timestamp: ts, + }, + Dimensions: []model.Dimension{ + { + Name: "CacheClusterId", + Value: "redis-cluster", + }, + }, + ResourceName: "arn:aws:elasticache:us-east-1:123456789012:cluster:redis-cluster", + }, + }, + }}, + labelsSnakeCase: true, + expectedMetrics: []*PrometheusMetric{ + { + Name: aws.String("aws_elasticache_cpuutilization_average"), + Value: 1, + Timestamp: ts, + Labels: map[string]string{ + "account_id": "123456789012", + "account_alias": "billingacct", + "name": "arn:aws:elasticache:us-east-1:123456789012:cluster:redis-cluster", + "region": "us-east-1", + "dimension_cache_cluster_id": "redis-cluster", + }, + }, + }, + expectedLabels: map[string]model.LabelSet{ + "aws_elasticache_cpuutilization_average": { + "account_id": {}, + "account_alias": {}, + "name": {}, + "region": {}, + "dimension_cache_cluster_id": {}, + }, + }, + expectedErr: nil, + }, } for _, tc := range testCases { From cb647c11c6c85bb30ddf4f32ab0d51ff2e0e46e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:17:36 +0200 Subject: [PATCH 12/18] Bump alpine from 3.20.0 to 3.20.1 (#1448) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fbc8cbb8f..bed1ee5f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ENV CGO_ENABLED=0 ARG VERSION RUN go build -v -ldflags "-X main.version=$VERSION" -o yace ./cmd/yace -FROM alpine:3.20.0 +FROM alpine:3.20.1 EXPOSE 5000 ENTRYPOINT ["yace"] From db108d1b4d0c41189d9dfb0c73df49faa71dee13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:22:51 +0200 Subject: [PATCH 13/18] Bump github.com/aws/aws-sdk-go from 1.54.3 to 1.54.7 (#1449) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cristian Greco --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5525296eb..562badebd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/nerdswords/yet-another-cloudwatch-exporter go 1.22.0 require ( - github.com/aws/aws-sdk-go v1.54.3 + github.com/aws/aws-sdk-go v1.54.7 github.com/aws/aws-sdk-go-v2 v1.28.0 github.com/aws/aws-sdk-go-v2/config v1.27.19 github.com/aws/aws-sdk-go-v2/credentials v1.17.19 diff --git a/go.sum b/go.sum index 49b0b4cb7..cce4db96d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.54.3 h1:Bk+EXoq6v5I1xmHR9GQGpsMWZZFXs+FD+5uPyEmfgX0= -github.com/aws/aws-sdk-go v1.54.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.7 h1:k1wJ+NMOsXgq/Lsa0y1mS0DFoDeHFPcz2OjCq5H5Mjg= +github.com/aws/aws-sdk-go v1.54.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.28.0 h1:ne6ftNhY0lUvlazMUQF15FF6NH80wKmPRFG7g2q6TCw= github.com/aws/aws-sdk-go-v2 v1.28.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2/config v1.27.19 h1:+DBS8gJP6VsxYkZ6UEV0/VsRM2rYpbQCYsosW9RRmeQ= From 50e0129b88b59411357be59a84557526ab3eb96c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:41:39 +0200 Subject: [PATCH 14/18] Bump the aws-sdk-v2 group across 1 directory with 15 updates (#1450) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cristian Greco --- go.mod | 42 ++++++++++++++--------------- go.sum | 84 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/go.mod b/go.mod index 562badebd..a212a0c92 100644 --- a/go.mod +++ b/go.mod @@ -4,21 +4,21 @@ go 1.22.0 require ( github.com/aws/aws-sdk-go v1.54.7 - github.com/aws/aws-sdk-go-v2 v1.28.0 - github.com/aws/aws-sdk-go-v2/config v1.27.19 - github.com/aws/aws-sdk-go-v2/credentials v1.17.19 - github.com/aws/aws-sdk-go-v2/service/amp v1.25.11 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 - github.com/aws/aws-sdk-go-v2/service/iam v1.32.5 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11 - github.com/aws/aws-sdk-go-v2/service/shield v1.25.11 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2 - github.com/aws/aws-sdk-go-v2/service/sts v1.28.13 + github.com/aws/aws-sdk-go-v2 v1.30.0 + github.com/aws/aws-sdk-go-v2/config v1.27.21 + github.com/aws/aws-sdk-go-v2/credentials v1.17.21 + github.com/aws/aws-sdk-go-v2/service/amp v1.26.1 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.24.1 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.21.1 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.41.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.39.1 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.39.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1 + github.com/aws/aws-sdk-go-v2/service/iam v1.33.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.22.1 + github.com/aws/aws-sdk-go-v2/service/shield v1.26.1 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.30.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.29.1 github.com/aws/smithy-go v1.20.2 github.com/go-kit/log v0.2.1 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db @@ -31,14 +31,14 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.20.12 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect diff --git a/go.sum b/go.sum index cce4db96d..d65f6fa5a 100644 --- a/go.sum +++ b/go.sum @@ -1,51 +1,51 @@ github.com/aws/aws-sdk-go v1.54.7 h1:k1wJ+NMOsXgq/Lsa0y1mS0DFoDeHFPcz2OjCq5H5Mjg= github.com/aws/aws-sdk-go v1.54.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go-v2 v1.28.0 h1:ne6ftNhY0lUvlazMUQF15FF6NH80wKmPRFG7g2q6TCw= -github.com/aws/aws-sdk-go-v2 v1.28.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= -github.com/aws/aws-sdk-go-v2/config v1.27.19 h1:+DBS8gJP6VsxYkZ6UEV0/VsRM2rYpbQCYsosW9RRmeQ= -github.com/aws/aws-sdk-go-v2/config v1.27.19/go.mod h1:KzZcioJWzy9oV+oS5CobYXlDtU9+eW7bPG1g7gizTW4= -github.com/aws/aws-sdk-go-v2/credentials v1.17.19 h1:R18G7nBBGLby51CFEqUBFF2IVl7LUdCtYj6iosUwh/0= -github.com/aws/aws-sdk-go-v2/credentials v1.17.19/go.mod h1:xr9kUMnaLTB866HItT6pg58JgiBP77fSQLBwIa//zk8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6 h1:vVOuhRyslJ6T/HteG71ZWCTas1q2w6f0NKsNbkXHs/A= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.6/go.mod h1:jimWaqLiT0sJGLh51dKCLLtExRYPtMU7MpxuCgtbkxg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10 h1:LZIUb8sQG2cb89QaVFtMSnER10gyKkqU1k3hP3g9das= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.10/go.mod h1:BRIqay//vnIOCZjoXWSLffL2uzbtxEmnSlfbvVh7Z/4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10 h1:HY7CXLA0GiQUo3WYxOP7WYkLcwvRX4cLPf5joUcrQGk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.10/go.mod h1:kfRBSxRa+I+VyON7el3wLZdrO91oxUxEwdAaWgFqN90= +github.com/aws/aws-sdk-go-v2 v1.30.0 h1:6qAwtzlfcTtcL8NHtbDQAqgM5s6NDipQTkPxyH/6kAA= +github.com/aws/aws-sdk-go-v2 v1.30.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/config v1.27.21 h1:yPX3pjGCe2hJsetlmGNB4Mngu7UPmvWPzzWCv1+boeM= +github.com/aws/aws-sdk-go-v2/config v1.27.21/go.mod h1:4XtlEU6DzNai8RMbjSF5MgGZtYvrhBP/aKZcRtZAVdM= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21 h1:pjAqgzfgFhTv5grc7xPHtXCAaMapzmwA7aU+c/SZQGw= +github.com/aws/aws-sdk-go-v2/credentials v1.17.21/go.mod h1:nhK6PtBlfHTUDVmBLr1dg+WHCOCK+1Fu/WQyVHPsgNQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8 h1:FR+oWPFb/8qMVYMWN98bUZAGqPvLHiyqg1wqQGfUAXY= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.8/go.mod h1:EgSKcHiuuakEIxJcKGzVNWh5srVAQ3jKaSrBGRYvM48= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12 h1:SJ04WXGTwnHlWIODtC5kJzKbeuHt+OUNOgKg7nfnUGw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.12/go.mod h1:FkpvXhA92gb3GE9LD6Og0pHHycTxW7xGpnEh5E7Opwo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12 h1:hb5KgeYfObi5MHkSSZMEudnIvX30iB+E21evI4r6BnQ= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.12/go.mod h1:CroKe/eWJdyfy9Vx4rljP5wTUjNJfb+fPz1uMYUhEGM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.11 h1:c7NvqxFAXktCp3Z2Ypgk4a6XP8ibuqutgHsP1AFQpnY= -github.com/aws/aws-sdk-go-v2/service/amp v1.25.11/go.mod h1:E99igP+DszIQm5cHtfOokxXIwH3KOJYeYohOtWJhrY0= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13 h1:R1aOoz7ep8ALQfdjNaqFe0+L50ymLoGyQHTDeSBI8ds= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.23.13/go.mod h1:8o0oTMAMbrpkgO+/YuYDuOrv3B4vnze4Wg4F0UtAnko= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11 h1:Zzu/FnLG4O30o/lkxa1iSoW1BA7MsJHod2o66MJscns= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.20.11/go.mod h1:LwpjsYVYLx70GKgLi6E9uh1fNtBAlfwC4XqJ01S9anc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12 h1:8taAvIdV+Ci599cI1fU8O2MZsbGlAzRcY5vP3IKUr/c= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.12/go.mod h1:wkL6X7IkZMh0yigm5wMCbnvjdtjRAmQ0yHDWco7j8F4= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7 h1:Tt1CrlmtcPROwUI1HNDDq0rklVWgD4tmtzLqZQjkwuQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.38.7/go.mod h1:8dUb61YstV6fBlMTDZmPOLlPhNsOAX2yAIjpEl3dk2g= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11 h1:OdHDbX7rzXjMqEX/JluI2FDuj0+eVzqpzrtGLnT4/h8= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.38.11/go.mod h1:qiWXZTmOzpRkW6JMyWy+2n1PRnhqmh7T1bH/jdxbJag= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2 h1:Rts0EZgdi3tneJMXp+uKrZHbMxQIu0y5O/2MG6a2+hY= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.2/go.mod h1:j0V2ahvdX3mGIyXQSe9vjdIQvSxz3uaMM0bR7Y+0WCE= -github.com/aws/aws-sdk-go-v2/service/iam v1.32.5 h1:G2judWqHbm2bDrmJPj9W0nD3Pv8+WzhY+fAAEQMpLf4= -github.com/aws/aws-sdk-go-v2/service/iam v1.32.5/go.mod h1:RorjhuicJ7tEwun17BEeD//1JiPdvxPv15KOa9BKxS8= +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/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/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/ec2 v1.165.1 h1:LkSnU1c9JKJyXYcwpWgQGuwctwv3pDenMUgH2CmLd1A= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.165.1/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno= +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/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12 h1:kO2J7WMroF/OTHN9WTcUtMjPhJ7ZoNxx0dwv6UCXQgY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.12/go.mod h1:mrNxrjYvXaSjZe5fkKaWgDnOQ6BExLn/7Ru9OpRsMPY= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11 h1:7OSSqpvlgK6VCqvzmIOGIOZFU4g4pSw3TKmYnBalQTE= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.11/go.mod h1:LWst3iIixiR2B6hce9lkCfWDXnLlL1k2HT7MMoldbVo= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.11 h1:c70hsjmQ+xCxikdEm++giMgi8vsG7L/B9sJo/c+6630= -github.com/aws/aws-sdk-go-v2/service/shield v1.25.11/go.mod h1:lWVl2JiZxWTUAByPejH8djt+fZ+El2W7HSRLd64UDqw= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.12 h1:FsYii6U+2k8ynYBo+pywlCBY9HNAFRh+iICRHbn+Qyw= -github.com/aws/aws-sdk-go-v2/service/sso v1.20.12/go.mod h1:j9Rps+Lcs2A0tYypWsNBeJOjgsIYUf1Styppo9Es0Wo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6 h1:lEE+xEcq3lh9bk362tgErP1+n689q5ERdmTwmF1XT3M= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.6/go.mod h1:2tR0x1DCL5IgnVZ1NQNFDNg5/XL/kiQgWI5l7I/N5Js= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2 h1:ympsCWU0bTbN0cS1zVPJ9DoOv8dYpqlxLIpfkoFomrs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.29.2/go.mod h1:wvF9ZwY7sm/+DuHM6HXO+SZEaRLL48CIrYM+7oj4Nzc= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.13 h1:TSzmuUeruVJ4XWYp3bYzKCXue70ECpJWmbP3UfEvhYY= -github.com/aws/aws-sdk-go-v2/service/sts v1.28.13/go.mod h1:FppRtFjBA9mSWTj2cIAWCP66+bbBPMuPpBfWRXC5Yi0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14 h1:zSDPny/pVnkqABXYRicYuPf9z2bTqfH13HT3v6UheIk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.14/go.mod h1:3TTcI5JSzda1nw/pkVC9dhgLre0SNBFj2lYS4GctXKI= +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/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/sso v1.21.1 h1:sd0BsnAvLH8gsp2e3cbaIr+9D7T1xugueQ7V/zUAsS4= +github.com/aws/aws-sdk-go-v2/service/sso v1.21.1/go.mod h1:lcQG/MmxydijbeTOp04hIuJwXGWPZGI3bwdFDGRTv14= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1 h1:1uEFNNskK/I1KoZ9Q8wJxMz5V9jyBlsiaNrM7vA3YUQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.25.1/go.mod h1:z0P8K+cBIsFXUr5rzo/psUeJ20XjPN0+Nn8067Nd+E4= +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/sts v1.29.1 h1:myX5CxqXE0QMZNja6FA1/FSE3Vu1rVmeUmpJMMzeZg0= +github.com/aws/aws-sdk-go-v2/service/sts v1.29.1/go.mod h1:N2mQiucsO0VwK9CYuS4/c2n6Smeh1v47Rz3dWCPFLdE= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= From f051cbfb7a0523ff8ed025baebfee5294a7ccab2 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 25 Jun 2024 11:45:37 +0200 Subject: [PATCH 15/18] Prepare release 0.61.0 (#1451) --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37484a4b0..0e49e0aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,42 @@ Refactoring: **Full Changelog**: https://github.com/... +# 0.61.0 + +**Important news and breaking changes** + +* This release adds support for AWS account aliases (by @thepalbi). If the role used by YACE has `"iam:ListAccountAliases"` permission, the account alias (if any) is added as a label to the `aws_account_info` metric. + +**Bugfixes and features** + +Features: +* Add AWS/EC2CapacityReservations to the services list by @luismy +* Add support for MediaPackage metrics by @theunissenne +* Add AWS/AppRunner as supported service by @fabiiw05 + +Bugs: +* Fix association with gwlb by @vainiusd + +Refactoring: +* Add support for batching by time params by @kgeckhart + +**Dependencies** + +* Bump alpine from 3.19.1 to 3.20.1 +* Bump github.com/aws/aws-sdk-go from 1.53.1 to 1.54.7 +* Bump github.com/aws/aws-sdk-go-v2/service/ec2 from 1.161.4 to 1.162.0 in the aws-sdk-v2 group +* Bump github.com/prometheus/common from 0.53.0 to 0.54.0 +* Bump golangci/golangci-lint-action from 5.3.0 to 6.0.1 +* Bump goreleaser/goreleaser-action from 5 to 6 +* Bump the aws-sdk-v2 group + +**New contributors** + +* @luismy made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1341 +* @fabiiw05 made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1433 + +**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.60.0...v0.61.0 + # 0.60.0 **Bugfixes and features** From 1857a51b1185e3f0b63dc4a0ea11d93524c596c6 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 25 Jun 2024 12:52:38 +0200 Subject: [PATCH 16/18] Fix goreleaser config file for v2 (#1452) --- .goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index 83597cea6..71293848f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +version: 2 builds: - binary: yace main: ./cmd/yace From f8df772053b6c89ad265ea92552323910e8d3036 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 25 Jun 2024 12:55:59 +0200 Subject: [PATCH 17/18] Prepare release 0.61.1 (#1453) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e49e0aab..3fa93f12a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,12 @@ Refactoring: **Full Changelog**: https://github.com/... +# 0.61.1 + +Bugfix release to update the `goreleaser` configuration, please refer to the release notes for `0.61.0` for actual code changes. + +https://github.com/nerdswords/yet-another-cloudwatch-exporter/releases/tag/v0.61.0 + # 0.61.0 **Important news and breaking changes** From 43c09fe4ed3e93449121765462433ed924d679a2 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 25 Jun 2024 14:53:39 +0200 Subject: [PATCH 18/18] Prepare release 0.61.2 (#1454) --- .goreleaser.yml | 2 +- CHANGELOG.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 71293848f..b23409830 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -17,6 +17,6 @@ archives: files: - none* changelog: - skip: true + disable: true checksum: name_template: 'checksums.txt' diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fa93f12a..19bcd19b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,12 @@ Refactoring: **Full Changelog**: https://github.com/... +# 0.61.2 + +Bugfix release to update the `goreleaser` configuration (again!), please refer to the release notes for `0.61.0` for actual code changes. + +https://github.com/nerdswords/yet-another-cloudwatch-exporter/releases/tag/v0.61.0 + # 0.61.1 Bugfix release to update the `goreleaser` configuration, please refer to the release notes for `0.61.0` for actual code changes.