From 1bb10c398d1a3198a8b86517bd780b8122e2e69d Mon Sep 17 00:00:00 2001 From: Pim van den Berg Date: Sat, 3 May 2014 11:40:46 +0200 Subject: move collectd_flush function to base class --- plugin/aggregation.php | 2 -- plugin/apache.php | 2 -- plugin/apcups.php | 2 -- plugin/battery.php | 2 -- plugin/bind.php | 2 -- plugin/conntrack.php | 2 -- plugin/contextswitch.php | 2 -- plugin/cpu.php | 2 -- plugin/cpufreq.php | 2 -- plugin/dbi.php | 2 -- plugin/df.php | 2 -- plugin/disk.php | 2 -- plugin/dns.php | 2 -- plugin/entropy.php | 2 -- plugin/filecount.php | 2 -- plugin/hddtemp.php | 2 -- plugin/interface.php | 2 -- plugin/ip6tables.php | 2 -- plugin/ipmi.php | 2 -- plugin/iptables.php | 2 -- plugin/irq.php | 2 -- plugin/libvirt.php | 2 -- plugin/load.php | 2 -- plugin/md.php | 2 -- plugin/memcached.php | 2 -- plugin/memory.php | 2 -- plugin/mysql.php | 2 -- plugin/netlink.php | 2 -- plugin/nfs.php | 2 -- plugin/nginx.php | 2 -- plugin/ntpd.php | 2 -- plugin/nut.php | 2 -- plugin/openvpn.php | 2 -- plugin/ping.php | 2 -- plugin/postgresql.php | 2 -- plugin/powerdns.php | 2 -- plugin/processes.php | 2 -- plugin/sensors.php | 2 -- plugin/snmp.php | 2 -- plugin/swap.php | 2 -- plugin/tail.php | 2 -- plugin/tcpconns.php | 2 -- plugin/thermal.php | 2 -- plugin/uptime.php | 2 -- plugin/users.php | 2 -- plugin/varnish.php | 2 -- plugin/vmem.php | 2 -- plugin/vserver.php | 5 ----- plugin/wireless.php | 2 -- plugin/zfs_arc.php | 2 -- 50 files changed, 103 deletions(-) (limited to 'plugin') diff --git a/plugin/aggregation.php b/plugin/aggregation.php index c4353ce..2a74403 100644 --- a/plugin/aggregation.php +++ b/plugin/aggregation.php @@ -3,7 +3,6 @@ # Collectd aggregation plugin require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # aggregation-(plugin)-(calculate)/(type)-(type-instance).rrd @@ -42,7 +41,6 @@ switch($pi[0]) { $obj->rrd_format = '%7.2lf'; $obj->rrdtool_opts .= ' -u 100'; - collectd_flush($obj->identifiers); $obj->rrd_graph(); break; } diff --git a/plugin/apache.php b/plugin/apache.php index 226385e..df7fe49 100644 --- a/plugin/apache.php +++ b/plugin/apache.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # apache[-X]/apache_bytes-X.rrd @@ -165,5 +164,4 @@ if ($CONFIG['version'] < 5) { } } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/apcups.php b/plugin/apcups.php index 24d1918..626b8f4 100644 --- a/plugin/apcups.php +++ b/plugin/apcups.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # apcups/ @@ -86,6 +85,5 @@ if ($CONFIG['version'] < 5 && unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/battery.php b/plugin/battery.php index 740d5cb..631776b 100644 --- a/plugin/battery.php +++ b/plugin/battery.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # battery-X/ @@ -35,6 +34,5 @@ switch($obj->args['type']) { } $obj->rrd_format = '%4.1lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/bind.php b/plugin/bind.php index 702fec5..cfbd4c6 100644 --- a/plugin/bind.php +++ b/plugin/bind.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG, $_GET); @@ -12,5 +11,4 @@ $obj = new Type_GenericStacked($CONFIG, $_GET); $obj->rrd_title = sprintf('%s/%s', $obj->args['pinstance'], $obj->args['type']); $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/conntrack.php b/plugin/conntrack.php index 27a3656..6e2bba0 100644 --- a/plugin/conntrack.php +++ b/plugin/conntrack.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # conntrack/conntrack.rrd @@ -33,5 +32,4 @@ if ($CONFIG['version'] < 5) { unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/contextswitch.php b/plugin/contextswitch.php index e71c417..71f6d9d 100644 --- a/plugin/contextswitch.php +++ b/plugin/contextswitch.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # contextswitch/contextswitch.rrd @@ -32,5 +31,4 @@ if ($CONFIG['version'] < 5) { unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/cpu.php b/plugin/cpu.php index a3e968a..76914a7 100644 --- a/plugin/cpu.php +++ b/plugin/cpu.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # cpu-X/ @@ -46,5 +45,4 @@ $obj->rrd_vertical = 'Jiffies'; $obj->rrd_format = '%5.2lf'; $obj->rrdtool_opts .= ' -u 100'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/cpufreq.php b/plugin/cpufreq.php index fbdc6ff..d9542d1 100644 --- a/plugin/cpufreq.php +++ b/plugin/cpufreq.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # cpufreq/cpufreq-X.rrd @@ -15,5 +14,4 @@ $obj->rrd_title = 'CPU frequency scaling'; $obj->rrd_vertical = 'Hz'; $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/dbi.php b/plugin/dbi.php index 31aacc9..b9dd268 100644 --- a/plugin/dbi.php +++ b/plugin/dbi.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; @@ -14,5 +13,4 @@ $obj = new Type_Default($CONFIG, $_GET); $obj->rrd_title = sprintf('%s', $obj->args['pinstance'], $obj->args['type']); $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/df.php b/plugin/df.php index 464e26c..f6d861b 100644 --- a/plugin/df.php +++ b/plugin/df.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; # LAYOUT # @@ -46,5 +45,4 @@ if ($CONFIG['version'] < 5) { $obj->rrd_title = sprintf('Free space (%s)', $obj->args['tinstance']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/disk.php b/plugin/disk.php index 33bb147..27a4acd 100644 --- a/plugin/disk.php +++ b/plugin/disk.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericIO.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # disk-XXXX/ @@ -47,5 +46,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/dns.php b/plugin/dns.php index f770988..cb9bb02 100644 --- a/plugin/dns.php +++ b/plugin/dns.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # dns/ @@ -49,5 +48,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/entropy.php b/plugin/entropy.php index 137e5a2..0433a4f 100644 --- a/plugin/entropy.php +++ b/plugin/entropy.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # entropy/entropy.rrd @@ -32,5 +31,4 @@ if ($CONFIG['version'] < 5) { unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/filecount.php b/plugin/filecount.php index 812be9c..5fa524d 100644 --- a/plugin/filecount.php +++ b/plugin/filecount.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # filecount-X/ @@ -31,5 +30,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/hddtemp.php b/plugin/hddtemp.php index 5526154..1d366a9 100644 --- a/plugin/hddtemp.php +++ b/plugin/hddtemp.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # hddtemp/temperature-.rrd @@ -15,5 +14,4 @@ $obj->rrd_title = 'HDD Temperature'; $obj->rrd_vertical = '°C'; $obj->rrd_format = '%.1lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/interface.php b/plugin/interface.php index c51d732..cc8c5ce 100644 --- a/plugin/interface.php +++ b/plugin/interface.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericIO.class.php'; -require_once 'inc/collectd.inc.php'; # LAYOUT - Collectd 4 # interface/ @@ -46,5 +45,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/ip6tables.php b/plugin/ip6tables.php index cd95bc8..090c475 100644 --- a/plugin/ip6tables.php +++ b/plugin/ip6tables.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # ip6tables/ipt_bytes-XXX.rrd @@ -24,5 +23,4 @@ switch($_GET['t']) { $obj->rrd_vertical = ''; $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/ipmi.php b/plugin/ipmi.php index 9f975b5..8e6b7bf 100644 --- a/plugin/ipmi.php +++ b/plugin/ipmi.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT (similar to sensors plugin) # @@ -41,5 +40,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/iptables.php b/plugin/iptables.php index de060be..e60d2dc 100644 --- a/plugin/iptables.php +++ b/plugin/iptables.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # iptables/ipt_bytes-XXX.rrd @@ -24,5 +23,4 @@ switch($_GET['t']) { $obj->rrd_vertical = ''; $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/irq.php b/plugin/irq.php index 52d49e8..6cd87f9 100644 --- a/plugin/irq.php +++ b/plugin/irq.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # irq/ @@ -16,5 +15,4 @@ $obj->rrd_title = 'Interrupts'; $obj->rrd_vertical = 'IRQs/s'; $obj->rrd_format = '%6.1lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/libvirt.php b/plugin/libvirt.php index 08d0a6d..0d7fff0 100644 --- a/plugin/libvirt.php +++ b/plugin/libvirt.php @@ -3,7 +3,6 @@ # Collectd libvirt plugin require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; # LAYOUT # libvirt/ @@ -142,5 +141,4 @@ if ($CONFIG['version'] < 5 && count($obj->data_sources) == 1) { unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/load.php b/plugin/load.php index 0429735..a6e3355 100644 --- a/plugin/load.php +++ b/plugin/load.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # load/load.rrd @@ -25,5 +24,4 @@ $obj->rrd_title = 'System load'; $obj->rrd_vertical = 'System load'; $obj->rrd_format = '%.2lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/md.php b/plugin/md.php index c435a23..03f529a 100644 --- a/plugin/md.php +++ b/plugin/md.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # md-XXXX/ @@ -18,5 +17,4 @@ $obj->rrd_title = sprintf('Disks (md-%s)', $obj->args['pinstance']); $obj->rrd_vertical = '#'; $obj->rrd_format = '%2.0lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/memcached.php b/plugin/memcached.php index 3424769..09715ae 100644 --- a/plugin/memcached.php +++ b/plugin/memcached.php @@ -7,7 +7,6 @@ require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # df-cache.rrd @@ -177,5 +176,4 @@ switch(GET('t')) { $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/memory.php b/plugin/memory.php index 20fb200..9fd2e30 100644 --- a/plugin/memory.php +++ b/plugin/memory.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # memory/ @@ -42,5 +41,4 @@ $obj->rrd_title = 'Physical memory utilization'; $obj->rrd_vertical = 'Bytes'; $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/mysql.php b/plugin/mysql.php index 445176b..aad0131 100644 --- a/plugin/mysql.php +++ b/plugin/mysql.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG, $_GET); $obj->rrd_format = '%5.1lf%s'; @@ -138,5 +137,4 @@ switch($obj->args['type']) break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/netlink.php b/plugin/netlink.php index 2dfbab6..28a25f1 100644 --- a/plugin/netlink.php +++ b/plugin/netlink.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG, $_GET); @@ -120,5 +119,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/nfs.php b/plugin/nfs.php index efcfd1e..612580c 100644 --- a/plugin/nfs.php +++ b/plugin/nfs.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; # Check http://github.com/octo/collectd/blob/master/src/nfs.c @@ -29,5 +28,4 @@ $obj->rrd_title = sprintf('NFS-%s Procedures', $obj->args['pinstance']); $obj->rrd_vertical = 'Procedures'; $obj->rrd_format = '%5.2lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/nginx.php b/plugin/nginx.php index d55a886..7d70190 100644 --- a/plugin/nginx.php +++ b/plugin/nginx.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # nginx/ @@ -64,5 +63,4 @@ switch($obj->args['type']) $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/ntpd.php b/plugin/ntpd.php index 1260c57..22f9580 100644 --- a/plugin/ntpd.php +++ b/plugin/ntpd.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # ntpd/ @@ -46,5 +45,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/nut.php b/plugin/nut.php index b1d1610..f8d7150 100644 --- a/plugin/nut.php +++ b/plugin/nut.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # nut-XXXX/ @@ -75,5 +74,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/openvpn.php b/plugin/openvpn.php index 429964b..1ff6dd1 100644 --- a/plugin/openvpn.php +++ b/plugin/openvpn.php @@ -3,7 +3,6 @@ # Collectd OpenVPN plugin require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # openvpn-XXXX/ @@ -40,5 +39,4 @@ switch(GET('t')) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/ping.php b/plugin/ping.php index 1da00c2..845a6d9 100644 --- a/plugin/ping.php +++ b/plugin/ping.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # ping/ @@ -35,5 +34,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/postgresql.php b/plugin/postgresql.php index 03e5cee..4c2a62f 100644 --- a/plugin/postgresql.php +++ b/plugin/postgresql.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # postgresql-X/pg_blks-heap_hit.rrd @@ -128,5 +127,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/powerdns.php b/plugin/powerdns.php index 55312e9..d83d67b 100644 --- a/plugin/powerdns.php +++ b/plugin/powerdns.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_Default($CONFIG, $_GET); @@ -12,5 +11,4 @@ $obj = new Type_Default($CONFIG, $_GET); $obj->rrd_title = sprintf('PowerDNS %s (%s)', $obj->args['type'], $obj->args['pinstance']); $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/processes.php b/plugin/processes.php index 54c1ad7..a35800b 100644 --- a/plugin/processes.php +++ b/plugin/processes.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # processes/ @@ -181,5 +180,4 @@ switch($obj->args['type']) } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/sensors.php b/plugin/sensors.php index ba31487..0ac2ccd 100644 --- a/plugin/sensors.php +++ b/plugin/sensors.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # sensors-XXXX/ @@ -34,5 +33,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/snmp.php b/plugin/snmp.php index 680d94f..4d871a8 100644 --- a/plugin/snmp.php +++ b/plugin/snmp.php @@ -3,7 +3,6 @@ # Collectd snmp plugin require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; switch(GET('t')) { @@ -32,6 +31,5 @@ switch(GET('t')) { $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/swap.php b/plugin/swap.php index 983d38d..5b02130 100644 --- a/plugin/swap.php +++ b/plugin/swap.php @@ -3,7 +3,6 @@ # Collectd Swap plugin require_once 'conf/common.inc.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # swap/ @@ -48,5 +47,4 @@ switch(GET('t')) { $obj->rrd_format = '%5.1lf%s'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/tail.php b/plugin/tail.php index 4e23174..91400c7 100644 --- a/plugin/tail.php +++ b/plugin/tail.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_Default($CONFIG, $_GET); @@ -27,5 +26,4 @@ if ($CONFIG['version'] < 5) { } } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/tcpconns.php b/plugin/tcpconns.php index 1e6917a..5c629c5 100644 --- a/plugin/tcpconns.php +++ b/plugin/tcpconns.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # tcpconns-XXXX/ @@ -15,5 +14,4 @@ $obj->rrd_title = sprintf('TCP Connections (%s)', $obj->args['pinstance']); $obj->rrd_vertical = '#'; $obj->rrd_format = '%5.1lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/thermal.php b/plugin/thermal.php index b2fa74c..fb39ecb 100644 --- a/plugin/thermal.php +++ b/plugin/thermal.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # thermal-XXXX/ @@ -22,5 +21,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/uptime.php b/plugin/uptime.php index 1d432a9..20c44d3 100644 --- a/plugin/uptime.php +++ b/plugin/uptime.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Uptime.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # uptime/uptime.rrd @@ -21,5 +20,4 @@ $obj->rrd_title = 'Uptime'; $obj->rrd_vertical = 'Days'; $obj->rrd_format = '%.1lf'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/users.php b/plugin/users.php index f4cde28..6b3bc4e 100644 --- a/plugin/users.php +++ b/plugin/users.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # users/users.rrd @@ -32,5 +31,4 @@ if ($CONFIG['version'] < 5) { unset($obj->colors['value']); } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/varnish.php b/plugin/varnish.php index 6b199b7..f2f597c 100644 --- a/plugin/varnish.php +++ b/plugin/varnish.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT #varnish-default-backend/connections-failures.rrd @@ -27,5 +26,4 @@ $obj->rrd_format = '%5.1lf%s'; $obj->rrd_title = sprintf('%s (%s)', ucfirst($obj->args['pinstance']), $obj->args['category']); $obj->rrd_vertical = 'hits'; -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/vmem.php b/plugin/vmem.php index 3e1a64c..8fb81ce 100644 --- a/plugin/vmem.php +++ b/plugin/vmem.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # vmem/ @@ -56,5 +55,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/vserver.php b/plugin/vserver.php index 8eee8db..27e739f 100644 --- a/plugin/vserver.php +++ b/plugin/vserver.php @@ -5,7 +5,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericIO.class.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; # LAYOUT # vserver-XXXX @@ -52,7 +51,6 @@ switch($obj->args['type']) { $obj->rrd_vertical = 'Bytes'; $obj->rrd_format = '%5.1lf%s'; - collectd_flush($obj->identifiers); $obj->rrd_graph(); break; case 'vs_threads': @@ -76,7 +74,6 @@ switch($obj->args['type']) { $obj->rrd_vertical = 'Numbers'; $obj->rrd_format = '%5.1lf%s'; - collectd_flush($obj->identifiers); $obj->rrd_graph(); break; case 'if_octets': @@ -104,7 +101,6 @@ switch($obj->args['type']) { $obj->scale = $CONFIG['network_datasize'] == 'bits' ? 8 : 1; $obj->rrd_format = '%5.1lf%s'; - collectd_flush($obj->identifiers); $obj->rrd_graph(); break; case 'vs_processes': @@ -117,7 +113,6 @@ switch($obj->args['type']) { $obj->rrd_format = '%5.1lf%s'; - collectd_flush($obj->identifiers); $obj->rrd_graph(); break; diff --git a/plugin/wireless.php b/plugin/wireless.php index 70598b5..991a0f3 100644 --- a/plugin/wireless.php +++ b/plugin/wireless.php @@ -4,7 +4,6 @@ require_once 'conf/common.inc.php'; require_once 'type/GenericStacked.class.php'; -require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG, $_GET); $obj->data_sources = array('value'); @@ -27,5 +26,4 @@ switch($obj->args['type']) { break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/zfs_arc.php b/plugin/zfs_arc.php index 85f3016..5fc4407 100644 --- a/plugin/zfs_arc.php +++ b/plugin/zfs_arc.php @@ -3,7 +3,6 @@ require_once 'conf/common.inc.php'; require_once 'type/Default.class.php'; -require_once 'inc/collectd.inc.php'; ## LAYOUT # zfs_arc/ @@ -95,5 +94,4 @@ switch($obj->args['type']) { $obj->rrd_vertical = 'ratio'; break; } -collectd_flush($obj->identifiers); $obj->rrd_graph(); -- cgit v1.1