From bb35cad5092cfb981198c8ec9129f6ad96c2f732 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 20 Sep 2011 14:29:04 +0000 Subject: [PATCH] code cleanup + move poll_device to includes/polling/functions git-svn-id: http://www.observium.org/svn/observer/trunk@2518 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/functions.inc.php | 122 +++++++++++++++++++++ poller.php | 166 +++-------------------------- 2 files changed, 139 insertions(+), 149 deletions(-) diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index d5deea0da..662bb4362 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -85,4 +85,126 @@ function poll_sensor($device, $class, $unit) } } +function poll_device($device, $options) +{ + global $config, $device, $polled_devices, $db_stats; + + $attribs = get_dev_attribs($device['device_id']); + + $status = 0; unset($array); + $device_start = utime(); // Start counting device poll time + + echo($device['hostname'] . " ".$device['device_id']." ".$device['os']." "); + if ($config['os'][$device['os']]['group']) + { + $device['os_group'] = $config['os'][$device['os']]['group']; + echo("(".$device['os_group'].")"); + } + echo("\n"); + + unset($poll_update); unset($poll_update_query); unset($poll_separator); + $poll_update_array = array(); + + $host_rrd = $config['rrd_dir'] . "/" . $device['hostname']; + if (!is_dir($host_rrd)) { mkdir($host_rrd); echo("Created directory : $host_rrd\n"); } + + $device['pingable'] = isPingable($device['hostname']); + if ($device['pingable']) + { + $device['snmpable'] = isSNMPable($device); + if ($device['snmpable']) + { + $status = "1"; + } else { + echo("SNMP Unreachable"); + $status = "0"; + } + } else { + echo("Unpingable"); + $status = "0"; + } + + if ($device['status'] != $status) + { + $poll_update .= $poll_separator . "`status` = '$status'"; + $poll_separator = ", "; + + dbUpdate(array('status' => $status), 'devices', 'device_id=?', array($device['device_id'])); + dbInsert(array('importance' => '0', 'device_id' => $device['device_id'], 'message' => "Device is " .($status == '1' ? 'up' : 'down')), 'alerts'); + + log_event('Device status changed to ' . ($status == '1' ? 'Up' : 'Down'), $device, ($status == '1' ? 'up' : 'down')); + notify($device, "Device ".($status == '1' ? 'Up' : 'Down').": " . $device['hostname'], "Device ".($status == '1' ? 'up' : 'down').": " . $device['hostname'] . " at " . date($config['timestamp_format'])); + } + + if ($status == "1") + { + $graphs = array(); + $oldgraphs = array(); + + if ($options['m']) + { + if (is_file("includes/polling/".$options['m'].".inc.php")) + { + include("includes/polling/".$options['m'].".inc.php"); + } + } else { + foreach($config['poller_modules'] as $module => $module_status) + { + if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) + { + include('includes/polling/'.$module.'.inc.php'); + } elseif (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == "0") { + echo("Module [ $module ] disabled on host.\n"); + } else { + echo("Module [ $module ] disabled globally.\n"); + } + } + } + + if (!$options['m']) + { + ## FIXME EVENTLOGGING -- MAKE IT SO WE DO THIS PER-MODULE? + ### This code cycles through the graphs already known in the database and the ones we've defined as being polled here + ### If there any don't match, they're added/deleted from the database. + ### Ideally we should hold graphs for xx days/weeks/polls so that we don't needlessly hide information. + + foreach (dbFetch("SELECT `graph` FROM `device_graphs` WHERE `device_id` = ?", array($device['device_id'])) as $graph) + { + if (!isset($graphs[$graph["graph"]])) + { + dbDelete('device_graphs', "`device_id` = ? AND `graph` = ?", array($device['device_id'], $graph["graph"])); + } else { + $oldgraphs[$graph["graph"]] = TRUE; + } + } + + foreach ($graphs as $graph => $value) + { + if (!isset($oldgraphs[$graph])) + { + dbInsert(array('device_id' => $device['device_id'], 'graph' => $graph), 'device_graphs'); + } + } + } + + $device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5); + + $update_array['last_polled'] = array('NOW()'); + $update_array['last_polled_timetaken'] = $device_time; + + #echo("$device_end - $device_start; $device_time $device_run"); + echo("Polled in $device_time seconds\n"); + + if ($debug) { echo("Updating " . $device['hostname'] . " - ".print_r($update_array)." \n"); } + + $updated = dbUpdate($update_array, 'devices', '`device_id` = ?', array($device['device_id'])); + if ($updated) { echo("UPDATED!\n"); } + + unset($storage_cache); // Clear cache of hrStorage ** MAYBE FIXME? ** + unset($cache); // Clear cache (unify all things here?) + } + + $polled_devices++; +} + ?> diff --git a/poller.php b/poller.php index 63705c54a..08e3e85e5 100755 --- a/poller.php +++ b/poller.php @@ -87,7 +87,7 @@ if (isset($options['d'])) echo("Starting polling run:\n\n"); $polled_devices = 0; -if(!isset($query)) +if (!isset($query)) { $query = "SELECT `device_id` FROM `devices` WHERE `disabled` = 0 $where ORDER BY `device_id` ASC"; } @@ -97,164 +97,32 @@ foreach (dbFetch($query) as $device) $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'"); poll_device($device, $options); - } +$poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time = substr($poller_run, 0, 5); -function poll_device($device, $options) { - - global $config; - global $device; - global $polled_devices; - global $db_stats; - - $attribs = get_dev_attribs($device['device_id']); - - $status = 0; unset($array); - $device_start = utime(); // Start counting device poll time - - echo($device['hostname'] . " ".$device['device_id']." ".$device['os']." "); - if ($config['os'][$device['os']]['group']) - { - $device['os_group'] = $config['os'][$device['os']]['group']; - echo("(".$device['os_group'].")"); - } - echo("\n"); - - unset($poll_update); unset($poll_update_query); unset($poll_separator); - $poll_update_array = array(); - - $host_rrd = $config['rrd_dir'] . "/" . $device['hostname']; - if (!is_dir($host_rrd)) { mkdir($host_rrd); echo("Created directory : $host_rrd\n"); } - - $device['pingable'] = isPingable($device['hostname']); - if ($device['pingable']) - { - $device['snmpable'] = isSNMPable($device); - if ($device['snmpable']) - { - $status = "1"; - } else { - echo("SNMP Unreachable"); - $status = "0"; - } - } else { - echo("Unpingable"); - $status = "0"; - } - - if ($device['status'] != $status) - { - $poll_update .= $poll_separator . "`status` = '$status'"; - $poll_separator = ", "; - - dbUpdate(array('status' => $status), 'devices', 'device_id=?', array($device['device_id'])); - dbInsert(array('importance' => '0', 'device_id' => $device['device_id'], 'message' => "Device is " .($status == '1' ? 'up' : 'down')), 'alerts'); - - log_event('Device status changed to ' . ($status == '1' ? 'Up' : 'Down'), $device, ($status == '1' ? 'up' : 'down')); - notify($device, "Device ".($status == '1' ? 'Up' : 'Down').": " . $device['hostname'], "Device ".($status == '1' ? 'up' : 'down').": " . $device['hostname'] . " at " . date($config['timestamp_format'])); - } - - if ($status == "1") - { - $graphs = array(); - $oldgraphs = array(); - - if ($options['m']) - { - if (is_file("includes/polling/".$options['m'].".inc.php")) - { - include("includes/polling/".$options['m'].".inc.php"); - } - } else { - foreach($config['poller_modules'] as $module => $module_status) - { - if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module]))) - { - include('includes/polling/'.$module.'.inc.php'); - } elseif (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == "0") { - echo("Module [ $module ] disabled on host.\n"); - } else { - echo("Module [ $module ] disabled globally.\n"); - } - } - } - -if (!$options['m']) +if ($polled_devices) { - - ## FIXME EVENTLOGGING -- MAKE IT SO WE DO THIS PER-MODULE? - ### This code cycles through the graphs already known in the database and the ones we've defined as being polled here - ### If there any don't match, they're added/deleted from the database. - ### Ideally we should hold graphs for xx days/weeks/polls so that we don't needlessly hide information. - - foreach (dbFetch("SELECT `graph` FROM `device_graphs` WHERE `device_id` = ?", array($device['device_id'])) as $graph) - { - if (!isset($graphs[$graph["graph"]])) - { - dbDelete('device_graphs', "`device_id` = ? AND `graph` = ?", array($device['device_id'], $graph["graph"])); - } else { - $oldgraphs[$graph["graph"]] = TRUE; - } - } - - foreach ($graphs as $graph => $value) - { - if (!isset($oldgraphs[$graph])) - { - dbInsert(array('device_id' => $device['device_id'], 'graph' => $graph), 'device_graphs'); - } - } + dbInsert(array('type' => 'poll', 'doing' => $doing, 'start' => $poller_start, 'duration' => $poller_time, 'devices' => $polled_devices ), 'perf_times'); } - $device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5); +$string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs"; +if ($debug) { echo("$string\n"); } - $update_array['last_polled'] = array('NOW()'); - $update_array['last_polled_timetaken'] = $device_time; +echo('MySQL: Cell['.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,2).'s]'. + ' Row[' .($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,2).'s]'. + ' Rows[' .($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,2).'s]'. + ' Column['.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,2).'s]'. + ' Update[' .($db_stats['update']+0).'/'.round($db_stats['update_sec']+0,2).'s]'. + ' Insert['.($db_stats['insert']+0). '/'.round($db_stats['insert_sec']+0,2).'s]'. + ' Delete['.($db_stats['delete']+0). '/'.round($db_stats['delete_sec']+0,2).'s]'); - #echo("$device_end - $device_start; $device_time $device_run"); - echo("Polled in $device_time seconds\n"); +echo("\n"); +logfile($string); +unset($config); ### Remove this for testing - if ($debug) { echo("Updating " . $device['hostname'] . " - ".print_r($update_array)." \n"); } - - $updated = dbUpdate($update_array, 'devices', '`device_id` = ?', array($device['device_id'])); - if($updated) { echo("UPDATED!\n"); } - - unset($storage_cache); // Clear cache of hrStorage ** MAYBE FIXME? ** - unset($cache); // Clear cache (unify all things here?) - } - - $polled_devices++; - -} - - $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time = substr($poller_run, 0, 5); - - if ($polled_devices) - { - dbInsert(array('type' => 'poll', 'doing' => $doing, 'start' => $poller_start, 'duration' => $poller_time, 'devices' => $polled_devices ), 'perf_times'); - } - - $string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs"; - if ($debug) echo("$string\n"); - - echo('MySQL: Cell['.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,2).'s]'. - ' Row[' .($db_stats['fetchrow']+0). '/'.round($db_stats['fetchrow_sec']+0,2).'s]'. - ' Rows[' .($db_stats['fetchrows']+0).'/'.round($db_stats['fetchrows_sec']+0,2).'s]'. - ' Column['.($db_stats['fetchcol']+0). '/'.round($db_stats['fetchcol_sec']+0,2).'s]'. - ' Update[' .($db_stats['update']+0).'/'.round($db_stats['update_sec']+0,2).'s]'. - ' Insert['.($db_stats['insert']+0). '/'.round($db_stats['insert_sec']+0,2).'s]'. - ' Delete['.($db_stats['delete']+0). '/'.round($db_stats['delete_sec']+0,2).'s]'); - - echo("\n"); - - logfile($string); - - unset($config); ### Remove this for testing - - #print_r(get_defined_vars()); - +#print_r(get_defined_vars()); ?>