From b1e34bd1868be418ef5ec26683a8d07f22cebd51 Mon Sep 17 00:00:00 2001 From: Pim van den Berg Date: Sat, 5 Feb 2011 20:01:26 +0100 Subject: replace function generate_colors by rainbow_colors When no colors are defined they will be generated by function rainbow_colors. --- plugin/bind.php | 1 - plugin/cpufreq.php | 1 - plugin/dns.php | 2 -- plugin/hddtemp.php | 1 - plugin/irq.php | 1 - plugin/mysql.php | 1 - plugin/nfs.php | 1 - plugin/ntpd.php | 1 - plugin/nut.php | 1 - plugin/ping.php | 1 - plugin/sensors.php | 1 - plugin/tcpconns.php | 1 - plugin/vmem.php | 1 - 13 files changed, 14 deletions(-) (limited to 'plugin') diff --git a/plugin/bind.php b/plugin/bind.php index 2550918..0eb0a0d 100644 --- a/plugin/bind.php +++ b/plugin/bind.php @@ -10,7 +10,6 @@ require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); $obj->rrd_title = sprintf('%s/%s', $obj->args['pinstance'], $obj->args['type']); $obj->rrd_format = '%5.1lf%s'; diff --git a/plugin/cpufreq.php b/plugin/cpufreq.php index ef2162b..0ecc9a3 100644 --- a/plugin/cpufreq.php +++ b/plugin/cpufreq.php @@ -13,7 +13,6 @@ $obj = new Type_Default($CONFIG); $obj->data_sources = array('value'); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); $obj->rrd_title = 'CPU frequency scaling'; $obj->rrd_vertical = 'Mhz'; $obj->rrd_format = '%5.1lf%s'; diff --git a/plugin/dns.php b/plugin/dns.php index a3e5613..15143b5 100644 --- a/plugin/dns.php +++ b/plugin/dns.php @@ -35,14 +35,12 @@ switch($obj->args['type']) { break; case 'dns_opcode': $obj->data_sources = array('value'); - $obj->generate_colors(); $obj->rrd_title = 'DNS Opcode Query'; $obj->rrd_vertical = 'Queries/s'; $obj->rrd_format = '%5.1lf%s'; break; case 'dns_qtype': $obj->data_sources = array('value'); - $obj->generate_colors(); $obj->rrd_title = 'DNS QType'; $obj->rrd_vertical = 'Queries/s'; $obj->rrd_format = '%5.1lf%s'; diff --git a/plugin/hddtemp.php b/plugin/hddtemp.php index 10f71e6..1c90b78 100644 --- a/plugin/hddtemp.php +++ b/plugin/hddtemp.php @@ -13,7 +13,6 @@ $obj = new Type_Default($CONFIG); $obj->ds_names = array('temperature' => 'Temperature'); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); $obj->rrd_title = 'HDD Temperature'; $obj->rrd_vertical = '°C'; $obj->rrd_format = '%.1lf'; diff --git a/plugin/irq.php b/plugin/irq.php index 19618a4..406b707 100644 --- a/plugin/irq.php +++ b/plugin/irq.php @@ -13,7 +13,6 @@ require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); $obj->rrd_title = 'Interrupts'; $obj->rrd_vertical = 'IRQs/s'; diff --git a/plugin/mysql.php b/plugin/mysql.php index 607e223..c73c37a 100644 --- a/plugin/mysql.php +++ b/plugin/mysql.php @@ -13,7 +13,6 @@ $obj->heigth = $heigth; switch($obj->args['type']) { case 'mysql_commands': - $obj->generate_colors(); $obj->rrd_title = sprintf('MySQL commands (%s)', $obj->args['pinstance']); $obj->rrd_vertical = 'Issues/s'; $obj->rrd_format = '%5.1lf%s'; diff --git a/plugin/nfs.php b/plugin/nfs.php index 7daf032..ca69b06 100644 --- a/plugin/nfs.php +++ b/plugin/nfs.php @@ -30,7 +30,6 @@ $obj->heigth = $heigth; $obj->rrd_title = sprintf('NFS-%s Procedures', $obj->args['pinstance']); $obj->rrd_vertical = 'Procedures'; $obj->rrd_format = '%5.2lf'; -$obj->generate_colors(); collectd_flush($obj->identifiers); $obj->rrd_graph(); diff --git a/plugin/ntpd.php b/plugin/ntpd.php index 1b13f78..c85ce8c 100644 --- a/plugin/ntpd.php +++ b/plugin/ntpd.php @@ -19,7 +19,6 @@ $obj->ds_names = array('ping' => 'Ping time', 'ping_droprate' => 'Ping droprate'); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); switch($obj->args['type']) { case 'delay': $obj->data_sources = array('seconds'); diff --git a/plugin/nut.php b/plugin/nut.php index 816a9ca..b1016e6 100644 --- a/plugin/nut.php +++ b/plugin/nut.php @@ -16,7 +16,6 @@ require_once 'inc/collectd.inc.php'; $obj = new Type_Default($CONFIG); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); switch($obj->args['type']) { case 'percent': $obj->data_sources = array('percent'); diff --git a/plugin/ping.php b/plugin/ping.php index 067f1f1..1ea53de 100644 --- a/plugin/ping.php +++ b/plugin/ping.php @@ -19,7 +19,6 @@ $obj->ds_names = array('ping' => 'Ping time', 'ping_droprate' => 'Ping droprate'); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); switch($obj->args['type']) { case 'ping': $obj->data_sources = array('ping'); diff --git a/plugin/sensors.php b/plugin/sensors.php index bfdb411..3f23e98 100644 --- a/plugin/sensors.php +++ b/plugin/sensors.php @@ -18,7 +18,6 @@ $obj->ds_names = array( ); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); switch($obj->args['type']) { case 'fanspeed': $obj->rrd_title = sprintf('Fanspeed (%s)', $obj->args['pinstance']); diff --git a/plugin/tcpconns.php b/plugin/tcpconns.php index 4867d32..f0d99ae 100644 --- a/plugin/tcpconns.php +++ b/plugin/tcpconns.php @@ -13,7 +13,6 @@ require_once 'inc/collectd.inc.php'; $obj = new Type_GenericStacked($CONFIG); $obj->width = $width; $obj->heigth = $heigth; -$obj->generate_colors(); $obj->rrd_title = sprintf('TCP Connections (%s)', $obj->args['pinstance']); $obj->rrd_vertical = '#'; $obj->rrd_format = '%5.1lf'; diff --git a/plugin/vmem.php b/plugin/vmem.php index 3b58a5e..ea541fc 100644 --- a/plugin/vmem.php +++ b/plugin/vmem.php @@ -43,7 +43,6 @@ switch($obj->args['type']) { break; case 'vmpage_number': $obj->data_sources = array('value'); - $obj->generate_colors(); $obj->order = array('active_anon', 'active_file', 'anon_pages', 'bounce', 'dirty', 'file_pages', -- cgit v1.1