ovs: allow user to disable ovs metrics via config

skydive-project · Jan 31, 2019 · e848c87 · e848c87
1 parent 723e8e4
commit e848c87
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+
 	// Viper remote client need to be internally initialized
 	_ "github.com/spf13/viper/remote"
 
@@ -143,6 +144,7 @@ func init() {
 	cfg.SetDefault("ovs.ovsdb", "unix:///var/run/openvswitch/db.sock")
 	cfg.SetDefault("ovs.oflow.enable", false)
 	cfg.SetDefault("ovs.oflow.openflow_versions", []string{"OpenFlow10"})
+	cfg.SetDefault("ovs.enable_stats", false)
 
 	cfg.SetDefault("sflow.port_min", 6345)
 	cfg.SetDefault("sflow.port_max", 6355)

diff --git a/etc/skydive.yml.default b/etc/skydive.yml.default
@@ -267,6 +267,7 @@ ovs:
   # at least locally
   # % sudo ovs-appctl -t ovsdb-server ovsdb-server/add-remote ptcp:6400:127.0.0.1
   # ovsdb: unix:///var/run/openvswitch/db.sock
+  # enable_stats: false
 
   oflow:
     # Enable the parsing of openflow rules (disabled by default)

diff --git a/topology/probes/ovsdb/ovsdb.go b/topology/probes/ovsdb/ovsdb.go
@@ -52,6 +52,7 @@ type Probe struct {
 	portToIntf   map[string]*graph.Node
 	portToBridge map[string]*graph.Node
 	cancel       context.CancelFunc
+	enableStats  bool
 }
 
 func isOvsInterfaceType(t string) bool {
@@ -402,7 +403,7 @@ func (o *Probe) OnOvsInterfaceAdd(monitor *ovsdb.OvsMonitor, uuid string, row *l
 		}
 	}
 
-	if field, ok := row.New.Fields["statistics"]; ok {
+	if field, ok := row.New.Fields["statistics"]; ok && o.enableStats {
 		now := time.Now()
 
 		statistics := field.(libovsdb.OvsMap)
@@ -626,10 +627,12 @@ func (o *Probe) Stop() {
 }
 
 // NewProbe creates a new graph OVS database probe
-func NewProbe(g *graph.Graph, n *graph.Node, p string, t string) *Probe {
+func NewProbe(g *graph.Graph, n *graph.Node, p string, t string, enableStats bool) *Probe {
 	mon := ovsdb.NewOvsMonitor(p, t)
 	mon.ExcludeColumn("*", "statistics")
-	mon.IncludeColumn("Interface", "statistics")
+	if enableStats {
+		mon.IncludeColumn("Interface", "statistics")
+	}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	o := &Probe{
@@ -643,6 +646,7 @@ func NewProbe(g *graph.Graph, n *graph.Node, p string, t string) *Probe {
 		OvsMon:       mon,
 		OvsOfProbe:   NewOvsOfProbe(ctx, g, n, mon.Target),
 		cancel:       cancel,
+		enableStats:  enableStats,
 	}
 
 	return o
@@ -672,6 +676,7 @@ func NewProbeFromConfig(g *graph.Graph, n *graph.Node) *Probe {
 		protocol = "tcp"
 		target = fmt.Sprintf("%s:%d", sa.Addr, sa.Port)
 	}
+	enableStats := config.GetBool("ovs.enable_stats")
 
-	return NewProbe(g, n, protocol, target)
+	return NewProbe(g, n, protocol, target, enableStats)
 }