@cryptotaxi247 / netdata-1 / commits / 097267581

netfilter plugin - final touch before moving it outside netdata

Costa Tsaousis (ktsaou) committed Mar 18, 2017 at 01:09 UTC 097267581b18fe7de21c077f583b22d16a9ab662
2 files changed +4 -4
configure.ac
+1 -1
@@ -51,7 +51,7 @@ AC_ARG_ENABLE(
51 [plugin-nfacct],
52 [AS_HELP_STRING([--enable-plugin-nfacct], [enable nfacct plugin, requires root])],
53 ,
54 - [enable_plugin_nfacct="detect"]
54 + [enable_plugin_nfacct="no"]
55 )
56 AC_ARG_ENABLE(
57 [plugin-freeipmi],
src/plugin_nfacct.c
+3 -3
@@ -13,6 +13,9 @@
13 #ifdef HAVE_LINUX_NETFILTER_NFNETLINK_CONNTRACK_H
14 #define DO_NFSTAT 1
15
16 +#define RRD_TYPE_NET_STAT_NETFILTER "netfilter"
17 +#define RRD_TYPE_NET_STAT_CONNTRACK "netlink" // FIXME: should be "conntrack" when merged with the /proc plugin
18 +
19 #include <linux/netfilter/nfnetlink_conntrack.h>
20
21 static struct {
@@ -175,9 +178,6 @@ static int nfstat_collect() {
178 return 0;
179 }
180
178 -#define RRD_TYPE_NET_STAT_NETFILTER "netfilter2"
179 -#define RRD_TYPE_NET_STAT_CONNTRACK "conntrack2"
180 -
181 static void nfstat_send_metrics() {
182
183 {