Awscloudwatchtags #41388
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -146,6 +146,25 @@ Enforces the use of FIPS service endpoints. See <<aws-credentials-config,AWS cre | |
| - ec2 | ||
| ---- | ||
|
|
||
| * *apigateway_max_results* | ||
|
|
||
| This configuration works together with AWS/APIGateway namespace. It defines the maximum number of returned results per page. The default value is 25 and the maximum value is 500. | ||
| See https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/[email protected]#GetRestApisInput.Limit[GetRestApisInput.Limit] | ||
|
|
||
| [source,yaml] | ||
| ---- | ||
| - module: aws | ||
| period: 10s | ||
| regions: | ||
| - us-east-1 | ||
| metricsets: | ||
| - cloudwatch | ||
| metrics: | ||
| - namespace: "AWS/ApiGateway" | ||
| resource_type: "apigateway:restapis" | ||
| apigateway_max_results: 40 | ||
| ---- | ||
|
|
||
| The aws module comes with a predefined dashboard. For example: | ||
|
|
||
| image::./images/metricbeat-aws-overview.png[] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -134,6 +134,25 @@ Enforces the use of FIPS service endpoints. See <<aws-credentials-config,AWS cre | |
| - ec2 | ||
| ---- | ||
|
|
||
| * *apigateway_max_results* | ||
|
|
||
| This configuration works together with AWS/APIGateway namespace. It defines the maximum number of returned results per page. The default value is 25 and the maximum value is 500. | ||
| See https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/[email protected]#GetRestApisInput.Limit[GetRestApisInput.Limit] | ||
|
|
||
| [source,yaml] | ||
| ---- | ||
| - module: aws | ||
| period: 10s | ||
| regions: | ||
| - us-east-1 | ||
| metricsets: | ||
| - cloudwatch | ||
| metrics: | ||
| - namespace: "AWS/ApiGateway" | ||
| resource_type: "apigateway:restapis" | ||
| apigateway_max_results: 40 | ||
| ---- | ||
|
|
||
| The aws module comes with a predefined dashboard. For example: | ||
|
|
||
| image::./images/metricbeat-aws-overview.png[] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is deprecated and goes EOL in July 2025, when you'll be forced to remove it because it won't get security updates (or I guess you could wait until there is a CVE reported in it and then urgently remove it): https://github.com/aws/aws-sdk-go
This PR also makes agentbeat 5% larger. Do we really need both versions of the AWS SDK?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The whole idea of this fix was that we needed to query both Rest APIs (that were included in old sdk) and WebSocket and HTTP APIs (that are included in the v2 sdk) in case user needed the metadata
(See code for check)
Let me doublecheck again and let you know. I am not still merging this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cmacknz I was not accurate, the
https://github.com/aws/aws-sdk-gowas not needed. Now it is removed!Long explanation:
I was wrongly using aws.StringValue (See old commit) from old sdk, in order to be safe with nill pointer exception
I found a replacer with aws.Tostring from new sdk (see new code)
Just to clarify for the following code, both functions use
aws-sdk-go-v2but: