X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftraffic.c;h=5fc55d757eecf414fb2e9d232289b38822f1f450;hb=f8c6d793143453b064c68f92cb17e88302b8bbb9;hp=b5e7887f6d25548d9ad36337e2aa8b1be148ed5e;hpb=4ff510ffa41e47f31c695c83f045fd79efecf5f4;p=collectd.git diff --git a/src/traffic.c b/src/traffic.c index b5e7887f..5fc55d75 100644 --- a/src/traffic.c +++ b/src/traffic.c @@ -1,11 +1,10 @@ /** * collectd - src/traffic.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005-2007 Florian octo Forster * * 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,11 +17,13 @@ * * Authors: * Florian octo Forster + * Sune Marcher **/ #include "collectd.h" #include "common.h" #include "plugin.h" +#include "configfile.h" #if HAVE_SYS_TYPES_H # include @@ -45,25 +46,77 @@ # include #endif -#define MODULE_NAME "traffic" - -#if HAVE_GETIFADDRS || defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) || defined(HAVE_LIBSTATGRAB) +/* + * Various people have reported problems with `getifaddrs' and varying versions + * of `glibc'. That's why it's disabled by default. Since more statistics are + * available this way one may enable it using the `--enable-getifaddrs' option + * of the configure script. -octo + */ +#if KERNEL_LINUX +# if !COLLECT_GETIFADDRS +# undef HAVE_GETIFADDRS +# endif /* !COLLECT_GETIFADDRS */ +#endif /* KERNEL_LINUX */ + +#if HAVE_GETIFADDRS || KERNEL_LINUX || HAVE_LIBKSTAT || HAVE_LIBSTATGRAB # define TRAFFIC_HAVE_READ 1 #else # define TRAFFIC_HAVE_READ 0 #endif -#define BUFSIZE 512 +/* + * (Module-)Global variables + */ +/* 2^32 = 4294967296 = ~4.2GByte/s = ~34GBit/s */ +static data_source_t octets_dsrc[2] = +{ + {"rx", DS_TYPE_COUNTER, 0, 4294967295.0}, + {"tx", DS_TYPE_COUNTER, 0, 4294967295.0} +}; + +static data_set_t octets_ds = +{ + "if_octets", 2, octets_dsrc +}; + +static data_source_t packets_dsrc[2] = +{ + {"rx", DS_TYPE_COUNTER, 0, 4294967295.0}, + {"tx", DS_TYPE_COUNTER, 0, 4294967295.0} +}; + +static data_set_t packets_ds = +{ + "if_packets", 2, packets_dsrc +}; + +static data_source_t errors_dsrc[2] = +{ + {"rx", DS_TYPE_COUNTER, 0, 4294967295.0}, + {"tx", DS_TYPE_COUNTER, 0, 4294967295.0} +}; -static char *traffic_filename_template = "traffic-%s.rrd"; +static data_set_t errors_ds = +{ + "if_errors", 2, errors_dsrc +}; -static char *ds_def[] = +static const char *config_keys[] = { - "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "Interface", + "IgnoreSelected", NULL }; -static int ds_num = 2; +static int config_keys_num = 2; + +static char **if_list = NULL; +static int if_list_num = 0; +/* + * if_list_action: + * 0 => default is to collect selected interface + * 1 => ignore selcted interfaces + */ +static int if_list_action = 0; #ifdef HAVE_LIBKSTAT #define MAX_NUMIF 256 @@ -72,24 +125,55 @@ static kstat_t *ksp[MAX_NUMIF]; static int numif = 0; #endif /* HAVE_LIBKSTAT */ -static void traffic_init (void) +static int interface_config (const char *key, const char *value) { -#if HAVE_GETIFADDRS - /* nothing */ -/* #endif HAVE_GETIFADDRS */ + char **temp; -#elif KERNEL_LINUX - /* nothing */ -/* #endif KERNEL_LINUX */ + if (strcasecmp (key, "Interface") == 0) + { + temp = (char **) realloc (if_list, (if_list_num + 1) * sizeof (char *)); + if (temp == NULL) + { + syslog (LOG_EMERG, "Cannot allocate more memory."); + return (1); + } + if_list = temp; + + if ((if_list[if_list_num] = strdup (value)) == NULL) + { + syslog (LOG_EMERG, "Cannot allocate memory."); + return (1); + } + if_list_num++; + } + else if (strcasecmp (key, "IgnoreSelected") == 0) + { + if ((strcasecmp (value, "True") == 0) + || (strcasecmp (value, "Yes") == 0) + || (strcasecmp (value, "On") == 0)) + if_list_action = 1; + else + if_list_action = 0; + } + else + { + return (-1); + } -#elif HAVE_LIBKSTAT + return (0); +} + +#if HAVE_LIBKSTAT +static int traffic_init (void) +{ +#if HAVE_LIBKSTAT kstat_t *ksp_chain; unsigned long long val; numif = 0; if (kc == NULL) - return; + return (-1); for (numif = 0, ksp_chain = kc->kc_chain; (numif < MAX_NUMIF) && (ksp_chain != NULL); @@ -105,56 +189,81 @@ static void traffic_init (void) continue; ksp[numif++] = ksp_chain; } -/* #endif HAVE_LIBKSTAT */ - -#elif HAVE_LIBSTATG - /* nothing */ -#endif /* HAVE_LIBSTATG */ +#endif /* HAVE_LIBKSTAT */ - return; -} + return (0); +} /* int traffic_init */ +#endif /* HAVE_LIBKSTAT */ -static void traffic_write (char *host, char *inst, char *val) +/* + * Check if this interface/instance should be ignored. This is called from + * both, `submit' and `write' to give client and server the ability to + * ignore certain stuff.. + */ +static int check_ignore_if (const char *interface) { - char file[BUFSIZE]; - int status; + int i; - status = snprintf (file, BUFSIZE, traffic_filename_template, inst); - if (status < 1) - return; - else if (status >= BUFSIZE) - return; + /* If no interfaces are given collect all interfaces. Mostly to be + * backwards compatible, but also because this is much easier. */ + if (if_list_num < 1) + return (0); - rrd_update_file (host, file, val, ds_def, ds_num); -} + for (i = 0; i < if_list_num; i++) + if (strcasecmp (interface, if_list[i]) == 0) + return (if_list_action); + return (1 - if_list_action); +} /* int check_ignore_if */ #if TRAFFIC_HAVE_READ -static void traffic_submit (char *device, - unsigned long long incoming, - unsigned long long outgoing) +static void if_submit (const char *dev, const char *type, + unsigned long long rx, + unsigned long long tx) { - char buf[BUFSIZE]; + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; - if (snprintf (buf, BUFSIZE, "%u:%lld:%lld", (unsigned int) curtime, incoming, outgoing) >= BUFSIZE) + if (check_ignore_if (dev)) return; - plugin_submit (MODULE_NAME, device, buf); -} + values[0].counter = rx; + values[1].counter = tx; + + vl.values = values; + vl.values_len = 2; + vl.time = time (NULL); + strcpy (vl.host, hostname); + strcpy (vl.plugin, "interface"); + strncpy (vl.type_instance, dev, sizeof (vl.type_instance)); -static void traffic_read (void) + plugin_dispatch_values (type, &vl); +} /* void if_submit */ + +static int traffic_read (void) { #if HAVE_GETIFADDRS struct ifaddrs *if_list; struct ifaddrs *if_ptr; +/* Darin/Mac OS X and possible other *BSDs */ #if HAVE_STRUCT_IF_DATA # define IFA_DATA if_data -# define IFA_INCOMING ifi_ibytes -# define IFA_OUTGOING ifi_obytes +# define IFA_RX_BYTES ifi_ibytes +# define IFA_TX_BYTES ifi_obytes +# define IFA_RX_PACKT ifi_ipackets +# define IFA_TX_PACKT ifi_opackets +# define IFA_RX_ERROR ifi_ierrors +# define IFA_TX_ERROR ifi_oerrors +/* #endif HAVE_STRUCT_IF_DATA */ + #elif HAVE_STRUCT_NET_DEVICE_STATS # define IFA_DATA net_device_stats -# define IFA_INCOMING rx_bytes -# define IFA_OUTGOING tx_bytes +# define IFA_RX_BYTES rx_bytes +# define IFA_TX_BYTES tx_bytes +# define IFA_RX_PACKT rx_packets +# define IFA_TX_PACKT tx_packets +# define IFA_RX_ERROR rx_errors +# define IFA_TX_ERROR tx_errors #else # error "No suitable type for `struct ifaddrs->ifa_data' found." #endif @@ -162,16 +271,22 @@ static void traffic_read (void) struct IFA_DATA *if_data; if (getifaddrs (&if_list) != 0) - return; + return (-1); for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next) { if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL) continue; - traffic_submit (if_ptr->ifa_name, - if_data->IFA_INCOMING, - if_data->IFA_OUTGOING); + if_submit (if_ptr->ifa_name, "if_octets", + if_data->IFA_RX_BYTES, + if_data->IFA_TX_BYTES); + if_submit (if_ptr->ifa_name, "if_packets", + if_data->IFA_RX_PACKT, + if_data->IFA_TX_PACKT); + if_submit (if_ptr->ifa_name, "if_errors", + if_data->IFA_RX_ERROR, + if_data->IFA_TX_ERROR); } freeifaddrs (if_list); @@ -190,14 +305,15 @@ static void traffic_read (void) if ((fh = fopen ("/proc/net/dev", "r")) == NULL) { syslog (LOG_WARNING, "traffic: fopen: %s", strerror (errno)); - return; + return (-1); } while (fgets (buffer, 1024, fh) != NULL) { - if (buffer[6] != ':') + if (!(dummy = strchr(buffer, ':'))) continue; - buffer[6] = '\0'; + dummy[0] = '\0'; + dummy++; device = buffer; while (device[0] == ' ') @@ -206,24 +322,31 @@ static void traffic_read (void) if (device[0] == '\0') continue; - dummy = buffer + 7; numfields = strsplit (dummy, fields, 16); - if (numfields < 9) + if (numfields < 11) continue; incoming = atoll (fields[0]); outgoing = atoll (fields[8]); + if_submit (device, "if_octets", incoming, outgoing); - traffic_submit (device, incoming, outgoing); + incoming = atoll (fields[1]); + outgoing = atoll (fields[9]); + if_submit (device, "if_packets", incoming, outgoing); + + incoming = atoll (fields[2]); + outgoing = atoll (fields[10]); + if_submit (device, "if_errors", incoming, outgoing); } fclose (fh); /* #endif KERNEL_LINUX */ -#elif defined(HAVE_LIBKSTAT) +#elif HAVE_LIBKSTAT int i; - unsigned long long incoming, outgoing; + unsigned long long rx; + unsigned long long tx; if (kc == NULL) return; @@ -233,12 +356,20 @@ static void traffic_read (void) if (kstat_read (kc, ksp[i], NULL) == -1) continue; - if ((incoming = get_kstat_value (ksp[i], "rbytes")) == -1LL) - continue; - if ((outgoing = get_kstat_value (ksp[i], "obytes")) == -1LL) - continue; + rx = get_kstat_value (ksp[i], "rbytes"); + tx = get_kstat_value (ksp[i], "obytes"); + if ((rx != -1LL) || (tx != -1LL)) + if_submit (ksp[i]->ks_name, "if_octets", rx, tx); + + rx = get_kstat_value (ksp[i], "ipackets"); + tx = get_kstat_value (ksp[i], "opackets"); + if ((rx != -1LL) || (tx != -1LL)) + if_submit (ksp[i]->ks_name, "if_packets", rx, tx); - traffic_submit (ksp[i]->ks_name, incoming, outgoing); + rx = get_kstat_value (ksp[i], "ierrors"); + tx = get_kstat_value (ksp[i], "oerrors"); + if ((rx != -1LL) || (tx != -1LL)) + if_submit (ksp[i]->ks_name, "if_errors", rx, tx); } /* #endif HAVE_LIBKSTAT */ @@ -249,17 +380,27 @@ static void traffic_read (void) ios = sg_get_network_io_stats (&num); for (i = 0; i < num; i++) - traffic_submit (ios[i].interface_name, ios[i].rx, ios[i].tx); + if_submit (ios[i].interface_name, "if_octets", ios[i].rx, ios[i].tx); #endif /* HAVE_LIBSTATGRAB */ -} -#else -#define traffic_read NULL + + return (0); +} /* int traffic_read */ #endif /* TRAFFIC_HAVE_READ */ void module_register (void) { - plugin_register (MODULE_NAME, traffic_init, traffic_read, traffic_write); -} + plugin_register_data_set (&octets_ds); + plugin_register_data_set (&packets_ds); + plugin_register_data_set (&errors_ds); + + plugin_register_config ("interface", interface_config, + config_keys, config_keys_num); + +#if HAVE_LIBKSTAT + plugin_register_init ("interface", traffic_init); +#endif -#undef BUFSIZE -#undef MODULE_NAME +#if TRAFFIC_HAVE_READ + plugin_register_read ("interface", traffic_read); +#endif +}