');
echo('
'.generate_link(ucfirst($app['app_type']),array('page'=>'apps','app'=>$app['app_type'])).'
');
$app_devices = dbFetchRows("SELECT * FROM `devices` AS D, `applications` AS A WHERE D.device_id = A.device_id AND A.app_type = ?", array($app['app_type']));
- foreach($app_devices as $app_device)
+ foreach ($app_devices as $app_device)
{
$graph_type = $graphs[$app['app_type']][0];
@@ -42,7 +40,7 @@ foreach($app_list as $app)
$overlib_link .= generate_graph_tag($graph_array);
$overlib_content = generate_overlib_content($graph_array, $port['hostname'] . " - " . $port['label']);
- echo("
");
echo(overlib_link($link, $overlib_link, $overlib_content));
echo("
");
diff --git a/html/pages/device/apps/drbd.inc.php b/html/pages/device/apps/drbd.inc.php
index 3749ce22f5..e002d02db4 100644
--- a/html/pages/device/apps/drbd.inc.php
+++ b/html/pages/device/apps/drbd.inc.php
@@ -5,7 +5,7 @@ echo('
'.$app['app_instance'].'
');
$graphs = array('drbd_network_bits' => 'Network Traffic',
'drbd_disk_bits' => 'Disk Traffic',
'drbd_unsynced' => 'Unsynced Data',
- 'drbd_queue' => 'Queues');
+ 'drbd_queue' => 'Queues');
foreach ($graphs as $key => $text)
{
@@ -25,5 +25,4 @@ foreach ($graphs as $key => $text)
echo("");
}
-
?>
diff --git a/html/pages/device/apps/mysql.inc.php b/html/pages/device/apps/mysql.inc.php
index 3a80dde3b1..6d825b39ee 100644
--- a/html/pages/device/apps/mysql.inc.php
+++ b/html/pages/device/apps/mysql.inc.php
@@ -37,12 +37,12 @@ $graphs['system'] = array(
$graphs['queries'] = array(
'mysql_command_counters' => 'Command Counters',
- 'mysql_query_cache' => 'Query Cache',
+ 'mysql_query_cache' => 'Query Cache',
'mysql_query_cache_memory' => 'Query Cache Memory',
'mysql_select_types' => 'Select Types',
'mysql_slow_queries' => 'Slow Queries',
'mysql_sorts' => 'Sorts',
- );
+ );
$graphs['innodb'] = array(
'mysql_innodb_buffer_pool' => 'InnoDB Buffer Pool',
@@ -54,7 +54,7 @@ $graphs['innodb'] = array(
'mysql_innodb_row_operations' => 'InnoDB Row Operations',
'mysql_innodb_semaphores' => 'InnoDB semaphores',
'mysql_innodb_transactions' => 'InnoDB Transactions',
- );
+ );
foreach ($graphs[$vars['app_section']] as $key => $text)
{
diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php
index 04eeedce34..e1491c8450 100644
--- a/html/pages/graphs.inc.php
+++ b/html/pages/graphs.inc.php
@@ -39,7 +39,7 @@ if (!$auth)
}
# Load our list of available graphtypes for this object
- # Fixme not all of these are going to be valid
+ # FIXME not all of these are going to be valid
if ($handle = opendir($config['install_dir'] . "/html/includes/graphs/".$type."/"))
{
while (false !== ($file = readdir($handle)))
@@ -231,7 +231,7 @@ if (!$auth)
}
### FIXME : do this properly
-# if($type == "port" && $subtype == "bits")
+# if ($type == "port" && $subtype == "bits")
# {
echo(' | ');
if ($vars['previous'] == "yes")
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index bee72b00d4..0e79366511 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -454,7 +454,6 @@ $config['poller_modules']['entity-physical'] = 1;
$config['poller_modules']['unix-agent'] = 0;
$config['poller_modules']['applications'] = 1;
-
## List of discovery modules. Need to be in this array to be
## considered for execution.
diff --git a/includes/polling/applications/apache.inc.php b/includes/polling/applications/apache.inc.php
index 87e8af58ab..8d0ee7697f 100644
--- a/includes/polling/applications/apache.inc.php
+++ b/includes/polling/applications/apache.inc.php
@@ -2,7 +2,7 @@
## Polls Apache statistics from script via SNMP
-if(!empty($agent_data['apache']))
+if (!empty($agent_data['apache']))
{
$apache = $agent_data['apache'];
} else {
@@ -12,12 +12,11 @@ if(!empty($agent_data['apache']))
}
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-apache-".$app['app_id'].".rrd";
-
echo(" apache");
- list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec, $bytesperreq, $busyworkers, $idleworkers,
- $score_wait, $score_start, $score_reading, $score_writing, $score_keepalive, $score_dns, $score_closing, $score_logging,
- $score_graceful, $score_idle, $score_open) = explode("\n", $apache);
+list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec, $bytesperreq, $busyworkers, $idleworkers,
+ $score_wait, $score_start, $score_reading, $score_writing, $score_keepalive, $score_dns, $score_closing, $score_logging,
+ $score_graceful, $score_idle, $score_open) = explode("\n", $apache);
if (!is_file($rrd_filename))
{
diff --git a/includes/polling/applications/drbd.inc.php b/includes/polling/applications/drbd.inc.php
index f62cbfb574..ab29c0b7bf 100644
--- a/includes/polling/applications/drbd.inc.php
+++ b/includes/polling/applications/drbd.inc.php
@@ -5,11 +5,10 @@ $drbd_data = $agent_data['drbd'][$drbd_dev];
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$drbd_dev.".rrd";
-
- foreach(explode("|", $drbd_data) as $part)
+ foreach (explode("|", $drbd_data) as $part)
{
list($stat, $val) = explode("=", $part);
- if(!empty($stat))
+ if (!empty($stat))
{
$drbd[$stat] = $val;
}
@@ -32,5 +31,4 @@ $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$
rrdtool_update($rrd_filename, "N:".$drbd['ns'].":".$drbd['nr'].":".$drbd['dw'].":".$drbd['dr'].":".$drbd['al'].":".$drbd['bm'].":".$drbd['lo'].":".$drbd['pe'].":".$drbd['ua'].":".$drbd['ap'].":".$drbd['oop']);
-
?>
diff --git a/includes/polling/applications/mysql.inc.php b/includes/polling/applications/mysql.inc.php
index e2d6d74f95..59de2d8f24 100644
--- a/includes/polling/applications/mysql.inc.php
+++ b/includes/polling/applications/mysql.inc.php
@@ -1,6 +1,6 @@
>>", $section);
$agent_data[$section] = trim($data);
}
-
+
## FIXME - split these into separate modules which are "autoloaded" when the section exists.
-
+
### RPM
if (!empty($agent_data['rpm']))
{
echo("\nRPM Packages: ");
## Build array of existing packages
$manager = "rpm";
-
+
$pkgs_db_db = dbFetchRows("SELECT * FROM `packages` WHERE `device_id` = ?", array($device['device_id']));
foreach ($pkgs_db_db as $pkg_db)
{
@@ -50,7 +50,7 @@ if($device['os_group'] == "unix")
$pkgs_db_id[$pkg_db['pkg_id']]['version'] = $pkg_db['version'];
$pkgs_db_id[$pkg_db['pkg_id']]['build'] = $pkg_db['build'];
}
-
+
foreach (explode("\n", $agent_data['rpm']) as $package)
{
list($name, $version, $build, $arch, $size) = explode(" ", $package);
@@ -65,14 +65,14 @@ if($device['os_group'] == "unix")
$pkgs_id[] = $pkgs[$manager][$name][$arch][$version][$build];
}
}
-
+
### DPKG
if (!empty($agent_data['dpkg']))
{
echo("\nDEB Packages: ");
## Build array of existing packages
$manager = "deb";
-
+
$pkgs_db_db = dbFetchRows("SELECT * FROM `packages` WHERE `device_id` = ?", array($device['device_id']));
foreach ($pkgs_db_db as $pkg_db)
{
@@ -86,7 +86,7 @@ if($device['os_group'] == "unix")
$pkgs_db_id[$pkg_db['pkg_id']]['version'] = $pkg_db['version'];
$pkgs_db_id[$pkg_db['pkg_id']]['build'] = $pkg_db['build'];
}
-
+
foreach (explode("\n", $agent_data['dpkg']) as $package)
{
list($name, $version, $arch, $size) = explode(" ", $package);
@@ -102,7 +102,7 @@ if($device['os_group'] == "unix")
$pkgs_id[] = $pkgs[$manager][$name][$arch][$version][$build];
}
}
-
+
## This is run for all "packages" and is common to RPM/DEB/etc
foreach ($pkgs_id as $pkg)
{
@@ -111,10 +111,10 @@ if($device['os_group'] == "unix")
$build = $pkg['build'];
$arch = $pkg['arch'];
$size = $pkg['size'];
-
+
#echo(str_pad($name, 20)." ".str_pad($version, 10)." ".str_pad($build, 10)." ".$arch."\n");
#echo($name." ");
-
+
if (is_array($pkgs_db[$pkg['manager']][$pkg['name']][$pkg['arch']][$pkg['version']][$pkg['build']]))
{
### FIXME - packages_history table
@@ -155,7 +155,7 @@ if($device['os_group'] == "unix")
}
unset($pkg_update);
}
-
+
## Packages
foreach ($pkgs_db_id as $id => $pkg)
{
@@ -163,7 +163,7 @@ if($device['os_group'] == "unix")
echo("-".$pkg['text']);
log_event('Package removed: '.$pkg['name'].' '.$pkg['arch'].' '.$pkg['version'].'-'.$pkg['build'], $device, 'package');
}
-
+
### Processes
if (!empty($agent_data['ps']))
{
@@ -172,33 +172,33 @@ if($device['os_group'] == "unix")
{
$process = preg_replace("/\((.*),([0-9]*),([0-9]*),([0-9\.]*)\)\ (.*)/", "\\1|\\2|\\3|\\4|\\5", $process);
list($user, $vsz, $rss, $pcpu, $command) = explode("|", $process, 5);
- $processlist[] = array('user' => $user, 'vsz' => $vsz, 'rss' => $rss, 'pcpu' => $pcpu, 'command' => $command);
+ $processlist[] = array('user' => $user, 'vsz' => $vsz, 'rss' => $rss, 'pcpu' => $pcpu, 'command' => $command);
}
#print_r($processlist);
}
-
+
### Apache
if (!empty($agent_data['apache']))
{
$app_found['apache'] = TRUE;
- if(dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], 'apache')) == "0")
+ if (dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], 'apache')) == "0")
{
echo("Found new application 'Apache'\n");
dbInsert(array('device_id' => $device['device_id'], 'app_type' => 'apache'), 'applications');
}
}
-
+
### MySQL
if (!empty($agent_data['mysql']))
{
$app_found['mysql'] = TRUE;
- if(dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], 'mysql')) == "0")
+ if (dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ?", array($device['device_id'], 'mysql')) == "0")
{
echo("Found new application 'MySQL'\n");
dbInsert(array('device_id' => $device['device_id'], 'app_type' => 'mysql'), 'applications');
}
}
-
+
### DRBD
if (!empty($agent_data['drbd']))
{
@@ -207,10 +207,10 @@ if($device['os_group'] == "unix")
foreach (explode("\n", $agent_data['drbd_raw']) as $drbd_entry)
{
list($drbd_dev, $drbd_data) = explode(":", $drbd_entry);
- if(preg_match("/^drbd/", $drbd_dev))
+ if (preg_match("/^drbd/", $drbd_dev))
{
$agent_data['drbd'][$drbd_dev] = $drbd_data;
- if(dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ? AND `app_instance` = ?", array($device['device_id'], 'drbd', $drbd_dev)) == "0")
+ if (dbFetchCell("SELECT COUNT(*) FROM `applications` WHERE `device_id` = ? AND `app_type` = ? AND `app_instance` = ?", array($device['device_id'], 'drbd', $drbd_dev)) == "0")
{
echo("Found new application 'DRBd' $drbd_dev\n");
dbInsert(array('device_id' => $device['device_id'], 'app_type' => 'drbd', 'app_instance' => $drbd_dev), 'applications');
@@ -219,14 +219,14 @@ if($device['os_group'] == "unix")
}
}
}
-
+
unset($pkg);
unset($pkgs_db_id);
unset($pkg_c);
unset($pkgs);
unset($pkgs_db);
unset($pkgs_db_db);
-
+
echo("\n");
}