Menu
▾
▴
[Nagios-checkins] SF.net SVN: nagios:[1757] nagiosbpi/trunk/nagiosbpi
|
From: <mgu...@us...> - 2011-07-19 16:59:52
|
Revision: 1757
http://nagios.svn.sourceforge.net/nagios/?rev=1757&view=rev
Author: mguthrie88
Date: 2011-07-19 16:59:46 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Bug fixes for BPI 1.3.1, fixed bugs related to hosts
Modified Paths:
--------------
nagiosbpi/trunk/nagiosbpi/BpGroup_class.php
nagiosbpi/trunk/nagiosbpi/CHANGELOG.txt
nagiosbpi/trunk/nagiosbpi/api_tool.php
nagiosbpi/trunk/nagiosbpi/bpi_style.css
nagiosbpi/trunk/nagiosbpi/config_functions/config_forms.php
nagiosbpi/trunk/nagiosbpi/constants.inc.php
nagiosbpi/trunk/nagiosbpi/functions/bpi_functions.php
Modified: nagiosbpi/trunk/nagiosbpi/BpGroup_class.php
===================================================================
--- nagiosbpi/trunk/nagiosbpi/BpGroup_class.php 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/BpGroup_class.php 2011-07-19 16:59:46 UTC (rev 1757)
@@ -351,7 +351,7 @@
else
{ $class = 'odd'; }
- $state = return_state($child['current_state']);
+ $state = return_state($child['current_state'],$child['type']);
$optmarker = ($child['option']== '|' ? '**' : '');
if($child['type'] == 'service') //add a type property for group or service
@@ -399,7 +399,7 @@
$hostlink = HOSTDETAIL.$host;
//http://localhost/nagios/cgi-bin/extinfo.cgi?type=2&host=XI+Demo&service=HTTP
}
-
+
//BEGIN hereroc string
$listitem=<<<LISTITEM
<li class='servicelisting'>
Modified: nagiosbpi/trunk/nagiosbpi/CHANGELOG.txt
===================================================================
--- nagiosbpi/trunk/nagiosbpi/CHANGELOG.txt 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/CHANGELOG.txt 2011-07-19 16:59:46 UTC (rev 1757)
@@ -1,3 +1,10 @@
+1.3.1 7/19/2011
+=====================
+- Bug fixes for group state check
+- Fixed bug with host states and css color
+- Fixed bug where hosts didn't preload into the "Edit" forms
+
+
1.3 7/18/2011
=====================
- added support for hosts as BPI group members
Modified: nagiosbpi/trunk/nagiosbpi/api_tool.php
===================================================================
--- nagiosbpi/trunk/nagiosbpi/api_tool.php 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/api_tool.php 2011-07-19 16:59:46 UTC (rev 1757)
@@ -63,6 +63,7 @@
//initialize variables
$info;
$service_details;
+$host_details;
$objects = array();
$obj_count = 0;
$statecount = 0;
@@ -79,6 +80,7 @@
global $input;
global $info;
global $service_details;
+ global $host_details;
global $objects;
global $obj_count;
global $statecount;
@@ -95,7 +97,7 @@
$info = get_info();
- $service_details = grab_details('service'); //global array of service status
+ list($host_details,$service_details) = grab_details(); //global array of service status
//initialize all BpGroup instances and determine properties of all groups
Modified: nagiosbpi/trunk/nagiosbpi/bpi_style.css
===================================================================
--- nagiosbpi/trunk/nagiosbpi/bpi_style.css 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/bpi_style.css 2011-07-19 16:59:46 UTC (rev 1757)
@@ -72,13 +72,13 @@
tr.even { background-color: #Efefef; } /* dark table rows */
tr.odd {background-color: #FFF; } /* light table rows */
-.Ok { background-color: #b2ff5f; } /*status colors */
+.Ok, .Up { background-color: #b2ff5f; } /*status colors */
.Warning { background-color: #FEFF5F; }
-.Critical { background-color: #FF795F; }
-.Unknown { background-color: #FFC45F; }
+.Critical, .Down { background-color: #FF795F; }
+.Unknown , .Unreachable { background-color: #FFC45F; }
/*fixed width for state td */
-td.Ok, th.Ok, td.Warning, th.Warning, td.Critical, th.Critical, td.Unknown, th.Unknown { width: 50px;}
+td.Ok, th.Ok, td.Warning, th.Warning, td.Critical, th.Critical, td.Unknown, th.Unknown, td.Up, td.Down, td.Unreachable { width: 50px;}
/*error messages */
.error { color:red; }
Modified: nagiosbpi/trunk/nagiosbpi/config_functions/config_forms.php
===================================================================
--- nagiosbpi/trunk/nagiosbpi/config_functions/config_forms.php 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/config_functions/config_forms.php 2011-07-19 16:59:46 UTC (rev 1757)
@@ -331,7 +331,7 @@
if($member['type'] == 'group')
{
//do group stuff
- $title = $member['title'].' (Group)';
+ $title = 'G: '.$member['title'];
$value = '$'.$member['index'];
$opt = $member['option'];
print "\npreload('$title','$value', '$opt');\n";
@@ -340,12 +340,21 @@
if($member['type'] == 'service')
{
//do service stuff
- $title = $member['host_name'].';'.$member['service_description'];
+ $title = 'S: '.$member['host_name'].';'.$member['service_description'];
$value = $member['host_name'].';'.$member['service_description'];
$opt = $member['option'];
print "\npreload('$title','$value','$opt');\n";
}
+ if($member['type'] == 'host')
+ {
+ //do service stuff
+ $title = 'H: '.$member['host_name'];
+ $value = $member['host_name'].';NULL';
+ $opt = $member['option'];
+ print "\npreload('$title','$value','$opt');\n";
+
+ }
}
//set the warning value via javascript
print "\nsetThresholds('$warn', '$crit')\n;";
Modified: nagiosbpi/trunk/nagiosbpi/constants.inc.php
===================================================================
--- nagiosbpi/trunk/nagiosbpi/constants.inc.php 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/constants.inc.php 2011-07-19 16:59:46 UTC (rev 1757)
@@ -4,19 +4,22 @@
define('DIRBASE', dirname(__FILE__)); //assigns current directory as root
-define('VERSION','1.3');
+define('VERSION','1.3.1');
$globals = fetch_globals();
-//get server web address
-$SERVER_BASE = isset($_SERVER['SERVER_NAME']) ?
- $_SERVER['SERVER_NAME'] : $_SERVER['SERVER_ADDR'];
-
-$PROTO = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-$base = $PROTO.'://'.$SERVER_BASE;
-define('SERVERBASE', $base);
+//only used for web front-end
+if(!isset($_SERVER['SERVER_ADDR'])) $_SERVER['SERVER_ADDR'] = 'http://localhost/';
+ //get server web address
+ $SERVER_BASE = isset($_SERVER['SERVER_NAME']) ?
+ $_SERVER['SERVER_NAME'] : $_SERVER['SERVER_ADDR'];
+
+ $PROTO = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+ $base = $PROTO.'://'.$SERVER_BASE;
+ define('SERVERBASE', $base);
+
//assign constants if they've been set correctly
if(isset( $globals['STATUSFILE'], $globals['OBJECTSFILE'],
$globals['CONFIGFILE'], $globals['CONFIGBACKUP']
Modified: nagiosbpi/trunk/nagiosbpi/functions/bpi_functions.php
===================================================================
--- nagiosbpi/trunk/nagiosbpi/functions/bpi_functions.php 2011-07-18 17:18:21 UTC (rev 1756)
+++ nagiosbpi/trunk/nagiosbpi/functions/bpi_functions.php 2011-07-19 16:59:46 UTC (rev 1757)
@@ -173,32 +173,54 @@
/////////////////////////////////////////////////////////////////////////////
//expecting int 0-3
-//returns state code: OK, WARNING, CRITICAL, UNKNOWN
-function return_state($arg)
+//returns service state code: OK, WARNING, CRITICAL, UNKNOWN
+//returns host state code: UP, DOWN, UNREACHABLE
+function return_state($arg,$type='')
{
- switch($arg)
+ if($type=='host')
{
- case 0:
- $state = "Ok";
- break;
-
- case 1:
- $state = "Warning";
- break;
-
- case 2:
- $state = "Critical";
- break;
-
- case 3:
- $state = "Unknown";
- break;
-
- default:
- $state = "Unknown";
- break;
-
- }//end switch
+ switch($arg)
+ {
+ case 0:
+ $state = "Up";
+ break;
+
+ case 1:
+ $state = "Down";
+ break;
+
+ default:
+ $state = "Unreachable";
+ break;
+
+ }//end switch
+ }
+ else
+ {
+ switch($arg)
+ {
+ case 0:
+ $state = "Ok";
+ break;
+
+ case 1:
+ $state = "Warning";
+ break;
+
+ case 2:
+ $state = "Critical";
+ break;
+
+ case 3:
+ $state = "Unknown";
+ break;
+
+ default:
+ $state = "Unknown";
+ break;
+
+ }//end switch
+ }
return $state;
}//end method return_service_state()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|