Update cloudwatch exporter dependency #839

andriikushch · 2024-05-14T09:43:29Z

PR Description

This PR adds a new configuration parameter for the Cloudwatch exporter. It allows to specify the AWS SDK version to use. v1 is the default version.

It was achieved by updating and integrating the version of the github.com/nerdswords/yet-another-cloudwatch-exporter package and all dependencies that it depends on.

According to the https://github.com/nerdswords/yet-another-cloudwatch-exporter/blob/a275f94e5d33b3b5330ecfced86c290e1db05928/pkg/config/feature_flags.go#L10 , using the AWS SDK v2, should improve performance.

After this change, using aliases for the AWS service names will produce warnings.

Which issue(s) this PR fixes

N.A.

A related change in the Agent project:

Update cloudwatch exporter dependency agent#6835

Notes to the Reviewer

PR Checklist

CHANGELOG.md updated
Documentation added
Tests updated
Config converters updated

…porter-dependency- # Conflicts: # CHANGELOG.md

clayton-cornell · 2024-05-16T22:15:08Z

Doc changes look OK.

Should this be backported? Or only in next?

…porter-dependency- # Conflicts: # go.mod # go.sum

andriikushch · 2024-05-21T08:29:26Z

Doc changes look OK.

Should this be backported? Or only in next?

@clayton-cornell It would be nice to backport it. The same change is in the Agent repository:

Update cloudwatch exporter dependency agent#6835.

clayton-cornell · 2024-05-22T16:21:19Z

Added backports to Alloy v1.0 and v1.1

There's a parallel Agent PR already in process, so added the label backport-to-agent:no

kgeckhart · 2024-05-22T18:02:33Z

internal/component/prometheus/exporter/cloudwatch/config.go

