diff options
author | Pim van den Berg | 2014-05-03 11:15:53 +0200 |
---|---|---|
committer | Pim van den Berg | 2014-05-03 11:15:53 +0200 |
commit | 1c888304d33a8c1405b8716356ae300fad39521c (patch) | |
tree | ce0f5ef1946da9fd006a333f49233007fa574ae4 /plugin | |
parent | inc: mv graphs_from_plugin, build_url functions to html.inc.php (diff) | |
download | apt-panopticon_cgp-1c888304d33a8c1405b8716356ae300fad39521c.zip apt-panopticon_cgp-1c888304d33a8c1405b8716356ae300fad39521c.tar.gz apt-panopticon_cgp-1c888304d33a8c1405b8716356ae300fad39521c.tar.bz2 apt-panopticon_cgp-1c888304d33a8c1405b8716356ae300fad39521c.tar.xz |
type/Default: don't depend on external function GET
Diffstat (limited to '')
50 files changed, 66 insertions, 66 deletions
diff --git a/plugin/aggregation.php b/plugin/aggregation.php index 3e8b598..c4353ce 100644 --- a/plugin/aggregation.php +++ b/plugin/aggregation.php | |||
@@ -13,7 +13,7 @@ $pi = explode("-", GET('pi')); | |||
13 | switch($pi[0]) { | 13 | switch($pi[0]) { |
14 | case 'cpu': | 14 | case 'cpu': |
15 | require_once 'type/GenericStacked.class.php'; | 15 | require_once 'type/GenericStacked.class.php'; |
16 | $obj = new Type_GenericStacked($CONFIG); | 16 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
17 | $obj->data_sources = array('value'); | 17 | $obj->data_sources = array('value'); |
18 | $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal'); | 18 | $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal'); |
19 | $obj->ds_names = array( | 19 | $obj->ds_names = array( |
diff --git a/plugin/apache.php b/plugin/apache.php index 7e4919a..226385e 100644 --- a/plugin/apache.php +++ b/plugin/apache.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | # apache[-X]/apache_requests-X.rrd | 13 | # apache[-X]/apache_requests-X.rrd |
14 | # apache[-X]/apache_scoreboard-X.rrd | 14 | # apache[-X]/apache_scoreboard-X.rrd |
15 | 15 | ||
16 | $obj = new Type_Default($CONFIG); | 16 | $obj = new Type_Default($CONFIG, $_GET); |
17 | 17 | ||
18 | switch ($obj->args['type']) { | 18 | switch ($obj->args['type']) { |
19 | case 'apache_bytes': | 19 | case 'apache_bytes': |
@@ -67,7 +67,7 @@ switch ($obj->args['type']) { | |||
67 | break; | 67 | break; |
68 | case 'apache_scoreboard': | 68 | case 'apache_scoreboard': |
69 | require_once 'type/GenericStacked.class.php'; | 69 | require_once 'type/GenericStacked.class.php'; |
70 | $obj = new Type_GenericStacked($CONFIG); | 70 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
71 | $obj->data_sources = array('value'); | 71 | $obj->data_sources = array('value'); |
72 | $obj->order = array( | 72 | $obj->order = array( |
73 | 'open', | 73 | 'open', |
diff --git a/plugin/apcups.php b/plugin/apcups.php index 5566977..24d1918 100644 --- a/plugin/apcups.php +++ b/plugin/apcups.php | |||
@@ -17,7 +17,7 @@ require_once 'inc/collectd.inc.php'; | |||
17 | # apcups/voltage-input.rrd | 17 | # apcups/voltage-input.rrd |
18 | # apcups/voltage-output.rrd | 18 | # apcups/voltage-output.rrd |
19 | 19 | ||
20 | $obj = new Type_Default($CONFIG); | 20 | $obj = new Type_Default($CONFIG, $_GET); |
21 | 21 | ||
22 | switch($obj->args['type']) { | 22 | switch($obj->args['type']) { |
23 | case 'charge': | 23 | case 'charge': |
diff --git a/plugin/battery.php b/plugin/battery.php index b03aba7..740d5cb 100644 --- a/plugin/battery.php +++ b/plugin/battery.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | # battery-X/current.rrd | 12 | # battery-X/current.rrd |
13 | # battery-X/voltage.rrd | 13 | # battery-X/voltage.rrd |
14 | 14 | ||
15 | $obj = new Type_Default($CONFIG); | 15 | $obj = new Type_Default($CONFIG, $_GET); |
16 | $obj->colors = array( | 16 | $obj->colors = array( |
17 | 'value' => '0000f0', | 17 | 'value' => '0000f0', |
18 | ); | 18 | ); |
diff --git a/plugin/bind.php b/plugin/bind.php index e6d562c..702fec5 100644 --- a/plugin/bind.php +++ b/plugin/bind.php | |||
@@ -7,7 +7,7 @@ require_once 'type/GenericStacked.class.php'; | |||
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | 9 | ||
10 | $obj = new Type_GenericStacked($CONFIG); | 10 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
11 | 11 | ||
12 | $obj->rrd_title = sprintf('%s/%s', $obj->args['pinstance'], $obj->args['type']); | 12 | $obj->rrd_title = sprintf('%s/%s', $obj->args['pinstance'], $obj->args['type']); |
13 | $obj->rrd_format = '%5.1lf%s'; | 13 | $obj->rrd_format = '%5.1lf%s'; |
diff --git a/plugin/conntrack.php b/plugin/conntrack.php index 0415f2a..27a3656 100644 --- a/plugin/conntrack.php +++ b/plugin/conntrack.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # conntrack/conntrack.rrd | 10 | # conntrack/conntrack.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Conntrack entries', | 15 | 'value' => 'Conntrack entries', |
diff --git a/plugin/contextswitch.php b/plugin/contextswitch.php index 45b5f30..e71c417 100644 --- a/plugin/contextswitch.php +++ b/plugin/contextswitch.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # contextswitch/contextswitch.rrd | 10 | # contextswitch/contextswitch.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Context switches', | 15 | 'value' => 'Context switches', |
diff --git a/plugin/cpu.php b/plugin/cpu.php index a886f97..a3e968a 100644 --- a/plugin/cpu.php +++ b/plugin/cpu.php | |||
@@ -17,7 +17,7 @@ require_once 'inc/collectd.inc.php'; | |||
17 | # cpu-X/cpu-user.rrd | 17 | # cpu-X/cpu-user.rrd |
18 | # cpu-X/cpu-wait.rrd | 18 | # cpu-X/cpu-wait.rrd |
19 | 19 | ||
20 | $obj = new Type_GenericStacked($CONFIG); | 20 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
21 | $obj->data_sources = array('value'); | 21 | $obj->data_sources = array('value'); |
22 | $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal'); | 22 | $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal'); |
23 | $obj->ds_names = array( | 23 | $obj->ds_names = array( |
diff --git a/plugin/cpufreq.php b/plugin/cpufreq.php index 99f51c6..fbdc6ff 100644 --- a/plugin/cpufreq.php +++ b/plugin/cpufreq.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # cpufreq/cpufreq-X.rrd | 10 | # cpufreq/cpufreq-X.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->rrd_title = 'CPU frequency scaling'; | 14 | $obj->rrd_title = 'CPU frequency scaling'; |
15 | $obj->rrd_vertical = 'Hz'; | 15 | $obj->rrd_vertical = 'Hz'; |
diff --git a/plugin/dbi.php b/plugin/dbi.php index cd650f2..31aacc9 100644 --- a/plugin/dbi.php +++ b/plugin/dbi.php | |||
@@ -8,7 +8,7 @@ require_once 'inc/collectd.inc.php'; | |||
8 | 8 | ||
9 | 9 | ||
10 | 10 | ||
11 | $obj = new Type_Default($CONFIG); | 11 | $obj = new Type_Default($CONFIG, $_GET); |
12 | 12 | ||
13 | 13 | ||
14 | $obj->rrd_title = sprintf('%s', $obj->args['pinstance'], $obj->args['type']); | 14 | $obj->rrd_title = sprintf('%s', $obj->args['pinstance'], $obj->args['type']); |
diff --git a/plugin/df.php b/plugin/df.php index d4ccc0e..464e26c 100644 --- a/plugin/df.php +++ b/plugin/df.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | # df-X/df_complex-reserved.rrd | 12 | # df-X/df_complex-reserved.rrd |
13 | # df-X/df_complex-used.rrd | 13 | # df-X/df_complex-used.rrd |
14 | 14 | ||
15 | $obj = new Type_GenericStacked($CONFIG); | 15 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
16 | $obj->data_sources = array('value'); | 16 | $obj->data_sources = array('value'); |
17 | $obj->order = array('reserved', 'free', 'used'); | 17 | $obj->order = array('reserved', 'free', 'used'); |
18 | $obj->ds_names = array( | 18 | $obj->ds_names = array( |
diff --git a/plugin/disk.php b/plugin/disk.php index 763ae10..33bb147 100644 --- a/plugin/disk.php +++ b/plugin/disk.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | # disk-XXXX/disk_ops.rrd | 13 | # disk-XXXX/disk_ops.rrd |
14 | # disk-XXXX/disk_time.rrd | 14 | # disk-XXXX/disk_time.rrd |
15 | 15 | ||
16 | $obj = new Type_GenericIO($CONFIG); | 16 | $obj = new Type_GenericIO($CONFIG, $_GET); |
17 | $obj->data_sources = array('read', 'write'); | 17 | $obj->data_sources = array('read', 'write'); |
18 | $obj->ds_names = array( | 18 | $obj->ds_names = array( |
19 | 'read' => 'Read', | 19 | 'read' => 'Read', |
diff --git a/plugin/dns.php b/plugin/dns.php index d9bc759..f770988 100644 --- a/plugin/dns.php +++ b/plugin/dns.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | # dns/dns_opcode-X.rrd | 12 | # dns/dns_opcode-X.rrd |
13 | # dns/dns_qtype-X.rrd | 13 | # dns/dns_qtype-X.rrd |
14 | 14 | ||
15 | $obj = new Type_GenericStacked($CONFIG); | 15 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
16 | $obj->rrd_format = '%5.1lf%s'; | 16 | $obj->rrd_format = '%5.1lf%s'; |
17 | 17 | ||
18 | switch($obj->args['type']) { | 18 | switch($obj->args['type']) { |
diff --git a/plugin/entropy.php b/plugin/entropy.php index 1c7f763..137e5a2 100644 --- a/plugin/entropy.php +++ b/plugin/entropy.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # entropy/entropy.rrd | 10 | # entropy/entropy.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Entropy bits', | 15 | 'value' => 'Entropy bits', |
diff --git a/plugin/filecount.php b/plugin/filecount.php index daa9fd9..812be9c 100644 --- a/plugin/filecount.php +++ b/plugin/filecount.php | |||
@@ -11,7 +11,7 @@ require_once 'inc/collectd.inc.php'; | |||
11 | # filecount-X/bytes.rrd | 11 | # filecount-X/bytes.rrd |
12 | # filecount-X/files.rrd | 12 | # filecount-X/files.rrd |
13 | 13 | ||
14 | $obj = new Type_GenericStacked($CONFIG); | 14 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
15 | 15 | ||
16 | $obj->rrd_format = '%5.1lf%s'; | 16 | $obj->rrd_format = '%5.1lf%s'; |
17 | $obj->data_sources = array('value'); | 17 | $obj->data_sources = array('value'); |
diff --git a/plugin/hddtemp.php b/plugin/hddtemp.php index 2df7f35..5526154 100644 --- a/plugin/hddtemp.php +++ b/plugin/hddtemp.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # hddtemp/temperature-<disk>.rrd | 10 | # hddtemp/temperature-<disk>.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->ds_names = array('temperature' => 'Temperature'); | 13 | $obj->ds_names = array('temperature' => 'Temperature'); |
14 | $obj->rrd_title = 'HDD Temperature'; | 14 | $obj->rrd_title = 'HDD Temperature'; |
15 | $obj->rrd_vertical = '°C'; | 15 | $obj->rrd_vertical = '°C'; |
diff --git a/plugin/interface.php b/plugin/interface.php index c8828b2..c51d732 100644 --- a/plugin/interface.php +++ b/plugin/interface.php | |||
@@ -17,7 +17,7 @@ require_once 'inc/collectd.inc.php'; | |||
17 | # interface-XXXX/if_octets.rrd | 17 | # interface-XXXX/if_octets.rrd |
18 | # interface-XXXX/if_packets.rrd | 18 | # interface-XXXX/if_packets.rrd |
19 | 19 | ||
20 | $obj = new Type_GenericIO($CONFIG); | 20 | $obj = new Type_GenericIO($CONFIG, $_GET); |
21 | $obj->data_sources = array('rx', 'tx'); | 21 | $obj->data_sources = array('rx', 'tx'); |
22 | $obj->ds_names = array( | 22 | $obj->ds_names = array( |
23 | 'rx' => 'Receive', | 23 | 'rx' => 'Receive', |
diff --git a/plugin/ip6tables.php b/plugin/ip6tables.php index 6d0304b..cd95bc8 100644 --- a/plugin/ip6tables.php +++ b/plugin/ip6tables.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # ip6tables/ipt_bytes-XXX.rrd | 10 | # ip6tables/ipt_bytes-XXX.rrd |
11 | # ip6tables/ipt_packets-XXX.rrd | 11 | # ip6tables/ipt_packets-XXX.rrd |
12 | 12 | ||
13 | $obj = new Type_GenericStacked($CONFIG); | 13 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
14 | 14 | ||
15 | $obj->data_sources = array('value'); | 15 | $obj->data_sources = array('value'); |
16 | switch($_GET['t']) { | 16 | switch($_GET['t']) { |
diff --git a/plugin/ipmi.php b/plugin/ipmi.php index e06e4ad..9f975b5 100644 --- a/plugin/ipmi.php +++ b/plugin/ipmi.php | |||
@@ -19,7 +19,7 @@ require_once 'inc/collectd.inc.php'; | |||
19 | # voltage-+12 V system_board (7.1).rrd | 19 | # voltage-+12 V system_board (7.1).rrd |
20 | # voltage-VBAT system_board (7.1).rrd | 20 | # voltage-VBAT system_board (7.1).rrd |
21 | 21 | ||
22 | $obj = new Type_Default($CONFIG); | 22 | $obj = new Type_Default($CONFIG, $_GET); |
23 | $obj->ds_names = array( | 23 | $obj->ds_names = array( |
24 | 'value' => 'Value', | 24 | 'value' => 'Value', |
25 | ); | 25 | ); |
diff --git a/plugin/iptables.php b/plugin/iptables.php index 7b12f51..de060be 100644 --- a/plugin/iptables.php +++ b/plugin/iptables.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # iptables/ipt_bytes-XXX.rrd | 10 | # iptables/ipt_bytes-XXX.rrd |
11 | # iptables/ipt_packets-XXX.rrd | 11 | # iptables/ipt_packets-XXX.rrd |
12 | 12 | ||
13 | $obj = new Type_GenericStacked($CONFIG); | 13 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
14 | 14 | ||
15 | $obj->data_sources = array('value'); | 15 | $obj->data_sources = array('value'); |
16 | switch($_GET['t']) { | 16 | switch($_GET['t']) { |
diff --git a/plugin/irq.php b/plugin/irq.php index e4e32f6..52d49e8 100644 --- a/plugin/irq.php +++ b/plugin/irq.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # irq/ | 10 | # irq/ |
11 | # irq/irq-XX.rrd | 11 | # irq/irq-XX.rrd |
12 | 12 | ||
13 | $obj = new Type_GenericStacked($CONFIG); | 13 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
14 | 14 | ||
15 | $obj->rrd_title = 'Interrupts'; | 15 | $obj->rrd_title = 'Interrupts'; |
16 | $obj->rrd_vertical = 'IRQs/s'; | 16 | $obj->rrd_vertical = 'IRQs/s'; |
diff --git a/plugin/libvirt.php b/plugin/libvirt.php index 1cc05c2..08d0a6d 100644 --- a/plugin/libvirt.php +++ b/plugin/libvirt.php | |||
@@ -16,7 +16,7 @@ require_once 'inc/collectd.inc.php'; | |||
16 | # libvirt/virt_cpu_total.rrd | 16 | # libvirt/virt_cpu_total.rrd |
17 | 17 | ||
18 | require_once 'type/GenericIO.class.php'; | 18 | require_once 'type/GenericIO.class.php'; |
19 | $obj = new Type_GenericIO($CONFIG); | 19 | $obj = new Type_GenericIO($CONFIG, $_GET); |
20 | 20 | ||
21 | switch($obj->args['type']) { | 21 | switch($obj->args['type']) { |
22 | case 'disk_octets': | 22 | case 'disk_octets': |
@@ -102,7 +102,7 @@ switch($obj->args['type']) { | |||
102 | break; | 102 | break; |
103 | case 'virt_cpu_total': | 103 | case 'virt_cpu_total': |
104 | require_once 'type/Default.class.php'; | 104 | require_once 'type/Default.class.php'; |
105 | $obj = new Type_Default($CONFIG); | 105 | $obj = new Type_Default($CONFIG, $_GET); |
106 | 106 | ||
107 | $obj->data_sources = array('value'); | 107 | $obj->data_sources = array('value'); |
108 | $obj->ds_names = array( | 108 | $obj->ds_names = array( |
@@ -116,7 +116,7 @@ switch($obj->args['type']) { | |||
116 | break; | 116 | break; |
117 | case 'virt_vcpu': | 117 | case 'virt_vcpu': |
118 | require_once 'type/Default.class.php'; | 118 | require_once 'type/Default.class.php'; |
119 | $obj = new Type_Default($CONFIG); | 119 | $obj = new Type_Default($CONFIG, $_GET); |
120 | 120 | ||
121 | $obj->data_sources = array('value'); | 121 | $obj->data_sources = array('value'); |
122 | $obj->ds_names = array( | 122 | $obj->ds_names = array( |
diff --git a/plugin/load.php b/plugin/load.php index fe2305c..0429735 100644 --- a/plugin/load.php +++ b/plugin/load.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # load/load.rrd | 10 | # load/load.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('shortterm', 'midterm', 'longterm'); | 13 | $obj->data_sources = array('shortterm', 'midterm', 'longterm'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'shortterm' => ' 1 min', | 15 | 'shortterm' => ' 1 min', |
diff --git a/plugin/md.php b/plugin/md.php index 56df8a3..c435a23 100644 --- a/plugin/md.php +++ b/plugin/md.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # md-XXXX/ | 10 | # md-XXXX/ |
11 | # md-XXXX/md_disks-XXXX.rrd | 11 | # md-XXXX/md_disks-XXXX.rrd |
12 | 12 | ||
13 | $obj = new Type_Default($CONFIG); | 13 | $obj = new Type_Default($CONFIG, $_GET); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Value', | 15 | 'value' => 'Value', |
16 | ); | 16 | ); |
diff --git a/plugin/memcached.php b/plugin/memcached.php index ee80caf..3424769 100644 --- a/plugin/memcached.php +++ b/plugin/memcached.php | |||
@@ -25,7 +25,7 @@ switch(GET('t')) { | |||
25 | # df-cache.rrd | 25 | # df-cache.rrd |
26 | case 'df': | 26 | case 'df': |
27 | require_once 'type/Default.class.php'; | 27 | require_once 'type/Default.class.php'; |
28 | $obj = new Type_Default($CONFIG); | 28 | $obj = new Type_Default($CONFIG, $_GET); |
29 | $obj->data_sources = array('used', 'free'); | 29 | $obj->data_sources = array('used', 'free'); |
30 | $obj->order = array('used', 'free'); | 30 | $obj->order = array('used', 'free'); |
31 | $obj->ds_names = array( | 31 | $obj->ds_names = array( |
@@ -43,7 +43,7 @@ switch(GET('t')) { | |||
43 | # memcached_command-(flush|get|set).rrd | 43 | # memcached_command-(flush|get|set).rrd |
44 | case 'memcached_command': | 44 | case 'memcached_command': |
45 | require_once 'type/GenericStacked.class.php'; | 45 | require_once 'type/GenericStacked.class.php'; |
46 | $obj = new Type_GenericStacked($CONFIG); | 46 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
47 | $obj->order = array('flush', 'get', 'set'); | 47 | $obj->order = array('flush', 'get', 'set'); |
48 | $obj->ds_names = array( | 48 | $obj->ds_names = array( |
49 | 'flush' => 'Flush', | 49 | 'flush' => 'Flush', |
@@ -62,7 +62,7 @@ switch(GET('t')) { | |||
62 | # memcached_connections-current.rrd | 62 | # memcached_connections-current.rrd |
63 | case 'memcached_connections': | 63 | case 'memcached_connections': |
64 | require_once 'type/Default.class.php'; | 64 | require_once 'type/Default.class.php'; |
65 | $obj = new Type_Default($CONFIG); | 65 | $obj = new Type_Default($CONFIG, $_GET); |
66 | $obj->data_sources = array('value'); | 66 | $obj->data_sources = array('value'); |
67 | $obj->ds_names = array( | 67 | $obj->ds_names = array( |
68 | 'value' => 'Connections', | 68 | 'value' => 'Connections', |
@@ -77,7 +77,7 @@ switch(GET('t')) { | |||
77 | # memcached_items-current.rrd | 77 | # memcached_items-current.rrd |
78 | case 'memcached_items': | 78 | case 'memcached_items': |
79 | require_once 'type/Default.class.php'; | 79 | require_once 'type/Default.class.php'; |
80 | $obj = new Type_Default($CONFIG); | 80 | $obj = new Type_Default($CONFIG, $_GET); |
81 | $obj->data_sources = array('value'); | 81 | $obj->data_sources = array('value'); |
82 | $obj->ds_names = array( | 82 | $obj->ds_names = array( |
83 | 'value ' => 'Items', | 83 | 'value ' => 'Items', |
@@ -92,7 +92,7 @@ switch(GET('t')) { | |||
92 | # memcached_octets.rrd | 92 | # memcached_octets.rrd |
93 | case 'memcached_octets': | 93 | case 'memcached_octets': |
94 | require_once 'type/Default.class.php'; | 94 | require_once 'type/Default.class.php'; |
95 | $obj = new Type_Default($CONFIG); | 95 | $obj = new Type_Default($CONFIG, $_GET); |
96 | $obj->data_sources = array('rx', 'tx'); | 96 | $obj->data_sources = array('rx', 'tx'); |
97 | $obj->order = array('rx', 'tx'); | 97 | $obj->order = array('rx', 'tx'); |
98 | $obj->ds_names = array( | 98 | $obj->ds_names = array( |
@@ -110,7 +110,7 @@ switch(GET('t')) { | |||
110 | # memcached_ops-(evictions|hits|misses).rrd | 110 | # memcached_ops-(evictions|hits|misses).rrd |
111 | case 'memcached_ops': | 111 | case 'memcached_ops': |
112 | require_once 'type/GenericStacked.class.php'; | 112 | require_once 'type/GenericStacked.class.php'; |
113 | $obj = new Type_GenericStacked($CONFIG); | 113 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
114 | $obj->order = array('evictions', 'hits', 'misses'); | 114 | $obj->order = array('evictions', 'hits', 'misses'); |
115 | $obj->ds_names = array( | 115 | $obj->ds_names = array( |
116 | 'evictions' => 'Evictions', | 116 | 'evictions' => 'Evictions', |
@@ -129,7 +129,7 @@ switch(GET('t')) { | |||
129 | # percent-hitratio.rrd | 129 | # percent-hitratio.rrd |
130 | case 'percent': | 130 | case 'percent': |
131 | require_once 'type/Default.class.php'; | 131 | require_once 'type/Default.class.php'; |
132 | $obj = new Type_Default($CONFIG); | 132 | $obj = new Type_Default($CONFIG, $_GET); |
133 | $obj->data_sources = array('percent'); | 133 | $obj->data_sources = array('percent'); |
134 | $obj->ds_names = array( | 134 | $obj->ds_names = array( |
135 | 'percent ' => 'Percentage', | 135 | 'percent ' => 'Percentage', |
@@ -143,7 +143,7 @@ switch(GET('t')) { | |||
143 | # ps_count.rrd | 143 | # ps_count.rrd |
144 | case 'ps_count': | 144 | case 'ps_count': |
145 | require_once 'type/Default.class.php'; | 145 | require_once 'type/Default.class.php'; |
146 | $obj = new Type_Default($CONFIG); | 146 | $obj = new Type_Default($CONFIG, $_GET); |
147 | $obj->data_sources = array('threads'); | 147 | $obj->data_sources = array('threads'); |
148 | $obj->order = array('threads'); | 148 | $obj->order = array('threads'); |
149 | $obj->ds_names = array( | 149 | $obj->ds_names = array( |
@@ -159,7 +159,7 @@ switch(GET('t')) { | |||
159 | # ps_cputime.rrd | 159 | # ps_cputime.rrd |
160 | case 'ps_cputime': | 160 | case 'ps_cputime': |
161 | require_once 'type/Default.class.php'; | 161 | require_once 'type/Default.class.php'; |
162 | $obj = new Type_Default($CONFIG); | 162 | $obj = new Type_Default($CONFIG, $_GET); |
163 | $obj->data_sources = array('user', 'syst'); | 163 | $obj->data_sources = array('user', 'syst'); |
164 | $obj->order = array('user', 'syst'); | 164 | $obj->order = array('user', 'syst'); |
165 | $obj->ds_names = array( | 165 | $obj->ds_names = array( |
diff --git a/plugin/memory.php b/plugin/memory.php index 3c9a745..20fb200 100644 --- a/plugin/memory.php +++ b/plugin/memory.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | # memory/memory-free.rrd | 13 | # memory/memory-free.rrd |
14 | # memory/memory-used.rrd | 14 | # memory/memory-used.rrd |
15 | 15 | ||
16 | $obj = new Type_GenericStacked($CONFIG); | 16 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
17 | $obj->order = array('free', 'inactive', 'buffered', 'cached', 'cache', 'locked', 'used', 'active', 'wired'); | 17 | $obj->order = array('free', 'inactive', 'buffered', 'cached', 'cache', 'locked', 'used', 'active', 'wired'); |
18 | $obj->ds_names = array( | 18 | $obj->ds_names = array( |
19 | 'free' => 'Free', | 19 | 'free' => 'Free', |
diff --git a/plugin/mysql.php b/plugin/mysql.php index 3d8b25b..445176b 100644 --- a/plugin/mysql.php +++ b/plugin/mysql.php | |||
@@ -6,7 +6,7 @@ require_once 'conf/common.inc.php'; | |||
6 | require_once 'type/GenericStacked.class.php'; | 6 | require_once 'type/GenericStacked.class.php'; |
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | $obj = new Type_GenericStacked($CONFIG); | 9 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
10 | $obj->rrd_format = '%5.1lf%s'; | 10 | $obj->rrd_format = '%5.1lf%s'; |
11 | 11 | ||
12 | switch($obj->args['type']) | 12 | switch($obj->args['type']) |
diff --git a/plugin/netlink.php b/plugin/netlink.php index df78515..2dfbab6 100644 --- a/plugin/netlink.php +++ b/plugin/netlink.php | |||
@@ -6,7 +6,7 @@ require_once 'conf/common.inc.php'; | |||
6 | require_once 'type/GenericStacked.class.php'; | 6 | require_once 'type/GenericStacked.class.php'; |
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | $obj = new Type_GenericStacked($CONFIG); | 9 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
10 | 10 | ||
11 | $obj->rrd_format = '%5.1lf%s'; | 11 | $obj->rrd_format = '%5.1lf%s'; |
12 | 12 | ||
diff --git a/plugin/nfs.php b/plugin/nfs.php index 9ae9196..efcfd1e 100644 --- a/plugin/nfs.php +++ b/plugin/nfs.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | ## LAYOUT | 12 | ## LAYOUT |
13 | # nfs-XX/nfs_procedure-YY.rrd | 13 | # nfs-XX/nfs_procedure-YY.rrd |
14 | 14 | ||
15 | $obj = new Type_GenericStacked($CONFIG); | 15 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
16 | $obj->data_sources = array('value'); | 16 | $obj->data_sources = array('value'); |
17 | switch($obj->args['pinstance']) { | 17 | switch($obj->args['pinstance']) { |
18 | case 'v2client': | 18 | case 'v2client': |
diff --git a/plugin/nginx.php b/plugin/nginx.php index 9d51a8e..d55a886 100644 --- a/plugin/nginx.php +++ b/plugin/nginx.php | |||
@@ -16,7 +16,7 @@ require_once 'inc/collectd.inc.php'; | |||
16 | # nginx/nginx_connections-writing.rrd | 16 | # nginx/nginx_connections-writing.rrd |
17 | # nginx/nginx_requests.rrd | 17 | # nginx/nginx_requests.rrd |
18 | 18 | ||
19 | $obj = new Type_Default($CONFIG); | 19 | $obj = new Type_Default($CONFIG, $_GET); |
20 | 20 | ||
21 | switch($obj->args['type']) | 21 | switch($obj->args['type']) |
22 | { | 22 | { |
diff --git a/plugin/ntpd.php b/plugin/ntpd.php index ebd1fa6..1260c57 100644 --- a/plugin/ntpd.php +++ b/plugin/ntpd.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | # ntpd/time_dispersion-<host>.rrd | 13 | # ntpd/time_dispersion-<host>.rrd |
14 | # ntpd/time_offset-<host>.rrd | 14 | # ntpd/time_offset-<host>.rrd |
15 | 15 | ||
16 | $obj = new Type_Default($CONFIG); | 16 | $obj = new Type_Default($CONFIG, $_GET); |
17 | $obj->ds_names = array('ping' => 'Ping time', | 17 | $obj->ds_names = array('ping' => 'Ping time', |
18 | 'ping_stddev' => 'Ping stddev', | 18 | 'ping_stddev' => 'Ping stddev', |
19 | 'ping_droprate' => 'Ping droprate'); | 19 | 'ping_droprate' => 'Ping droprate'); |
diff --git a/plugin/nut.php b/plugin/nut.php index 848b09b..b1d1610 100644 --- a/plugin/nut.php +++ b/plugin/nut.php | |||
@@ -14,7 +14,7 @@ require_once 'inc/collectd.inc.php'; | |||
14 | # nut-XXXX/timeleft-XXXX.rrd | 14 | # nut-XXXX/timeleft-XXXX.rrd |
15 | # nut-XXXX/voltage-XXXX.rrd | 15 | # nut-XXXX/voltage-XXXX.rrd |
16 | 16 | ||
17 | $obj = new Type_Default($CONFIG); | 17 | $obj = new Type_Default($CONFIG, $_GET); |
18 | switch($obj->args['type']) { | 18 | switch($obj->args['type']) { |
19 | case 'frequency': | 19 | case 'frequency': |
20 | if ($CONFIG['version'] < 5) { | 20 | if ($CONFIG['version'] < 5) { |
diff --git a/plugin/openvpn.php b/plugin/openvpn.php index 0f1a2c2..429964b 100644 --- a/plugin/openvpn.php +++ b/plugin/openvpn.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | switch(GET('t')) { | 13 | switch(GET('t')) { |
14 | case 'if_octets': | 14 | case 'if_octets': |
15 | require_once 'type/GenericIO.class.php'; | 15 | require_once 'type/GenericIO.class.php'; |
16 | $obj = new Type_GenericIO($CONFIG); | 16 | $obj = new Type_GenericIO($CONFIG, $_GET); |
17 | $obj->data_sources = array('rx', 'tx'); | 17 | $obj->data_sources = array('rx', 'tx'); |
18 | $obj->ds_names = array( | 18 | $obj->ds_names = array( |
19 | 'rx' => 'Receive', | 19 | 'rx' => 'Receive', |
@@ -30,7 +30,7 @@ switch(GET('t')) { | |||
30 | break; | 30 | break; |
31 | case 'users': | 31 | case 'users': |
32 | require_once 'type/Default.class.php'; | 32 | require_once 'type/Default.class.php'; |
33 | $obj = new Type_Default($CONFIG); | 33 | $obj = new Type_Default($CONFIG, $_GET); |
34 | $obj->ds_names = array( | 34 | $obj->ds_names = array( |
35 | 'value' => 'Users', | 35 | 'value' => 'Users', |
36 | ); | 36 | ); |
diff --git a/plugin/ping.php b/plugin/ping.php index 5836703..1da00c2 100644 --- a/plugin/ping.php +++ b/plugin/ping.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | # ping/ping_stddev-<host>.rrd | 12 | # ping/ping_stddev-<host>.rrd |
13 | # ping/ping_droprate-<host>.rrd | 13 | # ping/ping_droprate-<host>.rrd |
14 | 14 | ||
15 | $obj = new Type_Default($CONFIG); | 15 | $obj = new Type_Default($CONFIG, $_GET); |
16 | $obj->data_sources = array('value'); | 16 | $obj->data_sources = array('value'); |
17 | $obj->ds_names = array('ping' => 'Ping time', | 17 | $obj->ds_names = array('ping' => 'Ping time', |
18 | 'ping_stddev' => 'Ping stddev', | 18 | 'ping_stddev' => 'Ping stddev', |
diff --git a/plugin/postgresql.php b/plugin/postgresql.php index 361322d..03e5cee 100644 --- a/plugin/postgresql.php +++ b/plugin/postgresql.php | |||
@@ -21,7 +21,7 @@ require_once 'inc/collectd.inc.php'; | |||
21 | # postgresql-X/pg_n_tup_c-ins.rrd | 21 | # postgresql-X/pg_n_tup_c-ins.rrd |
22 | # postgresql-X/pg_n_tup_c-upd.rrd | 22 | # postgresql-X/pg_n_tup_c-upd.rrd |
23 | 23 | ||
24 | $obj = new Type_GenericStacked($CONFIG); | 24 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
25 | $obj->rrd_format = '%5.1lf%s'; | 25 | $obj->rrd_format = '%5.1lf%s'; |
26 | 26 | ||
27 | switch($obj->args['type']) { | 27 | switch($obj->args['type']) { |
diff --git a/plugin/powerdns.php b/plugin/powerdns.php index b62d06d..55312e9 100644 --- a/plugin/powerdns.php +++ b/plugin/powerdns.php | |||
@@ -7,7 +7,7 @@ require_once 'type/Default.class.php'; | |||
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | 9 | ||
10 | $obj = new Type_Default($CONFIG); | 10 | $obj = new Type_Default($CONFIG, $_GET); |
11 | 11 | ||
12 | $obj->rrd_title = sprintf('PowerDNS %s (%s)', $obj->args['type'], $obj->args['pinstance']); | 12 | $obj->rrd_title = sprintf('PowerDNS %s (%s)', $obj->args['type'], $obj->args['pinstance']); |
13 | $obj->rrd_format = '%5.1lf%s'; | 13 | $obj->rrd_format = '%5.1lf%s'; |
diff --git a/plugin/processes.php b/plugin/processes.php index 96fde2d..54c1ad7 100644 --- a/plugin/processes.php +++ b/plugin/processes.php | |||
@@ -15,7 +15,7 @@ require_once 'inc/collectd.inc.php'; | |||
15 | # processes/ps_state-running.rrd | 15 | # processes/ps_state-running.rrd |
16 | # processes/ps_state-sleeping.rrd | 16 | # processes/ps_state-sleeping.rrd |
17 | 17 | ||
18 | $obj = new Type_GenericStacked($CONFIG); | 18 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
19 | $obj->rrd_format = '%5.1lf%s'; | 19 | $obj->rrd_format = '%5.1lf%s'; |
20 | 20 | ||
21 | switch($obj->args['type']) | 21 | switch($obj->args['type']) |
diff --git a/plugin/sensors.php b/plugin/sensors.php index 9daf662..ba31487 100644 --- a/plugin/sensors.php +++ b/plugin/sensors.php | |||
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php'; | |||
12 | # sensors-XXXX/temerature-XXXX.rrd | 12 | # sensors-XXXX/temerature-XXXX.rrd |
13 | # sensors-XXXX/voltage-XXXX.rrd | 13 | # sensors-XXXX/voltage-XXXX.rrd |
14 | 14 | ||
15 | $obj = new Type_Default($CONFIG); | 15 | $obj = new Type_Default($CONFIG, $_GET); |
16 | $obj->ds_names = array( | 16 | $obj->ds_names = array( |
17 | 'value' => 'Value', | 17 | 'value' => 'Value', |
18 | ); | 18 | ); |
diff --git a/plugin/snmp.php b/plugin/snmp.php index d3cdb96..680d94f 100644 --- a/plugin/snmp.php +++ b/plugin/snmp.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | switch(GET('t')) { | 9 | switch(GET('t')) { |
10 | case 'if_octets': | 10 | case 'if_octets': |
11 | require_once 'type/GenericIO.class.php'; | 11 | require_once 'type/GenericIO.class.php'; |
12 | $obj = new Type_GenericIO($CONFIG); | 12 | $obj = new Type_GenericIO($CONFIG, $_GET); |
13 | $obj->data_sources = array('rx', 'tx'); | 13 | $obj->data_sources = array('rx', 'tx'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'rx' => 'Receive', | 15 | 'rx' => 'Receive', |
@@ -25,7 +25,7 @@ switch(GET('t')) { | |||
25 | break; | 25 | break; |
26 | default: | 26 | default: |
27 | require_once 'type/Default.class.php'; | 27 | require_once 'type/Default.class.php'; |
28 | $obj = new Type_Default($CONFIG); | 28 | $obj = new Type_Default($CONFIG, $_GET); |
29 | $obj->rrd_title = sprintf('SNMP: %s (%s)', $obj->args['type'], $obj->args['tinstance']); | 29 | $obj->rrd_title = sprintf('SNMP: %s (%s)', $obj->args['type'], $obj->args['tinstance']); |
30 | break; | 30 | break; |
31 | } | 31 | } |
diff --git a/plugin/swap.php b/plugin/swap.php index 863c600..983d38d 100644 --- a/plugin/swap.php +++ b/plugin/swap.php | |||
@@ -14,7 +14,7 @@ require_once 'inc/collectd.inc.php'; | |||
14 | switch(GET('t')) { | 14 | switch(GET('t')) { |
15 | case 'swap': | 15 | case 'swap': |
16 | require_once 'type/GenericStacked.class.php'; | 16 | require_once 'type/GenericStacked.class.php'; |
17 | $obj = new Type_GenericStacked($CONFIG); | 17 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
18 | $obj->order = array('free', 'cached', 'used'); | 18 | $obj->order = array('free', 'cached', 'used'); |
19 | $obj->ds_names = array( | 19 | $obj->ds_names = array( |
20 | 'free' => 'Free', | 20 | 'free' => 'Free', |
@@ -31,7 +31,7 @@ switch(GET('t')) { | |||
31 | break; | 31 | break; |
32 | case 'swap_io': | 32 | case 'swap_io': |
33 | require_once 'type/GenericIO.class.php'; | 33 | require_once 'type/GenericIO.class.php'; |
34 | $obj = new Type_GenericIO($CONFIG); | 34 | $obj = new Type_GenericIO($CONFIG, $_GET); |
35 | $obj->order = array('out', 'in'); | 35 | $obj->order = array('out', 'in'); |
36 | $obj->ds_names = array( | 36 | $obj->ds_names = array( |
37 | 'out' => 'Out', | 37 | 'out' => 'Out', |
diff --git a/plugin/tail.php b/plugin/tail.php index 3afcc2e..4e23174 100644 --- a/plugin/tail.php +++ b/plugin/tail.php | |||
@@ -7,7 +7,7 @@ require_once 'type/Default.class.php'; | |||
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | 9 | ||
10 | $obj = new Type_Default($CONFIG); | 10 | $obj = new Type_Default($CONFIG, $_GET); |
11 | 11 | ||
12 | $obj->rrd_title = sprintf('tail: %s (%s)', $obj->args['pinstance'], $obj->args['type']); | 12 | $obj->rrd_title = sprintf('tail: %s (%s)', $obj->args['pinstance'], $obj->args['type']); |
13 | $obj->rrd_format = '%5.1lf%s'; | 13 | $obj->rrd_format = '%5.1lf%s'; |
diff --git a/plugin/tcpconns.php b/plugin/tcpconns.php index bd23de7..1e6917a 100644 --- a/plugin/tcpconns.php +++ b/plugin/tcpconns.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # tcpconns-XXXX/ | 10 | # tcpconns-XXXX/ |
11 | # tcpconns-XXXX/tcp_connections-XXXX.rrd | 11 | # tcpconns-XXXX/tcp_connections-XXXX.rrd |
12 | 12 | ||
13 | $obj = new Type_GenericStacked($CONFIG); | 13 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
14 | $obj->rrd_title = sprintf('TCP Connections (%s)', $obj->args['pinstance']); | 14 | $obj->rrd_title = sprintf('TCP Connections (%s)', $obj->args['pinstance']); |
15 | $obj->rrd_vertical = '#'; | 15 | $obj->rrd_vertical = '#'; |
16 | $obj->rrd_format = '%5.1lf'; | 16 | $obj->rrd_format = '%5.1lf'; |
diff --git a/plugin/thermal.php b/plugin/thermal.php index 50789d0..b2fa74c 100644 --- a/plugin/thermal.php +++ b/plugin/thermal.php | |||
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php'; | |||
10 | # thermal-XXXX/ | 10 | # thermal-XXXX/ |
11 | # thermal-XXXX/gauge.rrd | 11 | # thermal-XXXX/gauge.rrd |
12 | 12 | ||
13 | $obj = new Type_Default($CONFIG); | 13 | $obj = new Type_Default($CONFIG, $_GET); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Temperature', | 15 | 'value' => 'Temperature', |
16 | ); | 16 | ); |
diff --git a/plugin/uptime.php b/plugin/uptime.php index 60a106a..1d432a9 100644 --- a/plugin/uptime.php +++ b/plugin/uptime.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # uptime/uptime.rrd | 10 | # uptime/uptime.rrd |
11 | 11 | ||
12 | $obj = new Type_Uptime($CONFIG); | 12 | $obj = new Type_Uptime($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Current', | 15 | 'value' => 'Current', |
diff --git a/plugin/users.php b/plugin/users.php index 2cb2427..f4cde28 100644 --- a/plugin/users.php +++ b/plugin/users.php | |||
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php'; | |||
9 | ## LAYOUT | 9 | ## LAYOUT |
10 | # users/users.rrd | 10 | # users/users.rrd |
11 | 11 | ||
12 | $obj = new Type_Default($CONFIG); | 12 | $obj = new Type_Default($CONFIG, $_GET); |
13 | $obj->data_sources = array('value'); | 13 | $obj->data_sources = array('value'); |
14 | $obj->ds_names = array( | 14 | $obj->ds_names = array( |
15 | 'value' => 'Users', | 15 | 'value' => 'Users', |
diff --git a/plugin/varnish.php b/plugin/varnish.php index 78d33bd..6b199b7 100644 --- a/plugin/varnish.php +++ b/plugin/varnish.php | |||
@@ -22,7 +22,7 @@ require_once 'inc/collectd.inc.php'; | |||
22 | #varnish-default-connections/connections-dropped.rrd | 22 | #varnish-default-connections/connections-dropped.rrd |
23 | #varnish-default-connections/connections-received.rrd | 23 | #varnish-default-connections/connections-received.rrd |
24 | 24 | ||
25 | $obj = new Type_Default($CONFIG); | 25 | $obj = new Type_Default($CONFIG, $_GET); |
26 | $obj->rrd_format = '%5.1lf%s'; | 26 | $obj->rrd_format = '%5.1lf%s'; |
27 | $obj->rrd_title = sprintf('%s (%s)', ucfirst($obj->args['pinstance']), $obj->args['category']); | 27 | $obj->rrd_title = sprintf('%s (%s)', ucfirst($obj->args['pinstance']), $obj->args['category']); |
28 | $obj->rrd_vertical = 'hits'; | 28 | $obj->rrd_vertical = 'hits'; |
diff --git a/plugin/vmem.php b/plugin/vmem.php index 9a17ed4..3e1a64c 100644 --- a/plugin/vmem.php +++ b/plugin/vmem.php | |||
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php'; | |||
13 | # vmem/vmpage_io-swapy.rrd | 13 | # vmem/vmpage_io-swapy.rrd |
14 | # vmem/vmpage_number-<type>.rrd | 14 | # vmem/vmpage_number-<type>.rrd |
15 | 15 | ||
16 | $obj = new Type_GenericStacked($CONFIG); | 16 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
17 | $obj->rrd_format = '%5.1lf%s'; | 17 | $obj->rrd_format = '%5.1lf%s'; |
18 | 18 | ||
19 | switch($obj->args['type']) { | 19 | switch($obj->args['type']) { |
diff --git a/plugin/vserver.php b/plugin/vserver.php index 186166d..8eee8db 100644 --- a/plugin/vserver.php +++ b/plugin/vserver.php | |||
@@ -25,14 +25,14 @@ require_once 'inc/collectd.inc.php'; | |||
25 | # vserver-XXXX/vs_threads-total.rrd | 25 | # vserver-XXXX/vs_threads-total.rrd |
26 | # vserver-XXXX/vs_threads-uninterruptable.rrd | 26 | # vserver-XXXX/vs_threads-uninterruptable.rrd |
27 | 27 | ||
28 | $obj = new Type_Default($CONFIG); | 28 | $obj = new Type_Default($CONFIG, $_GET); |
29 | 29 | ||
30 | switch($obj->args['type']) { | 30 | switch($obj->args['type']) { |
31 | case 'load': | 31 | case 'load': |
32 | require_once "plugin/load.php"; | 32 | require_once "plugin/load.php"; |
33 | break; | 33 | break; |
34 | case 'vs_memory': | 34 | case 'vs_memory': |
35 | $obj = new Type_GenericStacked($CONFIG); | 35 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
36 | $obj->order = array('vm', 'vml', 'rss', 'anon'); | 36 | $obj->order = array('vm', 'vml', 'rss', 'anon'); |
37 | # http://oldwiki.linux-vserver.org/Memory+Allocation | 37 | # http://oldwiki.linux-vserver.org/Memory+Allocation |
38 | $obj->ds_names = array( | 38 | $obj->ds_names = array( |
@@ -56,7 +56,7 @@ switch($obj->args['type']) { | |||
56 | $obj->rrd_graph(); | 56 | $obj->rrd_graph(); |
57 | break; | 57 | break; |
58 | case 'vs_threads': | 58 | case 'vs_threads': |
59 | $obj = new Type_GenericStacked($CONFIG); | 59 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
60 | $obj->order = array('running', 'uninterruptable', 'onhold', 'total'); | 60 | $obj->order = array('running', 'uninterruptable', 'onhold', 'total'); |
61 | # http://linux-vserver.org/ProcFS | 61 | # http://linux-vserver.org/ProcFS |
62 | $obj->ds_names = array( | 62 | $obj->ds_names = array( |
diff --git a/plugin/wireless.php b/plugin/wireless.php index 9d391ec..70598b5 100644 --- a/plugin/wireless.php +++ b/plugin/wireless.php | |||
@@ -6,7 +6,7 @@ require_once 'conf/common.inc.php'; | |||
6 | require_once 'type/GenericStacked.class.php'; | 6 | require_once 'type/GenericStacked.class.php'; |
7 | require_once 'inc/collectd.inc.php'; | 7 | require_once 'inc/collectd.inc.php'; |
8 | 8 | ||
9 | $obj = new Type_GenericStacked($CONFIG); | 9 | $obj = new Type_GenericStacked($CONFIG, $_GET); |
10 | $obj->data_sources = array('value'); | 10 | $obj->data_sources = array('value'); |
11 | $obj->ds_names = array('value' => 'Value'); | 11 | $obj->ds_names = array('value' => 'Value'); |
12 | $obj->colors = array('value' => '0000f0'); | 12 | $obj->colors = array('value' => '0000f0'); |
diff --git a/plugin/zfs_arc.php b/plugin/zfs_arc.php index 57a3bec..85f3016 100644 --- a/plugin/zfs_arc.php +++ b/plugin/zfs_arc.php | |||
@@ -15,7 +15,7 @@ require_once 'inc/collectd.inc.php'; | |||
15 | # zfs_arc/arc_ratio-L2.rrd | 15 | # zfs_arc/arc_ratio-L2.rrd |
16 | # zfs_arc/arc_size.rrd | 16 | # zfs_arc/arc_size.rrd |
17 | 17 | ||
18 | $obj = new Type_Default($CONFIG); | 18 | $obj = new Type_Default($CONFIG, $_GET); |
19 | $obj->rrd_format = '%5.1lf%s'; | 19 | $obj->rrd_format = '%5.1lf%s'; |
20 | 20 | ||
21 | switch($obj->args['type']) { | 21 | switch($obj->args['type']) { |