Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds ECS Cluster Region option #2854

Merged
merged 1 commit into from
Sep 18, 2017
Merged

Conversation

galindro
Copy link

Propourse

As talked with @ekimekim on slack, this PR adds an ECS Cluster Region option.

Usage

./scope -probe.ecs.cluster.region us-east-1

The default behaviour is to get the region from the instance metadata.

Copy link
Contributor

@ekimekim ekimekim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Please make sure all code has had gofmt -s run on it.

prog/main.go Outdated
kubernetesTokenFlag = "probe.kubernetes.token"
sensitiveFlags = []string{
serviceTokenFlag = "service-token"
probeEcsClusterRegionFlag = "probe.ecs.cluster.region"

This comment was marked as abuse.

This comment was marked as abuse.

region, err := ec2metadata.New(sess).Region()
if err != nil {
return nil, err
var err error

This comment was marked as abuse.

This comment was marked as abuse.

@ekimekim ekimekim merged commit b7db604 into weaveworks:master Sep 18, 2017
ekimekim added a commit that referenced this pull request Sep 19, 2017
ekimekim added a commit that referenced this pull request Sep 19, 2017
@galindro
Copy link
Author

@ekimekim When my commit will be tagged? I've noticed that it was mentioned in 1.6.5 changelog but, I can't see it in commit list nor in files changed

@ekimekim
Copy link
Contributor

It's there. Check https://github.com/weaveworks/scope/commits/v1.6.5
The commit list you linked compares v1.6.5 to master. Since your commit is on both, it doesn't appear.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants