Menu
▾
▴
perfparse-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(19) |
Oct
(10) |
Nov
(14) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(5) |
Mar
(33) |
Apr
(31) |
May
(3) |
Jun
(30) |
Jul
(4) |
Aug
(26) |
Sep
(23) |
Oct
|
Nov
(6) |
Dec
(56) |
| 2008 |
Jan
(12) |
Feb
(9) |
Mar
(2) |
Apr
(8) |
May
(2) |
Jun
(3) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
|
Nov
(16) |
Dec
(4) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(36) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Florian G. <re...@us...> - 2007-09-05 22:19:04
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2332/phpgui/templates Added Files: show_effective_del_policies.tpl.html Log Message: some work on ui --- NEW FILE: show_effective_del_policies.tpl.html --- <HTML> <!-- $Id: show_effective_del_policies.tpl.html,v 1.1 2007/09/05 22:18:30 redflo Exp $ --> <HEAD> <TITLE> PerfParse</TITLE> </HEAD> <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <!-- Header --> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td width=60><img src="<{$http_image_path}>/perfparse-logo-sm.png" border=0></td> <td align=center><font face="Arial, Helvetica" size=2> <b><{tr}>Show effective Deletion Policies<{/tr}></b><br> <a href="perfparse.php"><{tr}>Return to main menu<{/tr}></a><br> </td> <td width=60 align=right><font face="Arial, Helvetica" size=1><{$version}></td> </tr> </table> </td></tr></table></p> <!-- Error Window --> <{if $sql_error}> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <{$sql_error}> </td></tr></table> </p> <{/if}> <!-- Edit default policies --> <form method="get"> <input type=hidden name="page" value="show_effective_del_policies"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <!-- Group selection --> <{if $group_id}> <tr> <td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> <{tr}>Selected Group<{/tr}>: <{$groupinfos.$group_id}> </td> </tr> <tr> <td> <{tr}>bin deletion policy<{/tr}>: </td><td> <{$bin_group_policy.source}> <{$bin_group_policy.policy_name}> <{$bin_group_policy.policy_seconds}> sec. </td> </tr> <{else}> <tr> <td align=center width="33%" ><font face="Arial, Helvetica" size=2> <{tr}>Select Group<{/tr}>: </td> </tr> <tr> <tr> <td> <select name="group_id"> <{foreach from=$groupinfos key=gid item=gname}> <option value="<{$gid}>"><{$gname}></option> <{/foreach}> </select> </td> </tr> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> <input type="submit" name="set_group" value="<{tr}>Set<{/tr}>"> </td></tr> <{/if}> </table> </td></tr></table></p> </form> </body></html> |
|
From: Florian G. <re...@us...> - 2007-09-05 22:19:03
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2332/phpgui Modified Files: Makefile.am Makefile.in perfparse.php utils.php Log Message: some work on ui Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** utils.php 3 Sep 2007 22:56:25 -0000 1.41 --- utils.php 5 Sep 2007 22:18:30 -0000 1.42 *************** *** 587,590 **** --- 587,613 ---- // if policy set in metric + $ret=get_metric_bin_del_policy($db,$metric_id); + if($ret===FALSE || $ret['source']) { + return($ret); + } + + $metricprops=get_metric_props($db,$metric_id); + // if policy set in host + $ret=get_host_bin_del_policy($db,$metricprops['host_id']); + if($ret===FALSE || $ret['source']) { + return($ret); + } + + // if set in group + $ret=get_group_bin_del_policy_from_hostid($db,$host_id); + if($ret===FALSE || $ret['source']) { + return($ret); + } + + + + } + + function get_metric_bin_del_policy(&$db,$metric_id) { $query='select bin_delete_policy_individual,policy_name,delete_policy_seconds from perfdata_service_metric left join perfdata_delete_policy on bin_delete_policy_id=policy_id where metric_id=?'; *************** *** 598,608 **** return(array('source'=>'Metric Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); } // if policy set in host ! $query='select h.host_id,h.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from ! perfdata_service_metric m, perfdata_service s, perfdata_host h left join ! perfdata_delete_policy d on h.bin_delete_policy_id=d.policy_id where m.metric_id=? ! and s.service_id=m.service_id ! and s.host_id=h.host_id'; if(!$res=$db->GetRow($query,array($metric_id))) { return(FALSE); --- 621,632 ---- return(array('source'=>'Metric Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); } + return(array('source'=>'none')); + } + function get_host_bin_del_policy(&$db,$host_id) { // if policy set in host ! $query='select h.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from ! perfdata_host h left join ! perfdata_delete_policy d on h.bin_delete_policy_id=d.policy_id where h.host_id=? '; if(!$res=$db->GetRow($query,array($metric_id))) { return(FALSE); *************** *** 614,637 **** return(array('source'=>'Host Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); } ! $tmp_hostid=$res['host_id']; ! // if policy is set in group. If more than one group match, then the group with the longest policy matches. // Individual settings match first. $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from perfdata_host h, perfdata_host_groups gh, perfdata_groups g left join perfdata_delete_policy d on ! g.bin_delete_policy_id=d.policy_id ! where h.host_id=? and h.host_id=hg.host_id and hg.group_id=g.group_id'; if(!$res=$db->GetAll($query,array($tmp_hostid))) { return(FALSE); } - print_r($res); - - - } - /* graph functions */ --- 638,675 ---- return(array('source'=>'Host Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); } ! return(array('source'=>'none')); ! } ! function get_group_bin_del_policy(&$db,$group_id) { ! // if policy set in group ! $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from ! perfdata_groups g left join ! perfdata_delete_policy d on g.bin_delete_policy_id=d.policy_id where g.group_id=? '; ! if(!$res=$db->GetRow($query,array($group_id))) { ! return(FALSE); ! } ! if($res['bin_delete_policy_individual']!==NULL) { ! return(array('source'=>'Group Individual','policy_seconds'=>$res['bin_delete_policy_individual'])); ! } ! if($res['policy_name']!==NULL) { ! return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); ! } ! return(array('source'=>'none')); ! } ! ! function get_group_bin_del_policy_from_hostid(&$db,$host_id) { ! // if policy is set in group. If more than one group match, then the group with the longest policy matches. // Individual settings match first. $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from perfdata_host h, perfdata_host_groups gh, perfdata_groups g left join perfdata_delete_policy d on ! g.bin_delete_policy_id=d.policy_id ! where h.host_id=? and h.host_id=hg.host_id and hg.group_id=g.group_id'; if(!$res=$db->GetAll($query,array($tmp_hostid))) { return(FALSE); } print_r($res); } /* graph functions */ Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 3 Sep 2007 22:56:25 -0000 1.12 --- Makefile.in 5 Sep 2007 22:18:30 -0000 1.13 *************** *** 283,286 **** --- 283,287 ---- templates/edit_delete_policies.tpl.html \ templates/edit_default_delete_policies.tpl.html \ + templates/show_effective_del_policies.tpl.html \ templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 3 Sep 2007 22:56:25 -0000 1.6 --- Makefile.am 5 Sep 2007 22:18:30 -0000 1.7 *************** *** 35,38 **** --- 35,39 ---- templates/edit_delete_policies.tpl.html \ templates/edit_default_delete_policies.tpl.html \ + templates/show_effective_del_policies.tpl.html \ templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** perfparse.php 3 Sep 2007 23:03:48 -0000 1.54 --- perfparse.php 5 Sep 2007 22:18:30 -0000 1.55 *************** *** 611,620 **** --- 611,630 ---- case 'show_effective_del_policies': // get all needed object names and ids + + // group info $groupinfos=get_groups($db); + $smarty->assign_by_ref('groupinfos',$groupinfos); get_request_var('group_id','int',FALSE); if($group_id != FALSE) { $hostinfos=get_groupId_hostinfos($db,$group_id); + $smarty->assign_by_ref('hostinfos',$hostinfos); + + if($bin_group_policy=get_group_bin_del_policy($db,$group_id)==FALSE) { + $smarty->assign('sql_error',$db->ErrorMsg()); + } + $smarty->assign_by_ref('bin_group_policy',$bin_group_policy); } + get_request_var('host_id','int',FALSE); if($host_id != FALSE) { *************** *** 625,628 **** --- 635,639 ---- echo "<pre>hostinfos:\n"; print_r($hostinfos); echo "\n</pre>"; echo "<pre>metricsinfos:\n"; print_r($metricsinfos); echo "\n</pre>"; + echo "<pre>bin_group_policy:\n"; print_r($bin_group_policy); echo "\n</pre>"; if($effectivepolicy=get_effective_bin_del_policy($db,1/* testing */)==FALSE) { |
|
From: Florian G. <re...@us...> - 2007-09-04 07:51:41
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6715/modules Modified Files: storage_mysql.h Log Message: :-) Index: storage_mysql.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** storage_mysql.h 3 Sep 2007 22:56:25 -0000 1.4 --- storage_mysql.h 4 Sep 2007 07:51:42 -0000 1.5 *************** *** 1,5 **** /***************************************************************************** * ! * storgae_mysql.h - Parse Nagios data and store in relational database. * * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) --- 1,5 ---- /***************************************************************************** * ! * storage_mysql.h - Parse Nagios data and store in relational database. * * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) |
|
From: Florian G. <re...@us...> - 2007-09-03 23:03:46
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10649/templates Modified Files: edit_default_delete_policies.tpl.html Log Message: cosmetics Index: edit_default_delete_policies.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_default_delete_policies.tpl.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit_default_delete_policies.tpl.html 3 Sep 2007 22:56:25 -0000 1.1 --- edit_default_delete_policies.tpl.html 3 Sep 2007 23:03:48 -0000 1.2 *************** *** 32,39 **** <!-- Edit default policies --> - <p align=center> <form method="get"> <input type=hidden name="page" value="edit_default_delete_policies"> <input type=hidden name="edited" value="1"> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> --- 32,39 ---- <!-- Edit default policies --> <form method="get"> <input type=hidden name="page" value="edit_default_delete_policies"> <input type=hidden name="edited" value="1"> + <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> *************** *** 86,91 **** </table> - <tr><td> </td></tr> <table width="100%" border=0 cellpadding=0 cellspacing=0> --- 86,91 ---- </table> </td></tr> + <tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> |
|
From: Florian G. <re...@us...> - 2007-09-03 23:03:46
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10649 Modified Files: perfparse.php Log Message: cosmetics Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** perfparse.php 3 Sep 2007 22:56:25 -0000 1.53 --- perfparse.php 3 Sep 2007 23:03:48 -0000 1.54 *************** *** 591,595 **** get_request_var('edited','int',FALSE); - echo "edited=$edited"; if($edited) { if($def_bin_policy_seconds != $bin_policy['delete_policy_seconds']) { --- 591,594 ---- |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:26
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/scripts Modified Files: mysql_create.sql mysql_delete.sql Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: mysql_delete.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_delete.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_delete.sql 22 Aug 2006 13:37:50 -0000 1.3 --- mysql_delete.sql 3 Sep 2007 22:56:25 -0000 1.4 *************** *** 9,12 **** --- 9,13 ---- SET FOREIGN_KEY_CHECKS = 0; + DROP TABLE IF EXISTS perfdata_instances; DROP TABLE IF EXISTS perfdata_service_bin; DROP TABLE IF EXISTS perfdata_service_metric; *************** *** 28,31 **** --- 29,34 ---- DROP TABLE IF EXISTS perfdata_prefs; DROP TABLE IF EXISTS perfdata_graphs; + DROP TABLE IF EXISTS perfdata_reports; + DROP TABLE IF EXISTS perfdata_report_graphs; SET FOREIGN_KEY_CHECKS = 1; Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mysql_create.sql 25 Aug 2007 00:09:14 -0000 1.25 --- mysql_create.sql 3 Sep 2007 22:56:25 -0000 1.26 *************** *** 43,46 **** --- 43,50 ---- ) TYPE=InnoDB; + insert into perfdata_delete_policy (policy_id,policy_name,delete_policy_seconds,policy_comment,instance_id) values + (0,'__Default_Bin',-1,'Internal default bin policy.',0); + insert into perfdata_delete_policy (policy_id,policy_name,delete_policy_seconds,policy_comment,instance_id) values + (1,'__Default_Raw',-1,'Internal default raw policy.',0); # Was table perfdata_host_group. renamed for clarity *************** *** 53,57 **** instance_id INT DEFAULT 0, FOREIGN KEY perfdata_groups_ibfk_1 (instance_id) ! REFERENCES perfdata_instances(instance_id) ) type=InnoDB; --- 57,71 ---- instance_id INT DEFAULT 0, FOREIGN KEY perfdata_groups_ibfk_1 (instance_id) ! REFERENCES perfdata_instances(instance_id), ! raw_delete_policy_id INTEGER, ! raw_delete_policy_individual INTEGER, ! bin_delete_policy_id INTEGER, ! bin__delete_policy_individual INTEGER ! FOREIGN KEY perfdata_groups_ibfk_2 (bin_delete_policy_id) ! REFERENCES perfdata_delete_policy (policy_id) ! ON DELETE SET NULL, ! FOREIGN KEY perfdata_groups_ibfk_3 (raw_delete_policy_id) ! REFERENCES perfdata_delete_policy (policy_id) ! ON DELETE SET NULL ) type=InnoDB; |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:25
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/phpgui/templates Modified Files: mainmenu.tpl.html Added Files: edit_default_delete_policies.tpl.html Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: mainmenu.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/mainmenu.tpl.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mainmenu.tpl.html 8 Apr 2006 23:59:47 -0000 1.8 --- mainmenu.tpl.html 3 Sep 2007 22:56:25 -0000 1.9 *************** *** 50,60 **** </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_host_delete_policies"><{tr}>View / Edit Hosts Deletion Policy<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=delete_policy_bin"><{tr}>View / Edit Binary Data Deletion Policy<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=delete_policy_raw"><{tr}>View / Edit Raw Data Deletion Policy<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> --- 50,69 ---- </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_default_delete_policies"><{tr}>View / Edit Default Deletion Policies<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_group_delete_policies"><{tr}>View / Edit Group Deletion Policies<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_host_delete_policies"><{tr}>View / Edit Hosts Deletion Policies<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=delete_policy_bin"><{tr}>View / Edit Binary Data Deletion Policies (Metrics)<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=delete_policy_raw"><{tr}>View / Edit Raw Data Deletion Policies (Services)<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=show_effective_del_policies"><{tr}>Display effective delete policies of objects<{/tr}>.</a> </td></tr> <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> --- NEW FILE: edit_default_delete_policies.tpl.html --- <HTML> <!-- $Id: edit_default_delete_policies.tpl.html,v 1.1 2007/09/03 22:56:25 redflo Exp $ --> <HEAD> <TITLE> PerfParse</TITLE> </HEAD> <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <!-- Header --> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td width=60><img src="<{$http_image_path}>/perfparse-logo-sm.png" border=0></td> <td align=center><font face="Arial, Helvetica" size=2> <b><{tr}>Edit Default Deletion Policies<{/tr}></b><br> <a href="perfparse.php"><{tr}>Return to main menu<{/tr}></a><br> </td> <td width=60 align=right><font face="Arial, Helvetica" size=1><{$version}></td> </tr> </table> </td></tr></table></p> <!-- Error Window --> <{if $sql_error}> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <{$sql_error}> </td></tr></table> </p> <{/if}> <!-- Edit default policies --> <p align=center> <form method="get"> <input type=hidden name="page" value="edit_default_delete_policies"> <input type=hidden name="edited" value="1"> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td align=center width="33%" colspan="6" ><font face="Arial, Helvetica" size=2> <{tr}>Edit the default delete policy for binary data<{/tr}>: </td> </tr> <tr> <td align=center width="33%" colspan="6" ><font face="Arial, Helvetica" size=2> <{tr}>(enter a negative value to keep the data forever. Choose 0 to delete immediately)<{/tr}>: </td> </tr> <tr> <td> <font face="Arial, Helvetica" size=2> <{tr}>Days<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_bin_policy_days" size="4" value="<{$bin_policy.policy_days}>"/> </td><td> <font face="Arial, Helvetica" size=2> <{tr}>Hours<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_bin_policy_hours" size="2" value="<{$bin_policy.policy_hours}>"/> </td> </tr> <tr> <td> <font face="Arial, Helvetica" size=2> <{tr}>Minutes<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_bin_policy_minutes" size="2" value="<{$bin_policy.policy_minutes}>"/> </td><td> <font face="Arial, Helvetica" size=2> <{tr}>Seconds<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_bin_policy_seconds" size="2" value="<{$bin_policy.policy_seconds}>"/> </td> </tr> <td align=center width="33%" colspan="6"> <input type=submit value="<{tr}>Enter<{/tr}>"> </td> </tr> </table> <tr><td> </td></tr> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td align=center width="33%" colspan="6" ><font face="Arial, Helvetica" size=2> <{tr}>Edit the default delete policy for raw data<{/tr}>: </td> </tr> <tr> <td align=center width="33%" colspan="6" ><font face="Arial, Helvetica" size=2> <{tr}>(enter a negative value to keep the data forever. Choose 0 to delete immediately)<{/tr}>: </td> </tr> <tr> <td> <font face="Arial, Helvetica" size=2> <{tr}>Days<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_raw_policy_days" size="4" value="<{$raw_policy.policy_days}>"/> </td><td> <font face="Arial, Helvetica" size=2> <{tr}>Hours<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_raw_policy_hours" size="2" value="<{$raw_policy.policy_hours}>"/> </td> </tr> <tr> <td> <font face="Arial, Helvetica" size=2> <{tr}>Minutes<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_raw_policy_minutes" size="2" value="<{$raw_policy.policy_minutes}>"/> </td><td> <font face="Arial, Helvetica" size=2> <{tr}>Seconds<{/tr}>: </td><td> <font face="Arial, Helvetica" size=2> <input type="text" name="def_raw_policy_seconds" size="2" value="<{$raw_policy.policy_seconds}>"/> </td> </tr> <td align=center width="33%" colspan="6"> <input type=submit value="<{tr}>Enter<{/tr}>"> </td> </tr> </table> </td></tr></table></p> </form> </body></html> |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:25
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/phpgui Modified Files: Makefile.am Makefile.in perfparse.php utils.php Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** utils.php 12 Aug 2007 00:11:45 -0000 1.40 --- utils.php 3 Sep 2007 22:56:25 -0000 1.41 *************** *** 521,524 **** --- 521,544 ---- } + function get_delete_policy_parsed(&$db,$id) { + $policyinfo=get_delete_policy($db,$id); + $s=$policyinfo['delete_policy_seconds']; + if($s<0) { // infinity + $policyinfo['policy_seconds']=-1; + $policyinfo['policy_minutes']=0; + $policyinfo['policy_hours']=0; + $policyinfo['policy_days']=0; + return($policyinfo); + } + $policyinfo['policy_seconds']=$s%60; + $s=floor($s/60); + $policyinfo['policy_minutes']=$s%60; + $s=floor($s/60); + $policyinfo['policy_hours']=$s%24; + $policyinfo['policy_days']=floor($s/24); + return($policyinfo); + } + + function create_delete_policy(&$db,$policy,$seconds,$comment='') { *************** *** 529,532 **** --- 549,559 ---- } + function set_delete_policy_seconds(&$db,$id,$seconds) { + $query='update perfdata_delete_policy set + delete_policy_seconds=? where policy_id=?'; + $db->Execute($query,array($seconds,$id)); + return($db->ErrorNo()); + } + function edit_delete_policy(&$db,$id,$policy,$seconds,$comment='') { $query='update perfdata_delete_policy set *************** *** 543,546 **** --- 570,639 ---- } + function get_policy_time_from_request($d,$h,$m,$s) { + // in cases where policy is changed in ui + get_request_var($d,'int',0); + get_request_var($h,'int',0); + get_request_var($m,'int',0); + get_request_var($s,'int',0); + global $$d; + global $$h; + global $$m; + global $$s; + return($$s + 60*$$m + 3600*$$h + 86400*$$d); + } + + function get_effective_bin_del_policy(&$db,$metric_id) { + // todo: cache information + + // if policy set in metric + $query='select bin_delete_policy_individual,policy_name,delete_policy_seconds from perfdata_service_metric + left join perfdata_delete_policy on bin_delete_policy_id=policy_id where metric_id=?'; + if(!$res=$db->GetRow($query,array($metric_id))) { + return(FALSE); + } + if($res['bin_delete_policy_individual']!==NULL) { + return(array('source'=>'Individual','policy_seconds'=>$res['bin_delete_policy_individual'])); + } + if($res['policy_name']!==NULL) { + return(array('source'=>'Metric Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); + } + + // if policy set in host + $query='select h.host_id,h.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from + perfdata_service_metric m, perfdata_service s, perfdata_host h left join + perfdata_delete_policy d on h.bin_delete_policy_id=d.policy_id where m.metric_id=? + and s.service_id=m.service_id + and s.host_id=h.host_id'; + if(!$res=$db->GetRow($query,array($metric_id))) { + return(FALSE); + } + if($res['bin_delete_policy_individual']!==NULL) { + return(array('source'=>'Host Individual','policy_seconds'=>$res['bin_delete_policy_individual'])); + } + if($res['policy_name']!==NULL) { + return(array('source'=>'Host Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'])); + } + $tmp_hostid=$res['host_id']; + + // if policy is set in group. If more than one group match, then the group with the longest policy matches. + // Individual settings match first. + $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds + from perfdata_host h, perfdata_host_groups gh, + perfdata_groups g left join perfdata_delete_policy d on + g.bin_delete_policy_id=d.policy_id + where h.host_id=? and h.host_id=hg.host_id and hg.group_id=g.group_id'; + if(!$res=$db->GetAll($query,array($tmp_hostid))) { + return(FALSE); + } + + print_r($res); + + + + } + + + /* graph functions */ + function get_graph_details(&$db,$id) { $query='SELECT * from perfdata_graphs where id=?'; Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.in 2 Aug 2007 22:20:22 -0000 1.11 --- Makefile.in 3 Sep 2007 22:56:25 -0000 1.12 *************** *** 282,285 **** --- 282,286 ---- templates/select_host.tpl.html \ templates/edit_delete_policies.tpl.html \ + templates/edit_default_delete_policies.tpl.html \ templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 29 Dec 2006 00:27:06 -0000 1.5 --- Makefile.am 3 Sep 2007 22:56:25 -0000 1.6 *************** *** 34,37 **** --- 34,38 ---- templates/select_host.tpl.html \ templates/edit_delete_policies.tpl.html \ + templates/edit_default_delete_policies.tpl.html \ templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** perfparse.php 12 Aug 2007 00:11:45 -0000 1.52 --- perfparse.php 3 Sep 2007 22:56:25 -0000 1.53 *************** *** 140,143 **** --- 140,145 ---- // this switch - case does page specific tasks and loads the template. switch ($page) { + + case 'select_host': // get_hosts is defined in utils.php *************** *** 150,153 **** --- 152,156 ---- break; + case 'select_metric': // get host array *************** *** 203,206 **** --- 206,211 ---- break; + + case 'graph': // for the uri *************** *** 367,370 **** --- 372,377 ---- } break; + + case 'all_bin': case 'all_raw': *************** *** 392,395 **** --- 399,404 ---- $smarty->display($config['PHP_Style'].$page.'.tpl.html'); break; + + case 'raw_history': case 'raw_history_summary': *************** *** 427,430 **** --- 436,441 ---- $smarty->display($config['PHP_Style'].$page.'.tpl.html'); break; + + case 'add_amend_host_group': if(isset($_REQUEST['delete'])) { *************** *** 447,450 **** --- 458,463 ---- $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; + + case 'edit_host_list': get_request_var('group_id','int',''); *************** *** 482,485 **** --- 495,500 ---- $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; + + case 'saved_graphs': // group selection first (newer cgi version) *************** *** 516,519 **** --- 531,536 ---- $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; + + case 'edit_delete_policies': // handle create or edit policy template: *************** *** 521,545 **** get_request_var('create_policy','string',''); if(empty($create_policy) && $edit_policy != false) { ! $epolicy=get_delete_policy($db,$edit_policy); ! $s=$epolicy['delete_policy_seconds']; ! $epolicy['policy_seconds']=$s%60; ! $s=floor($s/60); ! $epolicy['policy_minutes']=$s%60; ! $s=floor($s/60); ! $epolicy['policy_hours']=$s%24; ! $epolicy['policy_days']=floor($s/24); $smarty->assign_by_ref('epolicy',$epolicy); // echo "epolicy:<pre>";print_r($epolicy);echo "</pre>"; $smarty->assign('edit_policy',$edit_policy); } elseif(!empty($create_policy)) { get_request_var('create_policy_comment','string',''); - get_request_var('create_policy_days','int',0); - get_request_var('create_policy_hours','int',0); - get_request_var('create_policy_minutes','int',0); - get_request_var('create_policy_seconds','int',0); - $create_policy_seconds=$create_policy_seconds+ - 60*$create_policy_minutes+ - 3600*$create_policy_hours+ - 86400*$create_policy_days; if($edit_policy != false) { // policy was edited --- 538,548 ---- get_request_var('create_policy','string',''); if(empty($create_policy) && $edit_policy != false) { ! $epolicy=get_delete_policy_parsed($db,$edit_policy); $smarty->assign_by_ref('epolicy',$epolicy); // echo "epolicy:<pre>";print_r($epolicy);echo "</pre>"; $smarty->assign('edit_policy',$edit_policy); } elseif(!empty($create_policy)) { + $create_policy_seconds=get_policy_time_from_request('create_policy_days','create_policy_hours','create_policy_minutes','create_policy_seconds'); get_request_var('create_policy_comment','string',''); if($edit_policy != false) { // policy was edited *************** *** 572,575 **** --- 575,643 ---- $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; + + + case 'edit_default_delete_policies': + $def_bin_policy_seconds=get_policy_time_from_request('def_bin_policy_days','def_bin_policy_hours', + 'def_bin_policy_minutes','def_bin_policy_seconds'); + $def_raw_policy_seconds=get_policy_time_from_request('def_raw_policy_days','def_raw_policy_hours', + 'def_raw_policy_minutes','def_raw_policy_seconds'); + $bin_policy=get_delete_policy_parsed($db,0); + $smarty->assign_by_ref('bin_policy',$bin_policy); + $raw_policy=get_delete_policy_parsed($db,1); + $smarty->assign_by_ref('raw_policy',$raw_policy); + + // print_r($bin_policy); + // echo "<br />$def_bin_policy_seconds<br />"; + + get_request_var('edited','int',FALSE); + echo "edited=$edited"; + if($edited) { + if($def_bin_policy_seconds != $bin_policy['delete_policy_seconds']) { + if(!set_delete_policy_seconds($db,0,$def_bin_policy_seconds)) { + $smarty->assign('sql_error',$db->ErrorMsg()); + } + $bin_policy=get_delete_policy_parsed($db,0); //refetch for display + } + if($def_raw_policy_seconds != $raw_policy['delete_policy_seconds']) { + if(!set_delete_policy_seconds($db,1,$def_raw_policy_seconds)) { + $smarty->assign('sql_error',$db->ErrorMsg()); + } + $raw_policy=get_delete_policy_parsed($db,1); //refetch for display + } + } + $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); + break; + + + case 'show_effective_del_policies': + // get all needed object names and ids + $groupinfos=get_groups($db); + get_request_var('group_id','int',FALSE); + if($group_id != FALSE) { + $hostinfos=get_groupId_hostinfos($db,$group_id); + } + + get_request_var('host_id','int',FALSE); + if($host_id != FALSE) { + $metricsinfos=get_metrics_from_hostid($db,$host_id); + } + + echo "<pre>groupinfos:\n"; print_r($groupinfos); echo "\n</pre>"; + echo "<pre>hostinfos:\n"; print_r($hostinfos); echo "\n</pre>"; + echo "<pre>metricsinfos:\n"; print_r($metricsinfos); echo "\n</pre>"; + + if($effectivepolicy=get_effective_bin_del_policy($db,1/* testing */)==FALSE) { + $smarty->assign('sql_error',$db->ErrorMsg); + //debug: + echo $db->ErrorMsg; + } + + echo "<pre>effectivepolicy:\n"; print_r($effectivepolicy); echo "\n</pre>"; + + + $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); + break; + + case 'read_nag_config': // load modified naupy class |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:25
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/doc/database Modified Files: database_schema_v20.odp Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: database_schema_v20.odp =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/database/database_schema_v20.odp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsQJBkQ8 and /tmp/cvsSIvxfe differ |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:25
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/modules Modified Files: storage_mysql.h Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: storage_mysql.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** storage_mysql.h 24 Aug 2006 14:36:45 -0000 1.3 --- storage_mysql.h 3 Sep 2007 22:56:25 -0000 1.4 *************** *** 3,7 **** * storgae_mysql.h - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * * $Id$ --- 3,8 ---- * storgae_mysql.h - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner * * $Id$ |
|
From: Florian G. <re...@us...> - 2007-09-03 22:56:25
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/perfparse Modified Files: perfparsed.c Log Message: again changed db schema slightly and start work on del policies settings ui pages. Index: perfparsed.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/perfparsed.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** perfparsed.c 6 Jun 2007 09:53:14 -0000 1.5 --- perfparsed.c 3 Sep 2007 22:56:25 -0000 1.6 *************** *** 181,184 **** --- 181,185 ---- } + // load staorage modules if(0 == storage_init(NULL)) { pp_log(__FILE__,__LINE__,LOG_WARNING,_("No module was loaded. Check the Storage_Module_Load config option.")); *************** *** 186,189 **** --- 187,191 ---- } + // print info about loaded storage modules switch(config_option) { case CONFIG_OPTION_HELP: storage_print_usage(stdout, "help"); exit(EXIT_SUCCESS); |
|
From: Florian G. <re...@us...> - 2007-08-25 00:09:17
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13639/scripts Modified Files: mysql_create.sql Log Message: host name can have 100 Chars now. Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mysql_create.sql 12 Aug 2007 00:17:27 -0000 1.24 --- mysql_create.sql 25 Aug 2007 00:09:14 -0000 1.25 *************** *** 58,62 **** CREATE TABLE IF NOT EXISTS perfdata_host ( host_id INT AUTO_INCREMENT PRIMARY KEY, ! host_name VARCHAR(75) UNIQUE, raw_delete_policy_id INTEGER, raw_delete_policy_individual INTEGER, --- 58,62 ---- CREATE TABLE IF NOT EXISTS perfdata_host ( host_id INT AUTO_INCREMENT PRIMARY KEY, ! host_name VARCHAR(100) UNIQUE, raw_delete_policy_id INTEGER, raw_delete_policy_individual INTEGER, |
|
From: Florian G. <re...@us...> - 2007-08-25 00:09:16
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13639/cgi Modified Files: perfchart.c Log Message: host name can have 100 Chars now. Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** perfchart.c 12 Aug 2007 00:17:27 -0000 1.14 --- perfchart.c 25 Aug 2007 00:09:14 -0000 1.15 *************** *** 71,75 **** /* CGI in */ ! char sHost[76]=""; char sService[76]=""; char sMetric[76]=""; --- 71,75 ---- /* CGI in */ ! char sHost[101]=""; char sService[76]=""; char sMetric[76]=""; *************** *** 370,374 **** for (currentRow = 0; currentRow<numberOfRows; currentRow++){ #endif ! strncpy(sHost,sData(0),76); strncpy(sService,sData(1),76); strncpy(sMetric,sData(2),76); --- 370,374 ---- for (currentRow = 0; currentRow<numberOfRows; currentRow++){ #endif ! strncpy(sHost,sData(0),101); strncpy(sService,sData(1),76); strncpy(sMetric,sData(2),76); |
|
From: Florian G. <re...@us...> - 2007-08-12 00:17:27
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9926/scripts Modified Files: mysql_create.sql Log Message: oops. percent is hidden in scale. Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mysql_create.sql 12 Aug 2007 00:11:45 -0000 1.23 --- mysql_create.sql 12 Aug 2007 00:17:27 -0000 1.24 *************** *** 342,347 **** s_smo BOOLEAN NOT NULL, graphtitle VARCHAR(250), ! g_sigma DOUBLE NOT NULL, ! percent BOOLEAN NOT NULL default FALSE ) type=InnoDB; --- 342,346 ---- s_smo BOOLEAN NOT NULL, graphtitle VARCHAR(250), ! g_sigma DOUBLE NOT NULL ) type=InnoDB; |
|
From: Florian G. <re...@us...> - 2007-08-12 00:17:27
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9926/cgi Modified Files: perfchart.c Log Message: oops. percent is hidden in scale. Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** perfchart.c 12 Aug 2007 00:11:44 -0000 1.13 --- perfchart.c 12 Aug 2007 00:17:27 -0000 1.14 *************** *** 1542,1546 **** if(iGraphId>0) { /* get graph details from database */ ! g_string_printf(s_SQL, "SELECT g.metric_id,scale,minin,maxin,timerange,relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,graphtitle,g_sigma,unit,percent,s_smo FROM perfdata_graphs g,perfdata_service_metric m WHERE id=%d and g.metric_id=m.metric_id",iGraphId); #ifdef USE_DB_MYSQL if (mysql_query(&db_mysql, s_SQL->str)) --- 1542,1546 ---- if(iGraphId>0) { /* get graph details from database */ ! g_string_printf(s_SQL, "SELECT g.metric_id,scale,minin,maxin,timerange,relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,graphtitle,g_sigma,unit,s_smo FROM perfdata_graphs g,perfdata_service_metric m WHERE id=%d and g.metric_id=m.metric_id",iGraphId); #ifdef USE_DB_MYSQL if (mysql_query(&db_mysql, s_SQL->str)) *************** *** 1635,1639 **** iWidth = 585, iHeight = 300; bVal = iData(11); ! bSmooth = iData(19); bWarn = iData(12); bCrit = iData(13); --- 1635,1639 ---- iWidth = 585, iHeight = 300; bVal = iData(11); ! bSmooth = iData(18); bWarn = iData(12); bCrit = iData(13); *************** *** 1646,1652 **** strncpy(sUnit, sData(17),20); ! /* Show values as percent */ ! bPercent = iData(18); ! // todo: check forcescale, accuratescale } --- 1646,1650 ---- strncpy(sUnit, sData(17),20); ! // todo: check forcescale, accuratescale } |
|
From: Florian G. <re...@us...> - 2007-08-12 00:11:55
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7758/phpgui/templates Modified Files: saved_graphs.tpl.html Log Message: Made saved graphs working - some bugs still unresolved Index: saved_graphs.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/saved_graphs.tpl.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** saved_graphs.tpl.html 8 Apr 2006 23:59:47 -0000 1.4 --- saved_graphs.tpl.html 12 Aug 2007 00:11:45 -0000 1.5 *************** *** 67,71 **** <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"> <tr><td align=center> ! <img src="/nagios/cgi-bin/perfchart.png?<{$graphurl}>" border=0> </td></tr></table></p> <p align=center> --- 67,71 ---- <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"> <tr><td align=center> ! <img src="/nagios/cgi-bin/perfchart.png?graph_id=<{$view}>" border=0> </td></tr></table></p> <p align=center> |
|
From: Florian G. <re...@us...> - 2007-08-12 00:11:55
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7758/libpp_mysql Modified Files: Makefile.am Makefile.in dbms.c dbms.h Log Message: Made saved graphs working - some bugs still unresolved Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 2 Aug 2007 22:20:21 -0000 1.20 --- Makefile.in 12 Aug 2007 00:11:44 -0000 1.21 *************** *** 268,271 **** --- 268,272 ---- libpp_mysql_la_SOURCES = common.c common.h dbms.h dbms.c del_policy.c del_policy.h db_macro_actions.c db_macro_actions.h libpp_mysql_la_CPPFLAGS = '-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' '-DLOCALEDIR="$(datadir)/locale"' ${MYSQL_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir} + LDADD = '${MYSQL_LIBS}' all: all-am Index: dbms.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dbms.c 6 Jun 2007 09:53:14 -0000 1.6 --- dbms.c 12 Aug 2007 00:11:45 -0000 1.7 *************** *** 85,88 **** --- 85,96 ---- } + double dData(int iCol) + { + if (result_row[iCol] && result_row[iCol][0]) + return atof(result_row[iCol]); + else + return 0.0; + } + void pp_mysql_default_sql_failure(char*f,int l, const char*str, const char *error) { pp_log(f,l,LOG_ERROR,"%s (%s)",str,error); Index: dbms.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dbms.h 28 Oct 2006 20:36:43 -0000 1.2 --- dbms.h 12 Aug 2007 00:11:45 -0000 1.3 *************** *** 45,48 **** --- 45,49 ---- int isNull(int iCol); char *sData(int iCol); + double dData(int iCol); void libpp_mysql_query(char*f,int l, const char *sql); void libpp_mysql_query_no_return(char*f,int l, const char *sql); Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- Makefile.am 12 Aug 2007 00:11:44 -0000 1.2 *************** *** 3,6 **** libpp_mysql_la_SOURCES = common.c common.h dbms.h dbms.c del_policy.c del_policy.h db_macro_actions.c db_macro_actions.h libpp_mysql_la_CPPFLAGS='-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' '-DLOCALEDIR="$(datadir)/locale"' ${MYSQL_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir} ! --- 3,6 ---- libpp_mysql_la_SOURCES = common.c common.h dbms.h dbms.c del_policy.c del_policy.h db_macro_actions.c db_macro_actions.h libpp_mysql_la_CPPFLAGS='-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' '-DLOCALEDIR="$(datadir)/locale"' ${MYSQL_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir} ! LDADD='${MYSQL_LIBS}' |
|
From: Florian G. <re...@us...> - 2007-08-12 00:11:55
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7758/cgi Modified Files: cgi.c perfchart.c Log Message: Made saved graphs working - some bugs still unresolved Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** perfchart.c 2 Jul 2007 22:25:24 -0000 1.12 --- perfchart.c 12 Aug 2007 00:11:44 -0000 1.13 *************** *** 54,61 **** --- 54,72 ---- #define CHART_AREA_BORDER 1 + /* An enumeration for scale */ + #define SCALE_USER 0 + #define SCALE_USER_EXACT 1 + #define SCALE_USER_PERCENT 2 + #define SCALE_RANGE 3 + #define SCALE_RANGE_EXACT 4 + #define SCALE_RANGE_PERCENT 5 + #define SCALE_AUTO 6 + gdImagePtr graph = 0; void getCGI(); void doSQL(); + void getSavedGraphDetails(void); + /* CGI in */ *************** *** 67,70 **** --- 78,82 ---- char sTimeRange[2]; time_t tRelativeTime; + int iScale=SCALE_AUTO; int bForceScale = FALSE; int bAccurateScale = FALSE; *************** *** 215,218 **** --- 227,236 ---- getCGI(); + /* Handle SQL */ + doSQL(); + + /* get values for stored graphs */ + getSavedGraphDetails(); + /* Write tmp file reporting PID */ writePIDFile(); *************** *** 228,233 **** initChartGraphics(); - /* Handle SQL */ - doSQL(); /* Get the bounds of the graph */ --- 246,249 ---- *************** *** 1521,1540 **** ***************************************/ ! ! void getCGI() ! { ! char *s; char c; time_t t; - - setlocale(LC_NUMERIC, "POSIX"); - - getCGIDBVars(); - - /* get graph id for stored graphs */ - iGraphId=atoi(scgi("graph_id")); if(iGraphId>0) { /* get graph details from database */ ! g_string_printf(s_SQL, "SELECT metric_id,scale,minin,maxin,timerange,relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,graphtitle,g_sigma FROM perfdata_graphs WHERE id=%d",iGraphId); #ifdef USE_DB_MYSQL if (mysql_query(&db_mysql, s_SQL->str)) --- 1537,1546 ---- ***************************************/ ! void getSavedGraphDetails() { char c; time_t t; if(iGraphId>0) { /* get graph details from database */ ! g_string_printf(s_SQL, "SELECT g.metric_id,scale,minin,maxin,timerange,relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,graphtitle,g_sigma,unit,percent,s_smo FROM perfdata_graphs g,perfdata_service_metric m WHERE id=%d and g.metric_id=m.metric_id",iGraphId); #ifdef USE_DB_MYSQL if (mysql_query(&db_mysql, s_SQL->str)) *************** *** 1552,1557 **** --- 1558,1604 ---- sMetricId=iData(0); // scale + // todo: switching from dropdown to checkboxes in html can make life easier here! + iScale=iData(1); + switch(iScale) { + case SCALE_USER: + bForceScale=FALSE; + bAccurateScale=FALSE; + bPercent=FALSE; + break; + case SCALE_USER_EXACT: + bForceScale=FALSE; + bAccurateScale=TRUE; + bPercent=FALSE; + break; + case SCALE_USER_PERCENT: + bForceScale=FALSE; + bAccurateScale=FALSE; + bPercent=TRUE; + break; + case SCALE_RANGE: /* todo */ + case SCALE_RANGE_EXACT: /* todo */ + case SCALE_RANGE_PERCENT: /* todo */ + case SCALE_AUTO: + default: + bForceScale=TRUE; + bAccurateScale=TRUE; + bPercent=FALSE; + break; + } // minin + if(strlen(sData(2))>0) { + dMin=dData(2); + bMin=TRUE; + } else { // to be calculated + bMin=FALSE; + } // maxin + if(strlen(sData(3))>0) { + dMax=dData(3); + bMax=TRUE; + } else { // to be calculated + bMax=FALSE; + } + c=sData(4)[0]; // timerange *************** *** 1585,1592 **** iWidth=iData(9); iHeight=iData(10); ! } ! } else { /* get graph details from cgi*/ sMetricId=atoi(scgi("metric_id")); --- 1632,1669 ---- iWidth=iData(9); iHeight=iData(10); + if (!iWidth || !iHeight) + iWidth = 585, iHeight = 300; + bVal = iData(11); + bSmooth = iData(19); + bWarn = iData(12); + bCrit = iData(13); + bStanDev = iData(14); + sTitle=strdup(sData(15)); + /* Gaussian Theta */ + fGaussianSigma = dData(16) / 2; + if (fGaussianSigma <= 0) fGaussianSigma = GAUSSIAN_SIGMA_DEFAULT; + + strncpy(sUnit, sData(17),20); ! /* Show values as percent */ ! bPercent = iData(18); ! ! // todo: check forcescale, accuratescale } ! } ! } ! ! void getCGI() ! { ! char *s; ! ! setlocale(LC_NUMERIC, "POSIX"); ! ! getCGIDBVars(); ! ! /* get graph id for stored graphs */ ! iGraphId=atoi(scgi("graph_id")); ! /* get graph detals for stored graphs is handled later */ ! if(iGraphId<=0) { /* get graph details from cgi*/ sMetricId=atoi(scgi("metric_id")); *************** *** 1698,1701 **** --- 1775,1781 ---- { + if(graph==0) { /*early error handling */ + initChartGraphics(); + } gdImageFilledRectangle(graph, 0, 0, iWidth, iHeight, white); *************** *** 1827,1830 **** --- 1907,1914 ---- tmpSQL = g_strdup(sql); tmpError = g_strdup(error); + + if(graph==0) { /*early error handling */ + initChartGraphics(); + } gdImageFilledRectangle(graph, 0, 0, iWidth, iHeight, white); Index: cgi.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/cgi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cgi.c 20 Dec 2006 22:57:45 -0000 1.3 --- cgi.c 12 Aug 2007 00:11:44 -0000 1.4 *************** *** 3,7 **** * cgi.c - Common functions for cgi functions. * ! * Copyright (c) 2004 Ben Clewett * $Id$ * --- 3,7 ---- * cgi.c - Common functions for cgi functions. * ! * Copyright (c) 2004-2007 Ben Clewett, Florian Gleixner * $Id$ * *************** *** 231,235 **** } - - - --- 231,232 ---- |
|
From: Florian G. <re...@us...> - 2007-08-12 00:11:55
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7758/phpgui Modified Files: perfparse.php utils.php Log Message: Made saved graphs working - some bugs still unresolved Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** utils.php 18 Jun 2007 22:12:38 -0000 1.39 --- utils.php 12 Aug 2007 00:11:45 -0000 1.40 *************** *** 580,584 **** // sanatize grapharray list($grapharray['sizex'],$grapharray['sizey'])=split('x',$grapharray['size'],2); ! $notempty=array('graph_name','refresh_time','metric_id','scale','timerange','output','sizex','sizey','s_val','s_war','s_cri','s_sta','g_sigma'); foreach($notempty as $checkvar) { if(!isset($grapharray[$checkvar]) || (is_string($grapharray[$checkvar]) && empty($grapharray[$checkvar]))) { --- 580,584 ---- // sanatize grapharray list($grapharray['sizex'],$grapharray['sizey'])=split('x',$grapharray['size'],2); ! $notempty=array('graph_name','refresh_time','metric_id','scale','timerange','output','sizex','sizey','s_val','s_war','s_cri','s_sta','s_smo','g_sigma'); foreach($notempty as $checkvar) { if(!isset($grapharray[$checkvar]) || (is_string($grapharray[$checkvar]) && empty($grapharray[$checkvar]))) { *************** *** 589,594 **** $query='insert into perfdata_graphs (title,descript,refresh_time,metric_id,scale,minin,maxin,timerange,'; ! $query.='relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,graphtitle,g_sigma) '; ! $query.='values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; $bindarray=array($grapharray['graph_name'],$grapharray['desc'],$grapharray['refresh_time'],$grapharray['metric_id'], $grapharray['scale'],$grapharray['minin'],$grapharray['maxin'],$grapharray['timerange']); --- 589,594 ---- $query='insert into perfdata_graphs (title,descript,refresh_time,metric_id,scale,minin,maxin,timerange,'; ! $query.='relativetime,fromtime,totime,output,sizex,sizey,s_val,s_war,s_cri,s_sta,s_smo,graphtitle,g_sigma) '; ! $query.='values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; $bindarray=array($grapharray['graph_name'],$grapharray['desc'],$grapharray['refresh_time'],$grapharray['metric_id'], $grapharray['scale'],$grapharray['minin'],$grapharray['maxin'],$grapharray['timerange']); *************** *** 631,634 **** --- 631,635 ---- $bindarray[]=$grapharray['s_cri']; $bindarray[]=$grapharray['s_sta']; + $bindarray[]=$grapharray['s_smo']; $bindarray[]=$grapharray['title']; $bindarray[]=$grapharray['g_sigma']; Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** perfparse.php 18 Jun 2007 22:12:38 -0000 1.51 --- perfparse.php 12 Aug 2007 00:11:45 -0000 1.52 *************** *** 1,5 **** <?php ! // Copyright (c) 2004,2005,2006 Florian Gleixner // Licensed under the GNU GENERAL PUBLIC LICENSE or the BSD License // --- 1,5 ---- <?php ! // Copyright (c) 2004-2007 Florian Gleixner // Licensed under the GNU GENERAL PUBLIC LICENSE or the BSD License // *************** *** 277,281 **** if(isset($actgraph[$fvar])) { $actgraph[$fvar]=1; ! } } // if(!isset($graphs .... } // foreach($formvars ... --- 277,283 ---- if(isset($actgraph[$fvar])) { $actgraph[$fvar]=1; ! } else { ! $actgraph[$fvar]=0; ! } } // if(!isset($graphs .... } // foreach($formvars ... *************** *** 500,508 **** $smarty->assign('graphs',$graphs); ! if(isset($_REQUEST['view']) && saved_graph_exists($db,$_REQUEST['view'])) { ! $smarty->assign('view',$_REQUEST['view']); ! $graphdetails=get_graph_details($db,$_REQUEST['view']); ! $smarty->assign('graphurl', $graphdetails['url']); ! $smarty->assign('graphtitle', $graphdetails['title']); } --- 502,515 ---- $smarty->assign('graphs',$graphs); ! if(get_request_var('view','int')) { ! if(saved_graph_exists($db,$view)) { ! $graphdetails=get_graph_details($db,$view); ! $smarty->assign('graphurl', $graphdetails['url']); ! $smarty->assign('graphtitle', $graphdetails['title']); ! } else { ! //Graph does not exist ! $view=NULL; ! $smarty->assign_by_ref('view',$view); ! } } |
|
From: Florian G. <re...@us...> - 2007-08-12 00:11:55
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7758/scripts Modified Files: mysql_create.sql Log Message: Made saved graphs working - some bugs still unresolved Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mysql_create.sql 20 Jun 2007 22:25:11 -0000 1.22 --- mysql_create.sql 12 Aug 2007 00:11:45 -0000 1.23 *************** *** 327,332 **** ON DELETE RESTRICT, scale INT NOT NULL, ! minin INT, ! maxin INT, timerange CHAR(1) NOT NULL, relativetime INT, --- 327,332 ---- ON DELETE RESTRICT, scale INT NOT NULL, ! minin DOUBLE, ! maxin DOUBLE, timerange CHAR(1) NOT NULL, relativetime INT, *************** *** 340,345 **** s_cri BOOLEAN NOT NULL, s_sta BOOLEAN NOT NULL, graphtitle VARCHAR(250), ! g_sigma INT NOT NULL ) type=InnoDB; --- 340,347 ---- s_cri BOOLEAN NOT NULL, s_sta BOOLEAN NOT NULL, + s_smo BOOLEAN NOT NULL, graphtitle VARCHAR(250), ! g_sigma DOUBLE NOT NULL, ! percent BOOLEAN NOT NULL default FALSE ) type=InnoDB; |
|
From: Florian G. <re...@us...> - 2007-08-08 22:19:49
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27673/cgi Modified Files: perfgant.c Log Message: Replace round() with rint(). Hopefully this will fix compile problems on Solaris Index: perfgant.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfgant.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** perfgant.c 13 Jun 2007 13:56:12 -0000 1.8 --- perfgant.c 8 Aug 2007 22:19:16 -0000 1.9 *************** *** 185,195 **** int last_scale=-30; for (i = 0; i < iDays; i++) { ! if((int) round(i*(dRowHeight + dRowGap)) - last_scale >20) { ! last_scale=(int) round(i*(dRowHeight + dRowGap)); t = i * DAY1 + tFromMidnight; r = localtime(&t); // sprintf(s, "%04d-%02d-%02d", r->tm_year + 1900, r->tm_mon + 1, r->tm_mday); sprintf(s, "%02d-%02d", r->tm_mon + 1, r->tm_mday); ! gdImageString(gant, gdFontSmall, 8, (int) round(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); switch (r->tm_wday) { case 0: strncpy(s, _("Sun"),4); break; --- 185,195 ---- int last_scale=-30; for (i = 0; i < iDays; i++) { ! if((int) rint(i*(dRowHeight + dRowGap)) - last_scale >20) { ! last_scale=(int) rint(i*(dRowHeight + dRowGap)); t = i * DAY1 + tFromMidnight; r = localtime(&t); // sprintf(s, "%04d-%02d-%02d", r->tm_year + 1900, r->tm_mon + 1, r->tm_mday); sprintf(s, "%02d-%02d", r->tm_mon + 1, r->tm_mday); ! gdImageString(gant, gdFontSmall, 8, (int) rint(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); switch (r->tm_wday) { case 0: strncpy(s, _("Sun"),4); break; *************** *** 201,205 **** case 6: strncpy(s, _("Sat"),4); break; } ! gdImageString(gant, gdFontSmall, iWidth - iSideBorder + 15, (int) round(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); } } --- 201,205 ---- case 6: strncpy(s, _("Sat"),4); break; } ! gdImageString(gant, gdFontSmall, iWidth - iSideBorder + 15, (int) rint(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); } } *************** *** 367,371 **** int getY(time_t t) { ! return (int) round(getDay(t)*(dRowHeight + dRowGap)) + iBorder + iRowGap; } --- 367,371 ---- int getY(time_t t) { ! return (int) rint(getDay(t)*(dRowHeight + dRowGap)) + iBorder + iRowGap; } *************** *** 452,456 **** iDays = (int)(tToMidnight - tFromMidnight) / DAY1; ! iHeight = iBorder * 2 + iRowHeight * iDays + (int) round(dRowGap) * (iDays + 1); if(iHeight > 600) { iHeight=600; --- 452,456 ---- iDays = (int)(tToMidnight - tFromMidnight) / DAY1; ! iHeight = iBorder * 2 + iRowHeight * iDays + (int) rint(dRowGap) * (iDays + 1); if(iHeight > 600) { iHeight=600; *************** *** 458,463 **** dRowGap=dRowHeight/2; } ! iRowHeight=(int) round(dRowHeight); ! iRowGap=(int) round(dRowGap); #ifdef DEBUG --- 458,463 ---- dRowGap=dRowHeight/2; } ! iRowHeight=(int) rint(dRowHeight); ! iRowGap=(int) rint(dRowGap); #ifdef DEBUG |
|
From: Florian G. <re...@us...> - 2007-08-08 22:19:49
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27673/db_tools Modified Files: convert.c Log Message: Replace round() with rint(). Hopefully this will fix compile problems on Solaris Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** convert.c 2 Aug 2007 22:20:21 -0000 1.38 --- convert.c 8 Aug 2007 22:19:17 -0000 1.39 *************** *** 878,882 **** int eh=0, emin=0, esec=0; esec=acttime-starttime; ! sec=floor((((float)iODBnumrows / (float)i - 1.0) * (float)esec)+0.5); if(sec>60) { min=floor(sec/60); --- 878,882 ---- int eh=0, emin=0, esec=0; esec=acttime-starttime; ! sec=rint(((float)iODBnumrows / (float)i - 1.0) * (float)esec); if(sec>60) { min=floor(sec/60); |
|
From: Florian G. <re...@us...> - 2007-08-02 22:20:25
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11528/phpgui Modified Files: Makefile.in Log Message: Did a autoupdate & autoscan. Replaced round(x) with ceil(x+0.5) for Solaris 9 which does not support C99 (See http://forum.java.sun.com/thread.jspa?threadID=5151269&tstart=210) Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 28 Mar 2007 22:54:28 -0000 1.10 --- Makefile.in 2 Aug 2007 22:20:22 -0000 1.11 *************** *** 190,193 **** --- 190,195 ---- VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ + YACC = @YACC@ + YFLAGS = @YFLAGS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ |
|
From: Florian G. <re...@us...> - 2007-08-02 22:20:25
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11528/perfparse Modified Files: Makefile.in Log Message: Did a autoupdate & autoscan. Replaced round(x) with ceil(x+0.5) for Solaris 9 which does not support C99 (See http://forum.java.sun.com/thread.jspa?threadID=5151269&tstart=210) Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 28 Mar 2007 22:54:28 -0000 1.19 --- Makefile.in 2 Aug 2007 22:20:22 -0000 1.20 *************** *** 213,216 **** --- 213,218 ---- VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ + YACC = @YACC@ + YFLAGS = @YFLAGS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ |
|
From: Florian G. <re...@us...> - 2007-08-02 22:20:25
|
Update of /cvsroot/perfparse/_perfparse/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11528/config Modified Files: Makefile.in Log Message: Did a autoupdate & autoscan. Replaced round(x) with ceil(x+0.5) for Solaris 9 which does not support C99 (See http://forum.java.sun.com/thread.jspa?threadID=5151269&tstart=210) Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 28 Mar 2007 22:54:27 -0000 1.19 --- Makefile.in 2 Aug 2007 22:20:21 -0000 1.20 *************** *** 195,198 **** --- 195,200 ---- VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ + YACC = @YACC@ + YFLAGS = @YFLAGS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ |
