Remove metricIDNameMap and use ListMetrics to construct metric queries #10627
Conversation
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
Remove default version qualifier and rename the environment variable to set it from `BEAT_VERSION_QUALIFIER` to `VERSION_QUALIFIER` this will align with other parts of the stack. **Tested with filebeat.** ``` ❯ ./filebeat version [08:39:01] filebeat version 7.0.0 (amd64), libbeat 7.0.0 [0a0c267 built 2018-11-19 13:38:15 +0000 UTC] ``` **Without the patch** ``` ❯ ./filebeat version [08:40:07] filebeat version 7.0.0-alpha1 (amd64), libbeat 7.0.0-alpha1 [b007837 built 2018-11-19 13:39:59 +0000 UTC] ``` Fixes: #8384
|
jenkins, test this |
jsoriano
reviewed
Feb 14, 2019
kaiyan-sheng
commented
Feb 14, 2019
jsoriano
approved these changes
Feb 19, 2019
kaiyan-sheng
added a commit
that referenced
this pull request
Feb 25, 2019
…struct metric querie… (#10837) * Remove metricIDNameMap and use ListMetrics to construct metric queries (#10627) * Remove metricNameIDMap and use ListMetrics to construct metric queries * Add utils.go to put common functions for all metricsets * Remove fields that dont need to apply schema * Remove s.Optional in schema and use s.FailOnRequired instead * Regenerate data,json * Move GetMetricDataResults into utils.go * Replace with report.error * Separating TestData from TestFetch * Move two functions only used by integration tests into a separate file * Move aws_testing.go under mtest (cherry picked from commit 589fd32) * Remove debug lines
kaiyan-sheng
removed
needs_backport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@jsoriano Thanks for pointing this out to me that I don't need a metricIDNameMap to convert between AWS cloudwatch metric names and ec2 metricset names. This PR is to add cloudwatch metric names into schema.
This PR also includes a bug fix: when AWS EC2 instances are in states other than
running, metrics are not collected and sent to ES.