From d780a4d2149058a769272cf28b4cf98be070e6f3 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Mon, 2 Mar 2015 17:02:28 +0000
Subject: [PATCH 1/8] Added Performance menu to System and add pollers page

---
 html/includes/print-menubar.php        |  7 ++++
 html/pages/performance.inc.php         | 33 ++++++++++++++++
 html/pages/performance/pollers.inc.php | 52 ++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 html/pages/performance.inc.php
 create mode 100644 html/pages/performance/pollers.inc.php

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 8eda4983b7..23bc674867 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -446,6 +446,13 @@ if ($_SESSION['userlevel'] >= '10')
            <li><a href="edituser/"><img src="images/16/user_edit.png" border="0" align="absmiddle" /> Edit User</a></li>
            <li><a href="authlog/"><img src="images/16/lock.png" border="0" align="absmiddle" /> Authlog</a></li>
            <li role="presentation" class="divider"></li>
+           <li class="dropdown-submenu">
+               <a href="#"><img src="images/16/clock.png" alt="Performance" width="16" height="16" /> Performance</a>
+               <ul class="dropdown-menu scrollable-menu">
+                    <li><a href="/performance/tab=pollers/"><img src="images/16/clock_link.png" alt="Pollers" width="16" height="16" /> Pollers</a></li>
+               </ul>
+           </li>
+           <li role="presentation" class="divider"></li>
            <li class="dropdown-submenu">
            <a href="#"><img src="images/16/building.png" border="0" align="absmiddle" /> API</a>
            <ul class="dropdown-menu scrollable-menu">
