Collect Cloudwatch metrics from the same timestamp#11142
Merged
kaiyan-sheng merged 10 commits intoelastic:masterfrom Mar 13, 2019
kaiyan-sheng:ec2_reload
Merged
Collect Cloudwatch metrics from the same timestamp#11142kaiyan-sheng merged 10 commits intoelastic:masterfrom kaiyan-sheng:ec2_reload
kaiyan-sheng merged 10 commits intoelastic:masterfrom
kaiyan-sheng:ec2_reload
Conversation
kaiyan-sheng
added
[zube]: In Review
review
needs_backport
ruflin
reviewed
Mar 11, 2019
kaiyan-sheng
changed the title
kaiyan-sheng
changed the title
ruflin
reviewed
Mar 12, 2019
ruflin
reviewed
Mar 12, 2019
Contributor
ruflin
left a comment
ruflin
left a comment
There was a problem hiding this comment.
@kaiyan-sheng Left a few minor comments but thanks to your explanation today the code makes now much more sense. I kind of hope we could make it more readable moving forward but at the same time it's not too great what we get from Cloudwatch :-(
Contributor
Author
|
After #11151 get merged, I will push a commit up to adopt FindTimestamp method in SQS and S3 metricsets. When backporting to 7.0, only the changes related to ec2 will be cherrypicked. |
Contributor
Author
|
jenkins, test this please |
added 8 commits
March 13, 2019 10:45
Contributor
Author
|
jenkins, test this please |
ruflin
approved these changes
Mar 13, 2019
Contributor
ruflin
left a comment
ruflin
left a comment
There was a problem hiding this comment.
LGTM
Comments can be addressed later.
| if len(output.Values) == 0 { | ||
| continue | ||
| } | ||
| exists, timestampIdx := aws.CheckTimestampInArray(timestamp, output.Timestamps) |
Contributor
There was a problem hiding this comment.
Looks like this code is identical to the code in the s3 daily storage file? Perhaps later we can take it out.
| if len(output.Values) == 0 { | ||
| continue | ||
| } | ||
| exists, timestampIdx := aws.CheckTimestampInArray(timestamp, output.Timestamps) |
Contributor
There was a problem hiding this comment.
One more time the same code? :-)
kaiyan-sheng
removed
needs_backport
kaiyan-sheng
pushed a commit
that referenced
this pull request
Mar 15, 2019
#11142) (#11236) * Collect Cloudwatch metrics from the same timestamp (#11142) * Update aws documentation * Add checks for instance fields in TestFetch * Add tests for CheckTimestampInArray and FindTimestamp * Update comment for CheckTimestampInArray * Change test to table driven * Adopt CheckTimestampInArray and FindTimestamp in S3 and SQS (cherry picked from commit 822b95a) * Backport changes for CheckEventField and compareType from e03f966
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We are collecting data from
2019-03-08 19:57:00 +0000 UTCfor example forCPUUtilization, then we need to collect the rest of the metrics from the same timestamp fromValuesarray.FindTimestampfunction finds this timestamp andCheckTimestampInArrayfunction checks if input timestamp exists in array and if it exists, return the position. In this example,2019-03-08 19:57:00 +0000 UTCexists in[2019-03-08 20:02:00 +0000 UTC,2019-03-08 19:57:00 +0000 UTC]and position is1.