connectivity plugin initial commit

diff --git a/AUTHORS b/AUTHORS
index a5fd7c2..a050e72 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -60,6 +60,7 @@ Andrew Bays <abays at redhat.com>
  - connectivity plugin.
  - procevent plugin.
  - sysevent plugin.
+ - connectivity plugin.
 
 Andy Parkins <andyp at fussylogic.co.uk>
  - battery plugin: sysfs code.

diff --git a/configure.ac b/configure.ac
index d9ea739..3ff2189 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6480,18 +6480,15 @@ if test "x$ac_system" = "xLinux"; then
   if test "x$with_libyajl" = "xyes" && test "x$with_libyajl2" = "xyes"; then
     plugin_ovs_events="yes"
     plugin_ovs_stats="yes"
-<<<<<<< HEAD
     plugin_procevent="yes"
-  fi
-
-  if test "x$have_pci_regs_h" = "xyes"; then
-    plugin_pcie_errors="yes"
-=======
 
     if test "x$with_libmnl" = "xyes"; then
       plugin_connectivity="yes"
     fi
->>>>>>> connectivity notifications
+  fi
+
+  if test "x$have_pci_regs_h" = "xyes"; then
+    plugin_pcie_errors="yes"
   fi
 fi
 

diff --git a/src/types.db b/src/types.db
index 6c08936..51b80d5 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -33,6 +33,7 @@ compression             uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
 compression_ratio       value:GAUGE:0:2
 commands                value:DERIVE:0:U
 connections             value:DERIVE:0:U
+connectivity            value:GAUGE:0:2
 conntrack               value:GAUGE:0:4294967295
 contextswitch           value:DERIVE:0:U
 cookies                 value:DERIVE:0:U