From: Florian Forster Date: Sun, 13 Sep 2009 10:24:20 +0000 (+0200) Subject: Merge branch 'collectd-4.6' into collectd-4.7 X-Git-Tag: collectd-4.7.3~1 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3ddd3791fefa478d770aba82303ec6a1913874fc;hp=-c;p=collectd.git Merge branch 'collectd-4.6' into collectd-4.7 Conflicts: ChangeLog version-gen.sh --- 3ddd3791fefa478d770aba82303ec6a1913874fc diff --combined ChangeLog index 1d6decbe,b1908f42..969c9e94 --- a/ChangeLog +++ b/ChangeLog @@@ -1,77 -1,24 +1,98 @@@ +2009-07-19, Version 4.7.2 + * Build system: Support for `DESTDIR' has been fixed in the Java + bindings. + * collectd: Okay-notifications have been fixed. Thanks to Andrés J. + Díaz for fixing this bug. + * collectd: A programming error has been fixed in the notification + code. The bug may result in an assertion failure. + * memcached plugin: Portability fix for Solaris. Thanks to Amit Gupta + for reporting the bug. + * ping plugin: Link the plugin with libm. + +2009-06-02, Version 4.7.1 + * Build system: Detection of Java has been improved and missing + details have been added to the configuration summary. Support for + libtool 2.2 has been added. + * collectd: Two bugs with the threshold checking have been fixed. The + first one prevented thresholds to be checked at all, the second one + caused wrong behavior with the persistency option. Thanks to Andrés + J. Díaz for fixing these problems. + * collectd: Handling of the `Include' configuration option has been + fixed. + * rrdtool plugin: Make sure initialization is run only once. This + resolves problems under Solaris and potentially other systems. + Thanks to Amit Gupta for reporting this bug. + * java plugin: Make it possible to use dots ('.') instead of slashes + ('/') as the class separator. Thanks to Randy Rizun for pointing + this out. + * swap plugin: A work-around for 32-bit Solaris has been added. Thanks + to Doug MacEachern for the patch. + +2009-05-11, Version 4.7.0 + * apache plugin: Support to query multiple servers has been added. + Thanks to Amit Gupta for the patch. + * apache plugin: Handling of lighttpd's scoreboard statistics has been + improved. Thanks to Amit Gupta for the patch. + * conntrack plugin: The new conntrack plugin collects the connection + tracking table size. Thanks to Tomasz Pala for the patch. + * fscache plugin: The new fscache plugin collects statistics about + Linux' file-system based caching framework. Thanks to Edward + Konetzko for the patch. + * gmond plugin: The new gmond plugin can receive and interpret + multicast traffic from Ganglia's gmond daemon. + * java plugin: The new java plugin exports the collectd API to Java, + making it possible to write extensions to collectd in Java. + * memcachec plugin: The new memcachec plugin queries data from a + memcached daemon and parses it similar to the cURL plugin. Thanks to + Doug MacEachern for the initial code. + * memcached plugin: Support for connections over UNIX domain sockets + has been added. Thanks to Franck Lombardi for the patch. + * memory plugin: Support for OpenBSD and possibly other *BSDs has been + added. Thanks to Simon Kuhnle for the patch. + * mysql plugin: Support to query multiple databases has been added. + Thanks to Doug MacEachern for the patch. + * mysql plugin: Master/slave statistics have been added. + * mysql plugin: Lock statistics have been added. Thanks to Rodolphe + Quiédeville for the patch. + * network plugin: The possibility to sign or encrypt network traffic + has been added. + * protocols plugin: The new protocols plugin provides information + about network protocols, such as IP, TCP and UDP. + * snmp plugin: The intervals given in the configuration of the SNMP + plugin must no longer be a multiple of the global interval. + * table plugin: The new Table plugin provides parsing for table-like + structured files, such as many files beneath /proc. + * ted plugin: The new TED plugin reads power consumption measurements + from “The Energy Detective” (TED). Thanks to Eric Reed for this + plugin. + * onewire plugin: The new `Interval' option allows collecting + information from OneWire sensors at arbitrary intervals. + * ping plugin: Support for collecting the drop rate and standard + deviation of round-trip times has been added. + * uptime plugin: The new uptime plugin can collect the server's + uptime. Thanks to Marco Chiappero for the patch. + + 2009-09-10, Version 4.6.5 + * collectd: Remove old values when a cache entry is marked as missing. + This way the “GETVAL” command of the UnixSock plugin doesn't return + old, no longer valid values when this happens. Thanks to Andrés J. + Díaz for the patch. + * apache, ascent, bind, curl, nginx plugins: Advise the cURL library + to follow redirects. Thanks to Joey Hess for reporting this bug. + * df plugin: Check the ignorelist before stating the file system, + possibly reducing the number of stats considerably. Thanks to Joey + Hess for reporting this bug. + * iptables plugin: Support for the new libiptc API has been added. + Thanks to Sebastian Harl for the patch. The build system has been + updated to the plugin only includes the shipped header files when it + is linked with the shipped library, too. + * libvirt plugin: Re-connect to libvirtd if connecting fails. Thanks + to Alan Pevec for the patch. + * powerdns plugin: Set a timeout when reading data from the datagram + socket. Handling of the “LocalSocket” option has been fixed. An + incorrectly used “type” has been corrected. Thanks to Luke Heberling + for his patches. + 2009-07-18, Version 4.6.4 * collectd: Okay-notifications have been fixed. Thanks to Andrés J. Díaz for fixing this bug. @@@ -1152,15 -1099,15 +1173,15 @@@ 2005-07-08, Version 1.3: CPU stats * Collecting CPU statistics now - 2004-07-12, Version 1.2: Using syslog + 2005-07-12, Version 1.2: Using syslog * collectd is now using the syslog facility to report errors, warnings and the like.. * The default directory is now /var/db/collectd - 2004-07-10, Version 1.1: Minor changes + 2005-07-10, Version 1.1: Minor changes * Nothing really useful to say ;) - 2004-07-09, Version 1.0: Initial Version + 2005-07-09, Version 1.0: Initial Version * The following modules are provided: * Load average * Ping time diff --combined contrib/collection3/etc/collection.conf index 2360f3c4,f6f1bee2..1bef175d --- a/contrib/collection3/etc/collection.conf +++ b/contrib/collection3/etc/collection.conf @@@ -47,6 -47,13 +47,13 @@@ GraphWidth 40 Color starting ff00ff Color waiting ffb000 + + DataSources value + DSName value Percent + RRDTitle "Cache hit ratio for {plugin_instance} {type_instance}" + RRDVerticalLabel "Percent" + RRDFormat "%5.1lf %%" + Module GenericStacked DataSources value @@@ -83,6 -90,35 +90,35 @@@ Module Df DataSources free used + + Module GenericStacked + DataSources value + RRDTitle "disk usage on {plugin_instance}" + RRDVerticalLabel "Byte" + RRDFormat "%6.2lf%s" + DSName "snap_used used for snapshots" + DSName "snap_reserved snapshot reserve " + DSName "used in use " + DSName "free free " + DSName "sis_saved sis_saved " + Order free snap_used snap_reserved sis_saved used + Color snap_reverse ff8000 + Color used ff0000 + Color snap_used 000080 + Color snap_reserved ff8000 + Color free 00ff00 + Color sis_saved 00e0e0 + + + Module GenericIO + DataSources read write + DSName "read Read " + DSName write Write + RRDTitle "Disk Latency for {plugin_instance}" + RRDVerticalLabel "microseconds" + Scale 0.000001 + RRDFormat "%5.1lf %ss" + Module GenericIO DataSources read write @@@ -103,6 -139,26 +139,26 @@@ # RRDOptions ... RRDFormat "%5.1lf" + + Module GenericStacked + DataSources value + RRDTitle "Netapp disc ops on {plugin_instance}" + RRDVerticalLabel "Ops" + RRDFormat "%6.2lf" + DSName fcp_ops FCP-Ops + DSName nfs_ops NFS-Ops + DSName http_ops HTTP-Ops + DSName cifs_ops CIFS-Ops + DSName dafs_ops DAFS-Ops + DSName iscsi_ops iSCSI-Ops + Order fcp_ops nfs_ops http_ops cifs_ops dafs_ops iscsi_ops + Color fcp_ops 000080 + Color nfs_ops ff0000 + Color http_ops ffb000 + Color cifs_ops 00e0a0 + Color dafs_ops 00e000 + Color iscsi_ops 00e0ff + Module GenericIO DataSources read write @@@ -131,13 -187,6 +187,13 @@@ RRDVerticalLabel "Queries/s" RRDFormat "%6.1lf" + + DataSources conntrack + DSName conntrack Conntrack count + RRDTitle "nf_conntrack connections on {hostname}" + RRDVerticalLabel "Count" + RRDFormat "%4.0lf" + DataSources entropy DSName entropy Entropy bits @@@ -288,7 -337,7 +344,7 @@@ Module GenericStacked DataSources value - RRDTitle "MySQL commands" + RRDTitle "MySQL commands ({plugin_instance})" RRDVerticalLabel "Invocations" RRDFormat "%6.2lf" @@@ -372,7 -421,7 +428,7 @@@ Module GenericStacked DataSources value - RRDTitle "MySQL handler" + RRDTitle "MySQL handler ({plugin_instance})" RRDVerticalLabel "Invocations" RRDFormat "%6.2lf" DSName commit commit @@@ -402,7 -451,7 +458,7 @@@ DataSources rx tx DSName rx RX DSName tx TX - RRDTitle "MySQL Traffic" + RRDTitle "MySQL Traffic ({plugin_instance})" RRDVerticalLabel "Bits per second" RRDFormat "%5.1lf%s" Scale 8 diff --combined src/powerdns.c index ef9669ac,a2e5b359..37fceed7 --- a/src/powerdns.c +++ b/src/powerdns.c @@@ -164,13 -164,13 +164,13 @@@ statname_lookup_t lookup_table[] = /* { {"latency", "latency", NULL}, /* Other stuff.. */ - {"corrupt-packets", "io_packets", "corrupt"}, + {"corrupt-packets", "ipt_packets", "corrupt"}, {"deferred-cache-inserts", "counter", "cache-deferred_insert"}, {"deferred-cache-lookup", "counter", "cache-deferred_lookup"}, {"qsize-a", "cache_size", "answers"}, {"qsize-q", "cache_size", "questions"}, - {"servfail-packets", "io_packets", "servfail"}, - {"timedout-packets", "io_packets", "timeout"}, + {"servfail-packets", "ipt_packets", "servfail"}, + {"timedout-packets", "ipt_packets", "timeout"}, {"udp4-answers", "dns_answer", "udp4"}, {"udp4-queries", "dns_question", "queries-udp4"}, {"udp6-answers", "dns_answer", "udp6"}, @@@ -289,11 -289,30 +289,11 @@@ static void submit (const char *plugin_ return; } - if (ds->ds[0].type == DS_TYPE_GAUGE) + if (0 != parse_value (value, &values[0], ds->ds[0])) { - char *endptr = NULL; - - values[0].gauge = strtod (value, &endptr); - - if (endptr == value) - { - ERROR ("powerdns plugin: Cannot convert `%s' " - "to a floating point number.", value); - return; - } - } - else - { - char *endptr = NULL; - - values[0].counter = strtoll (value, &endptr, 0); - if (endptr == value) - { - ERROR ("powerdns plugin: Cannot convert `%s' " - "to an integer number.", value); - return; - } + ERROR ("powerdns plugin: Cannot convert `%s' " + "to a number.", value); + return; } vl.values = values;