status: list available probes in status api

skydive-project · Feb 2, 2018 · 9348e1c · 9348e1c
1 parent 1daae94
commit 9348e1c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -91,8 +91,10 @@ type AnalyzerConnStatus struct {
 
 // AgentStatus represents the status of an agent
 type AgentStatus struct {
-	Clients   map[string]shttp.WSConnStatus
-	Analyzers map[string]AnalyzerConnStatus
+	Clients        map[string]shttp.WSConnStatus
+	Analyzers      map[string]AnalyzerConnStatus
+	TopologyProbes []string
+	FlowProbes     []string
 }
 
 // GetStatus returns the status of an agent
@@ -112,8 +114,10 @@ func (a *Agent) GetStatus() interface{} {
 	}
 
 	return &AgentStatus{
-		Clients:   a.wsServer.GetStatus(),
-		Analyzers: analyzers,
+		Clients:        a.wsServer.GetStatus(),
+		Analyzers:      analyzers,
+		TopologyProbes: a.topologyProbeBundle.ActiveProbes(),
+		FlowProbes:     a.flowProbeBundle.ActiveProbes(),
 	}
 }
 

diff --git a/analyzer/server.go b/analyzer/server.go
@@ -90,6 +90,7 @@ func (s *Server) GetStatus() interface{} {
 		Subscribers: s.subscriberWSServer.GetStatus(),
 		Alerts:      types.ElectionStatus{IsMaster: s.alertServer.IsMaster()},
 		Captures:    types.ElectionStatus{IsMaster: s.onDemandClient.IsMaster()},
+		Probes:      s.probeBundle.ActiveProbes(),
 	}
 }
 

diff --git a/api/types/types.go b/api/types/types.go
@@ -75,6 +75,7 @@ type AnalyzerStatus struct {
 	Subscribers map[string]shttp.WSConnStatus
 	Alerts      ElectionStatus
 	Captures    ElectionStatus
+	Probes      []string
 }
 
 // Capture describes a capture API

diff --git a/probe/bundle.go b/probe/bundle.go
@@ -67,6 +67,15 @@ func (p *ProbeBundle) GetProbe(name string) Probe {
 	return nil
 }
 
+//ActiveProbes returns all active probes name
+func (p *ProbeBundle) ActiveProbes() []string {
+	activeProbes := make([]string, 0, len(p.probes))
+	for k := range p.probes {
+		activeProbes = append(activeProbes, k)
+	}
+	return activeProbes
+}
+
 // AddProbe adds a probe to the bundle
 func (p *ProbeBundle) AddProbe(name string, probe Probe) {
 	p.RLock()