diff options
author | Pim van den Berg | 2010-09-17 21:24:35 +0200 |
---|---|---|
committer | Pim van den Berg | 2010-09-17 21:24:35 +0200 |
commit | 10ad741a22797b6710be1091d9e502e71929f255 (patch) | |
tree | edb5d5046eba5de647f12e8c9480faa054dd09f7 /plugin | |
parent | plugin/nfs: clean up some duplicate code (diff) | |
download | apt-panopticon_cgp-10ad741a22797b6710be1091d9e502e71929f255.zip apt-panopticon_cgp-10ad741a22797b6710be1091d9e502e71929f255.tar.gz apt-panopticon_cgp-10ad741a22797b6710be1091d9e502e71929f255.tar.bz2 apt-panopticon_cgp-10ad741a22797b6710be1091d9e502e71929f255.tar.xz |
automatic alignment of graph legend
Function fill_ds_names is renamed to parse_ds_names and now also
appends spaces to ds_names to make them equal of lenght.
Diffstat (limited to '')
-rw-r--r-- | plugin/apache.php | 20 | ||||
-rw-r--r-- | plugin/cpu.php | 12 | ||||
-rw-r--r-- | plugin/disk.php | 2 | ||||
-rw-r--r-- | plugin/interface.php | 2 | ||||
-rw-r--r-- | plugin/memcached.php | 12 | ||||
-rw-r--r-- | plugin/memory.php | 8 | ||||
-rw-r--r-- | plugin/netlink.php | 25 | ||||
-rw-r--r-- | plugin/processes.php | 10 | ||||
-rw-r--r-- | plugin/sensors.php | 2 | ||||
-rw-r--r-- | plugin/swap.php | 6 | ||||
-rw-r--r-- | plugin/vmem.php | 6 |
11 files changed, 52 insertions, 53 deletions
diff --git a/plugin/apache.php b/plugin/apache.php index 1dc3540..7153662 100644 --- a/plugin/apache.php +++ b/plugin/apache.php | |||
@@ -13,17 +13,17 @@ $obj = new Type_GenericStacked($CONFIG); | |||
13 | $obj->data_sources = array('count'); | 13 | $obj->data_sources = array('count'); |
14 | $obj->order = array('open', 'idle_cleanup', 'finishing', 'logging', 'closing', 'dnslookup', 'keepalive', 'sending', 'reading', 'starting', 'waiting'); | 14 | $obj->order = array('open', 'idle_cleanup', 'finishing', 'logging', 'closing', 'dnslookup', 'keepalive', 'sending', 'reading', 'starting', 'waiting'); |
15 | $obj->ds_names = array( | 15 | $obj->ds_names = array( |
16 | 'open' => 'Open (empty) ', | 16 | 'open' => 'Open (empty)', |
17 | 'waiting' => 'Waiting ', | 17 | 'waiting' => 'Waiting', |
18 | 'starting' => 'Starting up ', | 18 | 'starting' => 'Starting up', |
19 | 'reading' => 'Reading request', | 19 | 'reading' => 'Reading request', |
20 | 'sending' => 'Sending reply ', | 20 | 'sending' => 'Sending reply', |
21 | 'keepalive' => 'Keepalive ', | 21 | 'keepalive' => 'Keepalive', |
22 | 'dnslookup' => 'DNS Lookup ', | 22 | 'dnslookup' => 'DNS Lookup', |
23 | 'closing' => 'Closing ', | 23 | 'closing' => 'Closing', |
24 | 'logging' => 'Logging ', | 24 | 'logging' => 'Logging', |
25 | 'finishing' => 'Finishing ', | 25 | 'finishing' => 'Finishing', |
26 | 'idle_cleanup' => 'Idle cleanup ', | 26 | 'idle_cleanup' => 'Idle cleanup', |
27 | ); | 27 | ); |
28 | $obj->colors = array( | 28 | $obj->colors = array( |
29 | 'open' => 'e0e0e0', | 29 | 'open' => 'e0e0e0', |
diff --git a/plugin/cpu.php b/plugin/cpu.php index 081427f..5aeaf24 100644 --- a/plugin/cpu.php +++ b/plugin/cpu.php | |||
@@ -21,14 +21,14 @@ $obj = new Type_GenericStacked($CONFIG); | |||
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( |
24 | 'idle' => 'Idle ', | 24 | 'idle' => 'Idle', |
25 | 'nice' => 'Nice ', | 25 | 'nice' => 'Nice', |
26 | 'user' => 'User ', | 26 | 'user' => 'User', |
27 | 'wait' => 'Wait-IO', | 27 | 'wait' => 'Wait-IO', |
28 | 'system' => 'System ', | 28 | 'system' => 'System', |
29 | 'softirq' => 'SoftIRQ', | 29 | 'softirq' => 'SoftIRQ', |
30 | 'interrupt' => 'IRQ ', | 30 | 'interrupt' => 'IRQ', |
31 | 'steal' => 'Steal ', | 31 | 'steal' => 'Steal', |
32 | ); | 32 | ); |
33 | $obj->colors = array( | 33 | $obj->colors = array( |
34 | 'idle' => 'e8e8e8', | 34 | 'idle' => 'e8e8e8', |
diff --git a/plugin/disk.php b/plugin/disk.php index 0f7a11a..63015d8 100644 --- a/plugin/disk.php +++ b/plugin/disk.php | |||
@@ -16,7 +16,7 @@ require_once 'inc/collectd.inc.php'; | |||
16 | $obj = new Type_GenericIO($CONFIG); | 16 | $obj = new Type_GenericIO($CONFIG); |
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', |
20 | 'write' => 'Written', | 20 | 'write' => 'Written', |
21 | ); | 21 | ); |
22 | $obj->colors = array( | 22 | $obj->colors = array( |
diff --git a/plugin/interface.php b/plugin/interface.php index da8a573..82b9f25 100644 --- a/plugin/interface.php +++ b/plugin/interface.php | |||
@@ -15,7 +15,7 @@ require_once 'inc/collectd.inc.php'; | |||
15 | $obj = new Type_GenericIO($CONFIG); | 15 | $obj = new Type_GenericIO($CONFIG); |
16 | $obj->data_sources = array('rx', 'tx'); | 16 | $obj->data_sources = array('rx', 'tx'); |
17 | $obj->ds_names = array( | 17 | $obj->ds_names = array( |
18 | 'rx' => 'Receive ', | 18 | 'rx' => 'Receive', |
19 | 'tx' => 'Transmit', | 19 | 'tx' => 'Transmit', |
20 | ); | 20 | ); |
21 | $obj->colors = array( | 21 | $obj->colors = array( |
diff --git a/plugin/memcached.php b/plugin/memcached.php index b8dff28..6157d69 100644 --- a/plugin/memcached.php +++ b/plugin/memcached.php | |||
@@ -47,8 +47,8 @@ switch($_GET['t']) { | |||
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', |
50 | 'get' => 'Get ', | 50 | 'get' => 'Get', |
51 | 'set' => 'Set ', | 51 | 'set' => 'Set', |
52 | ); | 52 | ); |
53 | $obj->colors = array( | 53 | $obj->colors = array( |
54 | 'flush' => '00e000', | 54 | 'flush' => '00e000', |
@@ -96,7 +96,7 @@ switch($_GET['t']) { | |||
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( |
99 | 'rx' => 'Receive ', | 99 | 'rx' => 'Receive', |
100 | 'tx' => 'Transmit', | 100 | 'tx' => 'Transmit', |
101 | ); | 101 | ); |
102 | $obj->colors = array( | 102 | $obj->colors = array( |
@@ -113,8 +113,8 @@ switch($_GET['t']) { | |||
113 | $obj->order = array('evictions', 'hits', 'misses'); | 113 | $obj->order = array('evictions', 'hits', 'misses'); |
114 | $obj->ds_names = array( | 114 | $obj->ds_names = array( |
115 | 'evictions' => 'Evictions', | 115 | 'evictions' => 'Evictions', |
116 | 'hits' => 'Hits ', | 116 | 'hits' => 'Hits', |
117 | 'misses' => 'Misses ', | 117 | 'misses' => 'Misses', |
118 | ); | 118 | ); |
119 | $obj->colors = array( | 119 | $obj->colors = array( |
120 | 'evictions' => '00e000', | 120 | 'evictions' => '00e000', |
@@ -162,7 +162,7 @@ switch($_GET['t']) { | |||
162 | $obj->data_sources = array('user', 'syst'); | 162 | $obj->data_sources = array('user', 'syst'); |
163 | $obj->order = array('user', 'syst'); | 163 | $obj->order = array('user', 'syst'); |
164 | $obj->ds_names = array( | 164 | $obj->ds_names = array( |
165 | 'user' => 'User ', | 165 | 'user' => 'User', |
166 | 'syst' => 'System', | 166 | 'syst' => 'System', |
167 | ); | 167 | ); |
168 | $obj->colors = array( | 168 | $obj->colors = array( |
diff --git a/plugin/memory.php b/plugin/memory.php index 71e395c..ca85078 100644 --- a/plugin/memory.php +++ b/plugin/memory.php | |||
@@ -16,11 +16,11 @@ require_once 'inc/collectd.inc.php'; | |||
16 | $obj = new Type_GenericStacked($CONFIG); | 16 | $obj = new Type_GenericStacked($CONFIG); |
17 | $obj->order = array('free', 'buffered', 'cached', 'locked', 'used'); | 17 | $obj->order = array('free', 'buffered', 'cached', 'locked', 'used'); |
18 | $obj->ds_names = array( | 18 | $obj->ds_names = array( |
19 | 'free' => 'Free ', | 19 | 'free' => 'Free', |
20 | 'cached' => 'Cached ', | 20 | 'cached' => 'Cached', |
21 | 'buffered' => 'Buffered', | 21 | 'buffered' => 'Buffered', |
22 | 'locked' => 'Locked ', | 22 | 'locked' => 'Locked', |
23 | 'used' => 'Used ', | 23 | 'used' => 'Used', |
24 | ); | 24 | ); |
25 | $obj->colors = array( | 25 | $obj->colors = array( |
26 | 'free' => '00e000', | 26 | 'free' => '00e000', |
diff --git a/plugin/netlink.php b/plugin/netlink.php index f9b4fa6..9352f66 100644 --- a/plugin/netlink.php +++ b/plugin/netlink.php | |||
@@ -23,7 +23,7 @@ switch($obj->args['type']) { | |||
23 | case 'if_dropped': | 23 | case 'if_dropped': |
24 | $obj->data_sources = array('rx', 'tx'); | 24 | $obj->data_sources = array('rx', 'tx'); |
25 | $obj->ds_names = array( | 25 | $obj->ds_names = array( |
26 | 'rx' => 'Receive ', | 26 | 'rx' => 'Receive', |
27 | 'tx' => 'Transmit', | 27 | 'tx' => 'Transmit', |
28 | ); | 28 | ); |
29 | $obj->colors = array( | 29 | $obj->colors = array( |
@@ -36,7 +36,7 @@ switch($obj->args['type']) { | |||
36 | case 'if_errors': | 36 | case 'if_errors': |
37 | $obj->data_sources = array('rx', 'tx'); | 37 | $obj->data_sources = array('rx', 'tx'); |
38 | $obj->ds_names = array( | 38 | $obj->ds_names = array( |
39 | 'rx' => 'Receive ', | 39 | 'rx' => 'Receive', |
40 | 'tx' => 'Transmit', | 40 | 'tx' => 'Transmit', |
41 | ); | 41 | ); |
42 | $obj->colors = array( | 42 | $obj->colors = array( |
@@ -56,7 +56,7 @@ switch($obj->args['type']) { | |||
56 | case 'if_octets': | 56 | case 'if_octets': |
57 | $obj->data_sources = array('rx', 'tx'); | 57 | $obj->data_sources = array('rx', 'tx'); |
58 | $obj->ds_names = array( | 58 | $obj->ds_names = array( |
59 | 'rx' => 'Receive ', | 59 | 'rx' => 'Receive', |
60 | 'tx' => 'Transmit', | 60 | 'tx' => 'Transmit', |
61 | ); | 61 | ); |
62 | $obj->colors = array( | 62 | $obj->colors = array( |
@@ -69,7 +69,7 @@ switch($obj->args['type']) { | |||
69 | case 'if_packets': | 69 | case 'if_packets': |
70 | $obj->data_sources = array('rx', 'tx'); | 70 | $obj->data_sources = array('rx', 'tx'); |
71 | $obj->ds_names = array( | 71 | $obj->ds_names = array( |
72 | 'rx' => 'Receive ', | 72 | 'rx' => 'Receive', |
73 | 'tx' => 'Transmit', | 73 | 'tx' => 'Transmit', |
74 | ); | 74 | ); |
75 | $obj->colors = array( | 75 | $obj->colors = array( |
@@ -79,16 +79,15 @@ switch($obj->args['type']) { | |||
79 | $obj->rrd_title = sprintf('Interface Packets (%s)', $obj->args['pinstance']); | 79 | $obj->rrd_title = sprintf('Interface Packets (%s)', $obj->args['pinstance']); |
80 | $obj->rrd_vertical = 'Packets/s'; | 80 | $obj->rrd_vertical = 'Packets/s'; |
81 | break; | 81 | break; |
82 | break; | ||
83 | case 'if_rx_errors': | 82 | case 'if_rx_errors': |
84 | $obj->data_sources = array('value'); | 83 | $obj->data_sources = array('value'); |
85 | $obj->ds_names = array( | 84 | $obj->ds_names = array( |
86 | 'crc' => 'CRC ', | 85 | 'crc' => 'CRC', |
87 | 'fifo' => 'FiFo ', | 86 | 'fifo' => 'FiFo', |
88 | 'frame' => 'Frame ', | 87 | 'frame' => 'Frame', |
89 | 'length' => 'Lenght', | 88 | 'length' => 'Lenght', |
90 | 'missed' => 'Missed', | 89 | 'missed' => 'Missed', |
91 | 'over' => 'Over ', | 90 | 'over' => 'Over', |
92 | ); | 91 | ); |
93 | $obj->colors = array( | 92 | $obj->colors = array( |
94 | 'crc' => '00e000', | 93 | 'crc' => '00e000', |
@@ -104,11 +103,11 @@ switch($obj->args['type']) { | |||
104 | case 'if_tx_errors': | 103 | case 'if_tx_errors': |
105 | $obj->data_sources = array('value'); | 104 | $obj->data_sources = array('value'); |
106 | $obj->ds_names = array( | 105 | $obj->ds_names = array( |
107 | 'aborted' => 'Aborted ', | 106 | 'aborted' => 'Aborted', |
108 | 'carrier' => 'Carrier ', | 107 | 'carrier' => 'Carrier', |
109 | 'fifo' => 'FiFo ', | 108 | 'fifo' => 'FiFo', |
110 | 'heartbeat'=> 'Heartbeat', | 109 | 'heartbeat'=> 'Heartbeat', |
111 | 'window' => 'Window ', | 110 | 'window' => 'Window', |
112 | ); | 111 | ); |
113 | $obj->colors = array( | 112 | $obj->colors = array( |
114 | 'aborted' => 'f00000', | 113 | 'aborted' => 'f00000', |
diff --git a/plugin/processes.php b/plugin/processes.php index 934dead..caf445b 100644 --- a/plugin/processes.php +++ b/plugin/processes.php | |||
@@ -17,11 +17,11 @@ require_once 'inc/collectd.inc.php'; | |||
17 | 17 | ||
18 | $obj = new Type_GenericStacked($CONFIG); | 18 | $obj = new Type_GenericStacked($CONFIG); |
19 | $obj->ds_names = array( | 19 | $obj->ds_names = array( |
20 | 'paging' => 'Paging ', | 20 | 'paging' => 'Paging', |
21 | 'blocked' => 'Blocked ', | 21 | 'blocked' => 'Blocked', |
22 | 'zombies' => 'Zombies ', | 22 | 'zombies' => 'Zombies', |
23 | 'stopped' => 'Stopped ', | 23 | 'stopped' => 'Stopped', |
24 | 'running' => 'Running ', | 24 | 'running' => 'Running', |
25 | 'sleeping' => 'Sleeping', | 25 | 'sleeping' => 'Sleeping', |
26 | 'value' => 'Forks', | 26 | 'value' => 'Forks', |
27 | ); | 27 | ); |
diff --git a/plugin/sensors.php b/plugin/sensors.php index 4724492..33a642d 100644 --- a/plugin/sensors.php +++ b/plugin/sensors.php | |||
@@ -14,7 +14,7 @@ require_once 'inc/collectd.inc.php'; | |||
14 | 14 | ||
15 | $obj = new Type_Default($CONFIG); | 15 | $obj = new Type_Default($CONFIG); |
16 | $obj->ds_names = array( | 16 | $obj->ds_names = array( |
17 | 'value' => 'Value ', | 17 | 'value' => 'Value', |
18 | ); | 18 | ); |
19 | $obj->width = $width; | 19 | $obj->width = $width; |
20 | $obj->heigth = $heigth; | 20 | $obj->heigth = $heigth; |
diff --git a/plugin/swap.php b/plugin/swap.php index a8d06d4..7902081 100644 --- a/plugin/swap.php +++ b/plugin/swap.php | |||
@@ -17,9 +17,9 @@ switch($_GET['t']) { | |||
17 | $obj = new Type_GenericStacked($CONFIG); | 17 | $obj = new Type_GenericStacked($CONFIG); |
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', |
21 | 'cached' => 'Cached', | 21 | 'cached' => 'Cached', |
22 | 'used' => 'Used ', | 22 | 'used' => 'Used', |
23 | ); | 23 | ); |
24 | $obj->colors = array( | 24 | $obj->colors = array( |
25 | 'free' => '00e000', | 25 | 'free' => '00e000', |
@@ -35,7 +35,7 @@ switch($_GET['t']) { | |||
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', |
38 | 'in' => 'In ', | 38 | 'in' => 'In', |
39 | ); | 39 | ); |
40 | $obj->colors = array( | 40 | $obj->colors = array( |
41 | 'out' => '0000ff', | 41 | 'out' => '0000ff', |
diff --git a/plugin/vmem.php b/plugin/vmem.php index e465932..d7f9830 100644 --- a/plugin/vmem.php +++ b/plugin/vmem.php | |||
@@ -29,10 +29,10 @@ switch($obj->args['type']) { | |||
29 | break; | 29 | break; |
30 | case 'vmpage_io': | 30 | case 'vmpage_io': |
31 | $obj->data_sources = array('in', 'out'); | 31 | $obj->data_sources = array('in', 'out'); |
32 | $obj->ds_names = array('memory-in' => 'Memory (in) ', | 32 | $obj->ds_names = array('memory-in' => 'Memory (in)', |
33 | 'memory-out' => 'Memory (out)', | 33 | 'memory-out' => 'Memory (out)', |
34 | 'swap-in' => 'Swap (in) ', | 34 | 'swap-in' => 'Swap (in)', |
35 | 'swap-out' => 'Swap (out) '); | 35 | 'swap-out' => 'Swap (out)'); |
36 | $obj->colors = array('memory-in' => 'ff0000', | 36 | $obj->colors = array('memory-in' => 'ff0000', |
37 | 'memory-out' => '0000ff', | 37 | 'memory-out' => '0000ff', |
38 | 'swap-in' => 'ff00ff', | 38 | 'swap-in' => 'ff00ff', |