diff --git a/dist-pollers.php b/dist-pollers.php new file mode 100755 index 000000000..81e711694 --- /dev/null +++ b/dist-pollers.php @@ -0,0 +1,63 @@ +#!/usr/bin/env php + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +chdir(dirname($argv[0])); + +include("includes/defaults.inc.php"); +include("config.php"); +include("includes/definitions.inc.php"); +include("includes/functions.php"); +include("includes/polling/functions.inc.php"); +include("includes/alerts.inc.php"); +include('includes/console_table.php'); + +$options = getopt("l:u:r::"); + +if (isset($options['l'])) { + if ($options['l'] == 'pollers') { + $tbl = new Console_Table(); + $tbl->setHeaders(array('ID','Poller Name','Last Polled','# Devices','Poll Time')); + foreach (dbFetchRows("SELECT * FROM `pollers`") as $poller) { + $tbl->addRow(array($poller['id'],$poller['poller_name'],$poller['last_polled'],$poller['devices'],$poller['time_taken'])); + } + echo $tbl->getTable(); + } elseif ($options['l'] == 'groups') { + $tbl = new Console_Table(); + $tbl->setHeaders(array('ID','Group Name','Description')); + foreach (dbFetchRows("SELECT * FROM `poller_groups`") as $groups) { + $tbl->addRow(array($groups['id'],$groups['group_name'],$groups['descr'])); + } + echo $tbl->getTable(); + } +} elseif (isset($options['u']) && !empty($options['u'])) { + if (is_numeric($options['u'])) { + $db_column = 'id'; + } else { + $db_column = 'poller_name'; + } + if (dbDelete('pollers',"`$db_column` = ?", array($options['u'])) >= 0) { + echo "Poller " . $options['u'] . " has been removed\n"; + } +} elseif (isset($options['r'])) { + if(dbInsert(array('poller_name' => $config['distributed_poller_name'], 'last_polled' => '0000-00-00 00:00:00', 'devices' => 0, 'time_taken' => 0), 'pollers') >= 0) { + echo "Poller " . $config['distributed_poller_name'] . " has been registered\n"; + } +} else { + echo "-l pollers | groups List registered pollers or poller groups\n"; + echo "-u | Unregister a poller\n"; + echo "-r Register this install as a poller\n"; +} + +?> diff --git a/html/forms/parse-poller-groups.inc.php b/html/forms/parse-poller-groups.inc.php new file mode 100644 index 000000000..72fd86eb7 --- /dev/null +++ b/html/forms/parse-poller-groups.inc.php @@ -0,0 +1,25 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if(is_admin() === false) { + die('ERROR: You need to be admin'); +} + +$group_id = ($_POST['group_id']); + +if(is_numeric($group_id) && $group_id > 0) { + $group = dbFetchRow("SELECT * FROM `poller_groups` WHERE `id` = ? LIMIT 1",array($group_id)); + $output = array('group_name'=>$group['group_name'],'descr'=>$group['descr']); + echo _json_encode($output); +} diff --git a/html/forms/poller-group-remove.inc.php b/html/forms/poller-group-remove.inc.php new file mode 100644 index 000000000..b07f2c442 --- /dev/null +++ b/html/forms/poller-group-remove.inc.php @@ -0,0 +1,30 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if (!is_numeric($_POST['group_id'])) { + echo('error with data'); + exit; +} else { + if($_POST['confirm'] == 'yes') + { + $delete = dbDelete('poller_groups', '`id` = ?', array($_POST['group_id'])); + if ($delete > '0') { + echo('Poller group has been removed'); + exit; + } else { + echo('An error occurred removing the Poller group'); + exit; + } + } +} diff --git a/html/forms/poller-groups.inc.php b/html/forms/poller-groups.inc.php new file mode 100644 index 000000000..a9856729b --- /dev/null +++ b/html/forms/poller-groups.inc.php @@ -0,0 +1,47 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if(is_admin() === false) { + die('ERROR: You need to be admin'); +} + +$ok = ''; +$error = ''; +$group_id = $_POST['group_id']; +$group_name = mres($_POST['group_name']); +$descr = mres($_POST['descr']); +if(!empty($group_name)) { + if( is_numeric($group_id)) { + if (dbUpdate(array('group_name' => $group_name, 'descr' => $descr), "poller_groups", "id = ?", array($group_id))) { + $ok = "Updated poller group"; + } else { + $error = "Failed to update the poller group"; + } + } else { + if (dbInsert(array('group_name' => $group_name, 'descr' => $descr), 'poller_groups') >= 0) { + $ok = "Added new poller group"; + } else { + $error = "Failed to create new poller group"; + } + } +} else { + $error = "You haven't given your poller group a name, it feels sad :( - $group_name"; +} + +if(!empty( $ok )) { + die("$ok"); +} else { + die("ERROR: $error"); +} +?> diff --git a/html/includes/modal/poller_groups.inc.php b/html/includes/modal/poller_groups.inc.php new file mode 100644 index 000000000..81e014f4a --- /dev/null +++ b/html/includes/modal/poller_groups.inc.php @@ -0,0 +1,159 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if(is_admin() === false) { + echo ('ERROR: You need to be admin'); +} else { +?> + + + + + + + diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 8eda4983b..b0dcc22c3 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -446,6 +446,21 @@ if ($_SESSION['userlevel'] >= '10')
  • Edit User
  • Authlog
    • +'); + if($config['distributed_poller'] === TRUE) { + echo(' +
  • + Pollers Pollers + +
    • + + '); + } + +echo('
  • API
      diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php index cb16172a4..f73d85196 100644 --- a/html/pages/addhost.inc.php +++ b/html/pages/addhost.inc.php @@ -50,7 +50,8 @@ if ($_POST['hostname']) { print_error("Unsupported SNMP Version. There was a dropdown menu, how did you reach this error ?"); } - $result = addHost($hostname, $snmpver, $port, $transport); + $poller_group = $_POST['poller_group']; + $result = addHost($hostname, $snmpver, $port, $transport,0,$poller_group); if ($result) { print_message("Device added ($result)"); @@ -175,6 +176,29 @@ foreach ($config['snmp']['transports'] as $transport) + + +
      + +
      + + '); +} + +?> diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php index 226d8565a..9e8a5b7b0 100644 --- a/html/pages/device/edit/snmp.inc.php +++ b/html/pages/device/edit/snmp.inc.php @@ -10,6 +10,7 @@ if ($_POST['editing']) $port = $_POST['port'] ? mres($_POST['port']) : $config['snmp']['port']; $timeout = mres($_POST['timeout']); $retries = mres($_POST['retries']); + $poller_group = mres($_POST['poller_group']); $v3 = array ( 'authlevel' => mres($_POST['authlevel']), 'authname' => mres($_POST['authname']), @@ -24,7 +25,8 @@ if ($_POST['editing']) 'community' => $community, 'snmpver' => $snmpver, 'port' => $port, - 'transport' => $transport + 'transport' => $transport, + 'poller_group' => $poller_group ); if ($_POST['timeout']) { $update['timeout'] = $timeout; } @@ -169,6 +171,31 @@ echo(" "); +if ($config['distributed_poller'] === TRUE) { + echo(' +
      + +
      + +
      +
      + '); +} + + echo(' diff --git a/html/pages/pollers.inc.php b/html/pages/pollers.inc.php new file mode 100644 index 000000000..95cda0788 --- /dev/null +++ b/html/pages/pollers.inc.php @@ -0,0 +1,34 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +echo('
        '); + +$poll_tabs = array(array("name" => 'Pollers', 'icon' => 'clock_link'), + array("name" => 'Groups', 'icon' => 'clock_add')); + +foreach ($poll_tabs as $tab) { + echo(' +
      • + + ' . $tab["name"] . ' + +
        • '); + +} + +echo ('
      '); + +if (isset($vars['tab'])) { + require_once "pages/pollers/".mres($vars['tab']).".inc.php"; +} diff --git a/html/pages/pollers/groups.inc.php b/html/pages/pollers/groups.inc.php new file mode 100644 index 000000000..50019dfc2 --- /dev/null +++ b/html/pages/pollers/groups.inc.php @@ -0,0 +1,48 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +require_once "includes/modal/poller_groups.inc.php"; + +?> +
      + +

      +
      + + + + + + + + + + + + + + +'); +} + +?> + +
      IDGroup NameDescriptionAction
      '.$group['id'].''.$group['group_name'].''.$group['descr'].'
      +
      diff --git a/html/pages/pollers/pollers.inc.php b/html/pages/pollers/pollers.inc.php new file mode 100644 index 000000000..c5e0eb279 --- /dev/null +++ b/html/pages/pollers/pollers.inc.php @@ -0,0 +1,52 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +?> +
      +
      + + + + + + + + += 300) { + $row_class = 'danger'; + } elseif ($old >= 280 && $old < 300) { + $row_class = 'warning'; + } else { + $row_class = 'success'; + } + echo(' + + + + + + +'); +} + +?> + +
      Poller NameDevices PolledTotal Poll TimeLast Ran
      '.$poller['poller_name'].''.$poller['devices'].''.$poller['time_taken'].' Seconds'.$poller['last_polled'].'
      +
      diff --git a/includes/functions.php b/includes/functions.php index 0f4620cd9..3fe0bc925 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -266,7 +266,7 @@ function delete_device($id) return $ret; } -function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0') +function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0', $poller_group = '0') { global $config; @@ -315,7 +315,7 @@ function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0 $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB"); if (empty($snmphost) or ($snmphost == $host || $hostshort = $host)) { - $device_id = createHost ($host, NULL, $snmpver, $port, $transport, $v3); + $device_id = createHost ($host, NULL, $snmpver, $port, $transport, $v3, $poller_group); return $device_id; } else { if($quiet == '0') {print_error("Given hostname does not match SNMP-read hostname ($snmphost)!"); } @@ -337,7 +337,7 @@ function addHost($host, $snmpver, $port = '161', $transport = 'udp', $quiet = '0 $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB"); if (empty($snmphost) || ($snmphost && ($snmphost == $host || $hostshort = $host))) { - $device_id = createHost ($host, $community, $snmpver, $port, $transport); + $device_id = createHost ($host, $community, $snmpver, $port, $transport,array(),$poller_group); return $device_id; } else { if($quiet == '0') { print_error("Given hostname does not match SNMP-read hostname ($snmphost)!"); } @@ -520,7 +520,7 @@ function utime() return $sec + $usec; } -function createHost($host, $community = NULL, $snmpver, $port = 161, $transport = 'udp', $v3 = array()) +function createHost($host, $community = NULL, $snmpver, $port = 161, $transport = 'udp', $v3 = array(), $poller_group='0') { $host = trim(strtolower($host)); @@ -530,7 +530,8 @@ function createHost($host, $community = NULL, $snmpver, $port = 161, $transport 'port' => $port, 'transport' => $transport, 'status' => '1', - 'snmpver' => $snmpver + 'snmpver' => $snmpver, + 'poller_group' => $poller_group ); $device = array_merge($device, $v3); diff --git a/sql-schema/043.sql b/sql-schema/043.sql new file mode 100644 index 000000000..0a4025ff5 --- /dev/null +++ b/sql-schema/043.sql @@ -0,0 +1 @@ +CREATE TABLE `poller_groups` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,`group_name` VARCHAR( 255 ) NOT NULL ,`descr` VARCHAR( 255 ) NOT NULL) ENGINE = INNODB;