Generate settings.metrics.send-metrics based on AWS partition for AWS variants
#2247
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
cbgbt
force-pushed
the
send-metrics-partition
branch
from
e8b25fc
to
5cd1c19
Compare
|
It might be a good idea to split |
cbgbt
force-pushed
the
send-metrics-partition
branch
from
5cd1c19
to
50a6201
Compare
jpculp
approved these changes
Jun 30, 2022
bcressey
reviewed
Jun 30, 2022
| @@ -0,0 +1,71 @@ | |||
| /// This module contains utilities for populating userdata for the admin-container with user SSH keys from IMDS. | |||
| use clap::Parser; | |||
There was a problem hiding this comment.
Elsewhere we've tried to use argh for binary size reasons - can we do that here? structopt is also OK since it's currently in updog and metricdog.
etungsten
approved these changes
Jul 6, 2022
This commit moves prior shibaken functionality to generate admin container userdata to a subcommand.
Use the new shibaken interface to generate userdata for the admin container.
AWS variants now generate the `settings.metrics.send-metrics` setting based on partition information gathered from shibaken.
cbgbt
force-pushed
the
send-metrics-partition
branch
from
50a6201
to
eb2bbc9
Compare
|
Addresses comment by @bcressey and rebases. Moving from |
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.
Issue number: Related to #1255
Description of changes:
This set of changes modifies
settings.metrics.send-metricsto use a setting-generator for AWS variants. Specifically, we enable metrics-sending by default on AWS variants if the host is in theawsoraws-us-govpartitions, according to the IMDS.This information is retrieved by
shibaken, which required some changes to the interface, as well as the admin user-data generation which uses that interface.Testing done:
send-metricssuccessfully uses shibaken in theawspartitionsend-metricssuccessfully uses shibaken in theaws-us-govpartitionTerms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.