netfilter plugin - final touch before moving it outside netdata

diff --git a/configure.ac b/configure.ac
index e8fe1974c948e87770561c8d19a834246ea73ed9..d66f4d609aaa58f6da6fdefe202647f256f7ad68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_ENABLE(
     [plugin-nfacct],
     [AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
     ,
-    [enable_plugin_nfacct="detect"]
+    [enable_plugin_nfacct="no"]
 )
 AC_ARG_ENABLE(
     [plugin-freeipmi],

diff --git a/src/plugin_nfacct.c b/src/plugin_nfacct.c
index 6d0a24c04fca6f1115ec65b6cc065c3aa7e3a0d2..5d2e6dc75491b52224e13140fea015282bf64be8 100644 (file)
--- a/src/plugin_nfacct.c
+++ b/src/plugin_nfacct.c
@@ -13,6 +13,9 @@
 #ifdef HAVE_LINUX_NETFILTER_NFNETLINK_CONNTRACK_H
 #define DO_NFSTAT 1
 
+#define RRD_TYPE_NET_STAT_NETFILTER "netfilter"
+#define RRD_TYPE_NET_STAT_CONNTRACK "netlink" // FIXME: should be "conntrack" when merged with the /proc plugin
+
 #include <linux/netfilter/nfnetlink_conntrack.h>
 
 static struct {
@@ -175,9 +178,6 @@ static int nfstat_collect() {
     return 0;
 }
 
-#define RRD_TYPE_NET_STAT_NETFILTER "netfilter2"
-#define RRD_TYPE_NET_STAT_CONNTRACK "conntrack2"
-
 static void nfstat_send_metrics() {
 
     {