X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenvpn.c;h=1ac50830ceea5fb8f7cc4bdc5c21f68a5781a104;hb=aceb06f41f0a046983fa443c0452bbde546314cf;hp=5a14e9e803c5aabaa1766d309ef2c263bfd24e28;hpb=aca8f06eb3019d334a4c50a5d838bb3e505f33ee;p=collectd.git diff --git a/src/openvpn.c b/src/openvpn.c index 5a14e9e8..1ac50830 100644 --- a/src/openvpn.c +++ b/src/openvpn.c @@ -51,11 +51,13 @@ static vpn_status_t **vpn_list = NULL; static int vpn_num = 0; static int store_compression = 1; +static int new_naming_schema = 0; static const char *config_keys[] = { "StatusFile", - "Compression" + "Compression", + "ImprovedNamingSchema" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -83,9 +85,8 @@ static int openvpn_strsplit (char *string, char **fields, size_t size) return (i); } /* int openvpn_strsplit */ - /* dispatches stats about traffic (TCP or UDP) generated by the tunnel per single endpoint */ -static void iostats_submit (char *name, char *type, counter_t rx, counter_t tx) +static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; @@ -93,7 +94,8 @@ static void iostats_submit (char *name, char *type, counter_t rx, counter_t tx) values[0].counter = rx; values[1].counter = tx; - /* NOTE: using plugin_instance to identify each vpn config (and + /* NOTE ON THE NEW NAMING SCHEMA: + * using plugin_instance to identify each vpn config (and * status) file; using type_instance to identify the endpoint * host when in multimode, traffic or overhead when in single. */ @@ -102,15 +104,19 @@ static void iostats_submit (char *name, char *type, counter_t rx, counter_t tx) vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, name, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, "io_octets", sizeof (vl.type)); - sstrncpy (vl.type_instance, type, sizeof (vl.type_instance)); + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); + sstrncpy (vl.type, "if_octets", sizeof (vl.type)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); } /* void traffic_submit */ /* dispatches stats about data compression shown when in single mode */ -static void compression_submit (char *name, char *type, counter_t uncompressed, counter_t compressed) +static void compression_submit (char *pinst, char *tinst, + counter_t uncompressed, counter_t compressed) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; @@ -122,9 +128,12 @@ static void compression_submit (char *name, char *type, counter_t uncompressed, vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, name, sizeof (vl.plugin_instance)); + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); sstrncpy (vl.type, "compression", sizeof (vl.type)); - sstrncpy (vl.type_instance, type, sizeof (vl.type_instance)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); } /* void compression_submit */ @@ -252,10 +261,21 @@ static int multi1_read (char *name, FILE *fh) if (fields_num < 4) continue; - 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 (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" */ + } + read = 1; } @@ -281,20 +301,29 @@ static int multi2_read (char *name, FILE *fh) * with more or less fields. */ if (fields_num != 8) - { continue; + + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + + 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 { - if (strcmp (fields[0], "CLIENT_LIST") == 0) - { - iostats_submit (name, /* vpn instance */ - fields[1], /* "Common Name" */ - atoll (fields[4]), /* "Bytes Received" */ - atoll (fields[5])); /* "Bytes Sent" */ - read = 1; - } + /* 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; } return (read); @@ -324,14 +353,25 @@ static int multi3_read (char *name, FILE *fh) } else { - if (strcmp (fields[0], "CLIENT_LIST") == 0) + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + + if (new_naming_schema) { iostats_submit (name, /* vpn instance */ fields[1], /* "Common Name" */ atoll (fields[4]), /* "Bytes Received" */ atoll (fields[5])); /* "Bytes Sent" */ - read = 1; } + else + { + iostats_submit (fields[1], /* "Common Name" */ + NULL, /* unused when in multimode */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } + + read = 1; } } @@ -488,7 +528,7 @@ static int openvpn_config (const char *key, const char *value) } else { - /* doesn't waist memory, uses status_file starting at filename + 1 */ + /* doesn't waste memory, uses status_file starting at filename + 1 */ status_name = filename + 1; } @@ -528,7 +568,7 @@ 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) { if (IS_TRUE (value)) @@ -538,7 +578,19 @@ static int openvpn_config (const char *key, const char *value) store_compression = 0; DEBUG ("openvpn plugin: no 'compression statistcs' collected"); } - } + } /* if (strcasecmp ("Compression", key) == 0) */ + else if (strcasecmp ("ImprovedNamingSchema", key) == 0) + { + if (IS_TRUE (value)) + { + DEBUG ("openvpn plugin: using the new naming schema"); + new_naming_schema = 1; + } + else + { + new_naming_schema = 0; + } + } /* if (strcasecmp ("ImprovedNamingSchema", key) == 0) */ else { return (-1); @@ -570,3 +622,5 @@ void module_register (void) plugin_register_read ("openvpn", openvpn_read); plugin_register_shutdown ("openvpn", openvpn_shutdown); } /* void module_register */ + +/* vim: set sw=2 ts=2 : */