[Nagios-checkins] SF.net SVN: nagios:[106] nagiosvshell/branches/devel

[<dw...@us...>]

Revision: 106
          http://nagios.svn.sourceforge.net/nagios/?rev=106&view=rev
Author:   dworth
Date:     2011-01-02 23:33:57 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
even better filtering

now with a text field (needs prettying up) which accepts regexes to search the data!

marked off the TODO items associated with filtering!

Modified Paths:
--------------
    nagiosvshell/branches/devel/TODO.txt
    nagiosvshell/branches/devel/controllers/controller.php
    nagiosvshell/branches/devel/views/hosts.php
    nagiosvshell/branches/devel/views/services.php

Modified: nagiosvshell/branches/devel/TODO.txt
===================================================================
--- nagiosvshell/branches/devel/TODO.txt	2011-01-02 23:33:41 UTC (rev 105)
+++ nagiosvshell/branches/devel/TODO.txt	2011-01-02 23:33:57 UTC (rev 106)
@@ -6,16 +6,10 @@
 
 MODEL/DATA
 
--page_router() calls function to build appropriate array and then send it to the correct page for display    
 - turn the data that is read from the cgi.cfg file into session data so it only has to be read once
-- Eventually the "read_status" and "read_detail" need to be restructured so that it only reads the status file once and then the controller determines how the info should be processed (either for a table or a host/service details page).  This would probably be a bigger change.
 
 CONTROLLER
 
-
--filtering functions for hosts and services (warning, OK, critical) for group pages
-## same as above, just needs a filtering function for the host and services arrays, and then the array can be passed to the hosts.php or services.php pages to view a table of "all hosts with notifications disabled," or something to that effect.
-
 -create filtered tables based on Monitoring Features on tactical overview 
 - update xml viewer for all pages and insert links into pages  
 ##There is an xml builder built into the V-Shell, although it's not fully implemented yet.  If you pass the arguments index.php?xml=hosts you'll see what I mean.  I've only added this for some things so far, but it basically just turns an array into xml data and writes it to an xml file in the tmp directory.
@@ -25,8 +19,6 @@
 
 - create "problems" table for tactical overview page 
 # need a table and a filter for "unhandled problems" that haven't been acknowledged.  This is in the tactical overview in core, and I think a lot of people use it.
-- search ability for hosts and services 
-# need to be able to filter a services table by a search string so people with 8000 services can find what they need
 
 - tactical overview - additional data about monitoring performance??
 - tactical overview - filter for flapping, notification, event handlers, active checks, passive checks 

Modified: nagiosvshell/branches/devel/controllers/controller.php
===================================================================
--- nagiosvshell/branches/devel/controllers/controller.php	2011-01-02 23:33:41 UTC (rev 105)
+++ nagiosvshell/branches/devel/controllers/controller.php	2011-01-02 23:33:57 UTC (rev 106)
@@ -192,7 +192,14 @@
 	}
 	if ($name_filter)
 	{
-		$data = get_by_name($name_filter, $data);
+		$name_data = get_by_name($name_filter, $data);
+		$service_data = get_by_name($name_filter, $data, 'service_description');
+
+		$data = $name_data;
+		foreach ($service_data as $i => $service)
+		{
+			if (!isset($data[$i])) { $data[$i] = $service; }
+		}
 	}
 	return $data;
 }

Modified: nagiosvshell/branches/devel/views/hosts.php
===================================================================
--- nagiosvshell/branches/devel/views/hosts.php	2011-01-02 23:33:41 UTC (rev 105)
+++ nagiosvshell/branches/devel/views/hosts.php	2011-01-02 23:33:57 UTC (rev 106)
@@ -92,7 +92,9 @@
 		}
 
 	$table .= <<<STATUSFILTER
-		</select>
+		</select><br />
+		<label class='label' for='name_filter'>Search String</label>
+		<input type="text" name='name_filter' value=""></input>
 		<input type='submit' name='submitbutton' value='Filter' />
 	</form>
 </div>

Modified: nagiosvshell/branches/devel/views/services.php
===================================================================
--- nagiosvshell/branches/devel/views/services.php	2011-01-02 23:33:41 UTC (rev 105)
+++ nagiosvshell/branches/devel/views/services.php	2011-01-02 23:33:57 UTC (rev 106)
@@ -82,7 +82,7 @@
 <div class='resultFilter'>
 	<form id='resultfilterform' action='{$_SERVER['PHP_SELF']}' method='get'>
 		<input type="hidden" name="type" value="services">
-		<label class='label' for='pagelimit'>Filter Results</label>
+		<label class='label' for='state_filter'>Filter Results</label>
 		<select id='resultfilter' name='state_filter' onChange='this.form.submit();'>
 STATUSFILTER;
 
@@ -93,7 +93,9 @@
 		}
 
 	$table .= <<<STATUSFILTER
-		</select>
+		</select><br />
+		<label class='label' for='name_filter'>Search String</label>
+		<input type="text" name='name_filter'>Search String</input>
 		<input type='submit' name='submitbutton' value='Filter' />
 	</form>
 </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.