diff --git a/html/pages/performance.inc.php b/html/pages/performance.inc.php
new file mode 100644
index 0000000000..45890099ee
--- /dev/null
+++ b/html/pages/performance.inc.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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('<ul class="nav nav-tabs">');
+
+$perf_tabs = array(array("name" => 'Pollers', 'icon' => 'clock_link'));
+
+foreach ($perf_tabs as $tab) {
+    echo('
+            <li>
+                <a href="/performance/'. lcfirst($tab["name"]) .'">
+                   <img src="images/16/'. $tab["icon"] .'.png" align="absmiddle" border="0"> ' . $tab["name"] . '
+                </a>
+            </li>');
+
+}
+
+echo ('</ul>');
+
+if (isset($vars['tab'])) {
+    require_once "pages/performance/".mres($vars['tab']).".inc.php";
+}
diff --git a/html/pages/performance/pollers.inc.php b/html/pages/performance/pollers.inc.php
new file mode 100644
index 0000000000..ed052eadb2
--- /dev/null
+++ b/html/pages/performance/pollers.inc.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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.
+ */
+
+?>
+<br />
+<div class="table-responsive">
+    <table class="table table-striped table-bordered table-hover table-condensed">
+        <tr>
+            <th>Poller Name</th>
+            <th>Devices Polled</th>
+            <th>Total Poll Time</th>
+            <th>Last Ran</th>
+        </tr>
+
+<?php
+
+$query = "SELECT *,UNIX_TIMESTAMP(NOW()) AS `now`, UNIX_TIMESTAMP(`last_polled`) AS `then` FROM `pollers`";
+
+foreach (dbFetchRows($query) as $poller) {
+    $old = $poller['now'] - $poller['then'];
+    if ($old > 600) {
+        $row_class = 'danger';
+    } elseif ($old >= 280 && $old <= 300) {
+        $row_class = 'warning';
+    } else {
+        $row_class = 'success';
+    }
+    echo('
+        <tr class="'.$row_class.'">
+            <td>'.$poller['poller_name'].'</td>
+            <td>'.$poller['devices'].'</td>
+            <td>'.$poller['time_taken'].' Seconds</td>
+            <td>'.$poller['last_polled'].'</td>
+        </tr>
+');
+}
+
+?>
+
+    </table>
+</div>

From 6a6a9c7b3677e5c48f033353250e456116d4ecad Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Mon, 2 Mar 2015 17:36:01 +0000
Subject: [PATCH 2/8] Added missing tab=

---
 html/pages/performance.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/performance.inc.php b/html/pages/performance.inc.php
index 45890099ee..a05f69769a 100644
--- a/html/pages/performance.inc.php
+++ b/html/pages/performance.inc.php
@@ -19,7 +19,7 @@ $perf_tabs = array(array("name" => 'Pollers', 'icon' => 'clock_link'));
 foreach ($perf_tabs as $tab) {
     echo('
             <li>
-                <a href="/performance/'. lcfirst($tab["name"]) .'">
+                <a href="/performance/tab='. lcfirst($tab["name"]) .'">
                    <img src="images/16/'. $tab["icon"] .'.png" align="absmiddle" border="0"> ' . $tab["name"] . '
                 </a>
             </li>');

From 2618f148266b40706dd556b499dec7319119f847 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 15 Mar 2015 15:23:06 +0000
Subject: [PATCH 3/8] Updated checks on poller time

---
 html/pages/performance/pollers.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/pages/performance/pollers.inc.php b/html/pages/performance/pollers.inc.php
index ed052eadb2..c5e0eb2799 100644
--- a/html/pages/performance/pollers.inc.php
+++ b/html/pages/performance/pollers.inc.php
@@ -29,9 +29,9 @@ $query = "SELECT *,UNIX_TIMESTAMP(NOW()) AS `now`, UNIX_TIMESTAMP(`last_polled`)
 
 foreach (dbFetchRows($query) as $poller) {
     $old = $poller['now'] - $poller['then'];
-    if ($old > 600) {
+    if ($old >= 300) {
         $row_class = 'danger';
-    } elseif ($old >= 280 && $old <= 300) {
+    } elseif ($old >= 280 && $old < 300) {
         $row_class = 'warning';
     } else {
         $row_class = 'success';

From c7978996e190db9b5112224da7d5d13e89f7ab12 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 15 Mar 2015 16:37:15 +0000
Subject: [PATCH 4/8] Web ui and console files needed for monitoring pollers

---
 dist-pollers.php | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 dist-pollers.php

diff --git a/dist-pollers.php b/dist-pollers.php
new file mode 100755
index 0000000000..0b353692e0
--- /dev/null
+++ b/dist-pollers.php
@@ -0,0 +1,54 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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'])) {
+    $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 (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 List registered pollers\n";
+    echo "-u <id> | <poller name> Unregister a poller\n";
+    echo "-r Register this install as a poller\n";
+}
+
+?>

From d74a37c0785be1628d5de3274a668204b2cccd29 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 15 Mar 2015 21:44:35 +0000
Subject: [PATCH 5/8] Added support for managing poller groups and viewing
 poller stats

---
 html/forms/parse-poller-groups.inc.php        |  25 +++
 html/forms/poller-group-remove.inc.php        |  30 ++++
 html/forms/poller-groups.inc.php              |  47 ++++++
 html/includes/modal/poller_groups.inc.php     | 159 ++++++++++++++++++
 html/includes/print-menubar.php               |   5 +-
 html/pages/addhost.inc.php                    |  23 +++
 .../{performance.inc.php => pollers.inc.php}  |   9 +-
 html/pages/pollers/groups.inc.php             |  48 ++++++
 .../{performance => pollers}/pollers.inc.php  |   0
 sql-schema/043.sql                            |   1 +
 10 files changed, 341 insertions(+), 6 deletions(-)
 create mode 100644 html/forms/parse-poller-groups.inc.php
 create mode 100644 html/forms/poller-group-remove.inc.php
 create mode 100644 html/forms/poller-groups.inc.php
 create mode 100644 html/includes/modal/poller_groups.inc.php
 rename html/pages/{performance.inc.php => pollers.inc.php} (71%)
 create mode 100644 html/pages/pollers/groups.inc.php
 rename html/pages/{performance => pollers}/pollers.inc.php (100%)
 create mode 100644 sql-schema/043.sql

diff --git a/html/forms/parse-poller-groups.inc.php b/html/forms/parse-poller-groups.inc.php
new file mode 100644
index 0000000000..72fd86eb72
--- /dev/null
+++ b/html/forms/parse-poller-groups.inc.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 0000000000..b07f2c4422
--- /dev/null
+++ b/html/forms/poller-group-remove.inc.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 0000000000..a9856729b9
--- /dev/null
+++ b/html/forms/poller-groups.inc.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 0000000000..81e014f4ab
--- /dev/null
+++ b/html/includes/modal/poller_groups.inc.php
@@ -0,0 +1,159 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 {
+?>
+
+<div class="modal fade" id="confirm-delete" tabindex="-1" role="dialog" aria-labelledby="Delete" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h5 class="modal-title" id="Delete">Confirm Delete</h5>
+            </div>
+            <div class="modal-body">
+                <p>If you would like to remove the Poller Group then please click Delete.</p>
+            </div>
+            <div class="modal-footer">
+                <form role="form" class="remove_group_form">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger danger" id="group-removal" data-target="group-removal">Delete</button>
+                    <input type="hidden" name="group_id" id="group_id" value="">
+                    <input type="hidden" name="type" id="type" value="poller-group-remove">
+                    <input type="hidden" name="confirm" id="confirm" value="yes">
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade bs-example-modal-lg" id="poller-groups" tabindex="-1" role="dialog" aria-labelledby="Create" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="Create">Poller Groups</h4>
+            </div>
+            <div class="modal-body">
+                <form method="post" role="form" id="poller_groups" class="form-horizontal poller-groups-form">
+                <input type="hidden" name="group_id" id="group_id" value="">
+                <div class="row">
+                    <div class="col-md-12">
+                        <span id="response"></span>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="form-group">
+                            <label for="group_name" class="col-sm-3 control-label">Group Name:</label>
+                            <div class="col-sm-9">
+                                <input type="input" class="form-control" id="group_name" name="group_name" placeholder="Group Name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="descr" class="col-sm-3 control-label">Description:</label>
+                            <div class="col-sm-9">
+                                <input type="input" class="form-control" id="descr" name="descr" placeholder="Description">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                             <div class="col-sm-offset-3 col-sm-9">
+                                 <button type="submit" class="btn btn-primary btn-sm" id="create-group" name="create-group">Add Poller Group</button>
+                             </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</form>
+<script>
+
+$('#confirm-delete').on('show.bs.modal', function(e) {
+    group_id = $(e.relatedTarget).data('group_id');
+    $("#group_id").val(group_id);
+    event.preventDefault();
+});
+
+$('#group-removal').click('', function(e) {
+    event.preventDefault();
+    group_id = $("#group_id").val();
+    $.ajax({
+        type: "POST",
+        url: "/ajax_form.php",
+        data: $('form.remove_group_form').serialize() ,
+        success: function(msg) {
+            $("#thanks").html('<div class="alert alert-info">'+msg+'</div>');
+            $("#confirm-delete").modal('hide');
+            $("#"+group_id).remove();
+        },
+        error: function() {
+            $("#thanks").html('<div class="alert alert-info">An error occurred removing the token.</div>');
+            $("#confirm-delete").modal('hide');
+        }
+    });
+});
+
+$('#poller-groups').on('show.bs.modal', function (event) {
+    var button = $(event.relatedTarget);
+    var group_id = button.data('group_id');
+    $('#group_id').val(group_id);
+    if(group_id != '') {
+        $('#group_id').val(group_id);
+        $.ajax({
+            type: "POST",
+            url: "/ajax_form.php",
+            data: { type: "parse-poller-groups", group_id: group_id },
+            dataType: "json",
+            success: function(output) {
+                $('#group_name').val(output['group_name']);
+                $('#descr').val(output['descr']);
+            }
+        });
+    }
+});
+
+$('#create-group').click('', function(e) {
+    e.preventDefault();
+    var group_name = $("#group_name").val();
+    var descr = $("#descr").val();
+    var group_id = $('#group_id').val();
+    $.ajax({
+        type: "POST",
+        url: "/ajax_form.php",
+        data: { type: "poller-groups", group_name: group_name, descr: descr, group_id: group_id },
+        dataType: "html",
+        success: function(msg){
+            if(msg.indexOf("ERROR:") <= -1) {
+                $("#message").html('<div class="alert alert-info">'+msg+'</div>');
+                $("#poller-groups").modal('hide');
+                setTimeout(function() {
+                    location.reload(1);
+                }, 1000);
+            } else {
+                $("#error").html('<div class="alert alert-info">'+msg+'</div>');
+            }
+        },
+        error: function(){
+            $("#error").html('<div class="alert alert-info">An error occurred.</div>');
+        }
+    });
+});
+
+</script>
+
+<?php
+}
+?>
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 23bc674867..7a56154823 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -447,9 +447,10 @@ if ($_SESSION['userlevel'] >= '10')
            <li><a href="authlog/"><img src="images/16/lock.png" border="0" align="absmiddle" /> Authlog</a></li>
            <li role="presentation" class="divider"></li>
            <li class="dropdown-submenu">
-               <a href="#"><img src="images/16/clock.png" alt="Performance" width="16" height="16" /> Performance</a>
+               <a href="#"><img src="images/16/clock.png" alt="Pollers" width="16" height="16" /> Pollers</a>
                <ul class="dropdown-menu scrollable-menu">
-                    <li><a href="/performance/tab=pollers/"><img src="images/16/clock_link.png" alt="Pollers" width="16" height="16" /> Pollers</a></li>
+                    <li><a href="/pollers/tab=pollers/"><img src="images/16/clock_link.png" alt="Pollers" width="16" height="16" /> Pollers</a></li>
+                    <li><a href="/pollers/tab=groups/"><img src="images/16/clock_add.png" alt="Groups" width="16" height="16" /> Groups</a></li>
                </ul>
            </li>
            <li role="presentation" class="divider"></li>
diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index cb16172a49..04a27088b6 100644
--- a/html/pages/addhost.inc.php
+++ b/html/pages/addhost.inc.php
@@ -175,6 +175,29 @@ foreach ($config['snmp']['transports'] as $transport)
         </div>
       </div>
     </div>
+<?php
+
+if ($config['distributed_poller'] === TRUE) {
+    echo('
+      <div class="form-group">
+          <label for="poller_group" class="col-sm-3 control-label">Poller Group</label>
+          <div class="col-sm-9">
+              <select name="poller_group" id="poller_group" class="form-control input-sm">
+                  <option value="0"> Default poller group</option>
+    ');
+
+    foreach (dbFetchRows("SELECT `id`,`poller_name` FROM `pollers`") as $poller) {
+        echo '<option value="' . $poller['id'] . '">' . $poller['poller_name'] . '</option>';
+    }
+
+    echo('
+              </select>
+          </div>
+      </div>
+    ');
+}
+
+?>
     <button type="submit" class="btn btn-default input-sm" name="Submit">Add Host</button>
   </div>
 </form>
diff --git a/html/pages/performance.inc.php b/html/pages/pollers.inc.php
similarity index 71%
rename from html/pages/performance.inc.php
rename to html/pages/pollers.inc.php
index a05f69769a..95cda0788f 100644
--- a/html/pages/performance.inc.php
+++ b/html/pages/pollers.inc.php
@@ -14,12 +14,13 @@
 
 echo('<ul class="nav nav-tabs">');
 
-$perf_tabs = array(array("name" => 'Pollers', 'icon' => 'clock_link'));
+$poll_tabs = array(array("name" => 'Pollers', 'icon' => 'clock_link'),
+             array("name" => 'Groups', 'icon' => 'clock_add'));
 
-foreach ($perf_tabs as $tab) {
+foreach ($poll_tabs as $tab) {
     echo('
             <li>
-                <a href="/performance/tab='. lcfirst($tab["name"]) .'">
+                <a href="/pollers/tab='. lcfirst($tab["name"]) .'">
                    <img src="images/16/'. $tab["icon"] .'.png" align="absmiddle" border="0"> ' . $tab["name"] . '
                 </a>
             </li>');
@@ -29,5 +30,5 @@ foreach ($perf_tabs as $tab) {
 echo ('</ul>');
 
 if (isset($vars['tab'])) {
-    require_once "pages/performance/".mres($vars['tab']).".inc.php";
+    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 0000000000..50019dfc26
--- /dev/null
+++ b/html/pages/pollers/groups.inc.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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";
+
+?>
+<br />
+<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#poller-groups">Create new poller group</button>
+<br /><br />
+<div class="table-responsive">
+    <table class="table table-striped table-bordered table-hover table-condensed">
+        <tr>
+            <th>ID</th>
+            <th>Group Name</th>
+            <th>Description</th>
+            <th>Action</th>
+        </tr>
+
+<?php
+
+$query = "SELECT * FROM `poller_groups`";
+
+foreach (dbFetchRows($query) as $group) {
+    echo('
+        <tr id="'. $group['id'] .'">
+            <td>'.$group['id'].'</td>
+            <td>'.$group['group_name'].'</td>
+            <td>'.$group['descr'].'</td>
+            <td><button type="button" class="btn btn-success btn-xs" id="'.$group['id'].'" data-group_id="'.$group['id'].'" data-toggle="modal" data-target="#poller-groups">Edit</button> <button type="button" class="btn btn-danger btn-xs" id="'.$group['id'].'" data-group_id="'.$group['id'].'" data-toggle="modal" data-target="#confirm-delete">Delete</button></td>
+        </tr>
+');
+}
+
+?>
+
+    </table>
+</div>
diff --git a/html/pages/performance/pollers.inc.php b/html/pages/pollers/pollers.inc.php
similarity index 100%
rename from html/pages/performance/pollers.inc.php
rename to html/pages/pollers/pollers.inc.php
diff --git a/sql-schema/043.sql b/sql-schema/043.sql
new file mode 100644
index 0000000000..0a4025ff5d
--- /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;

From 85532f78aed0cdefb76e9cdc4f7fbe0e77c894c5 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 15 Mar 2015 21:49:12 +0000
Subject: [PATCH 6/8] Updated dist-pollers.php to support poller groups

---
 dist-pollers.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/dist-pollers.php b/dist-pollers.php
index 0b353692e0..81e7116941 100755
--- a/dist-pollers.php
+++ b/dist-pollers.php
@@ -23,15 +23,24 @@ include("includes/polling/functions.inc.php");
 include("includes/alerts.inc.php");
 include('includes/console_table.php');
 
-$options = getopt("l::u:r::");
+$options = getopt("l:u:r::");
 
 if (isset($options['l'])) {
-    $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']));
+    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();
     }
-    echo $tbl->getTable();
 } elseif (isset($options['u']) && !empty($options['u'])) {
     if (is_numeric($options['u'])) {
        $db_column = 'id';
@@ -46,7 +55,7 @@ if (isset($options['l'])) {
         echo "Poller " . $config['distributed_poller_name'] . " has been registered\n";
     }
 } else {
-    echo "-l List registered pollers\n";
+    echo "-l pollers | groups List registered pollers or poller groups\n";
     echo "-u <id> | <poller name> Unregister a poller\n";
     echo "-r Register this install as a poller\n";
 }

From e62f0bc7f47b4913de5ca9d6f7b967cc6332e1de Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 18 Mar 2015 19:25:09 +0000
Subject: [PATCH 7/8] Updated to remove the pollers menu if distributed poller
 is not set

---
 html/includes/print-menubar.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 7a56154823..b0dcc22c3f 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -446,6 +446,9 @@ if ($_SESSION['userlevel'] >= '10')
            <li><a href="edituser/"><img src="images/16/user_edit.png" border="0" align="absmiddle" /> Edit User</a></li>
            <li><a href="authlog/"><img src="images/16/lock.png" border="0" align="absmiddle" /> Authlog</a></li>
            <li role="presentation" class="divider"></li>
+');
+      if($config['distributed_poller'] === TRUE) {
+          echo('
            <li class="dropdown-submenu">
                <a href="#"><img src="images/16/clock.png" alt="Pollers" width="16" height="16" /> Pollers</a>
                <ul class="dropdown-menu scrollable-menu">
@@ -454,6 +457,10 @@ if ($_SESSION['userlevel'] >= '10')
                </ul>
            </li>
            <li role="presentation" class="divider"></li>
+           ');
+       }
+
+echo('
            <li class="dropdown-submenu">
            <a href="#"><img src="images/16/building.png" border="0" align="absmiddle" /> API</a>
            <ul class="dropdown-menu scrollable-menu">

From ec595c3eda5e4846305ded82f808ca24bbca8535 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 19 Mar 2015 12:00:03 +0000
Subject: [PATCH 8/8] Added support for adding / editing with a poller group
 selected

---
 html/pages/addhost.inc.php          |  7 ++++---
 html/pages/device/edit/snmp.inc.php | 29 ++++++++++++++++++++++++++++-
 includes/functions.php              | 11 ++++++-----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index 04a27088b6..f73d851967 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)");
@@ -186,8 +187,8 @@ if ($config['distributed_poller'] === TRUE) {
                   <option value="0"> Default poller group</option>
     ');
 
-    foreach (dbFetchRows("SELECT `id`,`poller_name` FROM `pollers`") as $poller) {
-        echo '<option value="' . $poller['id'] . '">' . $poller['poller_name'] . '</option>';
+    foreach (dbFetchRows("SELECT `id`,`group_name` FROM `poller_groups`") as $group) {
+        echo '<option value="' . $group['id'] . '">' . $group['group_name'] . '</option>';
     }
 
     echo('
diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php
index 226d8565a5..9e8a5b7b04 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("      </select>
     </div>
   </div>");
 
+if ($config['distributed_poller'] === TRUE) {
+    echo('
+      <div class="form-group">
+          <label for="poller_group" class="col-sm-2 control-label">Poller Group</label>
+          <div class="col-sm-4">
+              <select name="poller_group" id="poller_group" class="form-control input-sm">
+                  <option value="0"> Default poller group</option>
+    ');
+
+    foreach (dbFetchRows("SELECT `id`,`group_name` FROM `poller_groups`") as $group) {
+        echo '<option value="' . $group['id'] . '"';
+        if ($device['poller_group'] == $group['id']) {
+            echo ' selected';
+        }
+        echo '>' . $group['group_name'] . '</option>';
+    }
+
+    echo('
+              </select>
+          </div>
+      </div>
+    ');
+}
+
+
 echo('
   <button type="submit" name="Submit" class="btn btn-default">Save</button>
 </form>
diff --git a/includes/functions.php b/includes/functions.php
index 0f4620cd95..3fe0bc925d 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);