diff --git a/src/openvpn.c b/src/openvpn.c
index 78a168caecbf6dff94bccad3a0cb37f309a5a6d7..9ce23b4f4cb9c9e2550e86d337a866a451931404 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
/**
* collectd - src/openvpn.c
- * Copyright (C) 2008 Doug MacEachern
- * Copyright (C) 2009 Florian octo Forster
- * Copyright (C) 2009 Marco Chiappero
- * Copyright (C) 2009 Fabian Schuh
+ * Copyright (C) 2008 Doug MacEachern
+ * Copyright (C) 2009,2010 Florian octo Forster
+ * Copyright (C) 2009 Marco Chiappero
+ * Copyright (C) 2009 Fabian Schuh
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* Authors:
* Doug MacEachern <dougm at hyperic.com>
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <octo at collectd.org>
* Marco Chiappero <marco at absence.it>
* Fabian Schuh <mail at xeroc.org>
**/
static vpn_status_t **vpn_list = NULL;
static int vpn_num = 0;
-static int store_compression = 1;
-static int new_naming_schema = 0;
-static int number_connectedusers = 0;
-static int number_connectedusers_only = 0;
+static _Bool new_naming_schema = 0;
+static _Bool collect_compression = 1;
+static _Bool collect_user_count = 0;
+static _Bool collect_individual_users = 1;
static const char *config_keys[] =
{
"StatusFile",
- "Compression",
+ "Compression", /* old, deprecated name */
"ImprovedNamingSchema",
- "AggregateUsers",
- "OnlyAggregateUsers"
+ "CollectCompression",
+ "CollectUserCount",
+ "CollectIndividualUsers"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
} /* void numusers_submit */
/* dispatches stats about traffic (TCP or UDP) generated by the tunnel per single endpoint */
-static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx)
+static void iostats_submit (char *pinst, char *tinst, derive_t rx, derive_t tx)
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].counter = rx;
- values[1].counter = tx;
+ values[0].derive = rx;
+ values[1].derive = tx;
/* NOTE ON THE NEW NAMING SCHEMA:
* using plugin_instance to identify each vpn config (and
@@ -143,13 +144,13 @@ static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx
/* dispatches stats about data compression shown when in single mode */
static void compression_submit (char *pinst, char *tinst,
- counter_t uncompressed, counter_t compressed)
+ derive_t uncompressed, derive_t compressed)
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].counter = uncompressed;
- values[1].counter = compressed;
+ values[0].derive = uncompressed;
+ values[1].derive = compressed;
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
const int max_fields = STATIC_ARRAY_SIZE (fields);
int fields_num, read = 0;
- counter_t link_rx, link_tx;
- counter_t tun_rx, tun_tx;
- counter_t pre_compress, post_compress;
- counter_t pre_decompress, post_decompress;
- counter_t overhead_rx, overhead_tx;
+ derive_t link_rx, link_tx;
+ derive_t tun_rx, tun_tx;
+ derive_t pre_compress, post_compress;
+ derive_t pre_decompress, post_decompress;
+ derive_t overhead_rx, overhead_tx;
link_rx = 0;
link_tx = 0;
iostats_submit (name, "overhead", overhead_rx, overhead_tx);
- if (store_compression)
+ if (collect_compression)
{
compression_submit (name, "data_in", post_decompress, pre_decompress);
compression_submit (name, "data_out", pre_compress, post_compress);
if (fields_num < 4)
continue;
- if (number_connectedusers)
+ if (collect_user_count)
/* If so, sum all users, ignore the individuals*/
{
sum_users += 1;
}
- if (number_connectedusers_only==0)
+ if (collect_individual_users)
{
if (new_naming_schema)
{
- iostats_submit (fields[0], /* "Common Name" */
- NULL, /* unused when in multimode */
+ iostats_submit (name, /* vpn instance */
+ fields[0], /* "Common Name" */
atoll (fields[2]), /* "Bytes Received" */
atoll (fields[3])); /* "Bytes Sent" */
}
else
{
- iostats_submit (name, /* vpn instance */
- fields[0], /* "Common Name" */
+ iostats_submit (fields[0], /* "Common Name" */
+ NULL, /* unused when in multimode */
atoll (fields[2]), /* "Bytes Received" */
atoll (fields[3])); /* "Bytes Sent" */
}
read = 1;
}
- if (number_connectedusers)
+ if (collect_user_count)
{
numusers_submit(name, name, sum_users);
read = 1;
if (strcmp (fields[0], "CLIENT_LIST") != 0)
continue;
- if (number_connectedusers)
+ if (collect_user_count)
/* If so, sum all users, ignore the individuals*/
{
sum_users += 1;
}
- if (number_connectedusers_only==0)
+ if (collect_individual_users)
{
if (new_naming_schema)
{
read = 1;
}
- if (number_connectedusers)
+ if (collect_user_count)
{
numusers_submit(name, name, sum_users);
read = 1;
if (strcmp (fields[0], "CLIENT_LIST") != 0)
continue;
- if (number_connectedusers)
+ if (collect_user_count)
/* If so, sum all users, ignore the individuals*/
{
sum_users += 1;
}
- if (number_connectedusers_only==0)
+ if (collect_individual_users)
{
if (new_naming_schema)
{
}
}
- if (number_connectedusers)
+ if (collect_user_count)
{
numusers_submit(name, name, sum_users);
read = 1;
DEBUG ("openvpn plugin: status file \"%s\" added", temp->file);
} /* if (strcasecmp ("StatusFile", key) == 0) */
- else if (strcasecmp ("Compression", key) == 0)
+ else if ((strcasecmp ("CollectCompression", key) == 0)
+ || (strcasecmp ("Compression", key) == 0)) /* old, deprecated name */
{
- if (IS_TRUE (value))
- store_compression = 1;
+ if (IS_FALSE (value))
+ collect_compression = 0;
else
- {
- store_compression = 0;
- DEBUG ("openvpn plugin: no 'compression statistcs' collected");
- }
- } /* if (strcasecmp ("Compression", key) == 0) */
+ collect_compression = 1;
+ } /* if (strcasecmp ("CollectCompression", key) == 0) */
else if (strcasecmp ("ImprovedNamingSchema", key) == 0)
{
if (IS_TRUE (value))
new_naming_schema = 0;
}
} /* if (strcasecmp ("ImprovedNamingSchema", key) == 0) */
- else if (strcasecmp("AggregateUsers", key) == 0)
+ else if (strcasecmp("CollectUserCount", key) == 0)
{
if (IS_TRUE(value))
- {
- DEBUG ("openvpn plugin: Summing up all users");
- number_connectedusers = 1;
- }
+ collect_user_count = 1;
else
- {
- number_connectedusers = 0;
- }
- } /* if (strcasecmp("AggregateUsers", key) == 0) */
- else if (strcasecmp("OnlyAggregateUsers", key) == 0)
+ collect_user_count = 0;
+ } /* if (strcasecmp("CollectUserCount", key) == 0) */
+ else if (strcasecmp("CollectIndividualUsers", key) == 0)
{
- if (IS_TRUE(value))
- {
- DEBUG ("openvpn plugin: Summing up all users");
- number_connectedusers_only = 1;
- number_connectedusers = 1;
- }
+ if (IS_FALSE (value))
+ collect_individual_users = 0;
else
- {
- number_connectedusers_only = 0;
- }
- } /* if (strcasecmp("OnlyAggregateUsers", key) == 0) */
+ collect_individual_users = 1;
+ } /* if (strcasecmp("CollectIndividualUsers", key) == 0) */
else
{
return (-1);
return (0);
} /* int openvpn_shutdown */
+static int openvpn_init (void)
+{
+ if (!collect_individual_users
+ && !collect_compression
+ && !collect_user_count)
+ {
+ WARNING ("OpenVPN plugin: Neither `CollectIndividualUsers', "
+ "`CollectCompression', nor `CollectUserCount' is true. There's no "
+ "data left to collect.");
+ return (-1);
+ }
+
+ plugin_register_read ("openvpn", openvpn_read);
+ plugin_register_shutdown ("openvpn", openvpn_shutdown);
+
+ return (0);
+} /* int openvpn_init */
+
void module_register (void)
{
plugin_register_config ("openvpn", openvpn_config,
config_keys, config_keys_num);
- plugin_register_read ("openvpn", openvpn_read);
- plugin_register_shutdown ("openvpn", openvpn_shutdown);
+ plugin_register_init ("openvpn", openvpn_init);
} /* void module_register */
/* vim: set sw=2 ts=2 : */