aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/plugin
diff options
context:
space:
mode:
authorPim van den Berg2010-12-17 20:29:51 +0100
committerPim van den Berg2010-12-17 20:32:48 +0100
commit452721ecca3d3fb2321fe40aa45cf4f2504bcafe (patch)
tree6d113091f60eb2be93f3851535e964da6ac5e0a5 /plugin
parentplugin/apache: bytes, connections, idle_workers, requests support (diff)
downloadapt-panopticon_cgp-452721ecca3d3fb2321fe40aa45cf4f2504bcafe.zip
apt-panopticon_cgp-452721ecca3d3fb2321fe40aa45cf4f2504bcafe.tar.gz
apt-panopticon_cgp-452721ecca3d3fb2321fe40aa45cf4f2504bcafe.tar.bz2
apt-panopticon_cgp-452721ecca3d3fb2321fe40aa45cf4f2504bcafe.tar.xz
plugin/apache: pinstance was not shown in title
Diffstat (limited to 'plugin')
-rw-r--r--plugin/apache.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugin/apache.php b/plugin/apache.php
index 60371ed..667d052 100644
--- a/plugin/apache.php
+++ b/plugin/apache.php
@@ -25,7 +25,7 @@ switch ($obj->args['type']) {
25 'count' => '0000ff', 25 'count' => '0000ff',
26 ); 26 );
27 $obj->rrd_title = sprintf('Webserver Traffic%s', 27 $obj->rrd_title = sprintf('Webserver Traffic%s',
28 !isset($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : ''); 28 !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');
29 $obj->rrd_vertical = 'Bytes/s'; 29 $obj->rrd_vertical = 'Bytes/s';
30 break; 30 break;
31 case 'apache_connections': 31 case 'apache_connections':
@@ -37,7 +37,7 @@ switch ($obj->args['type']) {
37 'count' => '00b000', 37 'count' => '00b000',
38 ); 38 );
39 $obj->rrd_title = sprintf('Webserver Connections%s', 39 $obj->rrd_title = sprintf('Webserver Connections%s',
40 !isset($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : ''); 40 !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');
41 $obj->rrd_vertical = 'Conns/s'; 41 $obj->rrd_vertical = 'Conns/s';
42 break; 42 break;
43 case 'apache_idle_workers': 43 case 'apache_idle_workers':
@@ -49,7 +49,7 @@ switch ($obj->args['type']) {
49 'count' => '0000ff', 49 'count' => '0000ff',
50 ); 50 );
51 $obj->rrd_title = sprintf('Webserver Idle Workers%s', 51 $obj->rrd_title = sprintf('Webserver Idle Workers%s',
52 !isset($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : ''); 52 !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');
53 $obj->rrd_vertical = 'Workers'; 53 $obj->rrd_vertical = 'Workers';
54 break; 54 break;
55 case 'apache_requests': 55 case 'apache_requests':
@@ -61,7 +61,7 @@ switch ($obj->args['type']) {
61 'count' => '00b000', 61 'count' => '00b000',
62 ); 62 );
63 $obj->rrd_title = sprintf('Webserver Requests%s', 63 $obj->rrd_title = sprintf('Webserver Requests%s',
64 !isset($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : ''); 64 !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');
65 $obj->rrd_vertical = 'Requests/s'; 65 $obj->rrd_vertical = 'Requests/s';
66 break; 66 break;
67 case 'apache_scoreboard': 67 case 'apache_scoreboard':
@@ -96,7 +96,7 @@ switch ($obj->args['type']) {
96 'idle_cleanup' => 'ffff00', 96 'idle_cleanup' => 'ffff00',
97 ); 97 );
98 $obj->rrd_title = sprintf('Webserver Scoreboard%s', 98 $obj->rrd_title = sprintf('Webserver Scoreboard%s',
99 !isset($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : ''); 99 !empty($obj->args['pinstance']) ? ' ('.$obj->args['pinstance'].')' : '');
100 $obj->rrd_vertical = 'Slots'; 100 $obj->rrd_vertical = 'Slots';
101 break; 101 break;
102} 102}