topology: add block device topology probe

The probe reads JSON from the lsblk command to get a description of the block devices on the system. The JSON is parsed into structures that describe the relationships between the devices (parent/child,LVM,MD,multipath). If the environment variable SKYDIVE_BLOCKDEV_TEST_FILE is set the file is read rather than invoking "lsblk --json". This is for testing more complex block device setups that might not be available on the local system. Signed-off-by: Todd Gill <tgill@redhat.com>
skydive-project · Dec 30, 2019 · c74da18 · c74da18
1 parent a971198
commit c74da18
Show file tree

Hide file tree

Showing 13 changed files with 1,460 additions and 3 deletions.
diff --git a/agent/topology_probes.go b/agent/topology_probes.go
@@ -28,6 +28,7 @@ import (
 	"github.com/skydive-project/skydive/probe"
 	tp "github.com/skydive-project/skydive/topology/probes"
 	"github.com/skydive-project/skydive/topology/probes/bess"
+	"github.com/skydive-project/skydive/topology/probes/blockdev"
 	"github.com/skydive-project/skydive/topology/probes/docker"
 	"github.com/skydive-project/skydive/topology/probes/libvirt"
 	"github.com/skydive-project/skydive/topology/probes/lldp"
@@ -44,6 +45,7 @@ import (
 )
 
 func registerStaticProbes() {
+	blockdev.Register()
 	netlink.Register()
 	docker.Register()
 	lldp.Register()
@@ -59,6 +61,8 @@ func registerStaticProbes() {
 // NewTopologyProbe creates a new topology probe
 func NewTopologyProbe(name string, ctx tp.Context, bundle *probe.Bundle) (probe.Handler, error) {
 	switch name {
+	case "blockdev":
+		return blockdev.NewProbe(ctx, bundle)
 	case "netlink":
 		return netlink.NewProbe(ctx, bundle)
 	case "netns":

diff --git a/analyzer/probes.go b/analyzer/probes.go
@@ -26,6 +26,7 @@ import (
 	"github.com/skydive-project/skydive/plugin"
 	"github.com/skydive-project/skydive/probe"
 	"github.com/skydive-project/skydive/sflow"
+	"github.com/skydive-project/skydive/topology/probes/blockdev"
 	"github.com/skydive-project/skydive/topology/probes/docker"
 	"github.com/skydive-project/skydive/topology/probes/fabric"
 	"github.com/skydive-project/skydive/topology/probes/istio"
@@ -45,6 +46,7 @@ import (
 
 func registerStaticProbes() {
 	netlink.Register()
+	blockdev.Register()
 	docker.Register()
 	lldp.Register()
 	lxd.Register()

diff --git a/config/config.go b/config/config.go
@@ -110,6 +110,7 @@ func init() {
 	cfg.SetDefault("agent.flow.sflow.port_max", 6355)
 	cfg.SetDefault("agent.listen", "127.0.0.1:8081")
 	cfg.SetDefault("agent.topology.probes", []string{"ovsdb"})
+	cfg.SetDefault("agent.topology.blockdev.lsblk_path", "/usr/bin/lsblk")
 	cfg.SetDefault("agent.topology.docker.url", "unix:///var/run/docker.sock")
 	cfg.SetDefault("agent.topology.docker.netns.run_path", "/var/run/docker/netns")
 	cfg.SetDefault("agent.topology.netlink.metrics_update", 30)

diff --git a/statics/bindata.go b/statics/bindata.go
diff --git a/statics/img/blockdev.png b/statics/img/blockdev.png
diff --git a/statics/img/blockdevleaf.png b/statics/img/blockdevleaf.png
diff --git a/statics/img/blockdevlvm.png b/statics/img/blockdevlvm.png
diff --git a/statics/js/components/layout.js b/statics/js/components/layout.js
@@ -17,6 +17,9 @@ var setupFixedImages = function(labelMap) {
 };
 
 var nodeImgMap = setupFixedImages({
+  "blockdev": "blockdev",
+  "blockdevleaf": "blockdevleaf",
+  "blockdevlvm": "blockdevlvm",
   "host": "host",
   "port": "port",
   "ovsport": "port",
@@ -60,6 +63,7 @@ var nodeImgMap = setupFixedImages({
 });
 
 var managerImgMap = setupFixedImages({
+  "blockdev": "blockdev",
   "docker": "docker",
   "lxd": "lxd",
   "neutron": "openstack",