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] 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";
 }