X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconntrack.c;h=8a9200dd734eb7da8c2483eabcd0c7e76f36be59;hb=446138394bb95c49d0e05ea440fbf63aefe84bab;hp=e70ff5f1834b5deecc53bfe7f0419176ce564eeb;hpb=b3bfb951c73ea3d232e0e97a42479a5e3310125d;p=collectd.git

diff --git a/src/conntrack.c b/src/conntrack.c
index e70ff5f1..8a9200dd 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,61 +18,78 @@
  * 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"
 
 #if !KERNEL_LINUX
-# error "No applicable input method."
+#error "No applicable input method."
 #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 const char *config_keys[] = {"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;
 
-static void conntrack_submit (double conntrack)
-{
-	value_t values[1];
-	value_list_t vl = VALUE_LIST_INIT;
+  return 0;
+}
 
-	values[0].gauge = conntrack;
+static void conntrack_submit(const char *type, const char *type_instance,
+                             value_t conntrack) {
+  value_list_t vl = VALUE_LIST_INIT;
 
-	vl.values = values;
-	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));
+  vl.values = &conntrack;
+  vl.values_len = 1;
+  sstrncpy(vl.plugin, "conntrack", sizeof(vl.plugin));
+  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);
+  plugin_dispatch_values(&vl);
 } /* static void conntrack_submit */
 
-static int conntrack_read (void)
-{
-	double conntrack;
-	FILE *fh;
-	char buffer[64];
+static int conntrack_read(void) {
+  value_t conntrack, conntrack_max, conntrack_pct;
 
-	fh = fopen (CONNTRACK_FILE, "r");
-	if (fh == NULL)
-		return (-1);
+  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)
-	{
-		fclose (fh);
-		return (-1);
-	}
-	fclose (fh);
+  path = old_files ? CONNTRACK_MAX_FILE_OLD : CONNTRACK_MAX_FILE;
+  if (parse_value_file(path, &conntrack_max, DS_TYPE_GAUGE) != 0) {
+    ERROR("conntrack plugin: Reading \"%s\" failed.", path);
+    return (-1);
+  }
 
-	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);
+  return (0);
 } /* static int conntrack_read */
 
-void module_register (void)
-{
-	plugin_register_read ("conntrack", 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 */