From 88499b4e9dec601249eae9b6cdb0b2946e73a935 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Tue, 22 Nov 2016 15:13:36 -0800 Subject: [PATCH] Add --probe.ecs flag to enable running the ECS probe tagger --- prog/main.go | 5 +++++ prog/probe.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/prog/main.go b/prog/main.go index 956549cea..2f8999968 100644 --- a/prog/main.go +++ b/prog/main.go @@ -104,6 +104,8 @@ type probeFlags struct { kubernetesEnabled bool kubernetesConfig kubernetes.ClientConfig + ecsEnabled bool + weaveEnabled bool weaveAddr string weaveHostname string @@ -282,6 +284,9 @@ func main() { flag.StringVar(&flags.probe.kubernetesConfig.User, "probe.kubernetes.user", "", "The name of the kubeconfig user to use") flag.StringVar(&flags.probe.kubernetesConfig.Username, "probe.kubernetes.username", "", "Username for basic authentication to the API server") + // AWS ECS + flag.BoolVar(&flags.probe.ecsEnabled, "probe.ecs", false, "collect ecs-related attributes for containers on this node") + // Weave flag.StringVar(&flags.probe.weaveAddr, "probe.weave.addr", "127.0.0.1:6784", "IP address & port of the Weave router") flag.StringVar(&flags.probe.weaveHostname, "probe.weave.hostname", app.DefaultHostname, "Hostname to lookup in WeaveDNS") diff --git a/prog/probe.go b/prog/probe.go index 5d638ea81..2cb26bab4 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -23,6 +23,7 @@ import ( "github.com/weaveworks/scope/common/xfer" "github.com/weaveworks/scope/probe" "github.com/weaveworks/scope/probe/appclient" + "github.com/weaveworks/scope/probe/awsecs" "github.com/weaveworks/scope/probe/controls" "github.com/weaveworks/scope/probe/docker" "github.com/weaveworks/scope/probe/endpoint" @@ -201,6 +202,10 @@ func probeMain(flags probeFlags, targets []appclient.Target) { } } + if flags.ecsEnabled { + p.AddTagger(awsecs.Reporter{}) + } + if flags.weaveEnabled { client := weave.NewClient(sanitize.URL("http://", 6784, "")(flags.weaveAddr)) weave, err := overlay.NewWeave(hostID, client, dockerEndpoint)