Merge 0.34.0 and 0.33.0 #30
Merged
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
kgeckhart
requested review from
cristiangreco,
thepalbi,
IfSentient,
ferruvich and
matthewnolf
ferruvich
approved these changes
Apr 5, 2022
| # 0.34.0-alpha | ||
| * Update dependencies | ||
| * Add weekly dependabot updates (jylitalo) | ||
| * Add support for regional sts endpoints (matt-mercer) |
There was a problem hiding this comment.
👀
@cristiangreco I don't remember exactly what was the problem we had trying regional STS endpoints, but the blocker was before hitting the exporter, right?
There was a problem hiding this comment.
I think our problem was around "job validation". Anyway chatted with Kyle yesterday about this specific change and it shouldn't impact us as we use a custom session.
cmd/yace/main.go
Outdated
| @@ -207,15 +215,15 @@ func (s *scraper) scrape(ctx context.Context, cache exporter.SessionCache) { | |||
| defer sem.Release(1) | |||
|
|
|||
| newRegistry := prometheus.NewRegistry() | |||
| for _, counter := range []prometheus.Counter{exporter.CloudwatchAPICounter, exporter.CloudwatchAPIErrorCounter, exporter.CloudwatchGetMetricDataAPICounter, exporter.CloudwatchGetMetricStatisticsAPICounter, exporter.ResourceGroupTaggingAPICounter, exporter.AutoScalingAPICounter, exporter.ApiGatewayAPICounter, exporter.TargetGroupsAPICounter} { | |||
| for _, counter := range []prometheus.Counter{exporter.CloudwatchAPICounter, exporter.CloudwatchAPIErrorCounter, exporter.CloudwatchGetMetricDataAPICounter, exporter.CloudwatchGetMetricStatisticsAPICounter, exporter.ResourceGroupTaggingAPICounter, exporter.AutoScalingAPICounter, exporter.ApiGatewayAPICounter, exporter.TargetGroupsAPICounter, exporter.DmsAPICounter} { | |||
There was a problem hiding this comment.
I think we're missing exporter.Ec2APICounter here (should be 10 in total).
There was a problem hiding this comment.
Great catch! Perhaps I should do a follow up to export an array which contains all of them instead to help avoid this.
cristiangreco
approved these changes
Apr 5, 2022
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.
Merges in the latest version of YACE mostly to pickup changes related to propagating context through the AWS calls. There's other changes which shouldn't really impact us.
Full changes from upstream here, nerdswords/yet-another-cloudwatch-exporter@v0.32.0-alpha...v0.34.0-alpha. This was a pain because I never pushed the logging changes upstream which I need to do.