@@ -37,6 +40,7 @@ type Arguments struct {
 	Discovery             []DiscoveryJob        `alloy:"discovery,block,optional"`
 	Static                []StaticJob           `alloy:"static,block,optional"`
 	DecoupledScrape       DecoupledScrapeConfig `alloy:"decoupled_scraping,block,optional"`
+	AWSSDKVersion         string                `alloy:"aws_sdk_version,attr,optional"`


Given there's only two options v1 and v2 with v1 being deprecated with an EOL date I think this should really be a boolean to enable or disable sdk v2 vs a string like this. We aren't anticipating the need to support a v3 anytime soon.

CHANGELOG.md

kgeckhart · 2024-05-22T19:39:26Z

internal/component/prometheus/exporter/cloudwatch/config.go

@@ -26,6 +28,7 @@ var defaults = Arguments{
 		Enabled:        false,
 		ScrapeInterval: 5 * time.Minute,
 	},
+	AWSSDKVersion: "v2",


I think we should default to v1 for now to prevent breaking anyone on upgrade. We can make v2 the default following YACE changing.

Let's do it 👍

…porter-dependency- # Conflicts: # docs/sources/reference/components/prometheus.exporter.cloudwatch.md

.github/workflows/test.yml

CHANGELOG.md

thampiotr · 2024-08-28T10:10:41Z

docs/sources/reference/components/prometheus.exporter.cloudwatch.md

-    sts_region = "us-east-2"
-
+    sts_region      = "us-east-2"
+    aws_sdk_version_v2 = "false"
    discovery {
        type        = "sqs"


type=sqs is deprecated now - we need to search for all the examples everywhere and remove the usage of aliases

I will update doc and the tests. 👍

We kept it to test and show the backward compatibility.

A few commits ago, based on the discussion above, we added a compatibility layer to keep support for the aliases.

63ff123

The idea was to generate warnings but keep the support.

@thampiotr, shall we use this approach or drop the support completely?

I'm aware that there is compatibility and the old configs will work, my comment was more about using in our examples the official, correct names, not the aliases which are deprecated :)

internal/static/integrations/cloudwatch_exporter/cloudwatch_exporter.go

…ndency-

This reverts commit e176bd4.

I believe your concerns are addressed now! Please comment if not :)

github-actions · 2024-09-03T14:54:33Z

The backport to release/v1.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-839-to-release/v1.0 origin/release/v1.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 08573dfe866c1ef16f911479f69c3a9e62de4e4b
# Push it to GitHub
git push --set-upstream origin backport-839-to-release/v1.0
git switch main
# Remove the local backport branch
git branch -D backport-839-to-release/v1.0

Then, create a pull request where the base branch is release/v1.0 and the compare/head branch is backport-839-to-release/v1.0.

github-actions · 2024-09-03T14:54:34Z

The backport to release/v1.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-839-to-release/v1.1 origin/release/v1.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 08573dfe866c1ef16f911479f69c3a9e62de4e4b
# Push it to GitHub
git push --set-upstream origin backport-839-to-release/v1.1
git switch main
# Remove the local backport branch
git branch -D backport-839-to-release/v1.1

Then, create a pull request where the base branch is release/v1.1 and the compare/head branch is backport-839-to-release/v1.1.

github-actions · 2024-09-03T14:54:36Z

The backport to release/v1.2 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-839-to-release/v1.2 origin/release/v1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 08573dfe866c1ef16f911479f69c3a9e62de4e4b
# Push it to GitHub
git push --set-upstream origin backport-839-to-release/v1.2
git switch main
# Remove the local backport branch
git branch -D backport-839-to-release/v1.2

Then, create a pull request where the base branch is release/v1.2 and the compare/head branch is backport-839-to-release/v1.2.

github-actions · 2024-09-03T14:54:37Z

The backport to release/v1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-839-to-release/v1.3 origin/release/v1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 08573dfe866c1ef16f911479f69c3a9e62de4e4b
# Push it to GitHub
git push --set-upstream origin backport-839-to-release/v1.3
git switch main
# Remove the local backport branch
git branch -D backport-839-to-release/v1.3

Then, create a pull request where the base branch is release/v1.3 and the compare/head branch is backport-839-to-release/v1.3.

clayton-cornell · 2024-09-04T19:04:43Z

Removed backport labels.

andriikushch added 9 commits May 14, 2024 11:41

Update cloudwatch exporter dependency

023c06c

Fix imports

fb934e7

Fix converter tests

09f3380

Add documentation

6df9bdc

Change CHANGELOG.md

0802a26

Revert some changes in the test

b2d50c6

Merge branch 'refs/heads/main' into andriikushch/update-cloudwatch-ex…

4a109b3

…porter-dependency- # Conflicts: # CHANGELOG.md

Update CHANGELOG.md

c743403

Fix tests

a9a9f60

andriikushch marked this pull request as ready for review May 16, 2024 14:29

andriikushch requested a review from clayton-cornell as a code owner May 16, 2024 14:29

andriikushch requested a review from kgeckhart May 16, 2024 14:29

andriikushch mentioned this pull request May 16, 2024

Update cloudwatch exporter dependency grafana/agent#6835

Closed

4 tasks

andriikushch added outdated-dependency Related to an outdated dependency. dependencies Pull requests that update a dependency file labels May 16, 2024

clayton-cornell requested a review from a team May 16, 2024 22:14

clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label May 16, 2024

andriikushch added 2 commits May 21, 2024 10:06

Merge branch 'refs/heads/main' into andriikushch/update-cloudwatch-ex…

6566866

…porter-dependency- # Conflicts: # go.mod # go.sum

Update go.mod

dc04b58

Add -ld_classic to the CGO_LDFLAGS

6d6a0f6

clayton-cornell added backport release/v1.0 backport-to-agent:no PR should NOT be backported to the agent repo. backport release/v1.1 labels May 22, 2024

kgeckhart requested a review from thepalbi May 22, 2024 17:58

kgeckhart reviewed May 22, 2024

View reviewed changes

andriikushch removed backport release/v1.0 backport release/v1.1 labels May 23, 2024

andriikushch requested a review from kgeckhart June 18, 2024 11:10

Merge branch 'refs/heads/main' into andriikushch/update-cloudwatch-ex…

a04f268

…porter-dependency- # Conflicts: # docs/sources/reference/components/prometheus.exporter.cloudwatch.md

thampiotr reviewed Aug 28, 2024

View reviewed changes

clayton-cornell added backport release/v1.2 backport release/v1.3 labels Aug 28, 2024

andriikushch added 6 commits September 2, 2024 12:06

Merge branch 'main' into andriikushch/update-cloudwatch-exporter-depe…

800124f

…ndency-

Rename service name

91fe77c

Rename service name

dd9944d

Remove ld_classic tag

e176bd4

Update of the CHANGELOG.md

54943b4

Revert "Remove ld_classic tag"

6aa5fc2

This reverts commit e176bd4.

andriikushch requested a review from thampiotr September 2, 2024 12:20

thampiotr approved these changes Sep 3, 2024

View reviewed changes

thampiotr merged commit 08573df into main Sep 3, 2024
18 checks passed

thampiotr deleted the andriikushch/update-cloudwatch-exporter-dependency- branch September 3, 2024 14:53

github-actions bot added the backport-failed label Sep 3, 2024

clayton-cornell removed backport-failed backport release/v1.3 backport release/v1.2 backport release/v1.1 backport release/v1.0 backport-to-agent:no PR should NOT be backported to the agent repo. labels Sep 4, 2024

github-actions bot added the frozen-due-to-age label Oct 5, 2024

github-actions bot locked as resolved and limited conversation to collaborators Oct 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update cloudwatch exporter dependency #839

Update cloudwatch exporter dependency #839

andriikushch commented May 14, 2024 •

edited

Loading

clayton-cornell commented May 16, 2024

andriikushch commented May 21, 2024

clayton-cornell commented May 22, 2024

kgeckhart May 22, 2024

andriikushch May 23, 2024

kgeckhart May 22, 2024

andriikushch May 23, 2024

thampiotr Aug 28, 2024

andriikushch Sep 2, 2024 •

edited

Loading

thampiotr Sep 3, 2024

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

clayton-cornell commented Sep 4, 2024

Update cloudwatch exporter dependency #839

Update cloudwatch exporter dependency #839

Conversation

andriikushch commented May 14, 2024 • edited Loading

PR Description

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

clayton-cornell commented May 16, 2024

andriikushch commented May 21, 2024

clayton-cornell commented May 22, 2024

kgeckhart May 22, 2024

Choose a reason for hiding this comment

andriikushch May 23, 2024

Choose a reason for hiding this comment

kgeckhart May 22, 2024

Choose a reason for hiding this comment

andriikushch May 23, 2024

Choose a reason for hiding this comment

thampiotr Aug 28, 2024

Choose a reason for hiding this comment

andriikushch Sep 2, 2024 • edited Loading

Choose a reason for hiding this comment

thampiotr Sep 3, 2024

Choose a reason for hiding this comment

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

github-actions bot commented Sep 3, 2024

clayton-cornell commented Sep 4, 2024

andriikushch commented May 14, 2024 •

edited

Loading

andriikushch Sep 2, 2024 •

edited

Loading