Merge pull request #1467 from safchain/cri-o

Cri o

Author: lebauce

agent/probes.go

@@ -39,6 +39,7 @@ import (
 	"github.com/skydive-project/skydive/topology/probes/neutron"
 	"github.com/skydive-project/skydive/topology/probes/opencontrail"
 	"github.com/skydive-project/skydive/topology/probes/ovsdb"
+	"github.com/skydive-project/skydive/topology/probes/runc"
 	"github.com/skydive-project/skydive/topology/probes/socketinfo"
 )
 
@@ -114,6 +115,12 @@ func NewTopologyProbeBundleFromConfig(g *graph.Graph, hostNode *graph.Node) (*pr
 				return nil, fmt.Errorf("Failed to initialize Libvirt probe: %s", err)
 			}
 			probes[t] = libvirt
+		case "runc":
+			runc, err := runc.NewProbe(nsProbe)
+			if err != nil {
+				return nil, fmt.Errorf("Failed to initialize runc probe: %s", err)
+			}
+			probes[t] = runc
 		default:
 			logging.GetLogger().Errorf("unknown probe type %s", t)
 		}

common/proc.go

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package common
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+)
+
+// ProcessState describes the state of a process
+type ProcessState rune
+
+const (
+	// Running state
+	Running ProcessState = 'R'
+	// Sleeping state
+	Sleeping ProcessState = 'S'
+	// Waiting state
+	Waiting ProcessState = 'D'
+	// Zombie state
+	Zombie ProcessState = 'Z'
+	// Stopped state
+	Stopped ProcessState = 'T'
+	// TracingStop state
+	TracingStop ProcessState = 't'
+	// Dead state
+	Dead ProcessState = 'X'
+)
+
+// ProcessInfo describes the information of a running process
+type ProcessInfo struct {
+	Process  string
+	Pid      int64
+	Name     string
+	PPid     int64
+	PGrp     int64
+	Session  int64
+	Utime    int64
+	Stime    int64
+	CUtime   int64
+	CStime   int64
+	Priority int64
+	Nice     int64
+	Threads  int64
+	Start    int64
+	Vsize    int64
+	RSS      int64
+	State    ProcessState
+}
+
+// GetProcessInfo retrieve process info from /proc
+func GetProcessInfo(pid int) (*ProcessInfo, error) {
+	processPath := fmt.Sprintf("/proc/%d", pid)
+	exe, err := os.Readlink(processPath + "/exe")
+	if err != nil {
+		return nil, err
+	}
+
+	stat, err := ioutil.ReadFile(processPath + "/stat")
+	if err != nil {
+		return nil, err
+	}
+
+	pi := &ProcessInfo{
+		Process: exe,
+	}
+
+	var name string
+	var state rune
+	var null int64
+
+	fmt.Sscanf(string(stat), "%d %s %c %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
+		&pi.Pid, &name, &state, &pi.PPid, &pi.PGrp, &pi.Session,
+		&null, &null, &null, &null, &null, &null, &null,
+		&pi.Utime, &pi.Stime, &pi.CUtime, &pi.CStime, &pi.Priority, &pi.Nice, &pi.Threads,
+		&null,
+		&pi.Start, &pi.Vsize, &pi.RSS)
+
+	pi.Name = name[1 : len(name)-1]
+	pi.State = ProcessState(state)
+
+	return pi, nil
+}

config/config.go

@@ -88,6 +88,7 @@ func init() {
 	cfg.SetDefault("agent.topology.neutron.region_name", "RegionOne")
 	cfg.SetDefault("agent.topology.neutron.tenant_name", "service")
 	cfg.SetDefault("agent.topology.neutron.username", "neutron")
+	cfg.SetDefault("agent.topology.runc.run_path", []string{"/run/containerd/runc", "/run/runc"})
 	cfg.SetDefault("agent.topology.socketinfo.host_update", 10)
 
 	cfg.SetDefault("analyzer.auth.cluster.backend", "noauth")

contrib/ansible/roles/skydive_dev/tasks/main.yml

@@ -54,6 +54,7 @@
      - ffmpeg
      - npm
      - gifsicle
+     - podman
 
 - service:
     name: "{{ item }}"

etc/skydive.yml.default

@@ -191,6 +191,7 @@ agent:
       # - socketinfo
       # - lxd
       # - lldp
+      # - runc
 
     netlink:
       # delay in seconds between two metric updates
@@ -219,6 +220,10 @@ agent:
     libvirt:
       # url: qemu:///system
 
+    runc:
+      run_path:
+        # - /var/run/runc
+
   capture:
     # Period in second to get capture stats from the probe. Note this
     # stats_update: 1

scripts/ci/cleanup.sh

@@ -32,6 +32,11 @@ function cleanup() {
   cleanup_items docker "docker_rm"
   cleanup_items lxd "lxc delete --force"
 
+  # cleanup podman/runc
+  podman stop -a
+  podman rm -fa
+  podman rmi -fa
+
   "${CURDIR}/../scale.sh" stop 10 10 10
 
   # clean elasticsearch

statics/img/runc.png

@@ -61,4 +61,5 @@ var managerImgMap = setupFixedImages({
   "neutron": "openstack",
   "k8s": "k8s",
   "istio": "istio",
+  "runc": "runc"
 });

statics/js/components/layout.js

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package tests
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestRuncSimple(t *testing.T) {
+	test := &Test{
+		setupCmds: []Cmd{
+			{"podman run -d --name nginx --label Name=test nginx", true},
+		},
+
+		tearDownCmds: []Cmd{
+			{"podman kill nginx", false},
+			{"podman rm nginx", false},
+		},
+
+		mode: Replay,
+
+		checks: []CheckFunction{func(c *CheckContext) error {
+			gremlin := c.gremlin.V().Has("Type", "netns", "Manager", "runc")
+			gremlin = gremlin.Out("Type", "container", "Manager", "runc", "Runc.CreateConfig.Labels.Name", "test")
+
+			nodes, err := c.gh.GetNodes(gremlin)
+			if err != nil {
+				return err
+			}
+
+			if len(nodes) != 1 {
+				return fmt.Errorf("Expected 1 node, got %+v", nodes)
+			}
+
+			return nil
+		}},
+	}
+
+	RunTest(t, test)
+}

tests/runc_test.go

@@ -89,6 +89,7 @@ agent:
       - lxd
       - opencontrail
       - lldp
+      - runc
     netlink:
       metrics_update: 5
     lldp: