X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconntrack.c;h=26f62786b242872dd89c4a943358f3d0164b2d45;hb=b42b7eaaaa3d2b375dc17b52f8858c0ebe2f5f40;hp=e70ff5f1834b5deecc53bfe7f0419176ce564eeb;hpb=a2bf02b4f5bf4a22395b57bba6715dada3859612;p=collectd.git

diff --git a/src/conntrack.c b/src/conntrack.c
index e70ff5f1..26f62786 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -8,7 +8,7 @@
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
@@ -18,10 +18,11 @@
  * Authors:
  *   Tomasz Pala <gotar at pld-linux.org>
  * based on entropy.c by:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -30,49 +31,75 @@
 #endif
 
 #define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count"
+#define CONNTRACK_MAX_FILE "/proc/sys/net/netfilter/nf_conntrack_max"
+#define CONNTRACK_FILE_OLD "/proc/sys/net/ipv4/netfilter/ip_conntrack_count"
+#define CONNTRACK_MAX_FILE_OLD "/proc/sys/net/ipv4/netfilter/ip_conntrack_max"
 
-static void conntrack_submit (double conntrack)
+static const char *config_keys[] =
 {
-	value_t values[1];
-	value_list_t vl = VALUE_LIST_INIT;
+	"OldFiles"
+};
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+/*
+    Each table/chain combo that will be queried goes into this list
+*/
+
+static int old_files = 0;
+
+static int conntrack_config(const char *key, const char *value)
+{
+    if (strcmp(key, "OldFiles") == 0)
+        old_files = 1;
 
-	values[0].gauge = conntrack;
+    return 0;
+}
 
-	vl.values = values;
+static void conntrack_submit (const char *type, const char *type_instance,
+			      value_t conntrack)
+{
+	value_list_t vl = VALUE_LIST_INIT;
+
+	vl.values = &conntrack;
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin));
-	sstrncpy (vl.type, "conntrack", sizeof (vl.type));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	if (type_instance != NULL)
+		sstrncpy (vl.type_instance, type_instance,
+			  sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
 } /* static void conntrack_submit */
 
 static int conntrack_read (void)
 {
-	double conntrack;
-	FILE *fh;
-	char buffer[64];
+	value_t conntrack, conntrack_max, conntrack_pct;
 
-	fh = fopen (CONNTRACK_FILE, "r");
-	if (fh == NULL)
+	char const *path = old_files ? CONNTRACK_FILE_OLD : CONNTRACK_FILE;
+	if (parse_value_file (path, &conntrack, DS_TYPE_GAUGE) != 0)
+	{
+		ERROR ("conntrack plugin: Reading \"%s\" failed.", path);
 		return (-1);
+	}
 
-	if (fgets (buffer, sizeof (buffer), fh) == NULL)
+	path = old_files ? CONNTRACK_MAX_FILE_OLD : CONNTRACK_MAX_FILE;
+	if (parse_value_file (path, &conntrack_max, DS_TYPE_GAUGE) != 0)
 	{
-		fclose (fh);
+		ERROR ("conntrack plugin: Reading \"%s\" failed.", path);
 		return (-1);
 	}
-	fclose (fh);
 
-	conntrack = atof (buffer);
+	conntrack_pct.gauge = (conntrack.gauge / conntrack_max.gauge) * 100;
 
-	if (conntrack > 0.0)
-		conntrack_submit (conntrack);
+	conntrack_submit ("conntrack", NULL,   conntrack);
+	conntrack_submit ("conntrack", "max",  conntrack_max);
+	conntrack_submit ("percent",   "used", conntrack_pct);
 
 	return (0);
 } /* static int conntrack_read */
 
 void module_register (void)
 {
+	plugin_register_config ("conntrack", conntrack_config,
+                            config_keys, config_keys_num);
 	plugin_register_read ("conntrack", conntrack_read);
 } /* void module_register */