X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenvpn.c;h=2aca4145cdae3d36c2e1ead682b9ab0343a418b6;hb=f6d2b3c2f83808f9f3913bf0220b3e6ad84fe23c;hp=b03ae96444d53b5c932e2ece3ee4f5610e11304f;hpb=f47fafadba730f0758e1718a103a970dd45dc5c5;p=collectd.git diff --git a/src/openvpn.c b/src/openvpn.c index b03ae964..2aca4145 100644 --- a/src/openvpn.c +++ b/src/openvpn.c @@ -3,6 +3,7 @@ * Copyright (C) 2008 Doug MacEachern * Copyright (C) 2009 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 @@ -21,6 +22,7 @@ * Doug MacEachern * Florian octo Forster * Marco Chiappero + * Fabian Schuh **/ #include "collectd.h" @@ -50,16 +52,19 @@ typedef struct vpn_status_s vpn_status_t; 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 _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" + "CollectCompression", + "CollectUserCount", + "CollectIndividualUsers" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -244,7 +249,7 @@ static int single_read (char *name, FILE *fh) 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); @@ -285,33 +290,36 @@ static int multi1_read (char *name, FILE *fh) if (fields_num < 4) continue; - if (number_connectedusers) - /* If so, sum all users, ignore the individuals*/ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ { - sum_users += 1; + sum_users += 1; } - - if (new_naming_schema) + if (collect_individual_users) { - iostats_submit (fields[0], /* "Common Name" */ - NULL, /* unused when in multimode */ - atoll (fields[2]), /* "Bytes Received" */ - atoll (fields[3])); /* "Bytes Sent" */ - } - else - { - iostats_submit (name, /* vpn instance */ - fields[0], /* "Common Name" */ - atoll (fields[2]), /* "Bytes Received" */ - atoll (fields[3])); /* "Bytes Sent" */ + if (new_naming_schema) + { + iostats_submit (name, /* vpn instance */ + fields[0], /* "Common Name" */ + atoll (fields[2]), /* "Bytes Received" */ + atoll (fields[3])); /* "Bytes Sent" */ + } + else + { + 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 && read == 1) + if (collect_user_count) { - numusers_submit(name, name, sum_users); + numusers_submit(name, name, sum_users); + read = 1; } return (read); @@ -342,36 +350,39 @@ static int multi2_read (char *name, FILE *fh) if (strcmp (fields[0], "CLIENT_LIST") != 0) continue; - if (number_connectedusers) - /* If so, sum all users, ignore the individuals*/ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ { - sum_users += 1; + sum_users += 1; } - - if (new_naming_schema) + if (collect_individual_users) { - /* plugin inst = file name, type inst = fields[1] */ - iostats_submit (name, /* vpn instance */ - fields[1], /* "Common Name" */ - atoll (fields[4]), /* "Bytes Received" */ - atoll (fields[5])); /* "Bytes Sent" */ - } - else - { - /* plugin inst = fields[1], type inst = "" */ - iostats_submit (fields[1], /* "Common Name" */ - NULL, /* unused when in multimode */ - atoll (fields[4]), /* "Bytes Received" */ - atoll (fields[5])); /* "Bytes Sent" */ + if (new_naming_schema) + { + /* plugin inst = file name, type inst = fields[1] */ + iostats_submit (name, /* vpn instance */ + fields[1], /* "Common Name" */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } + else + { + /* plugin inst = fields[1], type inst = "" */ + iostats_submit (fields[1], /* "Common Name" */ + NULL, /* unused when in multimode */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } } read = 1; } - if (number_connectedusers && read == 1) + if (collect_user_count) { - numusers_submit(name, name, sum_users); - } + numusers_submit(name, name, sum_users); + read = 1; + } return (read); } /* int multi2_read */ @@ -404,34 +415,38 @@ static int multi3_read (char *name, FILE *fh) if (strcmp (fields[0], "CLIENT_LIST") != 0) continue; - if (number_connectedusers) - /* If so, sum all users, ignore the individuals*/ + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ { - sum_users += 1; + sum_users += 1; } - if (new_naming_schema) + if (collect_individual_users) { - iostats_submit (name, /* vpn instance */ - fields[1], /* "Common Name" */ - atoll (fields[4]), /* "Bytes Received" */ - atoll (fields[5])); /* "Bytes Sent" */ - } - else - { - iostats_submit (fields[1], /* "Common Name" */ - NULL, /* unused when in multimode */ - atoll (fields[4]), /* "Bytes Received" */ - atoll (fields[5])); /* "Bytes Sent" */ + if (new_naming_schema) + { + iostats_submit (name, /* vpn instance */ + fields[1], /* "Common Name" */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } + else + { + iostats_submit (fields[1], /* "Common Name" */ + NULL, /* unused when in multimode */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } } - read = 1; + read = 1; } } - if (number_connectedusers && read == 1) + if (collect_user_count) { - numusers_submit(name, name, sum_users); + numusers_submit(name, name, sum_users); + read = 1; } return (read); @@ -453,7 +468,7 @@ static int openvpn_read (void) { char errbuf[1024]; WARNING ("openvpn plugin: fopen(%s) failed: %s", vpn_list[i]->file, - sstrerror (errno, errbuf, sizeof (errbuf))); + sstrerror (errno, errbuf, sizeof (errbuf))); continue; } @@ -565,7 +580,7 @@ static int openvpn_config (const char *key, const char *value) if (status_version == 0) { WARNING ("openvpn plugin: unable to detect status version, \ - discarding status file \"%s\".", value); + discarding status file \"%s\".", value); return (1); } @@ -574,7 +589,7 @@ static int openvpn_config (const char *key, const char *value) { char errbuf[1024]; WARNING ("openvpn plugin: sstrdup failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + sstrerror (errno, errbuf, sizeof (errbuf))); return (1); } @@ -615,7 +630,7 @@ static int openvpn_config (const char *key, const char *value) { char errbuf[1024]; ERROR ("openvpn plugin: malloc failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + sstrerror (errno, errbuf, sizeof (errbuf))); sfree (temp->file); sfree (temp); @@ -628,16 +643,14 @@ static int openvpn_config (const char *key, const char *value) 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)) @@ -650,18 +663,20 @@ static int openvpn_config (const char *key, const char *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) */ + collect_user_count = 0; + } /* if (strcasecmp("CollectUserCount", key) == 0) */ + else if (strcasecmp("CollectIndividualUsers", key) == 0) + { + if (IS_FALSE (value)) + collect_individual_users = 0; + else + collect_individual_users = 1; + } /* if (strcasecmp("CollectIndividualUsers", key) == 0) */ else { return (-1); @@ -686,12 +701,29 @@ static int openvpn_shutdown (void) 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 : */