Update of /cvsroot/perfparse/_perfparse-phpgui
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28017/phpgui
Modified Files:
perfparse.php
Log Message:
Availabiliti now working
Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** perfparse.php 11 Dec 2008 09:37:01 -0000 1.66
--- perfparse.php 30 Dec 2008 21:55:44 -0000 1.67
***************
*** 327,330 ****
--- 327,331 ----
}
+ // TODO: make url path configurable
// create url here
$actgraph['url']=
***************
*** 388,399 ****
$servicearray=array();
if(get_request_var('availability','array')) {
! echo "<pre>\navailability:\n";print_r($availability); echo "</pre>";
foreach($availability as $serviceId => $dummyarray) {
if ($dummyarray['display'] && $servicearray[$serviceId]=get_info_from_service_id($db,$serviceId)) {
$numreports++;
}
}
}
! echo "<pre>\nservicearray:\n";print_r($servicearray); echo "</pre>";
$smarty->assign_by_ref('servicearray',$servicearray);
--- 389,423 ----
$servicearray=array();
if(get_request_var('availability','array')) {
! // echo "<pre>\navailability:\n";print_r($availability); echo "</pre>";
foreach($availability as $serviceId => $dummyarray) {
if ($dummyarray['display'] && $servicearray[$serviceId]=get_info_from_service_id($db,$serviceId)) {
+ $servicearray[$serviceId]=array_merge($servicearray[$serviceId],$availability[$serviceId]);
$numreports++;
+ $actgraph=&$servicearray[$serviceId]; // alias
+ // get (default) timerange
+ check_setdefault($actgraph['timerange'],'char','r');
+ check_setdefault($actgraph['relativetime'],'string','00:00');
+ check_setdefault($actgraph['relativedays'],'int','7');
+ check_setdefault($actgraph['from'],'string',strftime('%Y-%m-%d %H:%M',time()-7*86400));
+ check_setdefault($actgraph['to'],'string',strftime('%Y-%m-%d %H:%M',time()));
+ if($actgraph['timerange']=='r') {
+ $actgraph['from']=rel_to_abs_timerange($actgraph['relativedays'],$actgraph['relativetime']);
+ $actgraph['to']=strftime('%Y-%m-%d %H:%M',time());
+ } else {
+ // to be sure set timerange to absolute
+ $actgraph['timerange']='a';
+ $td=mktime_YmdHM($actgraph['to'])-mktime_YmdHM($actgraph['from']);
+ $actgraph['relativedays']=$tdd=floor($td/86400);
+ $tdh=floor(($td-$tdd*86400)/3600);
+ $tdm=round(($td-$tdd*86400-$tdh*3600)/60);
+ $actgraph['relativetime']=sprintf('%02d:%02d',$tdh,$tdm);
+ }
+
+ $actgraph['url']='/nagios/cgi-bin/perfgant.png?service_id='.$serviceId.'&from='.mktime_YmdHM($actgraph['from']).'&to='.mktime_YmdHM($actgraph['to']);
+
}
}
}
! // echo "<pre>\nservicearray:\n";print_r($servicearray); echo "</pre>";
$smarty->assign_by_ref('servicearray',$servicearray);
|
