Merge pull request #3419 from weaveworks/disable-reporting-k8s-cluster

Disable host and endpoint reporting in Kubernetes cluster mode
weaveworks · Nov 6, 2018 · 5798d04 · 5798d04
2 parents ee0ce7b + 71972c3
commit 5798d04
Showing 1 changed file with 32 additions and 30 deletions.
diff --git a/prog/probe.go b/prog/probe.go
@@ -213,40 +213,42 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
 	}
 
 	p := probe.New(flags.spyInterval, flags.publishInterval, clients, flags.noControls)
+	var processCache *process.CachingWalker
 
-	hostReporter := host.NewReporter(hostID, hostName, probeID, version, clients, handlerRegistry)
-	defer hostReporter.Stop()
-	p.AddReporter(hostReporter)
-	p.AddTagger(probe.NewTopologyTagger(), host.NewTagger(hostID))
+	if flags.kubernetesRole != kubernetesRoleCluster {
+		hostReporter := host.NewReporter(hostID, hostName, probeID, version, clients, handlerRegistry)
+		defer hostReporter.Stop()
+		p.AddReporter(hostReporter)
+		p.AddTagger(probe.NewTopologyTagger(), host.NewTagger(hostID))
 
-	var processCache *process.CachingWalker
-	if flags.procEnabled {
-		processCache = process.NewCachingWalker(process.NewWalker(flags.procRoot, false))
-		p.AddTicker(processCache)
-		p.AddReporter(process.NewReporter(processCache, hostID, process.GetDeltaTotalJiffies, flags.noCommandLineArguments))
-	}
+		if flags.procEnabled {
+			processCache = process.NewCachingWalker(process.NewWalker(flags.procRoot, false))
+			p.AddTicker(processCache)
+			p.AddReporter(process.NewReporter(processCache, hostID, process.GetDeltaTotalJiffies, flags.noCommandLineArguments))
+		}
 
-	dnsSnooper, err := endpoint.NewDNSSnooper()
-	if err != nil {
-		log.Errorf("Failed to start DNS snooper: nodes for external services will be less accurate: %s", err)
-	} else {
-		defer dnsSnooper.Stop()
-	}
+		dnsSnooper, err := endpoint.NewDNSSnooper()
+		if err != nil {
+			log.Errorf("Failed to start DNS snooper: nodes for external services will be less accurate: %s", err)
+		} else {
+			defer dnsSnooper.Stop()
+		}
 
-	endpointReporter := endpoint.NewReporter(endpoint.ReporterConfig{
-		HostID:       hostID,
-		HostName:     hostName,
-		SpyProcs:     flags.spyProcs,
-		UseConntrack: flags.useConntrack,
-		WalkProc:     flags.procEnabled,
-		UseEbpfConn:  flags.useEbpfConn,
-		ProcRoot:     flags.procRoot,
-		BufferSize:   flags.conntrackBufferSize,
-		ProcessCache: processCache,
-		DNSSnooper:   dnsSnooper,
-	})
-	defer endpointReporter.Stop()
-	p.AddReporter(endpointReporter)
+		endpointReporter := endpoint.NewReporter(endpoint.ReporterConfig{
+			HostID:       hostID,
+			HostName:     hostName,
+			SpyProcs:     flags.spyProcs,
+			UseConntrack: flags.useConntrack,
+			WalkProc:     flags.procEnabled,
+			UseEbpfConn:  flags.useEbpfConn,
+			ProcRoot:     flags.procRoot,
+			BufferSize:   flags.conntrackBufferSize,
+			ProcessCache: processCache,
+			DNSSnooper:   dnsSnooper,
+		})
+		defer endpointReporter.Stop()
+		p.AddReporter(endpointReporter)
+	}
 
 	if flags.dockerEnabled {
 		// Don't add the bridge in Kubernetes since container IPs are global and