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...> - 2008-04-11 12:54:26
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23860 Modified Files: Makefile.am Log Message: forgot tabber.tpl.html Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 13 Feb 2008 22:50:32 -0000 1.9 --- Makefile.am 11 Apr 2008 12:54:24 -0000 1.10 *************** *** 40,43 **** --- 40,44 ---- templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ + templates/tabber.tpl.html \ templates/default.css \ templates_c/index.php \ |
|
From: Florian G. <re...@us...> - 2008-04-01 19:22:24
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/phpgui Modified Files: perfparse.php Log Message: smarty needs literal with js Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** perfparse.php 23 Jan 2008 22:33:53 -0000 1.62 --- perfparse.php 1 Apr 2008 19:22:26 -0000 1.63 *************** *** 1,5 **** <?php ! // Copyright (c) 2004-2007 Florian Gleixner // Licensed under the GNU GENERAL PUBLIC LICENSE or the BSD License // --- 1,5 ---- <?php ! // Copyright (c) 2004-2008 Florian Gleixner // Licensed under the GNU GENERAL PUBLIC LICENSE or the BSD License // |
|
From: Florian G. <re...@us...> - 2008-04-01 19:22:22
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/phpgui/templates Modified Files: raw_history.tpl.html Log Message: smarty needs literal with js Index: raw_history.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/raw_history.tpl.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** raw_history.tpl.html 23 Jan 2008 22:33:53 -0000 1.7 --- raw_history.tpl.html 1 Apr 2008 19:22:26 -0000 1.8 *************** *** 1,6 **** <HTML> <HEAD> ! <TITLE> ! PerfParse</TITLE> <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> function isAbsRelVisible() { --- 1,6 ---- <HTML> <HEAD> ! <TITLE>PerfParse</TITLE> ! {literal} <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> function isAbsRelVisible() { *************** *** 29,32 **** --- 29,34 ---- } </SCRIPT> + {/literal} + </HEAD> <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000" onload="isAbsRelVisible()"> <p align=center> |
|
From: Florian G. <re...@us...> - 2008-03-15 00:01:21
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22141 Modified Files: graph.tpl.html saved_graphs.tpl.html Log Message: design Index: graph.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/graph.tpl.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** graph.tpl.html 11 Mar 2008 23:03:22 -0000 1.15 --- graph.tpl.html 15 Mar 2008 00:01:24 -0000 1.16 *************** *** 16,28 **** if(els[i].id=="Abs_"+ref) { if(ttype=='Abs') { ! els[i].style.visibility="visible"; }else{ ! els[i].style.visibility="hidden"; } } else if (els[i].id=="Rel_"+ref) { if(ttype=='Abs') { ! els[i].style.visibility="hidden"; }else{ ! els[i].style.visibility="visible"; } } --- 16,28 ---- if(els[i].id=="Abs_"+ref) { if(ttype=='Abs') { ! els[i].style.display="inline"; }else{ ! els[i].style.display="none"; } } else if (els[i].id=="Rel_"+ref) { if(ttype=='Abs') { ! els[i].style.display="none"; }else{ ! els[i].style.display="inline"; } } *************** *** 77,82 **** <img src="{$metricarray.url}" border=0> </td> ! <td><b>{tr}Host{/tr}:</b> {$host_name} <br /> ! <b>{tr}Service{/tr}:</b> {$service} <br /> <b>{tr}Metric{/tr}:</b> {$metric} <br /> <div class="tabber"> --- 77,82 ---- <img src="{$metricarray.url}" border=0> </td> ! <td style="vertical-align:top;"><b>{tr}Host{/tr}:</b> {$host_name} ! <b>{tr}Service{/tr}:</b> {$service} <b>{tr}Metric{/tr}:</b> {$metric} <br /> <div class="tabber"> *************** *** 103,118 **** <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="RelSwitch" {if $metricarray.timerange=="r"}checked="checked"{/if} >{tr}Relative{/tr} <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="AbsSwitch" {if $metricarray.timerange=="a"}checked="checked"{/if}>{tr}Absolute{/tr} ! <div id="Rel_{$host_name}_{$service}_{$metric}">{tr}Rel Period{/tr}:</div> ! <div id="Rel_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativedays]" value="{$metricarray.relativedays}" size=2 maxlength=4> {tr}Days{/tr} </div> ! <div id="Rel_{$host_name}_{$service}_{$metric}">{tr}And Hours{/tr}:</div> ! <div id="Rel_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativetime]" value="{$metricarray.relativetime}" size=5 maxlength=5> {tr}HH:MM{/tr} </div> ! <div style="visibility:hidden;" id="Abs_{$host_name}_{$service}_{$metric}">{tr}Abs From{/tr}:</div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][from]" value="{$metricarray.from}" size=17 maxlength=20></div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}">{tr}Abs To{/tr}:</div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][to]" value="{$metricarray.to}" size=17 maxlength=20></div> </div> <div class="tabbertab"> <h2>{tr}Output{/tr}:</h2> ! <b>{tr}Output{/tr}:</b> <select name="displaygraphs[{$host_name}][{$service}][{$metric}][output]"> <option value="Histogram" {if $metricarray.output=="Histogram"}selected="selected"{/if}>{tr}Histogram{/tr} --- 103,119 ---- <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="RelSwitch" {if $metricarray.timerange=="r"}checked="checked"{/if} >{tr}Relative{/tr} <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="AbsSwitch" {if $metricarray.timerange=="a"}checked="checked"{/if}>{tr}Absolute{/tr} ! <br /> ! <div id="Rel_{$host_name}_{$service}_{$metric}">{tr}Rel Period{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativedays]" value="{$metricarray.relativedays}" size=2 maxlength=4> {tr}Days{/tr} ! {tr}And Hours{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativetime]" value="{$metricarray.relativetime}" size=5 maxlength=5> {tr}HH:MM{/tr}</div> ! <div style="display:none;" id="Abs_{$host_name}_{$service}_{$metric}">{tr}Abs From{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][from]" value="{$metricarray.from}" size=17 maxlength=20> ! {tr}Abs To{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][to]" value="{$metricarray.to}" size=17 maxlength=20></div> </div> <div class="tabbertab"> <h2>{tr}Output{/tr}:</h2> ! {tr}Output{/tr}: <select name="displaygraphs[{$host_name}][{$service}][{$metric}][output]"> <option value="Histogram" {if $metricarray.output=="Histogram"}selected="selected"{/if}>{tr}Histogram{/tr} *************** *** 120,128 **** <option value="Diff" {if $metricarray.output=="Diff"}selected="selected"{/if}>{tr}Differential Rate{/tr} <option value="Int" {if $metricarray.output=="Int"}selected="selected"{/if}>{tr}Integral Sum{/tr} ! <b>{tr}Size{/tr}:</b> <select name="displaygraphs[{$host_name}][{$service}][{$metric}][size]"> <option value="400x200" {if $metricarray.size=="400x200"}selected="selected"{/if}>{tr}Small{/tr} <option value="585x300" {if $metricarray.size=="585x300"}selected="selected"{/if}>{tr}Normal{/tr} <option value="1000x600" {if $metricarray.size=="1000x600"}selected="selected"{/if}>{tr}Large{/tr} </div> <div class="tabbertab"> --- 121,131 ---- <option value="Diff" {if $metricarray.output=="Diff"}selected="selected"{/if}>{tr}Differential Rate{/tr} <option value="Int" {if $metricarray.output=="Int"}selected="selected"{/if}>{tr}Integral Sum{/tr} ! </select> ! {tr}Size{/tr}: <select name="displaygraphs[{$host_name}][{$service}][{$metric}][size]"> <option value="400x200" {if $metricarray.size=="400x200"}selected="selected"{/if}>{tr}Small{/tr} <option value="585x300" {if $metricarray.size=="585x300"}selected="selected"{/if}>{tr}Normal{/tr} <option value="1000x600" {if $metricarray.size=="1000x600"}selected="selected"{/if}>{tr}Large{/tr} + </select> </div> <div class="tabbertab"> *************** *** 138,146 **** <h2><b>{tr}Advanced Options{/tr}.</b></h2> {tr}Graph Legend{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][title]" value="{$metricarray.title}" size=60 maxlength=80> {tr}Smooth Plot: Gaussian Average: Width (pixels){/tr}: <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][g_sigma]" value="{$metricarray.g_sigma}" size=5 maxlength=5> ! ({tr}Large = Slow, see{/tr} <a href="http://perfparse.sourceforge.net/faq.php#gaussian">{tr}FAQ{/tr}</a>) ! <div> <div class="tabbertab"> <h2><b>{tr}Save Graph{/tr}.</b></h2> --- 141,149 ---- <h2><b>{tr}Advanced Options{/tr}.</b></h2> {tr}Graph Legend{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][title]" value="{$metricarray.title}" size=60 maxlength=80><br /> {tr}Smooth Plot: Gaussian Average: Width (pixels){/tr}: <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][g_sigma]" value="{$metricarray.g_sigma}" size=5 maxlength=5> ! ({tr}Large = Slow, see{/tr} <a href="http://perfparse.sourceforge.net/faq.php#gaussian">{tr}FAQ{/tr}</a>)<br /> ! </div> <div class="tabbertab"> <h2><b>{tr}Save Graph{/tr}.</b></h2> Index: saved_graphs.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/saved_graphs.tpl.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** saved_graphs.tpl.html 23 Jan 2008 22:33:53 -0000 1.7 --- saved_graphs.tpl.html 15 Mar 2008 00:01:24 -0000 1.8 *************** *** 1,21 **** <HTML> <HEAD> ! <TITLE> ! PerfParse</TITLE> ! <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <p align=center> ! <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> ! <table width="100%" border=0 cellpadding=0 cellspacing=2> ! <tr> ! <td colspan=4><table width="100%" border=0 cellpadding=0 cellspacing=0><tr><td> ! <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}Stored Graphs{/tr}</b><br> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br> ! </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1>{$version}</td> ! </td></tr></table></td> </tr> </table> ! </td></tr></table></p> <p align=center><table width="600" border=1 cellspacing=0 cellpadding=2> <tr> --- 1,25 ---- <HTML> <HEAD> ! <TITLE>PerfParse</TITLE> ! <!-- $Id$ --> ! {include file="tabber.tpl.html"} ! </HEAD> ! <BODY> <p align=center> ! <span class="logo"> ! <table class="logotext"> ! <tr><td> ! <img src="{$http_image_path}perfparse-logo-sm.png" border=0> ! </td><td> ! <b>{tr}Stored Graphs{/tr}</b><br /> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a> ! </td><td class="normtext" width="20%"> ! {$version} ! </td> </tr> </table> ! </span> ! <br /> ! </p> <p align=center><table width="600" border=1 cellspacing=0 cellpadding=2> <tr> *************** *** 71,80 **** <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> - <table width="100%" border=0 cellpadding=0 cellspacing=5> <tr> <td align=center><font face="Arial, Helvetica" size=2><b>{tr}URL to create this graph{/tr}:</b></td> </tr> <tr> ! <td><font face="Courier" size=1>/nagios/cgi-bin/perfchart.cgi?{$graphurl|escape:"htmlall"}</td> </tr> --- 75,83 ---- <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <tr> <td align=center><font face="Arial, Helvetica" size=2><b>{tr}URL to create this graph{/tr}:</b></td> </tr> <tr> ! <td><font face="Courier" size=1>/nagios/cgi-bin/perfchart.png?graph_id={$view|escape:"htmlall"}</td> </tr> |
|
From: Florian G. <re...@us...> - 2008-03-11 23:03:20
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28916 Modified Files: graph.tpl.html Log Message: design Index: graph.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/graph.tpl.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** graph.tpl.html 23 Jan 2008 22:33:53 -0000 1.14 --- graph.tpl.html 11 Mar 2008 23:03:22 -0000 1.15 *************** *** 1,6 **** <HTML> <HEAD> ! <TITLE> ! PerfParse</TITLE> {literal} <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> --- 1,8 ---- <HTML> <HEAD> ! <TITLE>PerfParse</TITLE> ! <!-- $Id$--> ! {include file="tabber.tpl.html"} ! {literal} <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> *************** *** 10,14 **** } function showTimerange(ref,ttype) { ! els = document.getElementsByTagName("td"); for(i = 0; i < els.length; ++i) { if(els[i].id=="Abs_"+ref) { --- 12,16 ---- } function showTimerange(ref,ttype) { ! els = document.getElementsByTagName("div"); for(i = 0; i < els.length; ++i) { if(els[i].id=="Abs_"+ref) { *************** *** 30,57 **** </SCRIPT> {/literal} ! <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000" onload="isAbsRelVisible()"> ! <p align=center> ! <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <form method="POST" name="graph"> <input type=hidden name="page" value="graph"> ! <table width="100%" border=0 cellpadding=0 cellspacing=2> ! <tr> ! <td colspan=7><table width="100%" border=0 cellpadding=0 cellspacing=0><tr><td> ! <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}PerfParse Metric Analysis{/tr}</b><br><br> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br> ! <a href="perfparse.php?page=all_bin">{tr}Click to select new service{/tr}.</a> ! </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1>{$version}</td> ! </td></tr></table></td> </tr> ! <tr><td align="center" colspan="7"><input type="submit" value="{tr}Draw graph{/tr}" /> <!-- save the graphs array --> {foreach from=$graphs key=mid item=bla} <input type="hidden" name="graphs[{$mid}]" value="{$bla}" /> {/foreach} ! </td></tr> <!-- loop through displaygraphs --> {foreach from=$displaygraphs key=host_name item=hostarray} --- 32,69 ---- </SCRIPT> {/literal} ! </HEAD> ! ! <BODY> ! <!-- <BODY onload="isAbsRelVisible()"> --> <form method="POST" name="graph"> <input type=hidden name="page" value="graph"> ! <p align=center> ! <span class="logo"> ! <table class="logotext"> ! <tr><td> ! <img src="{$http_image_path}perfparse-logo-sm.png" border=0> ! </td><td> ! <b>{tr}PerfParse Metric Analysis{/tr}:<br /> ! </b><br /> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br /> ! <a href="perfparse.php?page=all_bin">{tr}Click to select a new service{/tr}.</a> ! </td><td class="normtext" width="20%"> ! {$version} ! </td> </tr> ! <tr><td align="center" colspan="3"><input type="submit" value="{tr}Draw graph{/tr}" /></td></tr> ! </table> ! </span> ! <br /> ! </p> ! <!-- save the graphs array --> {foreach from=$graphs key=mid item=bla} <input type="hidden" name="graphs[{$mid}]" value="{$bla}" /> {/foreach} ! ! <table> <!-- loop through displaygraphs --> {foreach from=$displaygraphs key=host_name item=hostarray} *************** *** 61,201 **** {foreach from=$servicearray key=metric item=metricarray} <!-- metric {$metric} --> ! <tr><td colspan=7><hr width="100%"></td></tr> ! <tr> ! <td align="center" rowspan="14"> <!-- The graph --> <img src="{$metricarray.url}" border=0> </td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Host{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$host_name}</td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Service{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$service}</td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Metric{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$metric}</td> ! </tr> ! <tr><td colspan=6 height=4><hr></td></tr> ! <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Scale{/tr}:</td> ! <td> ! <select name="displaygraphs[{$host_name}][{$service}][{$metric}][scale]"> ! <option value="1" {if $metricarray.scale == 1}selected="selected"{/if}>{tr}User{/tr}: ! <option value="0" {if $metricarray.scale == 0}selected="selected"{/if}>{tr}User, Rounded{/tr}: ! <option value="2" {if $metricarray.scale == 2}selected="selected"{/if}>{tr}User, as Percent{/tr}: ! {if $metricarray.value_max } ! <option value="3" {if $metricarray.scale == 3}selected="selected"{/if}>{tr}from Plugin{/tr}: ! <option value="4" {if $metricarray.scale == 4}selected="selected"{/if}>{tr}from Plugin, Rounded{/tr}: ! <option value="5" {if $metricarray.scale == 5}selected="selected"{/if}>{tr}from Plugin, as Percent{/tr}: ! {/if} ! <option value="6" {if $metricarray.scale == 6}selected="selected"{/if}>{tr}Automatic{/tr}. ! </select> ! </td> ! <td align=right><font face="Arial, Helvetica" size=2> {tr}User Min{/tr}: ! </td> ! <td> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][minin]" value="{$metricarray.minin}" size=12 maxlength=12> ! </td> ! <td align=right><font face="Arial, Helvetica" size=2> ! Max: ! </td> ! <td> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][maxin]" value="{$metricarray.maxin}" size=12 maxlength=12> ! </td> ! </tr> ! <tr><td colspan=6 height=4><hr></td></tr> ! <tr> ! <td align=right rowspan=2><font face="Arial, Helvetica" size=2>{tr}Period{/tr}:</td> ! <td valign=middle><font face="Arial, Helvetica" size=2> <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="RelSwitch" {if $metricarray.timerange=="r"}checked="checked"{/if} >{tr}Relative{/tr}</td> ! <td align=right id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Rel Period{/tr}:</td> ! <td valign=middle id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativedays]" value="{$metricarray.relativedays}" size=2 maxlength=4> {tr}Days{/tr} </td> ! <td align=right id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> ! {tr}And Hours{/tr}: ! </td> ! <td id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativetime]" value="{$metricarray.relativetime}" size=5 maxlength=5> {tr}HH:MM{/tr} </td> ! </tr> ! <tr> ! <td><font face="Arial, Helvetica" size=2> ! <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="AbsSwitch" {if $metricarray.timerange=="a"}checked="checked"{/if}>{tr}Absolute{/tr} </td> ! <td align=right id="Abs_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Abs From{/tr}:</td> ! <td id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][from]" value="{$metricarray.from}" size=17 maxlength=20></td> ! <td align=right id="Abs_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Abs To{/tr}:</td> ! <td id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][to]" value="{$metricarray.to}" size=17 maxlength=20></td> ! </tr> ! <tr><td colspan=6 height=4><hr height=4></td></tr> ! <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Output{/tr}:</td> ! <td><select name="displaygraphs[{$host_name}][{$service}][{$metric}][output]"> <option value="Histogram" {if $metricarray.output=="Histogram"}selected="selected"{/if}>{tr}Histogram{/tr} <option value="Average" {if $metricarray.output=="Average"}selected="selected"{/if}>{tr}Daily Average{/tr} <option value="Diff" {if $metricarray.output=="Diff"}selected="selected"{/if}>{tr}Differential Rate{/tr} <option value="Int" {if $metricarray.output=="Int"}selected="selected"{/if}>{tr}Integral Sum{/tr} ! </td> ! <td colspan=2> </td> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Size{/tr}:</td> ! <td><select name="displaygraphs[{$host_name}][{$service}][{$metric}][size]"> <option value="400x200" {if $metricarray.size=="400x200"}selected="selected"{/if}>{tr}Small{/tr} <option value="585x300" {if $metricarray.size=="585x300"}selected="selected"{/if}>{tr}Normal{/tr} <option value="1000x600" {if $metricarray.size=="1000x600"}selected="selected"{/if}>{tr}Large{/tr} ! </td> ! </tr> ! <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Plot{/tr}:</td> ! <td colspan=5><font face="Arial, Helvetica" size="2"> ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_val]" value="1" {if $metricarray.s_val}checked="checked"{/if}> {tr}Value{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_smo]" value="1" {if $metricarray.s_smo}checked="checked"{/if}> {tr}Smooth{/tr}* ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_war]" value="1" {if $metricarray.s_war}checked="checked"{/if}> {tr}Warning{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_cri]" value="1" {if $metricarray.s_cri}checked="checked"{/if}> {tr}Critical{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_sta]" value="1" {if $metricarray.s_sta}checked="checked"{/if}> {tr}Stan. Dev{/tr}* </font> ! <font face="Arial, Helvetica" size="1">(* {tr}Where Used{/tr})</font> ! </td> ! </tr> ! <tr> ! <td colspan=4 align=center><font face="Arial, Helvetica" size=2><b>{tr}Advanced Options{/tr}.</b></font></td> ! </tr> ! <tr> ! <td colspan=2 align=right><font face="Arial, Helvetica" size=2> ! {tr}Graph Legend{/tr}: ! </font></td> ! <td colspan=2> ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][title]" value="{$metricarray.title}" size=60 maxlength=80> ! </td> ! </tr> ! <tr> ! <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! {tr}Smooth Plot: Gaussian Average: Width (pixels){/tr}: ! </td> ! <td colspan=2><nobr> ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][g_sigma]" value="{$metricarray.g_sigma}" size=5 maxlength=5> ! <font face="Arial, Helvetica" size=1>({tr}Large = Slow, see{/tr} <a href="http://perfparse.sourceforge.net/faq.php#gaussian">{tr}FAQ{/tr}</a>)</font> ! </td> ! </tr> ! <tr> ! <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! {tr}Save graph for future reference{/tr} ! </font></td> ! <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! <input type="submit" name="save_graph_metric_id[{$metricarray.metric_id}]" value="Save graph" /> ! <b>{$errorsave[$metricarray.metric_id]}</b> ! </font></td> ! <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! {tr}Save with Title{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][graph_name]" value="{$metricarray.graph_name}" size=40 maxlength=80> ! </font></td> ! </tr> ! <tr> ! <td colspan="6" align=center><font face="Arial, Helvetica" size=2><b>{tr}URL to create this graph{/tr}:</b></td> ! </tr> ! <tr> ! <td colspan="7"><font face="Courier" size=-5> ! {$uristart}{$metricarray.url}</font> ! </td> ! </tr> {/foreach} {/foreach} {/foreach} - <tr><td align="center" colspan="7"><input type="submit" value="{tr}Draw graph{/tr}" /></td></tr> </table> ! </td></tr></table></p> </form> </body></html> --- 73,161 ---- {foreach from=$servicearray key=metric item=metricarray} <!-- metric {$metric} --> ! <tr><td> <!-- The graph --> <img src="{$metricarray.url}" border=0> </td> ! <td><b>{tr}Host{/tr}:</b> {$host_name} <br /> ! <b>{tr}Service{/tr}:</b> {$service} <br /> ! <b>{tr}Metric{/tr}:</b> {$metric} <br /> ! <div class="tabber"> ! <div class="tabbertab"> ! <h2>{tr}Scale{/tr}:</h2> ! <select name="displaygraphs[{$host_name}][{$service}][{$metric}][scale]"> ! <option value="1" {if $metricarray.scale == 1}selected="selected"{/if}>{tr}User{/tr}: ! <option value="0" {if $metricarray.scale == 0}selected="selected"{/if}>{tr}User, Rounded{/tr}: ! <option value="2" {if $metricarray.scale == 2}selected="selected"{/if}>{tr}User, as Percent{/tr}: ! {if $metricarray.value_max } ! <option value="3" {if $metricarray.scale == 3}selected="selected"{/if}>{tr}from Plugin{/tr}: ! <option value="4" {if $metricarray.scale == 4}selected="selected"{/if}>{tr}from Plugin, Rounded{/tr}: ! <option value="5" {if $metricarray.scale == 5}selected="selected"{/if}>{tr}from Plugin, as Percent{/tr}: ! {/if} ! <option value="6" {if $metricarray.scale == 6}selected="selected"{/if}>{tr}Automatic{/tr}. ! </select> {tr}User Min{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][minin]" value="{$metricarray.minin}" size=12 maxlength=12> ! {tr}Max{/tr}: ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][maxin]" value="{$metricarray.maxin}" size=12 maxlength=12> ! </div> ! <div class="tabbertab"> ! <h2>{tr}Period{/tr}:</h2> ! <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="RelSwitch" {if $metricarray.timerange=="r"}checked="checked"{/if} >{tr}Relative{/tr} ! <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="AbsSwitch" {if $metricarray.timerange=="a"}checked="checked"{/if}>{tr}Absolute{/tr} ! <div id="Rel_{$host_name}_{$service}_{$metric}">{tr}Rel Period{/tr}:</div> ! <div id="Rel_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativedays]" value="{$metricarray.relativedays}" size=2 maxlength=4> {tr}Days{/tr} </div> ! <div id="Rel_{$host_name}_{$service}_{$metric}">{tr}And Hours{/tr}:</div> ! <div id="Rel_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativetime]" value="{$metricarray.relativetime}" size=5 maxlength=5> {tr}HH:MM{/tr} </div> ! <div style="visibility:hidden;" id="Abs_{$host_name}_{$service}_{$metric}">{tr}Abs From{/tr}:</div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][from]" value="{$metricarray.from}" size=17 maxlength=20></div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}">{tr}Abs To{/tr}:</div> ! <div style="visibility:hidden" id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][to]" value="{$metricarray.to}" size=17 maxlength=20></div> ! </div> ! <div class="tabbertab"> ! <h2>{tr}Output{/tr}:</h2> ! <b>{tr}Output{/tr}:</b> ! <select name="displaygraphs[{$host_name}][{$service}][{$metric}][output]"> <option value="Histogram" {if $metricarray.output=="Histogram"}selected="selected"{/if}>{tr}Histogram{/tr} <option value="Average" {if $metricarray.output=="Average"}selected="selected"{/if}>{tr}Daily Average{/tr} <option value="Diff" {if $metricarray.output=="Diff"}selected="selected"{/if}>{tr}Differential Rate{/tr} <option value="Int" {if $metricarray.output=="Int"}selected="selected"{/if}>{tr}Integral Sum{/tr} ! <b>{tr}Size{/tr}:</b> ! <select name="displaygraphs[{$host_name}][{$service}][{$metric}][size]"> <option value="400x200" {if $metricarray.size=="400x200"}selected="selected"{/if}>{tr}Small{/tr} <option value="585x300" {if $metricarray.size=="585x300"}selected="selected"{/if}>{tr}Normal{/tr} <option value="1000x600" {if $metricarray.size=="1000x600"}selected="selected"{/if}>{tr}Large{/tr} ! </div> ! <div class="tabbertab"> ! <h2>{tr}Plot{/tr}:</h2> ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_val]" value="1" {if $metricarray.s_val}checked="checked"{/if}> {tr}Value{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_smo]" value="1" {if $metricarray.s_smo}checked="checked"{/if}> {tr}Smooth{/tr}* ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_war]" value="1" {if $metricarray.s_war}checked="checked"{/if}> {tr}Warning{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_cri]" value="1" {if $metricarray.s_cri}checked="checked"{/if}> {tr}Critical{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_sta]" value="1" {if $metricarray.s_sta}checked="checked"{/if}> {tr}Stan. Dev{/tr}* ! (* {tr}Where Used{/tr}) ! </div> ! <div class="tabbertab"> ! <h2><b>{tr}Advanced Options{/tr}.</b></h2> ! {tr}Graph Legend{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][title]" value="{$metricarray.title}" size=60 maxlength=80> ! {tr}Smooth Plot: Gaussian Average: Width (pixels){/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][g_sigma]" value="{$metricarray.g_sigma}" size=5 maxlength=5> ! ({tr}Large = Slow, see{/tr} <a href="http://perfparse.sourceforge.net/faq.php#gaussian">{tr}FAQ{/tr}</a>) ! <div> ! <div class="tabbertab"> ! <h2><b>{tr}Save Graph{/tr}.</b></h2> ! {tr}Save graph for future reference{/tr} ! <input type="submit" name="save_graph_metric_id[{$metricarray.metric_id}]" value="Save graph" /> ! <b>{$errorsave[$metricarray.metric_id]}</b> ! {tr}Save with Title{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][graph_name]" value="{$metricarray.graph_name}" size=40 maxlength=80> ! </div> ! </div> ! </td></tr> {/foreach} {/foreach} {/foreach} </table> ! <input type="submit" value="{tr}Draw graph{/tr}" /> </form> </body></html> |
|
From: Florian G. <re...@us...> - 2008-02-26 23:41:45
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12844 Modified Files: select_metric.tpl.html Log Message: new design Index: select_metric.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/select_metric.tpl.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** select_metric.tpl.html 23 Jan 2008 22:33:53 -0000 1.11 --- select_metric.tpl.html 26 Feb 2008 23:41:46 -0000 1.12 *************** *** 1,7 **** <HTML> <HEAD> ! <TITLE> ! PerfParse</TITLE> ! <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <script type="text/javascript" language="javascript"> {literal} --- 1,11 ---- <HTML> <HEAD> ! <TITLE>PerfParse</TITLE> ! ! <!-- $Id$ --> ! {include file="tabber.tpl.html"} ! </HEAD> ! ! <BODY> <script type="text/javascript" language="javascript"> {literal} *************** *** 37,113 **** </script> <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}Select Metric to Graph for host(s){/tr}:<br> {foreach from=$hidnames key=n item=host} '{$host}' {/foreach} ! </b><br><br> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br> ! <a href="perfparse.php?page=select_host">{tr}Click to select another host{/tr}.</a> ! </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1>{$version}</td> </tr> </table> ! </td></tr></table></p> ! <p align=center> ! <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"> <form action="perfparse.php?page=graph" method="POST"> ! <tr><td><input type="submit" value="{tr}submit{/tr}"></td></tr> {foreach from=$hidnames key=hostid item=host} ! <tr><td> ! <fieldset><legend><b>{tr}Host{/tr}:</b> {$host}</legend> ! <table width="100%" border=0 cellpadding=0 cellspacing=0> ! {foreach from=$metrics[$hostid] key=serviceid item=metric} ! <tr> ! <td align=center> ! <font face="Arial, Helvetica" size=2><b>{tr}Service{/tr}:</b> {$metric.service_description}</font> ! <table width="100%" border=1 cellpadding=5 cellspacing=0 bgcolor="#FFFFFF"> ! <tr> ! {foreach from=$metric.metrics key=metricid item=metricname} ! <td><font face="Arial, Helvetica" size=2> ! <input type="checkbox" name="graphs[{$metricid}][display]" value="true" id="{$metric.service_description}_{$metricname}" onclick="javascript:UncheckMetricSwitch(this,'all_{$metric.service_description}_{$metricname}')"/>{$metricname} ! </td> ! {/foreach} ! </tr></table> ! </td> ! </tr> {/foreach} ! </table> ! </fieldset> ! </td></tr> {/foreach} {if $numhosts > 1} ! <tr><td> ! <fieldset><legend><b>{tr}Select common metrics for all Hosts{/tr}</legend> ! <table width="100%" border=0 cellpadding=0 cellspacing=0> {foreach from=$diffmetrics key=service item=metric} ! <tr> ! <td align=center> ! <font face="Arial, Helvetica" size=2><b>{tr}Service{/tr}:</b> {$service}</font> ! <table width="100%" border=1 cellpadding=5 cellspacing=0 bgcolor="#FFFFFF"> ! <tr> ! {foreach from=$metric key=n item=m} ! <td><font face="Arial, Helvetica" size=2> ! <input type="checkbox" name="all" id="all_{$service}_{$n}" value="true" onclick="javascript:CheckAllMetrics(this,'{$service}_{$n}')" />{$n} ! ({$m.count} {tr}Hosts{/tr}) ! </td> ! {/foreach} ! </tr></table> ! </td> ! </tr> {/foreach} ! </table> ! </fieldset> ! </td></tr> {/if} ! <tr><td><input type="submit" value="{tr}submit{/tr}"></td></tr> </form> - </table></p> </body></html> --- 41,100 ---- </script> + <p align=center> ! <span class="logo"> ! <table class="logotext"> ! <tr><td> ! <img src="{$http_image_path}perfparse-logo-sm.png" border=0> ! </td><td> ! <b>{tr}Select Metric to Graph for host(s){/tr}:<br /> {foreach from=$hidnames key=n item=host} '{$host}' {/foreach} ! </b><br /> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br /> ! <a href="perfparse.php?page=select_host">{tr}Click to select another host{/tr}.</a> ! </td><td class="normtext" width="20%"> ! {$version} ! </td> </tr> </table> ! </span> ! <br /> ! </p> ! <form action="perfparse.php?page=graph" method="POST"> ! <input type="submit" value="{tr}submit{/tr}"> ! <div class="tabber"> {foreach from=$hidnames key=hostid item=host} ! <div class="tabbertab"> ! <h2><b>{tr}Host{/tr}:</b> {$host}</h2> ! {foreach from=$metrics[$hostid] key=serviceid item=metric} ! <fieldset><legend><b>{tr}Service{/tr}:</b> {$metric.service_description}</legend> ! {foreach from=$metric.metrics key=metricid item=metricname} ! <input type="checkbox" name="graphs[{$metricid}][display]" value="true" id="{$metric.service_description}_{$metricname}" onclick="javascript:UncheckMetricSwitch(this,'all_{$metric.service_description}_{$metricname}')"/>{$metricname} ! <br /> ! {/foreach} ! </fieldset><br /> {/foreach} ! </div> {/foreach} {if $numhosts > 1} ! <div class="tabbertab"> ! <h2><b>{tr}Select common metrics for all Hosts{/tr}</b></h2> {foreach from=$diffmetrics key=service item=metric} ! <fieldset><legend><b>{tr}Service{/tr}:</b> {$service}</legend> ! {foreach from=$metric key=n item=m} ! <input type="checkbox" name="all" id="all_{$service}_{$n}" value="true" onclick="javascript:CheckAllMetrics(this,'{$service}_{$n}')" />{$n} ! ({$m.count} {tr}Hosts{/tr})<br /> ! {/foreach} ! </fieldset> {/foreach} ! </div> <!--tabbertab--> {/if} + </div> <!--tabber--> ! <input type="submit" value="{tr}submit{/tr}"> </form> </body></html> |
|
From: Florian G. <re...@us...> - 2008-02-23 15:23:05
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18204 Modified Files: default.css mainmenu.tpl.html select_host.tpl.html Added Files: tabber.tpl.html Log Message: more redesign Index: mainmenu.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/mainmenu.tpl.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mainmenu.tpl.html 13 Feb 2008 23:12:11 -0000 1.13 --- mainmenu.tpl.html 23 Feb 2008 15:23:07 -0000 1.14 *************** *** 3,23 **** <TITLE> PerfParse</TITLE> ! ! <!-- $Id$ --> ! <script type="text/javascript" src="tabber.js"></script> ! <link rel="stylesheet" href="templates/default.css" TYPE="text/css" MEDIA="screen"> ! <link rel="stylesheet" href="templates/print.css" TYPE="text/css" MEDIA="print"> ! ! {literal} ! <script type="text/javascript"> ! ! /* Optional: Temporarily hide the "tabber" class so it does not "flash" ! on the page as plain HTML. After tabber runs, the class is changed ! to "tabberlive" and it will appear. */ ! ! document.write('<style type="text/css">.tabber{display:none;}<\/style>'); ! </script> ! {/literal} ! </HEAD> --- 3,7 ---- <TITLE> PerfParse</TITLE> ! {include file="tabber.tpl.html"} </HEAD> Index: select_host.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/select_host.tpl.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** select_host.tpl.html 23 Jan 2008 22:33:53 -0000 1.9 --- select_host.tpl.html 23 Feb 2008 15:23:07 -0000 1.10 *************** *** 1,21 **** <HTML> <HEAD> ! <TITLE> ! PerfParse</TITLE> ! <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <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}Select Host to Graph{/tr}</b><br> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a> ! </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1>{$version}</td> ! </tr> ! </table> ! </td></tr></table></p> ! <form action="perfparse.php?page=select_metric" method="POST"> <script type="text/javascript" language="javascript"> {literal} --- 1,29 ---- <HTML> <HEAD> ! <TITLE>PerfParse</TITLE> ! ! <!-- $Id$ --> ! {include file="tabber.tpl.html"} ! ! </HEAD> ! ! <BODY> <p align=center> ! <span class="logo"> ! <table class="logotext"> ! <tr><td> ! <img src="{$http_image_path}perfparse-logo-sm.png" border=0> ! </td><td> ! <b>{tr}Select Host to Graph{/tr}</b><br /> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a> ! </td><td class="normtext" width="20%"> ! {$version} ! </td> ! </tr> ! </table> ! </span> ! <br /> ! </p> ! <script type="text/javascript" language="javascript"> {literal} *************** *** 52,73 **** </script> ! <p align=center> ! <input type="submit" value="{tr}submit{/tr}"> ! <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> ! <table width="100%" border=0 cellpadding=0 cellspacing=0> ! {foreach from=$hosts key=group item=hostarray} ! <tr> ! <td align=center> ! <fieldset><legend><b>{tr}Group{/tr}:</b> {$group}</legend> ! <input type="checkbox" id="EnaDis{$group}" onclick="javascript:EnableDisableHostgroup(this,'{$group}')"><b>{tr}All hosts of group{/tr}:</b> {$group}<br /> ! {foreach from=$hostarray key=host_id item=host} ! <nobr><input type="checkbox" name="host_id[]" id="{$group}" value="{$host_id}" onclick="javascript:UncheckHostgroupSwitch(this,'{$group}')" >{$host}</nobr> ! {/foreach} ! </fieldset> ! </td></tr> {/foreach} ! </table> <input type="submit" value="{tr}submit{/tr}"> - </p> </form> </body></html> --- 60,76 ---- </script> ! <form action="perfparse.php?page=select_metric" method="POST"> ! <div class="tabber"> ! {foreach from=$hosts key=group item=hostarray} ! <div class="tabbertab"> ! <h2><b>{tr}Group{/tr}:</b> {$group}</h2> ! <input type="checkbox" id="EnaDis{$group}" onclick="javascript:EnableDisableHostgroup(this,'{$group}')"><b>{tr}All hosts of group{/tr}:</b> {$group}<br /> ! {foreach from=$hostarray key=host_id item=host} ! <nobr><input type="checkbox" name="host_id[]" id="{$group}" value="{$host_id}" onclick="javascript:UncheckHostgroupSwitch(this,'{$group}')" >{$host}</nobr><br /> ! {/foreach} ! </div> {/foreach} ! </div> <input type="submit" value="{tr}submit{/tr}"> </form> </body></html> --- NEW FILE: tabber.tpl.html --- <script type="text/javascript" src="tabber.js"></script> <link rel="stylesheet" href="templates/default.css" TYPE="text/css" MEDIA="screen"> <link rel="stylesheet" href="templates/print.css" TYPE="text/css" MEDIA="print"> {literal} <script type="text/javascript"> /* Optional: Temporarily hide the "tabber" class so it does not "flash" on the page as plain HTML. After tabber runs, the class is changed to "tabberlive" and it will appear. */ document.write('<style type="text/css">.tabber{display:none;}<\/style>'); </script> {/literal} Index: default.css =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/default.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** default.css 23 Jan 2008 22:33:53 -0000 1.1 --- default.css 23 Feb 2008 15:23:07 -0000 1.2 *************** *** 25,31 **** --- 25,49 ---- } + table { + padding: 1ex; + margin: 1ex; + background-color: #DDE; + } + + .logotext { + text-align: center; + font-family: verdana,arial,serif; + font-size: 12pt; + font-weight: bold; + text-decoration: none; + } + + .normtext { + font-size: 8pt; + } .logo { text-align: center; + font-size: 12pt; width: 600px; border: 0.1ex solid #778; |
|
From: Florian G. <re...@us...> - 2008-02-19 22:25:10
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9255/perfparse Modified Files: storage.c Log Message: prepare for more gentle sql error handling Index: storage.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** storage.c 13 Feb 2008 22:50:32 -0000 1.10 --- storage.c 19 Feb 2008 22:25:14 -0000 1.11 *************** *** 3,7 **** * storage.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) * Florian Gleixner * --- 3,7 ---- * storage.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2008 Yves Mettier (yme...@li...) * Florian Gleixner * *************** *** 193,197 **** int r = this->module->store_line(this->module,log_line); if(0 != r) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not store a line with storage module '%s' (check permissions, connection parameters...)"), this->module->id); #ifdef PERFPARSED exit(EXIT_FAILURE); --- 193,197 ---- int r = this->module->store_line(this->module,log_line); if(0 != r) { ! pp_log_fl(LOG_ERROR, _("Could not store a line with storage module '%s' (check permissions, connection parameters...)"), this->module->id); #ifdef PERFPARSED exit(EXIT_FAILURE); *************** *** 233,237 **** } #ifdef PERFPARSED ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed stopped\n")); #endif } --- 233,237 ---- } #ifdef PERFPARSED ! pp_log_fl(LOG_INFO, _("Perfparsed stopped\n")); #endif } *************** *** 261,264 **** --- 261,265 ---- #ifdef PERFPARSED int storage_periodic_cleanup(void) { + pp_log_func; storage_module_element_t *this; long h; *************** *** 282,286 **** switch(pid = fork()) { case -1: ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Perfparsed : periodic cleanup cannot start (fork failed)\n")); break; case 0: --- 283,287 ---- switch(pid = fork()) { case -1: ! pp_log_fl(LOG_ERROR, _("Perfparsed : periodic cleanup cannot start (fork failed)\n")); break; case 0: *************** *** 291,295 **** } } ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)) { /* Error log */ --- 292,296 ---- } } ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)) { /* Error log */ *************** *** 297,301 **** dir = g_path_get_dirname(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG)); pattern = g_path_get_basename(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG)); ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of errorlog\n")); check_dir_for_files_to_remove_or_compress(config_get_value_as_integer(CONFIG_ITEM_ID_ERROR_LOG_KEEP_N_DAYS),dir,pattern); g_free(dir); --- 298,302 ---- dir = g_path_get_dirname(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG)); pattern = g_path_get_basename(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG)); ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of errorlog\n")); check_dir_for_files_to_remove_or_compress(config_get_value_as_integer(CONFIG_ITEM_ID_ERROR_LOG_KEEP_N_DAYS),dir,pattern); g_free(dir); *************** *** 304,322 **** if(config_get_value_as_boolean(CONFIG_ITEM_ID_DROP_FILE_ROTATE)) { /* Drop file */ ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of dropfile\n")); check_dir_for_files_to_remove_or_compress(config_get_value_as_integer(CONFIG_ITEM_ID_DROP_FILE_KEEP_N_DAYS),config_get_value_as_string(CONFIG_ITEM_ID_DROP_FILE),NULL); } /* Module periodic_cleanup procedures */ ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage modules\n")); for(this=storage_modules; this; this = this->next) { if(this->module->enabled && this->module->periodic_cleanup) { ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s\n"),this->module->id); this->module->periodic_cleanup(this->module); ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s finished\n"),this->module->id); }else { ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s not supported or module disabled\n"),this->module->id); } } ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage modules finished\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE)) { exit(EXIT_SUCCESS); --- 305,323 ---- if(config_get_value_as_boolean(CONFIG_ITEM_ID_DROP_FILE_ROTATE)) { /* Drop file */ ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of dropfile\n")); check_dir_for_files_to_remove_or_compress(config_get_value_as_integer(CONFIG_ITEM_ID_DROP_FILE_KEEP_N_DAYS),config_get_value_as_string(CONFIG_ITEM_ID_DROP_FILE),NULL); } /* Module periodic_cleanup procedures */ ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of storage modules\n")); for(this=storage_modules; this; this = this->next) { if(this->module->enabled && this->module->periodic_cleanup) { ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s\n"),this->module->id); this->module->periodic_cleanup(this->module); ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s finished\n"),this->module->id); }else { ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of storage module %s not supported or module disabled\n"),this->module->id); } } ! pp_log_fl(LOG_INFO, _("Perfparsed : periodic cleanup of storage modules finished\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE)) { exit(EXIT_SUCCESS); *************** *** 333,336 **** --- 334,338 ---- */ void storage_dump_status(void) { + pp_log_func; char*file; FILE*fd; *************** *** 348,352 **** if(NULL == (fd = fopen(file,"w"))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not dump modules status\n")); return; } else { --- 350,354 ---- if(NULL == (fd = fopen(file,"w"))) { ! pp_log_fl(LOG_ERROR,_("Could not dump modules status\n")); return; } else { |
|
From: Florian G. <re...@us...> - 2008-02-19 22:25:09
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9255/libpp_mysql Modified Files: dbms.c dbms.h Log Message: prepare for more gentle sql error handling Index: dbms.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dbms.c 13 Feb 2008 22:50:32 -0000 1.11 --- dbms.c 19 Feb 2008 22:25:13 -0000 1.12 *************** *** 3,7 **** * dbms.c - Common functions required by PerfParse suit. * ! * Copyright (c) 2004-2007 Ben Clewett (per...@cl...) and * Florian Gleixner * --- 3,7 ---- * dbms.c - Common functions required by PerfParse suit. * ! * Copyright (c) 2004-2008 Ben Clewett (per...@cl...) and * Florian Gleixner * *************** *** 103,114 **** } ! void libpp_mysql_query(char*file, int line, const char *sql) { pp_log_func; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); freeResult(); ! if(mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); iRowsAffected = mysql_affected_rows(&db_mysql); --- 103,116 ---- } ! int libpp_mysql_query(char*file, int line, const char *sql) { pp_log_func; ! pp_log_fl(LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); freeResult(); ! if(mysql_query(&db_mysql, sql)) { sql_failure(file, line, sql, mysql_error(&db_mysql)); + return(FALSE); //if sql_failure does not bail out + } iRowsAffected = mysql_affected_rows(&db_mysql); *************** *** 117,123 **** ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"Rows: %d\n", rows()); iSQLCount++; } --- 119,126 ---- ! pp_log_fl(LOG_DEBUG_SQL,"Rows: %d\n", rows()); iSQLCount++; + return(TRUE); } *************** *** 129,136 **** MYSQL_RES *result; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); result = mysql_use_result(&db_mysql); --- 132,141 ---- MYSQL_RES *result; ! pp_log_fl(LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); ! if (mysql_query(&db_mysql, sql)) { sql_failure(file, line, sql, mysql_error(&db_mysql)); + return(FALSE); + } result = mysql_use_result(&db_mysql); *************** *** 156,165 **** MYSQL_ROW row; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); if (sRet) free(sRet); ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); result = mysql_use_result(&db_mysql); --- 161,172 ---- MYSQL_ROW row; ! pp_log_fl(LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); if (sRet) free(sRet); ! if (mysql_query(&db_mysql, sql)) { sql_failure(file, line, sql, mysql_error(&db_mysql)); + return(NULL); // if sql_failure does not bail out + } result = mysql_use_result(&db_mysql); *************** *** 179,191 **** ! void libpp_mysql_query_no_return(char*file, int line, const char *sql) { pp_log_func; MYSQL_RES *discaud; ! pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); iRowsAffected = mysql_affected_rows(&db_mysql); --- 186,200 ---- ! int libpp_mysql_query_no_return(char*file, int line, const char *sql) { pp_log_func; MYSQL_RES *discaud; ! pp_log_fl(LOG_DEBUG_SQL,"SQL execution: \"%s\"\n", sql); ! if (mysql_query(&db_mysql, sql)) { sql_failure(file, line, sql, mysql_error(&db_mysql)); + return(FALSE); + } iRowsAffected = mysql_affected_rows(&db_mysql); *************** *** 198,202 **** iSQLCount++; ! } --- 207,212 ---- iSQLCount++; ! ! return(TRUE); } Index: dbms.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dbms.h 12 Aug 2007 00:11:45 -0000 1.3 --- dbms.h 19 Feb 2008 22:25:14 -0000 1.4 *************** *** 3,7 **** * dbms.h - Common functions required by PerfParse suit. * ! * Copyright (c) 2004 Ben Clewett (per...@cl...) * $Id$ * --- 3,9 ---- * dbms.h - Common functions required by PerfParse suit. * ! * Copyright (c) 2004-2008 Ben Clewett (per...@cl...) ! * Florian Gleixner ! * * $Id$ * *************** *** 46,51 **** 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); int libpp_mysql_query_int(char*f,int l, const char *sql); const char *libpp_mysql_query_char(char*f,int l, const char *sql); --- 48,53 ---- char *sData(int iCol); double dData(int iCol); ! int libpp_mysql_query(char*f,int l, const char *sql); ! int libpp_mysql_query_no_return(char*f,int l, const char *sql); int libpp_mysql_query_int(char*f,int l, const char *sql); const char *libpp_mysql_query_char(char*f,int l, const char *sql); |
|
From: Florian G. <re...@us...> - 2008-02-17 23:09:59
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4365/libpp_mysql Modified Files: del_policy.c Log Message: typo Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** del_policy.c 13 Feb 2008 22:50:32 -0000 1.10 --- del_policy.c 17 Feb 2008 23:09:58 -0000 1.11 *************** *** 571,575 **** } if(time(NULL)-t0 > 60) { ! pp_lof_fl(LOG_DEBUG,_("wait 5 sec. to let other transactions run.\n")); sleep(5); t0=time(NULL); --- 571,575 ---- } if(time(NULL)-t0 > 60) { ! pp_log_fl(LOG_DEBUG,_("wait 5 sec. to let other transactions run.\n")); sleep(5); t0=time(NULL); |
|
From: Florian G. <re...@us...> - 2008-02-13 23:12:08
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2277/templates Modified Files: mainmenu.tpl.html Log Message: fix path to css file Index: mainmenu.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/mainmenu.tpl.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mainmenu.tpl.html 23 Jan 2008 22:33:53 -0000 1.12 --- mainmenu.tpl.html 13 Feb 2008 23:12:11 -0000 1.13 *************** *** 4,10 **** PerfParse</TITLE> <script type="text/javascript" src="tabber.js"></script> ! <link rel="stylesheet" href="templates/tabbed/default.css" TYPE="text/css" MEDIA="screen"> ! <link rel="stylesheet" href="templates/tabbed/print.css" TYPE="text/css" MEDIA="print"> {literal} --- 4,11 ---- PerfParse</TITLE> + <!-- $Id$ --> <script type="text/javascript" src="tabber.js"></script> ! <link rel="stylesheet" href="templates/default.css" TYPE="text/css" MEDIA="screen"> ! <link rel="stylesheet" href="templates/print.css" TYPE="text/css" MEDIA="print"> {literal} |
|
From: Florian G. <re...@us...> - 2008-02-13 22:50:31
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26028/perfparse Modified Files: storage.c Log Message: fix install issues phpui (thanks to Sabrina Kavanaugh). Make cleanup more friendly. Index: storage.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** storage.c 18 Dec 2007 15:08:51 -0000 1.9 --- storage.c 13 Feb 2008 22:50:32 -0000 1.10 *************** *** 167,170 **** --- 167,171 ---- int storage_disconnect(void) { + pp_log_func; storage_module_element_t *this; for(this=storage_modules; this; this = this->next) { *************** *** 176,179 **** --- 177,181 ---- int storage_set_registry(const char*hostname, const char*key, const char*value, time_t tm) { + pp_log_func; storage_module_element_t *this; for(this=storage_modules; this; this = this->next) { *************** *** 184,187 **** --- 186,190 ---- int storage_store_line(const log_line_t *log_line) { + pp_log_func; storage_module_element_t *this; for(this=storage_modules; this; this = this->next) { *************** *** 202,205 **** --- 205,209 ---- int storage_store_perf(const log_line_t *log_line, const perf_fields_t *perf_fields) { + pp_log_func; storage_module_element_t *this; int perf = 0; *************** *** 220,223 **** --- 224,228 ---- */ void storage_atexit(void) { + pp_log_func; storage_module_element_t *this; if(main_pid == getpid()) { *************** *** 234,237 **** --- 239,243 ---- int storage_print_statistics(FILE*fd, void(*print_global_statistics_cb)(FILE*fd, perfparse_statistics_t*stats), perfparse_statistics_t*stats) { + pp_log_func; storage_module_element_t *this; if (!config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) return(0); *************** *** 245,248 **** --- 251,255 ---- int storage_print_usage(FILE*fd, const char*id) { + pp_log_func; storage_module_element_t *this; for(this=storage_modules; this; this = this->next) { |
|
From: Florian G. <re...@us...> - 2008-02-13 22:50:30
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26028/libpp_mysql Modified Files: dbms.c del_policy.c Log Message: fix install issues phpui (thanks to Sabrina Kavanaugh). Make cleanup more friendly. Index: dbms.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dbms.c 15 Dec 2007 23:30:56 -0000 1.10 --- dbms.c 13 Feb 2008 22:50:32 -0000 1.11 *************** *** 109,113 **** freeResult(); ! if (mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); --- 109,113 ---- freeResult(); ! if(mysql_query(&db_mysql, sql)) sql_failure(file, line, sql, mysql_error(&db_mysql)); Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** del_policy.c 3 Jan 2008 22:04:44 -0000 1.9 --- del_policy.c 13 Feb 2008 22:50:32 -0000 1.10 *************** *** 463,466 **** --- 463,467 ---- time_t dps=DEL_POLICY_UNDEFINED; time_t t=time(NULL); + time_t t0=time(NULL); // for pausing sometimes t_policyinfo *policyinfo=NULL; *************** *** 569,572 **** --- 570,578 ---- policyinfo->iMetricId,(int) dps); } + if(time(NULL)-t0 > 60) { + pp_lof_fl(LOG_DEBUG,_("wait 5 sec. to let other transactions run.\n")); + sleep(5); + t0=time(NULL); + } query(s_SQL->str); } |
|
From: Florian G. <re...@us...> - 2008-02-13 22:50:29
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26028/phpgui Modified Files: Makefile.am Makefile.in Log Message: fix install issues phpui (thanks to Sabrina Kavanaugh). Make cleanup more friendly. Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 28 Jan 2008 01:14:35 -0000 1.15 --- Makefile.in 13 Feb 2008 22:50:32 -0000 1.16 *************** *** 242,247 **** --- 242,249 ---- lang/de.php \ lang/en.php \ + lang/fr.php \ naupy.inc.php \ perfparse.php \ + tabber.js \ smarty_extensions/block.tr.php \ smarty_extensions/modifier.difftime.php \ *************** *** 275,278 **** --- 277,281 ---- templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ + templates/default.css \ templates_c/index.php \ Smarty/COPYING.lib \ Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 28 Jan 2008 01:14:35 -0000 1.8 --- Makefile.am 13 Feb 2008 22:50:32 -0000 1.9 *************** *** 5,10 **** --- 5,12 ---- lang/de.php \ lang/en.php \ + lang/fr.php \ naupy.inc.php \ perfparse.php \ + tabber.js \ smarty_extensions/block.tr.php \ smarty_extensions/modifier.difftime.php \ *************** *** 38,41 **** --- 40,44 ---- templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ + templates/default.css \ templates_c/index.php \ Smarty/COPYING.lib \ |
|
From: Florian G. <re...@us...> - 2008-01-28 01:14:32
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17680/phpgui Modified Files: Makefile.am Makefile.in Log Message: more design Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.in 18 Dec 2007 15:10:34 -0000 1.14 --- Makefile.in 28 Jan 2008 01:14:35 -0000 1.15 *************** *** 756,760 **** install-data-hook: chmod u+rwx $(DESTDIR)$(phpuidir)/templates_c ! chown ${INST_APACHE_USER} $(DESTDIR)$(phpuidir)/templates_c # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 756,760 ---- install-data-hook: chmod u+rwx $(DESTDIR)$(phpuidir)/templates_c ! chown -R ${INST_APACHE_USER} $(DESTDIR)$(phpuidir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 5 Sep 2007 22:18:30 -0000 1.7 --- Makefile.am 28 Jan 2008 01:14:35 -0000 1.8 *************** *** 326,329 **** install-data-hook: chmod u+rwx $(DESTDIR)$(phpuidir)/templates_c ! chown ${INST_APACHE_USER} $(DESTDIR)$(phpuidir)/templates_c --- 326,329 ---- install-data-hook: chmod u+rwx $(DESTDIR)$(phpuidir)/templates_c ! chown -R ${INST_APACHE_USER} $(DESTDIR)$(phpuidir) |
|
From: Florian G. <re...@us...> - 2008-01-28 01:14:32
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17680/phpgui/templates Modified Files: edit_delete_policies.tpl.html Log Message: more design Index: edit_delete_policies.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_delete_policies.tpl.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** edit_delete_policies.tpl.html 23 Jan 2008 22:33:53 -0000 1.5 --- edit_delete_policies.tpl.html 28 Jan 2008 01:14:36 -0000 1.6 *************** *** 4,30 **** <TITLE> PerfParse</TITLE> ! <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 Delete 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} --- 4,44 ---- <TITLE> PerfParse</TITLE> ! ! <script type="text/javascript" src="tabber.js"></script> ! <link rel="stylesheet" href="templates/tabbed/default.css" TYPE="text/css" MEDIA="screen"> ! <link rel="stylesheet" href="templates/tabbed/print.css" TYPE="text/css" MEDIA="print"> ! ! {literal} ! <script type="text/javascript"> ! ! /* Optional: Temporarily hide the "tabber" class so it does not "flash" ! on the page as plain HTML. After tabber runs, the class is changed ! to "tabberlive" and it will appear. */ ! ! document.write('<style type="text/css">.tabber{display:none;}<\/style>'); ! </script> ! {/literal} ! ! </HEAD> ! ! <BODY> <!-- Header --> ! <p align="center"> ! <span class="logo" style="min-height: 47pt"> ! <div style="float: left"><img src="{$http_image_path}/perfparse-logo-sm.png" border=0></div> ! <h2>{tr}Edit Delete Policies{/tr}</h2><br /> ! <a href="perfparse.php">{tr}Return to main menu{/tr}</a><br /> ! {$version}<br /> ! </span> ! <br /> ! </p> <!-- Error Window --> {if $sql_error} <p align=center> ! <span class="logo"> ! {$sql_error} ! </span> </p> {/if} |
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2285/templates Modified Files: add_amend_host_group.tpl.html all_bin.tpl.html all_raw.tpl.html edit_default_delete_policies.tpl.html edit_delete_policies.tpl.html edit_host_list.tpl.html error.tpl.html graph.tpl.html graphmenu.tpl.html mainmenu.tpl.html raw_history.tpl.html read_nag_config.tpl.html saved_graphs.tpl.html select_host.tpl.html select_metric.tpl.html show_effective_del_policies.tpl.html Added Files: default.css Log Message: Start new more modern design and change Smarty delimiter for better editability. Index: mainmenu.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/mainmenu.tpl.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mainmenu.tpl.html 10 Nov 2007 21:03:32 -0000 1.11 --- mainmenu.tpl.html 23 Jan 2008 22:33:53 -0000 1.12 *************** *** 3,74 **** <TITLE> PerfParse</TITLE> ! <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> ! <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 colspan=3 align=center><img src="<{$http_image_path}>perfparse-logo.png" border=0></td> ! </tr> ! <tr> ! <td width="10%"> </td> ! <td align=center><font face="Arial, Helvetica" size=2> ! <b><a href="http://perfparse.sourceforge.net">PerfParse</a></b><br> ! <{tr}>Copyright<{/tr}> © 2004-2007. <{$version}></b></font> ! </td> ! <td width="10%" align=right><font face="Arial, Helvetica" size=1> </td> ! </tr> ! <tr><td colspan=3><hr width="96%"</td></tr> ! <tr><td colspan=3 align=center><font face="Arial, Helvetica" size=2> ! <b><{tr}>Data Analysis Options<{/tr}></b> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=select_host"><{tr}>Graph Binary Data<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_bin"><{tr}>View and Graph Binary Data<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=all_raw&normal=1&warning=1&critical=1&unknown=1"><{tr}>View Raw Plugin Data<{/tr}>.</a></td> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=saved_graphs"><{tr}>View Stored Graphs<{/tr}>.</a></td> ! </td></tr> ! <tr><td colspan=3><hr width="96%"</td></tr> ! <tr><td colspan=3 align=center><font face="Arial, Helvetica" size=2> ! <b><{tr}>Administration<{/tr}></b> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=add_amend_host_group"><{tr}>View / Edit Host Groups<{/tr}></a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_host_list"><{tr}>View / Edit Host Groups List<{/tr}>.</a> ! </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=read_nag_config"><{tr}>Synchronize Host Groups with Nagios Configuration<{/tr}>.</a> ! </td></tr> ! <tr><td colspan=2> </td></tr> ! <tr><td></td><td colspan=2><font face="Arial, Helvetica" size=2> ! <a href="perfparse.php?page=edit_delete_policies"><{tr}>View / Edit Deletion Policy Templates<{/tr}></a> ! </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> ! </table> ! </td></tr></table></p> </body></html> --- 3,61 ---- <TITLE> PerfParse</TITLE> ! ! <script type="text/javascript" src="tabber.js"></script> ! <link rel="stylesheet" href="templates/tabbed/default.css" TYPE="text/css" MEDIA="screen"> ! <link rel="stylesheet" href="templates/tabbed/print.css" TYPE="text/css" MEDIA="print"> ! ! {literal} ! <script type="text/javascript"> ! ! /* Optional: Temporarily hide the "tabber" class so it does not "flash" ! on the page as plain HTML. After tabber runs, the class is changed ! to "tabberlive" and it will appear. */ ! ! document.write('<style type="text/css">.tabber{display:none;}<\/style>'); ! </script> ! {/literal} ! ! </HEAD> ! ! <BODY> ! ! <p align="center"> ! <span class="logo"> ! <img src="{$http_image_path}perfparse-logo.png" border=0><br /><br /> ! <b><a href="http://perfparse.sourceforge.net">PerfParse</a></b><br /><br /> ! <b>{tr}Copyright{/tr} © 2004-2007. {$version}</b> ! </span> ! <br /> ! </p> ! ! ! <div class="tabber"> ! <div class="tabbertab"> ! <h2>{tr}Data Analysis Options{/tr}</h2> ! <a href="perfparse.php?page=select_host">{tr}Graph Binary Data{/tr}.</a><br /> ! <a href="perfparse.php?page=all_bin">{tr}View and Graph Binary Data{/tr}.</a><br /> ! <a href="perfparse.php?page=all_raw&normal=1&warning=1&critical=1&unknown=1">{tr}View Raw Plugin Data{/tr}.</a><br /> ! <a href="perfparse.php?page=saved_graphs">{tr}View Stored Graphs{/tr}.</a><br /> ! </div> ! ! <div class="tabbertab"> ! <h2>{tr}Administration{/tr}</h2> ! <h3>{tr}Host Groups{/tr}</h3> ! <a href="perfparse.php?page=add_amend_host_group">{tr}View / Edit Host Groups{/tr}</a><br /> ! <a href="perfparse.php?page=edit_host_list">{tr}View / Edit Host Groups List{/tr}.</a><br /> ! <a href="perfparse.php?page=read_nag_config">{tr}Synchronize Host Groups with Nagios Configuration{/tr}.</a><br /> ! <h3>{tr}Deletion Policies{/tr}</h3> ! <a href="perfparse.php?page=edit_delete_policies">{tr}View / Edit Deletion Policy Templates{/tr}</a><br /> ! <a href="perfparse.php?page=edit_default_delete_policies">{tr}View / Edit Default Deletion Policies{/tr}.</a><br /> ! <a href="perfparse.php?page=edit_group_delete_policies">{tr}View / Edit Group Deletion Policies{/tr}.</a><br /> ! <a href="perfparse.php?page=edit_host_delete_policies">{tr}View / Edit Hosts Deletion Policies{/tr}.</a><br /> ! <a href="perfparse.php?page=delete_policy_bin">{tr}View / Edit Binary Data Deletion Policies (Metrics){/tr}.</a><br /> ! <a href="perfparse.php?page=delete_policy_raw">{tr}View / Edit Raw Data Deletion Policies (Services){/tr}.</a><br /> ! <a href="perfparse.php?page=show_effective_del_policies">{tr}Display effective delete policies of objects{/tr}.</a><br /> ! </div> ! </div> ! </body></html> Index: edit_default_delete_policies.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_default_delete_policies.tpl.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_default_delete_policies.tpl.html 3 Sep 2007 23:03:48 -0000 1.2 --- edit_default_delete_policies.tpl.html 23 Jan 2008 22:33:53 -0000 1.3 *************** *** 12,21 **** <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> --- 12,21 ---- <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> *************** *** 23,33 **** <!-- 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 --> --- 23,33 ---- <!-- 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 --> *************** *** 41,50 **** <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> --- 41,50 ---- <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> *************** *** 53,66 **** <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> --- 53,66 ---- <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> *************** *** 68,85 **** <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> --- 68,85 ---- <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> *************** *** 92,101 **** <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> --- 92,101 ---- <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> *************** *** 104,117 **** <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> --- 104,117 ---- <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> *************** *** 119,136 **** <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> --- 119,136 ---- <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> Index: show_effective_del_policies.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/show_effective_del_policies.tpl.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** show_effective_del_policies.tpl.html 28 Sep 2007 21:53:16 -0000 1.3 --- show_effective_del_policies.tpl.html 23 Jan 2008 22:33:53 -0000 1.4 *************** *** 12,21 **** <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> --- 12,21 ---- <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> *************** *** 23,35 **** <!-- Error Window --> ! <{if $sql_error}> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> ! <{tr}>SQL-Error<{/tr}>: </td></tr><tr><td> ! <{$sql_error}> </td></tr></table> </p> ! <{/if}> <!-- Edit default policies --> --- 23,35 ---- <!-- Error Window --> ! {if $sql_error} <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> ! {tr}SQL-Error{/tr}: </td></tr><tr><td> ! {$sql_error} </td></tr></table> </p> ! {/if} <!-- Edit default policies --> *************** *** 43,51 **** <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b><{tr}>Default Policies<{/tr}>:</b> </td></tr><tr><td><font face="Arial, Helvetica" size=2> ! <{tr}>Bin Policy<{/tr}>:</td><td><font face="Arial, Helvetica" size=2><{$default_bin_policy.delete_policy_seconds|difftime}> </td></tr><tr><td><font face="Arial, Helvetica" size=2> ! <{tr}>Raw Policy<{/tr}>:</td><td><font face="Arial, Helvetica" size=2><{$default_raw_policy.delete_policy_seconds|difftime}> </td></tr> </table></td></tr></table><br /> --- 43,51 ---- <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b>{tr}Default Policies{/tr}:</b> </td></tr><tr><td><font face="Arial, Helvetica" size=2> ! {tr}Bin Policy{/tr}:</td><td><font face="Arial, Helvetica" size=2>{$default_bin_policy.delete_policy_seconds|difftime} </td></tr><tr><td><font face="Arial, Helvetica" size=2> ! {tr}Raw Policy{/tr}:</td><td><font face="Arial, Helvetica" size=2>{$default_raw_policy.delete_policy_seconds|difftime} </td></tr> </table></td></tr></table><br /> *************** *** 55,218 **** <table width="100%" border=0 cellpadding=0 cellspacing=0> <!-- Group selection --> ! <{if $group_id}> ! <input type=hidden name="group_id" value="<{$group_id}>"> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b><{tr}>Selected Group<{/tr}>: <{$groupinfos.$group_id}></b> </td></tr> <tr><td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i><{tr}>bin deletion policy<{/tr}>:</i> </td></tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Source<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_group_policy.source}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Policy Name<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_group_policy.policy_name}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Retention Time<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_group_policy.policy_seconds|difftime}> </td> </tr> <td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i><{tr}>raw deletion policy<{/tr}>:</i> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Source<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_group_policy.source}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Policy Name<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_group_policy.policy_name}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Retention Time<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_group_policy.policy_seconds|difftime}> </td> </tr> ! <{else}> <tr><td align=center width="33%" ><font face="Arial, Helvetica" size=2> ! <{tr}>Select Group<{/tr}>: </td></tr> <tr><td> <select name="group_id"> ! <option value="-1"><{tr}>Unassigned<{/tr}></option> ! <{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><br /> ! <{if $group_id}> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <!-- Host selection --> ! <{if $host_id}> ! <input type=hidden name="host_id" value="<{$host_id}>"> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b><{tr}>Selected Host<{/tr}>: <{$selected_host}></b> </td></tr> <tr><td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i><{tr}>bin deletion policy<{/tr}>:</i> </td></tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Source<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_host_policy.source}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Policy Name<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_host_policy.policy_name}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Retention Time<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$bin_host_policy.policy_seconds|difftime}> </td> </tr> <td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i><{tr}>raw deletion policy<{/tr}>:</i> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Source<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_host_policy.source}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Policy Name<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_host_policy.policy_name}> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! <{tr}>Retention Time<{/tr}>: </td><td><font face="Arial, Helvetica" size=2> ! <{$raw_host_policy.policy_seconds|difftime}> </td> </tr> ! <{else}> <tr><td align=center width="33%" ><font face="Arial, Helvetica" size=2> ! <{tr}>Select Host<{/tr}>: </td></tr> <tr><td> <select name="host_id"> ! <{foreach from=$hostinfos key=hid item=hinfo}> ! <option value="<{$hid}>"><{$hinfo.host_name}></option> ! <{/foreach}> </select> </td></tr> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <input type="submit" name="set_host" value="<{tr}>Set<{/tr}>"> </td></tr> ! <{/if}> </table></td></tr></table><br /> ! <{/if}> ! <{if $group_id && $host_id}> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> ! <tr><td><b><{tr}>Service<{/tr}></b></td><td><b><{tr}>Raw deletion policy<{/tr}></b></td> ! <td><b><{tr}>Effective raw deletion policy<{/tr}></b></td> ! <td><b><{tr}>Metric<{/tr}></b></td><td><b><{tr}>Bin deletion policy<{/tr}></b></td> ! <td><b><{tr}>Effective bin deletion policy<{/tr}></b></td> </tr> ! <{foreach from=$metricsinfos key=serviceid item=servicearray}> <tr> ! <td rowspan="<{$servicearray.count_metrics}>"><{$servicearray.service_description}></td> ! <td rowspan="<{$servicearray.count_metrics}>">todo</td> ! <td rowspan="<{$servicearray.count_metrics}>">todo</td> ! <{foreach from=$servicearray.metrics key=metricid item=metric}> ! <td><{$metric}></td> <td>todo</td> <td>todo</td> </tr> ! <{/foreach}> ! <{/foreach}> </table></td></tr></table></p> ! <{/if}> </form> --- 55,218 ---- <table width="100%" border=0 cellpadding=0 cellspacing=0> <!-- Group selection --> ! {if $group_id} ! <input type=hidden name="group_id" value="{$group_id}"> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b>{tr}Selected Group{/tr}: {$groupinfos.$group_id}</b> </td></tr> <tr><td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i>{tr}bin deletion policy{/tr}:</i> </td></tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Source{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_group_policy.source} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Policy Name{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_group_policy.policy_name} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Retention Time{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_group_policy.policy_seconds|difftime} </td> </tr> <td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i>{tr}raw deletion policy{/tr}:</i> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Source{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_group_policy.source} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Policy Name{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_group_policy.policy_name} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Retention Time{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_group_policy.policy_seconds|difftime} </td> </tr> ! {else} <tr><td align=center width="33%" ><font face="Arial, Helvetica" size=2> ! {tr}Select Group{/tr}: </td></tr> <tr><td> <select name="group_id"> ! <option value="-1">{tr}Unassigned{/tr}</option> ! {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><br /> ! {if $group_id} <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <!-- Host selection --> ! {if $host_id} ! <input type=hidden name="host_id" value="{$host_id}"> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <b>{tr}Selected Host{/tr}: {$selected_host}</b> </td></tr> <tr><td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i>{tr}bin deletion policy{/tr}:</i> </td></tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Source{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_host_policy.source} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Policy Name{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_host_policy.policy_name} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Retention Time{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$bin_host_policy.policy_seconds|difftime} </td> </tr> <td colspan="2" ><font face="Arial, Helvetica" size=2> ! <i>{tr}raw deletion policy{/tr}:</i> </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Source{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_host_policy.source} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Policy Name{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_host_policy.policy_name} </td> </tr><tr> <td><font face="Arial, Helvetica" size=2> ! {tr}Retention Time{/tr}: </td><td><font face="Arial, Helvetica" size=2> ! {$raw_host_policy.policy_seconds|difftime} </td> </tr> ! {else} <tr><td align=center width="33%" ><font face="Arial, Helvetica" size=2> ! {tr}Select Host{/tr}: </td></tr> <tr><td> <select name="host_id"> ! {foreach from=$hostinfos key=hid item=hinfo} ! <option value="{$hid}">{$hinfo.host_name}</option> ! {/foreach} </select> </td></tr> <tr><td align=center width="33%" colspan="2" ><font face="Arial, Helvetica" size=2> ! <input type="submit" name="set_host" value="{tr}Set{/tr}"> </td></tr> ! {/if} </table></td></tr></table><br /> ! {/if} ! {if $group_id && $host_id} <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> ! <tr><td><b>{tr}Service{/tr}</b></td><td><b>{tr}Raw deletion policy{/tr}</b></td> ! <td><b>{tr}Effective raw deletion policy{/tr}</b></td> ! <td><b>{tr}Metric{/tr}</b></td><td><b>{tr}Bin deletion policy{/tr}</b></td> ! <td><b>{tr}Effective bin deletion policy{/tr}</b></td> </tr> ! {foreach from=$metricsinfos key=serviceid item=servicearray} <tr> ! <td rowspan="{$servicearray.count_metrics}">{$servicearray.service_description}</td> ! <td rowspan="{$servicearray.count_metrics}">todo</td> ! <td rowspan="{$servicearray.count_metrics}">todo</td> ! {foreach from=$servicearray.metrics key=metricid item=metric} ! <td>{$metric}</td> <td>todo</td> <td>todo</td> </tr> ! {/foreach} ! {/foreach} </table></td></tr></table></p> ! {/if} </form> Index: graph.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/graph.tpl.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** graph.tpl.html 18 Jun 2007 22:12:38 -0000 1.13 --- graph.tpl.html 23 Jan 2008 22:33:53 -0000 1.14 *************** *** 3,7 **** <TITLE> PerfParse</TITLE> ! <{literal}> <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> function isAbsRelVisible(sw,ref) { --- 3,7 ---- <TITLE> PerfParse</TITLE> ! {literal} <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> function isAbsRelVisible(sw,ref) { *************** *** 29,33 **** </SCRIPT> ! <{/literal}> <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000" onload="isAbsRelVisible()"> <p align=center> --- 29,33 ---- </SCRIPT> ! {/literal} <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000" onload="isAbsRelVisible()"> <p align=center> *************** *** 40,98 **** <tr> <td colspan=7><table width="100%" border=0 cellpadding=0 cellspacing=0><tr><td> ! <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}>PerfParse Metric Analysis<{/tr}></b><br><br> ! <a href="perfparse.php"><{tr}>Click to return to main menu<{/tr}>.</a><br> ! <a href="perfparse.php?page=all_bin"><{tr}>Click to select new service<{/tr}>.</a> </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1><{$version}></td> </td></tr></table></td> </tr> ! <tr><td align="center" colspan="7"><input type="submit" value="<{tr}>Draw graph<{/tr}>" /> <!-- save the graphs array --> ! <{foreach from=$graphs key=mid item=bla}> ! <input type="hidden" name="graphs[<{$mid}>]" value="<{$bla}>" /> ! <{/foreach}> </td></tr> <!-- loop through displaygraphs --> ! <{foreach from=$displaygraphs key=host_name item=hostarray}> ! <!-- host <{$host_name}> --> ! <{foreach from=$hostarray key=service item=servicearray}> ! <!-- service <{$service}> --> ! <{foreach from=$servicearray key=metric item=metricarray}> ! <!-- metric <{$metric}> --> <tr><td colspan=7><hr width="100%"></td></tr> <tr> <td align="center" rowspan="14"> <!-- The graph --> ! <img src="<{$metricarray.url}>" border=0> </td> ! <td align=right><font face="Arial, Helvetica" size=2><b><{tr}>Host<{/tr}>:</td> ! <td><font face="Arial, Helvetica" size=2> <{$host_name}></td> ! <td align=right><font face="Arial, Helvetica" size=2><b><{tr}>Service<{/tr}>:</td> ! <td><font face="Arial, Helvetica" size=2> <{$service}></td> ! <td align=right><font face="Arial, Helvetica" size=2><b><{tr}>Metric<{/tr}>:</td> ! <td><font face="Arial, Helvetica" size=2> <{$metric}></td> </tr> <tr><td colspan=6 height=4><hr></td></tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2><{tr}>Scale<{/tr}>:</td> <td> ! <select name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][scale]"> ! <option value="1" <{if $metricarray.scale == 1}>selected="selected"<{/if}>><{tr}>User<{/tr}>: ! <option value="0" <{if $metricarray.scale == 0}>selected="selected"<{/if}>><{tr}>User, Rounded<{/tr}>: ! <option value="2" <{if $metricarray.scale == 2}>selected="selected"<{/if}>><{tr}>User, as Percent<{/tr}>: ! <{if $metricarray.value_max }> ! <option value="3" <{if $metricarray.scale == 3}>selected="selected"<{/if}>><{tr}>from Plugin<{/tr}>: ! <option value="4" <{if $metricarray.scale == 4}>selected="selected"<{/if}>><{tr}>from Plugin, Rounded<{/tr}>: ! <option value="5" <{if $metricarray.scale == 5}>selected="selected"<{/if}>><{tr}>from Plugin, as Percent<{/tr}>: ! <{/if}> ! <option value="6" <{if $metricarray.scale == 6}>selected="selected"<{/if}>><{tr}>Automatic<{/tr}>. </select> </td> <td align=right><font face="Arial, Helvetica" size=2> ! <{tr}>User Min<{/tr}>: </td> <td> ! <input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][minin]" value="<{$metricarray.minin}>" size=12 maxlength=12> </td> <td align=right><font face="Arial, Helvetica" size=2> --- 40,98 ---- <tr> <td colspan=7><table width="100%" border=0 cellpadding=0 cellspacing=0><tr><td> ! <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}PerfParse Metric Analysis{/tr}</b><br><br> ! <a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a><br> ! <a href="perfparse.php?page=all_bin">{tr}Click to select new service{/tr}.</a> </td> ! <td width=60 align=right><font face="Arial, Helvetica" size=1>{$version}</td> </td></tr></table></td> </tr> ! <tr><td align="center" colspan="7"><input type="submit" value="{tr}Draw graph{/tr}" /> <!-- save the graphs array --> ! {foreach from=$graphs key=mid item=bla} ! <input type="hidden" name="graphs[{$mid}]" value="{$bla}" /> ! {/foreach} </td></tr> <!-- loop through displaygraphs --> ! {foreach from=$displaygraphs key=host_name item=hostarray} ! <!-- host {$host_name} --> ! {foreach from=$hostarray key=service item=servicearray} ! <!-- service {$service} --> ! {foreach from=$servicearray key=metric item=metricarray} ! <!-- metric {$metric} --> <tr><td colspan=7><hr width="100%"></td></tr> <tr> <td align="center" rowspan="14"> <!-- The graph --> ! <img src="{$metricarray.url}" border=0> </td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Host{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$host_name}</td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Service{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$service}</td> ! <td align=right><font face="Arial, Helvetica" size=2><b>{tr}Metric{/tr}:</td> ! <td><font face="Arial, Helvetica" size=2> {$metric}</td> </tr> <tr><td colspan=6 height=4><hr></td></tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Scale{/tr}:</td> <td> ! <select name="displaygraphs[{$host_name}][{$service}][{$metric}][scale]"> ! <option value="1" {if $metricarray.scale == 1}selected="selected"{/if}>{tr}User{/tr}: ! <option value="0" {if $metricarray.scale == 0}selected="selected"{/if}>{tr}User, Rounded{/tr}: ! <option value="2" {if $metricarray.scale == 2}selected="selected"{/if}>{tr}User, as Percent{/tr}: ! {if $metricarray.value_max } ! <option value="3" {if $metricarray.scale == 3}selected="selected"{/if}>{tr}from Plugin{/tr}: ! <option value="4" {if $metricarray.scale == 4}selected="selected"{/if}>{tr}from Plugin, Rounded{/tr}: ! <option value="5" {if $metricarray.scale == 5}selected="selected"{/if}>{tr}from Plugin, as Percent{/tr}: ! {/if} ! <option value="6" {if $metricarray.scale == 6}selected="selected"{/if}>{tr}Automatic{/tr}. </select> </td> <td align=right><font face="Arial, Helvetica" size=2> ! {tr}User Min{/tr}: </td> <td> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][minin]" value="{$metricarray.minin}" size=12 maxlength=12> </td> <td align=right><font face="Arial, Helvetica" size=2> *************** *** 100,199 **** </td> <td> ! <input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][maxin]" value="<{$metricarray.maxin}>" size=12 maxlength=12> </td> </tr> <tr><td colspan=6 height=4><hr></td></tr> <tr> ! <td align=right rowspan=2><font face="Arial, Helvetica" size=2><{tr}>Period<{/tr}>:</td> ! <td valign=middle><font face="Arial, Helvetica" size=2> <input type=radio name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'<{$host_name}>_<{$service}>_<{$metric}>')" id="RelSwitch" <{if $metricarray.timerange=="r"}>checked="checked"<{/if}> ><{tr}>Relative<{/tr}></td> ! <td align=right id="Rel_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2><{tr}>Rel Period<{/tr}>:</td> ! <td valign=middle id="Rel_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2> <input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][relativedays]" value="<{$metricarray.relativedays}>" size=2 maxlength=4> <{tr}>Days<{/tr}> </td> ! <td align=right id="Rel_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2> ! <{tr}>And Hours<{/tr}>: </td> ! <td id="Rel_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2> ! <input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][relativetime]" value="<{$metricarray.relativetime}>" size=5 maxlength=5> <{tr}>HH:MM<{/tr}> </td> </tr> <tr> <td><font face="Arial, Helvetica" size=2> ! <input type=radio name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'<{$host_name}>_<{$service}>_<{$metric}>')" id="AbsSwitch" <{if $metricarray.timerange=="a"}>checked="checked"<{/if}>><{tr}>Absolute<{/tr}> </td> ! <td align=right id="Abs_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2><{tr}>Abs From<{/tr}>:</td> ! <td id="Abs_<{$host_name}>_<{$service}>_<{$metric}>"><input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][from]" value="<{$metricarray.from}>" size=17 maxlength=20></td> ! <td align=right id="Abs_<{$host_name}>_<{$service}>_<{$metric}>"><font face="Arial, Helvetica" size=2><{tr}>Abs To<{/tr}>:</td> ! <td id="Abs_<{$host_name}>_<{$service}>_<{$metric}>"><input type=text name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][to]" value="<{$metricarray.to}>" size=17 maxlength=20></td> </tr> <tr><td colspan=6 height=4><hr height=4></td></tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2><{tr}>Output<{/tr}>:</td> ! <td><select name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][output]"> ! <option value="Histogram" <{if $metricarray.output=="Histogram"}>selected="selected"<{/if}>><{tr}>Histogram<{/tr}> ! <option value="Average" <{if $metricarray.output=="Average"}>selected="selected"<{/if}>><{tr}>Daily Average<{/tr}> ! <option value="Diff" <{if $metricarray.output=="Diff"}>selected="selected"<{/if}>><{tr}>Differential Rate<{/tr}> ! <option value="Int" <{if $metricarray.output=="Int"}>selected="selected"<{/if}>><{tr}>Integral Sum<{/tr}> </td> <td colspan=2> </td> ! <td align=right><font face="Arial, Helvetica" size=2><{tr}>Size<{/tr}>:</td> ! <td><select name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][size]"> ! <option value="400x200" <{if $metricarray.size=="400x200"}>selected="selected"<{/if}>><{tr}>Small<{/tr}> ! <option value="585x300" <{if $metricarray.size=="585x300"}>selected="selected"<{/if}>><{tr}>Normal<{/tr}> ! <option value="1000x600" <{if $metricarray.size=="1000x600"}>selected="selected"<{/if}>><{tr}>Large<{/tr}> </td> </tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2><{tr}>Plot<{/tr}>:</td> <td colspan=5><font face="Arial, Helvetica" size="2"> ! <input type=checkbox name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][s_val]" value="1" <{if $metricarray.s_val}>checked="checked"<{/if}>> <{tr}>Value<{/tr}> ! <input type=checkbox name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][s_smo]" value="1" <{if $metricarray.s_smo}>checked="checked"<{/if}>> <{tr}>Smooth<{/tr}>* ! <input type=checkbox name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][s_war]" value="1" <{if $metricarray.s_war}>checked="checked"<{/if}>> <{tr}>Warning<{/tr}> ! <input type=checkbox name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][s_cri]" value="1" <{if $metricarray.s_cri}>checked="checked"<{/if}>> <{tr}>Critical<{/tr}> ! <input type=checkbox name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][s_sta]" value="1" <{if $metricarray.s_sta}>checked="checked"<{/if}>> <{tr}>Stan. Dev<{/tr}>* </font> ! <font face="Arial, Helvetica" size="1">(* <{tr}>Where Used<{/tr}>)</font> </td> </tr> <tr> ! <td colspan=4 align=center><font face="Arial, Helvetica" size=2><b><{tr}>Advanced Options<{/tr}>.</b></font></td> </tr> <tr> <td colspan=2 align=right><font face="Arial, Helvetica" size=2> ! <{tr}>Graph Legend<{/tr}>: </font></td> <td colspan=2> ! <input type="text" name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][title]" value="<{$metricarray.title}>" size=60 maxlength=80> </td> </tr> <tr> <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! <{tr}>Smooth Plot: Gaussian Average: Width (pixels)<{/tr}>: </td> <td colspan=2><nobr> ! <input type="text" name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][g_sigma]" value="<{$metricarray.g_sigma}>" size=5 maxlength=5> ! <font face="Arial, Helvetica" size=1>(<{tr}>Large = Slow, see<{/tr}> <a href="http://perfparse.sourceforge.net/faq.php#gaussian"><{tr}>FAQ<{/tr}></a>)</font> </td> </tr> <tr> <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! <{tr}>Save graph for future reference<{/tr}> </font></td> <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! <input type="submit" name="save_graph_metric_id[<{$metricarray.metric_id}>]" value="Save graph" /> ! <b><{$errorsave[$metricarray.metric_id]}></b> </font></td> <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! <{tr}>Save with Title<{/tr}>: ! <input type="text" name="displaygraphs[<{$host_name}>][<{$service}>][<{$metric}>][graph_name]" value="<{$metricarray.graph_name}>" size=40 maxlength=80> </font></td> </tr> <tr> ! <td colspan="6" align=center><font face="Arial, Helvetica" size=2><b><{tr}>URL to create this graph<{/tr}>:</b></td> </tr> <tr> <td colspan="7"><font face="Courier" size=-5> ! <{$uristart}><{$metricarray.url}></font> </td> </tr> ! <{/foreach}> ! <{/foreach}> ! <{/foreach}> ! <tr><td align="center" colspan="7"><input type="submit" value="<{tr}>Draw graph<{/tr}>" /></td></tr> </table> </td></tr></table></p> --- 100,199 ---- </td> <td> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][maxin]" value="{$metricarray.maxin}" size=12 maxlength=12> </td> </tr> <tr><td colspan=6 height=4><hr></td></tr> <tr> ! <td align=right rowspan=2><font face="Arial, Helvetica" size=2>{tr}Period{/tr}:</td> ! <td valign=middle><font face="Arial, Helvetica" size=2> <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="r" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="RelSwitch" {if $metricarray.timerange=="r"}checked="checked"{/if} >{tr}Relative{/tr}</td> ! <td align=right id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Rel Period{/tr}:</td> ! <td valign=middle id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativedays]" value="{$metricarray.relativedays}" size=2 maxlength=4> {tr}Days{/tr} </td> ! <td align=right id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> ! {tr}And Hours{/tr}: </td> ! <td id="Rel_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2> ! <input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][relativetime]" value="{$metricarray.relativetime}" size=5 maxlength=5> {tr}HH:MM{/tr} </td> </tr> <tr> <td><font face="Arial, Helvetica" size=2> ! <input type=radio name="displaygraphs[{$host_name}][{$service}][{$metric}][timerange]" value="a" onclick="javascript:isAbsRelVisible(this,'{$host_name}_{$service}_{$metric}')" id="AbsSwitch" {if $metricarray.timerange=="a"}checked="checked"{/if}>{tr}Absolute{/tr} </td> ! <td align=right id="Abs_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Abs From{/tr}:</td> ! <td id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][from]" value="{$metricarray.from}" size=17 maxlength=20></td> ! <td align=right id="Abs_{$host_name}_{$service}_{$metric}"><font face="Arial, Helvetica" size=2>{tr}Abs To{/tr}:</td> ! <td id="Abs_{$host_name}_{$service}_{$metric}"><input type=text name="displaygraphs[{$host_name}][{$service}][{$metric}][to]" value="{$metricarray.to}" size=17 maxlength=20></td> </tr> <tr><td colspan=6 height=4><hr height=4></td></tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Output{/tr}:</td> ! <td><select name="displaygraphs[{$host_name}][{$service}][{$metric}][output]"> ! <option value="Histogram" {if $metricarray.output=="Histogram"}selected="selected"{/if}>{tr}Histogram{/tr} ! <option value="Average" {if $metricarray.output=="Average"}selected="selected"{/if}>{tr}Daily Average{/tr} ! <option value="Diff" {if $metricarray.output=="Diff"}selected="selected"{/if}>{tr}Differential Rate{/tr} ! <option value="Int" {if $metricarray.output=="Int"}selected="selected"{/if}>{tr}Integral Sum{/tr} </td> <td colspan=2> </td> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Size{/tr}:</td> ! <td><select name="displaygraphs[{$host_name}][{$service}][{$metric}][size]"> ! <option value="400x200" {if $metricarray.size=="400x200"}selected="selected"{/if}>{tr}Small{/tr} ! <option value="585x300" {if $metricarray.size=="585x300"}selected="selected"{/if}>{tr}Normal{/tr} ! <option value="1000x600" {if $metricarray.size=="1000x600"}selected="selected"{/if}>{tr}Large{/tr} </td> </tr> <tr> ! <td align=right><font face="Arial, Helvetica" size=2>{tr}Plot{/tr}:</td> <td colspan=5><font face="Arial, Helvetica" size="2"> ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_val]" value="1" {if $metricarray.s_val}checked="checked"{/if}> {tr}Value{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_smo]" value="1" {if $metricarray.s_smo}checked="checked"{/if}> {tr}Smooth{/tr}* ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_war]" value="1" {if $metricarray.s_war}checked="checked"{/if}> {tr}Warning{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_cri]" value="1" {if $metricarray.s_cri}checked="checked"{/if}> {tr}Critical{/tr} ! <input type=checkbox name="displaygraphs[{$host_name}][{$service}][{$metric}][s_sta]" value="1" {if $metricarray.s_sta}checked="checked"{/if}> {tr}Stan. Dev{/tr}* </font> ! <font face="Arial, Helvetica" size="1">(* {tr}Where Used{/tr})</font> </td> </tr> <tr> ! <td colspan=4 align=center><font face="Arial, Helvetica" size=2><b>{tr}Advanced Options{/tr}.</b></font></td> </tr> <tr> <td colspan=2 align=right><font face="Arial, Helvetica" size=2> ! {tr}Graph Legend{/tr}: </font></td> <td colspan=2> ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][title]" value="{$metricarray.title}" size=60 maxlength=80> </td> </tr> <tr> <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! {tr}Smooth Plot: Gaussian Average: Width (pixels){/tr}: </td> <td colspan=2><nobr> ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][g_sigma]" value="{$metricarray.g_sigma}" size=5 maxlength=5> ! <font face="Arial, Helvetica" size=1>({tr}Large = Slow, see{/tr} <a href="http://perfparse.sourceforge.net/faq.php#gaussian">{tr}FAQ{/tr}</a>)</font> </td> </tr> <tr> <td align=right colspan=2><font face="Arial, Helvetica" size=2> ! {tr}Save graph for future reference{/tr} </font></td> <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! <input type="submit" name="save_graph_metric_id[{$metricarray.metric_id}]" value="Save graph" /> ! <b>{$errorsave[$metricarray.metric_id]}</b> </font></td> <td align=right colspan=2><font face="Arial, Helvetica" size=2><nobr> ! {tr}Save with Title{/tr}: ! <input type="text" name="displaygraphs[{$host_name}][{$service}][{$metric}][graph_name]" value="{$metricarray.graph_name}" size=40 maxlength=80> </font></td> </tr> <tr> ! <td colspan="6" align=center><font face="Arial, Helvetica" size=2><b>{tr}URL to create this graph{/tr}:</b></td> </tr> <tr> <td colspan="7"><font face="Courier" size=-5> ! {$uristart}{$metricarray.url}</font> </td> </tr> ! {/foreach} ! {/foreach} ! {/foreach} ! <tr><td align="center" colspan="7"><input type="submit" value="{tr}Draw graph{/tr}" /></td></tr> </table> </td></tr></table></p> Index: raw_history.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/raw_history.tpl.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** raw_history.tpl.html 12 Jun 2007 15:11:10 -0000 1.6 --- raw_history.tpl.html 23 Jan 2008 22:33:53 -0000 1.7 *************** *** 34,46 **** <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}>Raw History Report<{/tr}></b> <br> ! <a href="perfparse.php?page=all_raw"><{tr}>Return to Raw Report<{/tr}>.</a> <br> ! <a href="perfparse.php"><{tr}>Return to main menu<{/tr}></a> </font></td> ! <td width=60 align=right><font face="Arial, Helvetica" size="1"><{$version}></font></td> </tr> </table> --- 34,46 ---- <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}Raw History Report{/tr}</b> <br> ! <a href="perfparse.php?page=all_raw">{tr}Return to Raw Report{/tr}.</a> <br> ! <a href="perfparse.php">{tr}Return to main menu{/tr}</a> </font></td> ! <td width=60 align=right><font face="Arial, Helvetica" size="1">{$version}</font></td> </tr> </table> *************** *** 51,55 **** <table width="100%" border=0 cellpadding=0 cellspacing=0> <form method=get name="graph"> ! <input type=hidden name="service_id" value="<{$service_id|escape:"url"}>"> <input type=hidden name="page" value="raw_history"> </table> --- 51,55 ---- <table width="100%" border=0 cellpadding=0 cellspacing=0> <form method=get name="graph"> ! <input type=hidden name="service_id" value="{$service_id|escape:"url"}"> <input type=hidden name="page" value="raw_history"> </table> *************** *** 57,78 **** <tr> <td align=right><font face="Arial, Helvetica" size=2> ! <b><{tr}>Host<{/tr}>:</b> </td> <td><font face="Arial, Helvetica" size=2> ! <{$host_name|escape:"htmlall"}> </td> <td align=right><font face="Arial, Helvetica" size=2> ! <b><{tr}>Service<{/tr}>:</b> </td> <td><font face="Arial, Helvetica" size=2> ! <{$service|escape:"htmlall"}> </td> <td align=right><font face="Arial, Helvetica" size=2> ! <b><{tr}>Report<{/tr}>:</b> </td> <td><font face="Arial, Helvetica" size=2> <select name="type"> ! <option value="0" <{if $type==0}>selected="selected"<{/if}>><{tr}>All events<{/tr}> ! <option value="1" <{if $type==1}>selected="selected"<{/if}>><{tr}>Change in Events<{/tr}> ! <option value="2" <{if $type==2}>selected="selected"<{/if}>><{tr}>Summary Only<{/tr}> </select> </td> --- 57,78 ---- <tr> <td align=right><font face="Arial, Helvetica" size=2> ! <b>{tr}Host{/tr}:</b> </td> <td><font face="Arial, Helvetica" size=2> ! {$host_name|escape:"htmlall"} </td> <td align=right><font face="Arial, Helvetica" size=2> ! <b>{tr}Service{/tr}:</b> </td> <td><font face="Arial, Helvetica" size=2> ! {$service|escape:"htmlall"} </td> <td align=right><font face="Arial, Helvetica" size=2> ! <b>{tr}Report{/tr}:</b> </td> <td><font face="Arial, Helvetica" size=2> <select name="type"> ! <option value="0" {if $type==0}selected="selected"{/if}>{tr}All events{/tr} ! <option value="1" {if $type==1}selected="selected"{/if}>{tr}Change in Events{/tr} ! <option value="2" {if $type==2}selected="selected"{/if}>{tr}Summary Only{/tr} </select> </td> *************** *** 81,137 **** <tr> <td align=right rowspan=2><font face="Arial, Helvetica" size=2><b>Period:</b></font></td> ! <td valign=middle><font face="Arial, Helvetica" size=2> <input type=radio name="timerange" value="r" onclick="isAbsRelVisible()" <{if $timerange=='r'}>checked="checked"<{/if}>><{tr}>Relative<{/tr}></td> ! <td align=right id="Rel1"><font face="Arial, Helvetica" size=2><b><{tr}>Rel Period<{/tr}>:</b></font></td> ! <td valign=middle id="Rel2"><font face="Arial, Helvetica" size=2> <input type=text name="relativedays" value="<{$relativedays}>" size=2 maxlength=4> <{tr}>Days<{/tr}> </td> <td align=right id="Rel3"><font face="Arial, Helvetica" size=2> ! <b><{tr}>And Hours<{/tr}>:</b> </td> <td id="Rel4"><font face="Arial, Helvetica" size=2> ! <input type=text name="relativetime" value="<{$relativetime}>" size=5 maxlength=5> HH:MM </td> </tr> <tr> <td><font face="Arial, Helvetica" size=2> ! <input type=radio name="timerange" value="a" onclick="isAbsRelVisible()" <{if $timerange=='a'}>checked="checked"<{/if}>><{tr}>Absolute<{/tr}> </td> ! <td align=right id="Abs1"><font face="Arial, Helvetica" size=2><b><{tr}>Abs From<{/tr}>:</b></font></td> ! <td id="Abs2"><input type=text name="from" value="<{$from}>" size=17 maxlength=20></td> ! <td align=right id="Abs3"><font face="Arial, Helvetica" size=2><b><{tr}>Abs To<{/tr}>:</b></font></td> ! <td id="Abs4"><input type=text name="to" value="<{$to}>" size=17 maxlength=20></td> </tr> <tr><td colspan=6 height=4><hr width="100%" height=4></td></tr> <tr> <td colspan=6 align=center> ! <input type=submit value="<{tr}>Generate Report<{/tr}>"> </td> </tr> </table> </td></tr></table></p> ! <{if $raw_hist.datacount }> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> <td bgcolor="#FFFFCC" align=center width="1%"><nobr><font face="Arial, Helvetica" size=2>Status</td> ! <td bgcolor="#FFFFCC" align=center width="1%"><nobr><font face="Arial, Helvetica" size=2><a href="perfparse.php?page=raw_history&type=<{$type|escape:"url"}>&service_id=<{$service_id|escape:"url"}>&inc=perfdata%5Fservice%5Fraw%2Ectime"><img src="<{$http_image_path}>inc1.png" border=0></a><a href="perfparse.php?page=raw_history&type=<{$type|escape:"url"}>&service_id=<{$service_id|escape:"url"}>&dec=perfdata%5Fservice%5Fraw%2Ectime"><img src="<{$http_image_path}>dec0.png" border=0></a> Last Check</td> <td bgcolor="#FFFFCC" align=center width="1%"><nobr><font face="Arial, Helvetica" size=2>∆ Time</td> ! <td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2><a href="perfparse.php?page=raw_history&type=<{$type|escape:"url"}>&service_id=<{$service_id|escape:"url"}>&inc=perfdata%5Fservice%5Fraw%2Etxt%5Fdata"><img src="<{$http_image_path}>inc0.png" border=0></a><a href="perfparse.php?page=raw_history&type=<{$type|escape:"url"}>&service_id=<{$service_id|escape:"url"}>&dec=perfdata%5Fservice%5Fraw%2Etxt%5Fdata"><img src="<{$http_image_path}>dec0.png" border=0></a> Plugin Output</td> </tr> ! <{foreach from=$raw_hist.data item=item key=key}> <tr> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.state}> </td> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2><nobr> <{$item.ctime|date_format:"%c"}> </td> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2><nobr> <{if $item.delta.d}><{$item.delta.d}> <{tr}>d<{/tr}> <{/if}><{$item.delta.h|string_format:"%d"}>:<{$item.delta.m|string_format:"%02d"}>:<{$item.delta.s|string_format:"%02d"}> </td> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.txt_data}> </td> </tr> ! <{/foreach}> </table> ! <{/if}> ! <{* todo: relative time and correction of date input *}> ! <{* todo: fix path to cgi *}> ! <p align="center"><img src="/nagios/cgi-bin/perfgant.png?service_id=<{$service_id|escape:"url"}>&from=<{$ifrom|escape:"url"}>&to=<... [truncated message content] |
|
From: Florian G. <re...@us...> - 2008-01-23 22:33:51
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2285 Modified Files: perfparse.php Added Files: tabber.js Log Message: Start new more modern design and change Smarty delimiter for better editability. Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** perfparse.php 18 Dec 2007 15:08:51 -0000 1.61 --- perfparse.php 23 Jan 2008 22:33:53 -0000 1.62 *************** *** 50,55 **** // set left & right delimiter to <{ }>. So it is easier for html editors and // javascript ! $smarty->left_delimiter='<{'; ! $smarty->right_delimiter='}>'; // php-perfparse version --- 50,55 ---- // set left & right delimiter to <{ }>. So it is easier for html editors and // javascript ! // $smarty->left_delimiter='<{'; ! // $smarty->right_delimiter='}>'; // php-perfparse version --- NEW FILE: tabber.js --- /*================================================== $Id: tabber.js,v 1.1 2008/01/23 22:33:53 redflo Exp $ tabber.js by Patrick Fitzgerald pa...@ba... Documentation can be found at the following URL: http://www.barelyfitz.com/projects/tabber/ License (http://www.opensource.org/licenses/mit-license.php) Copyright (c) 2006 Patrick Fitzgerald Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================*/ function tabberObj(argsObj) { var arg; /* name of an argument to override */ /* Element for the main tabber div. If you supply this in argsObj, then the init() method will be called. */ this.div = null; /* Class of the main tabber div */ this.classMain = "tabber"; /* Rename classMain to classMainLive after tabifying (so a different style can be applied) */ this.classMainLive = "tabberlive"; /* Class of each DIV that contains a tab */ this.classTab = "tabbertab"; /* Class to indicate which tab should be active on startup */ this.classTabDefault = "tabbertabdefault"; /* Class for the navigation UL */ this.classNav = "tabbernav"; /* When a tab is to be hidden, instead of setting display='none', we set the class of the div to classTabHide. In your screen stylesheet you should set classTabHide to display:none. In your print stylesheet you should set display:block to ensure that all the information is printed. */ this.classTabHide = "tabbertabhide"; /* Class to set the navigation LI when the tab is active, so you can use a different style on the active tab. */ this.classNavActive = "tabberactive"; /* Elements that might contain the title for the tab, only used if a title is not specified in the TITLE attribute of DIV classTab. */ this.titleElements = ['h2','h3','h4','h5','h6']; /* Should we strip out the HTML from the innerHTML of the title elements? This should usually be true. */ this.titleElementsStripHTML = true; /* If the user specified the tab names using a TITLE attribute on the DIV, then the browser will display a tooltip whenever the mouse is over the DIV. To prevent this tooltip, we can remove the TITLE attribute after getting the tab name. */ this.removeTitle = true; /* If you want to add an id to each link set this to true */ this.addLinkId = false; /* If addIds==true, then you can set a format for the ids. <tabberid> will be replaced with the id of the main tabber div. <tabnumberzero> will be replaced with the tab number (tab numbers starting at zero) <tabnumberone> will be replaced with the tab number (tab numbers starting at one) <tabtitle> will be replaced by the tab title (with all non-alphanumeric characters removed) */ this.linkIdFormat = '<tabberid>nav<tabnumberone>'; /* You can override the defaults listed above by passing in an object: var mytab = new tabber({property:value,property:value}); */ for (arg in argsObj) { this[arg] = argsObj[arg]; } /* Create regular expressions for the class names; Note: if you change the class names after a new object is created you must also change these regular expressions. */ this.REclassMain = new RegExp('\\b' + this.classMain + '\\b', 'gi'); this.REclassMainLive = new RegExp('\\b' + this.classMainLive + '\\b', 'gi'); this.REclassTab = new RegExp('\\b' + this.classTab + '\\b', 'gi'); this.REclassTabDefault = new RegExp('\\b' + this.classTabDefault + '\\b', 'gi'); this.REclassTabHide = new RegExp('\\b' + this.classTabHide + '\\b', 'gi'); /* Array of objects holding info about each tab */ this.tabs = new Array(); /* If the main tabber div was specified, call init() now */ if (this.div) { this.init(this.div); /* We don't need the main div anymore, and to prevent a memory leak in IE, we must remove the circular reference between the div and the tabber object. */ this.div = null; } } /*-------------------------------------------------- Methods for tabberObj --------------------------------------------------*/ tabberObj.prototype.init = function(e) { /* Set up the tabber interface. e = element (the main containing div) Example: init(document.getElementById('mytabberdiv')) */ var childNodes, /* child nodes of the tabber div */ i, i2, /* loop indices */ t, /* object to store info about a single tab */ defaultTab=0, /* which tab to select by default */ DOM_ul, /* tabbernav list */ DOM_li, /* tabbernav list item */ DOM_a, /* tabbernav link */ aId, /* A unique id for DOM_a */ headingElement; /* searching for text to use in the tab */ /* Verify that the browser supports DOM scripting */ if (!document.getElementsByTagName) { return false; } /* If the main DIV has an ID then save it. */ if (e.id) { this.id = e.id; } /* Clear the tabs array (but it should normally be empty) */ this.tabs.length = 0; /* Loop through an array of all the child nodes within our tabber element. */ childNodes = e.childNodes; for(i=0; i < childNodes.length; i++) { /* Find the nodes where class="tabbertab" */ if(childNodes[i].className && childNodes[i].className.match(this.REclassTab)) { /* Create a new object to save info about this tab */ t = new Object(); /* Save a pointer to the div for this tab */ t.div = childNodes[i]; /* Add the new object to the array of tabs */ this.tabs[this.tabs.length] = t; /* If the class name contains classTabDefault, then select this tab by default. */ if (childNodes[i].className.match(this.REclassTabDefault)) { defaultTab = this.tabs.length-1; } } } /* Create a new UL list to hold the tab headings */ DOM_ul = document.createElement("ul"); DOM_ul.className = this.classNav; /* Loop through each tab we found */ for (i=0; i < this.tabs.length; i++) { t = this.tabs[i]; /* Get the label to use for this tab: From the title attribute on the DIV, Or from one of the this.titleElements[] elements, Or use an automatically generated number. */ t.headingText = t.div.title; /* Remove the title attribute to prevent a tooltip from appearing */ if (this.removeTitle) { t.div.title = ''; } if (!t.headingText) { /* Title was not defined in the title of the DIV, So try to get the title from an element within the DIV. Go through the list of elements in this.titleElements (typically heading elements ['h2','h3','h4']) */ for (i2=0; i2<this.titleElements.length; i2++) { headingElement = t.div.getElementsByTagName(this.titleElements[i2])[0]; if (headingElement) { t.headingText = headingElement.innerHTML; if (this.titleElementsStripHTML) { t.headingText.replace(/<br>/gi," "); t.headingText = t.headingText.replace(/<[^>]+>/g,""); } break; } } } if (!t.headingText) { /* Title was not found (or is blank) so automatically generate a number for the tab. */ t.headingText = i + 1; } /* Create a list element for the tab */ DOM_li = document.createElement("li"); /* Save a reference to this list item so we can later change it to the "active" class */ t.li = DOM_li; /* Create a link to activate the tab */ DOM_a = document.createElement("a"); DOM_a.appendChild(document.createTextNode(t.headingText)); DOM_a.href = "javascript:void(null);"; DOM_a.title = t.headingText; DOM_a.onclick = this.navClick; /* Add some properties to the link so we can identify which tab was clicked. Later the navClick method will need this. */ DOM_a.tabber = this; DOM_a.tabberIndex = i; /* Do we need to add an id to DOM_a? */ if (this.addLinkId && this.linkIdFormat) { /* Determine the id name */ aId = this.linkIdFormat; aId = aId.replace(/<tabberid>/gi, this.id); aId = aId.replace(/<tabnumberzero>/gi, i); aId = aId.replace(/<tabnumberone>/gi, i+1); aId = aId.replace(/<tabtitle>/gi, t.headingText.replace(/[^a-zA-Z0-9\-]/gi, '')); DOM_a.id = aId; } /* Add the link to the list element */ DOM_li.appendChild(DOM_a); /* Add the list element to the list */ DOM_ul.appendChild(DOM_li); } /* Add the UL list to the beginning of the tabber div */ e.insertBefore(DOM_ul, e.firstChild); /* Make the tabber div "live" so different CSS can be applied */ e.className = e.className.replace(this.REclassMain, this.classMainLive); /* Activate the default tab, and do not call the onclick handler */ this.tabShow(defaultTab); /* If the user specified an onLoad function, call it now. */ if (typeof this.onLoad == 'function') { this.onLoad({tabber:this}); } return this; }; tabberObj.prototype.navClick = function(event) { /* This method should only be called by the onClick event of an <A> element, in which case we will determine which tab was clicked by examining a property that we previously attached to the <A> element. Since this was triggered from an onClick event, the variable "this" refers to the <A> element that triggered the onClick event (and not to the tabberObj). When tabberObj was initialized, we added some extra properties to the <A> element, for the purpose of retrieving them now. Get the tabberObj object, plus the tab number that was clicked. */ var rVal, /* Return value from the user onclick function */ a, /* element that triggered the onclick event */ self, /* the tabber object */ tabberIndex, /* index of the tab that triggered the event */ onClickArgs; /* args to send the onclick function */ a = this; if (!a.tabber) { return false; } self = a.tabber; tabberIndex = a.tabberIndex; /* Remove focus from the link because it looks ugly. I don't know if this is a good idea... */ a.blur(); /* If the user specified an onClick function, call it now. If the function returns false then do not continue. */ if (typeof self.onClick == 'function') { onClickArgs = {'tabber':self, 'index':tabberIndex, 'event':event}; /* IE uses a different way to access the event object */ if (!event) { onClickArgs.event = window.event; } rVal = self.onClick(onClickArgs); if (rVal === false) { return false; } } self.tabShow(tabberIndex); return false; }; tabberObj.prototype.tabHideAll = function() { var i; /* counter */ /* Hide all tabs and make all navigation links inactive */ for (i = 0; i < this.tabs.length; i++) { this.tabHide(i); } }; tabberObj.prototype.tabHide = function(tabberIndex) { var div; if (!this.tabs[tabberIndex]) { return false; } /* Hide a single tab and make its navigation link inactive */ div = this.tabs[tabberIndex].div; /* Hide the tab contents by adding classTabHide to the div */ if (!div.className.match(this.REclassTabHide)) { div.className += ' ' + this.classTabHide; } this.navClearActive(tabberIndex); return this; }; tabberObj.prototype.tabShow = function(tabberIndex) { /* Show the tabberIndex tab and hide all the other tabs */ var div; if (!this.tabs[tabberIndex]) { return false; } /* Hide all the tabs first */ this.tabHideAll(); /* Get the div that holds this tab */ div = this.tabs[tabberIndex].div; /* Remove classTabHide from the div */ div.className = div.className.replace(this.REclassTabHide, ''); /* Mark this tab navigation link as "active" */ this.navSetActive(tabberIndex); /* If the user specified an onTabDisplay function, call it now. */ if (typeof this.onTabDisplay == 'function') { this.onTabDisplay({'tabber':this, 'index':tabberIndex}); } return this; }; tabberObj.prototype.navSetActive = function(tabberIndex) { /* Note: this method does *not* enforce the rule that only one nav item can be active at a time. */ /* Set classNavActive for the navigation list item */ this.tabs[tabberIndex].li.className = this.classNavActive; return this; }; tabberObj.prototype.navClearActive = function(tabberIndex) { /* Note: this method does *not* enforce the rule that one nav should always be active. */ /* Remove classNavActive from the navigation list item */ this.tabs[tabberIndex].li.className = ''; return this; }; /*==================================================*/ function tabberAutomatic(tabberArgs) { /* This function finds all DIV elements in the document where class=tabber.classMain, then converts them to use the tabber interface. tabberArgs = an object to send to "new tabber()" */ var tempObj, /* Temporary tabber object */ divs, /* Array of all divs on the page */ i; /* Loop index */ if (!tabberArgs) { tabberArgs = {}; } /* Create a tabber object so we can get the value of classMain */ tempObj = new tabberObj(tabberArgs); /* Find all DIV elements in the document that have class=tabber */ /* First get an array of all DIV elements and loop through them */ divs = document.getElementsByTagName("div"); for (i=0; i < divs.length; i++) { /* Is this DIV the correct class? */ if (divs[i].className && divs[i].className.match(tempObj.REclassMain)) { /* Now tabify the DIV */ tabberArgs.div = divs[i]; divs[i].tabber = new tabberObj(tabberArgs); } } return this; } /*==================================================*/ function tabberAutomaticOnLoad(tabberArgs) { /* This function adds tabberAutomatic to the window.onload event, so it will run after the document has finished loading. */ var oldOnLoad; if (!tabberArgs) { tabberArgs = {}; } /* Taken from: http://simon.incutio.com/archive/2004/05/26/addLoadEvent */ oldOnLoad = window.onload; if (typeof window.onload != 'function') { window.onload = function() { tabberAutomatic(tabberArgs); }; } else { window.onload = function() { oldOnLoad(); tabberAutomatic(tabberArgs); }; } } /*==================================================*/ /* Run tabberAutomaticOnload() unless the "manualStartup" option was specified */ if (typeof tabberOptions == 'undefined') { tabberAutomaticOnLoad(); } else { if (!tabberOptions['manualStartup']) { tabberAutomaticOnLoad(tabberOptions); } } |
|
From: Florian G. <re...@us...> - 2008-01-07 22:56:27
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10621 Modified Files: ChangeLog Log Message: more doc Index: ChangeLog =================================================================== RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 7 Jan 2008 22:22:44 -0000 1.22 --- ChangeLog 7 Jan 2008 22:56:31 -0000 1.23 *************** *** 1,3 **** --- 1,4 ---- Version 1.0 beta 1 + Perfparse daemon deletes now old data (FG) More works in the PHP interface (FG) Added version information to storage API (module) (FG) |
|
From: Florian G. <re...@us...> - 2008-01-07 22:22:43
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30743 Modified Files: ChangeLog Log Message: Documentation Index: ChangeLog =================================================================== RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 3 Jan 2008 22:04:44 -0000 1.21 --- ChangeLog 7 Jan 2008 22:22:44 -0000 1.22 *************** *** 1,3 **** --- 1,4 ---- Version 1.0 beta 1 + More works in the PHP interface (FG) Added version information to storage API (module) (FG) Added advanced error log facilities. (FG) *************** *** 10,14 **** Correct creation of table perfdata_delete_policy (MySQL) (Cedric Temple) Correct bug in page "all_bin" when selected one graph (Cedric Temple) ! Added comments to policies (FG) Changed database schema. Normalized some tables (FG) Added option to set port and/or socket for database connection (FG) --- 11,15 ---- Correct creation of table perfdata_delete_policy (MySQL) (Cedric Temple) Correct bug in page "all_bin" when selected one graph (Cedric Temple) ! Redesigned delete policies (FG) Changed database schema. Normalized some tables (FG) Added option to set port and/or socket for database connection (FG) |
|
From: Florian G. <re...@us...> - 2008-01-03 22:06:14
|
Update of /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160/libnagios_perfdata_parser Modified Files: Makefile.am Makefile.in Log Message: some refactoring Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 18 Dec 2007 15:10:33 -0000 1.21 --- Makefile.in 3 Jan 2008 22:04:44 -0000 1.22 *************** *** 71,74 **** --- 71,78 ---- libnagios_perfdata_parser_la_OBJECTS = \ $(am_libnagios_perfdata_parser_la_OBJECTS) + libnagios_perfdata_parser_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libnagios_perfdata_parser_la_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp *************** *** 256,259 **** --- 260,264 ---- lib_LTLIBRARIES = libnagios_perfdata_parser.la libnagios_perfdata_parser_la_SOURCES = log_parser.c libnagios_perfdata_parser.h + libnagios_perfdata_parser_la_LDFLAGS = -version-info 1:0:0 all: all-am *************** *** 317,321 **** done libnagios_perfdata_parser.la: $(libnagios_perfdata_parser_la_OBJECTS) $(libnagios_perfdata_parser_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libnagios_perfdata_parser_la_OBJECTS) $(libnagios_perfdata_parser_la_LIBADD) $(LIBS) mostlyclean-compile: --- 322,326 ---- done libnagios_perfdata_parser.la: $(libnagios_perfdata_parser_la_OBJECTS) $(libnagios_perfdata_parser_la_DEPENDENCIES) ! $(libnagios_perfdata_parser_la_LINK) -rpath $(libdir) $(libnagios_perfdata_parser_la_OBJECTS) $(libnagios_perfdata_parser_la_LIBADD) $(LIBS) mostlyclean-compile: Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/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 3 Jan 2008 22:04:44 -0000 1.2 *************** *** 2,3 **** --- 2,4 ---- lib_LTLIBRARIES = libnagios_perfdata_parser.la libnagios_perfdata_parser_la_SOURCES=log_parser.c libnagios_perfdata_parser.h + libnagios_perfdata_parser_la_LDFLAGS= -version-info 1:0:0 |
|
From: Florian G. <re...@us...> - 2008-01-03 22:06:13
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160/libpp_mysql Modified Files: Makefile.am Makefile.in del_policy.c del_policy.h Log Message: some refactoring Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile.in 18 Dec 2007 15:10:33 -0000 1.22 --- Makefile.in 3 Jan 2008 22:04:44 -0000 1.23 *************** *** 72,75 **** --- 72,78 ---- libpp_mysql_la-db_macro_actions.lo libpp_mysql_la_OBJECTS = $(am_libpp_mysql_la_OBJECTS) + libpp_mysql_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpp_mysql_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp *************** *** 259,262 **** --- 262,266 ---- 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}' + libpp_mysql_la_LDFLAGS = -version-info 1:0:0 all: all-am *************** *** 320,324 **** done libpp_mysql.la: $(libpp_mysql_la_OBJECTS) $(libpp_mysql_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libpp_mysql_la_OBJECTS) $(libpp_mysql_la_LIBADD) $(LIBS) mostlyclean-compile: --- 324,328 ---- done libpp_mysql.la: $(libpp_mysql_la_OBJECTS) $(libpp_mysql_la_DEPENDENCIES) ! $(libpp_mysql_la_LINK) -rpath $(libdir) $(libpp_mysql_la_OBJECTS) $(libpp_mysql_la_LIBADD) $(LIBS) mostlyclean-compile: Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 12 Aug 2007 00:11:44 -0000 1.2 --- Makefile.am 3 Jan 2008 22:04:44 -0000 1.3 *************** *** 4,6 **** 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}' ! --- 4,6 ---- 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}' ! libpp_mysql_la_LDFLAGS = -version-info 1:0:0 Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** del_policy.c 17 Dec 2007 20:49:53 -0000 1.8 --- del_policy.c 3 Jan 2008 22:04:44 -0000 1.9 *************** *** 3,7 **** * del_policy.c - Common functions required by PerfParse suit. * ! * Copyright (c) 2004 Ben Clewett (per...@cl...) * $Id$ * --- 3,9 ---- * del_policy.c - Common functions required by PerfParse suit. * ! * Copyright (c) 2004-2008 Ben Clewett (per...@cl...) ! * Florian Gleixner ! * * $Id$ * *************** *** 184,188 **** { pp_log_func; ! g_string_printf(s_SQL, "SELECT delete_policy FROM perfdata_delete_policy WHERE policy_id = %d", i); --- 186,190 ---- { pp_log_func; ! g_string_printf(s_SQL, "SELECT delete_policy_seconds FROM perfdata_delete_policy WHERE policy_id = %d", i); *************** *** 229,238 **** in host, get them from hostgroup setting */ ! void getRawHostPolicy(t_policyinfo *policyinfo) { pp_log_func; ! g_string_printf(s_SQL, "SELECT raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.raw_delete_policy_id=p.policy_id WHERE host_id = '%d'", policyinfo->iHostId); query(s_SQL->str); --- 231,245 ---- in host, get them from hostgroup setting */ ! void getHostPolicy(t_policyinfo *policyinfo, int ptype) { pp_log_func; ! if(ptype==GET_BIN) { ! g_string_printf(s_SQL, "SELECT bin_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.bin_delete_policy_id=p.policy_id WHERE host_id = '%d'", ! policyinfo->iHostId); ! } else { ! g_string_printf(s_SQL, "SELECT raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.raw_delete_policy_id=p.policy_id WHERE host_id = '%d'", policyinfo->iHostId); + } query(s_SQL->str); *************** *** 246,264 **** policyinfo->iPolicySource=DEL_POLICY_SOURCE_HOST_GROUP; } else { ! getRawGroupPolicy(policyinfo); } } /* get Raw deletion policy info from settings in hostgroup. If there are no settings in hostgroup, get them from default entries. */ ! void getRawGroupPolicy(t_policyinfo *policyinfo) { pp_log_func; ! ! g_string_printf(s_SQL,"SELECT g.raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.raw_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'", policyinfo->iHostId); query(s_SQL->str); --- 253,289 ---- policyinfo->iPolicySource=DEL_POLICY_SOURCE_HOST_GROUP; } else { ! getGroupPolicy(policyinfo,ptype); } } + void getRawHostPolicy(t_policyinfo *policyinfo) + { + pp_log_func; + getHostPolicy(policyinfo,GET_RAW); + } + + void getBinHostPolicy(t_policyinfo *policyinfo) + { + pp_log_func; + getHostPolicy(policyinfo,GET_BIN); + } + /* get Raw deletion policy info from settings in hostgroup. If there are no settings in hostgroup, get them from default entries. */ ! void getGroupPolicy(t_policyinfo *policyinfo,int ptype) { pp_log_func; ! ! if(ptype==GET_BIN){ ! g_string_printf(s_SQL,"SELECT g.bin_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.bin_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'", policyinfo->iHostId); + } else { + g_string_printf(s_SQL,"SELECT g.raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.raw_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'", + policyinfo->iHostId); + } + query(s_SQL->str); *************** *** 291,295 **** if(policyinfo->iPolicySource==DEL_POLICY_SOURCE_NONE) { ! policyinfo->iPolicySeconds=getDefaultRawPolicy(); policyinfo->iPolicySource=DEL_POLICY_SOURCE_DEFAULT; } --- 316,320 ---- if(policyinfo->iPolicySource==DEL_POLICY_SOURCE_NONE) { ! policyinfo->iPolicySeconds=getDefaultPolicy(ptype); policyinfo->iPolicySource=DEL_POLICY_SOURCE_DEFAULT; } *************** *** 297,309 **** } ! int getBinHostPolicy(char *sHost) { pp_log_func; ! g_string_printf(s_SQL, "SELECT bin_delete_policy FROM perfdata_host WHERE host_name = '%s'", ! sql_escape(sHost,PERCENT_ESCAPE_CHAR)); ! ! return sql2pval(query_char(s_SQL->str)); } TPolicyList *getPolicyList() --- 322,336 ---- } ! void getRawGroupPolicy(t_policyinfo *policyinfo) { pp_log_func; ! getGroupPolicy(policyinfo,GET_RAW); } + void getBinGroupPolicy(t_policyinfo *policyinfo) + { + pp_log_func; + getGroupPolicy(policyinfo,GET_BIN); + } TPolicyList *getPolicyList() *************** *** 346,347 **** --- 373,575 ---- /* [TODO] */ } + + + + void purge_all_deleted_metrics(void) { + pp_log_func; + int *p=NULL; + GSList *tmplist2,*tmplist=NULL; + + // find metric ids to delete completely + g_string_printf(s_SQL, "SELECT metric_id from perfdata_service_metric where is_deleted=1"); + query(s_SQL->str); + + while ((result_row = mysql_fetch_row(query_result))) { + p = (int *)malloc(sizeof(int)); + *p = iData(0); + pp_log(__FILE__,__LINE__,LOG_DEBUG,"metric_id %d is marked for deletion\n",iData(0)); + tmplist=g_slist_append(tmplist,p); + } + + tmplist2=tmplist; + // need a second loop because we only have one mysql connection + while(tmplist2) { + purge_all_metricid_data(*(int *)tmplist2->data); + tmplist2=g_slist_next(tmplist2); + } + + g_slist_free(tmplist); //todo: check if we need to free the content + } + + void purge_all_metricid_data(int iMid) { + pp_log_func; + pp_log(__FILE__,__LINE__,LOG_INFO,"Deleting all data from metric id %d\n",iMid); + g_string_printf(s_SQL,"DELETE from perfdata_service_bin WHERE metric_id=%d",iMid); + query_no_return(s_SQL->str); + } + + void purge_all_deleted_services(void) { + pp_log_func; + int *p=NULL; + GSList *tmplist2,*tmplist=NULL; + // find service ids to delete completely + g_string_printf(s_SQL, "SELECT service_id from perfdata_service where is_deleted=1"); + query(s_SQL->str); + + while ((result_row = mysql_fetch_row(query_result))) { + p = (int *)malloc(sizeof(int)); + *p = iData(0); + pp_log(__FILE__,__LINE__,LOG_DEBUG,"service_id %d is marked for deletion\n",iData(0)); + tmplist=g_slist_append(tmplist,p); + } + + tmplist2=tmplist; + while(tmplist2) { + purge_all_serviceid_data(*(int *)tmplist2->data); + tmplist2=g_slist_next(tmplist2); + } + + g_slist_free(tmplist); + + } + + void purge_all_serviceid_data(int iSid) { + pp_log_func; + pp_log(__FILE__,__LINE__,LOG_INFO,"Deleting all data from service id %d\n",iSid); + g_string_printf(s_SQL,"DELETE from perfdata_service_raw WHERE service_id=%d",iSid); + query_no_return(s_SQL->str); + } + + void purge_raw_by_policy(void) { + pp_log_func; + pp_log_fl(LOG_INFO,_("Purging all raw data by policy settings\n")); + purge_all_by_policy(GET_RAW); + } + + void purge_bin_by_policy(void) { + pp_log_func; + pp_log_fl(LOG_INFO,_("Purging all binary data by policy settings\n")); + purge_all_by_policy(GET_BIN); + } + + /* TODO: really have to rethink if that complicated policy setting is a mess + * i think i'll have to remove the "individual" settings things, as they will + * never of big usage + */ + + void purge_all_by_policy(int ptype) { + pp_log_func; + GSList *tmplist2,*tmplist=NULL; + time_t dps=DEL_POLICY_UNDEFINED; + time_t t=time(NULL); + t_policyinfo *policyinfo=NULL; + + if(ptype==GET_RAW) { + g_string_printf(s_SQL,"SELECT service_id,service_description,host_id,policy_name,delete_policy_seconds,raw_delete_policy_individual FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id"); + } else { + g_string_printf(s_SQL,"SELECT metric_id,metric,host_id,policy_name,delete_policy_seconds,bin_delete_policy_individual FROM perfdata_service s, perfdata_service_metric m LEFT JOIN perfdata_delete_policy d ON m.bin_delete_policy_id=d.policy_id where s.service_id=m.service_id"); + } + query(s_SQL->str); + + while ((result_row = mysql_fetch_row(query_result))) { + policyinfo = (t_policyinfo *)malloc(sizeof(t_policyinfo)); + policyinfo->iPolicySource=DEL_POLICY_SOURCE_NONE; + if(ptype==GET_RAW) { + policyinfo->iServiceId = iData(0); + policyinfo->sServiceDesc=strdup(sData(1)); + policyinfo->iMetricId=-1; + policyinfo->sMetric=NULL; + } else { + policyinfo->iMetricId = iData(0); + policyinfo->sMetric=strdup(sData(1)); + policyinfo->iServiceId = -1; + policyinfo->sServiceDesc=NULL; + } + policyinfo->iHostId=iData(2); + policyinfo->sPolicyName=strdup(sData(3)); + policyinfo->iPolicySeconds=DEL_POLICY_UNDEFINED; + + if(!isNull(5)) { + policyinfo->iPolicySeconds=iData(5); + policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE; + } else if (!isNull(4)){ + policyinfo->iPolicySeconds=iData(4); + policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE_GROUP; + } + + tmplist=g_slist_append(tmplist,policyinfo); + } + + tmplist2=tmplist; + + while(tmplist2) { + policyinfo=(t_policyinfo *) tmplist2->data; + if(policyinfo->iPolicySource==DEL_POLICY_SOURCE_NONE) { // get policy info from host or hostgroup + getHostPolicy(policyinfo,ptype); + } + + if(ptype==GET_RAW) { + pp_log(__FILE__,__LINE__,LOG_DEBUG,"service_id %d policy info (ServiceDesc: %s,HostId: %d, PolicyName: %s, PolicySeconds: %d, PolicySource: %d) in temporary list\n" + ,policyinfo->iServiceId,policyinfo->sServiceDesc, + policyinfo->iHostId,policyinfo->sPolicyName, + policyinfo->iPolicySeconds, + policyinfo->iPolicySource); + } else { + pp_log(__FILE__,__LINE__,LOG_DEBUG,"metric_id %d policy info (Metric: %s,HostId: %d, PolicyName: %s, PolicySeconds: %d, PolicySource: %d) in temporary list\n" + ,policyinfo->iMetricId,policyinfo->sMetric, + policyinfo->iHostId,policyinfo->sPolicyName, + policyinfo->iPolicySeconds, + policyinfo->iPolicySource); + } + + //now purge data + + if(policyinfo->iPolicySeconds>1) { + dps=t-policyinfo->iPolicySeconds; + if(ptype==GET_RAW) { + pp_log_fl(LOG_INFO,_("Purging raw data older than %s from service '%s', ServiceId %d due to "), + asctime(localtime(&dps)),policyinfo->sServiceDesc, + policyinfo->iServiceId); + } else { + pp_log_fl(LOG_INFO,_("Purging bin data older than %s from metric '%s', MetricId %d due to "), + asctime(localtime(&dps)),policyinfo->sMetric, + policyinfo->iMetricId); + } + switch(policyinfo->iPolicySource) { + case DEL_POLICY_SOURCE_SERVICE: + pp_log_fl(LOG_INFO,_("individual service setting\n")); + break; + case DEL_POLICY_SOURCE_HOST: + pp_log_fl(LOG_INFO,_("individual host setting\n")); + break; + case DEL_POLICY_SOURCE_HOSTGROUP: + pp_log_fl(LOG_INFO,_("individual hostgroup setting\n")); + break; + case DEL_POLICY_SOURCE_SERVICE_GROUP: + pp_log_fl(LOG_INFO,_("group '%s' setting in service.\n"),policyinfo->sPolicyName); + break; + case DEL_POLICY_SOURCE_HOST_GROUP: + pp_log_fl(LOG_INFO,_("group '%s' setting in host.\n"),policyinfo->sPolicyName); + break; + case DEL_POLICY_SOURCE_HOSTGROUP_GROUP: + pp_log_fl(LOG_INFO,_("group '%s' setting in hostgroup.\n"),policyinfo->sPolicyName); + break; + case DEL_POLICY_SOURCE_DEFAULT: + pp_log_fl(LOG_INFO,_("default setting.\n")); + default: + pp_log_fl(LOG_FATAL,_("This is a error. This line should not be executed.\n")); + } + + + if(ptype==GET_RAW) { + g_string_printf(s_SQL,"DELETE FROM perfdata_service_raw WHERE service_id=%d and ctime < %d", + policyinfo->iServiceId,(int) dps); + } else { + g_string_printf(s_SQL,"DELETE FROM perfdata_service_bin WHERE metric_id=%d and ctime < %d", + policyinfo->iMetricId,(int) dps); + } + query(s_SQL->str); + } + tmplist2=g_slist_next(tmplist2); + } + } Index: del_policy.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** del_policy.h 17 Dec 2007 20:49:53 -0000 1.6 --- del_policy.h 3 Jan 2008 22:04:44 -0000 1.7 *************** *** 1,2 **** --- 1,30 ---- + /***************************************************************************** + * + * del_policy.h - Common functions required by PerfParse suit. + * + * Copyright (c) 2004-2008 Ben Clewett (per...@cl...) + * Florian Gleixner + * + * $Id$ + * + * License: + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + *****************************************************************************/ + + #ifndef PP_DEL_POLICY_H #define PP_DEL_POLICY_H *************** *** 14,17 **** --- 42,47 ---- #define DEFAULT_RAW_POLICY_ID 1 #define DEFAULT_BIN_POLICY_ID 0 + #define GET_BIN DEFAULT_BIN_POLICY_ID + #define GET_RAW DEFAULT_RAW_POLICY_ID enum { *************** *** 38,41 **** --- 68,73 ---- int iServiceId; char *sServiceDesc; + int iMetricId; // only filled if used with bin data purging + char *sMetric; int iHostId; char *sPolicyName; *************** *** 57,63 **** char *getPolicyDesc(int iPolicy); void getRawHostPolicy(t_policyinfo *policyinfo); void getRawGroupPolicy(t_policyinfo *policyinfo); - int getBinHostPolicy(char *sHost); void validateDefaultDP(); --- 89,101 ---- char *getPolicyDesc(int iPolicy); void getRawHostPolicy(t_policyinfo *policyinfo); + void getBinHostPolicy(t_policyinfo *policyinfo); + void getHostPolicy(t_policyinfo *policyinfo,int ptype); + + + + void getGroupPolicy(t_policyinfo *policyinfo, int ptype); void getRawGroupPolicy(t_policyinfo *policyinfo); + void getBinGroupPolicy(t_policyinfo *policyinfo); void validateDefaultDP(); *************** *** 72,75 **** --- 110,122 ---- + void purge_all_metricid_data(int); + void purge_all_serviceid_data(int); + void purge_all_deleted_metrics(void); + void purge_all_deleted_services(void); + + void purge_raw_by_policy(void); + + void purge_bin_by_policy(void); + void purge_all_by_policy(int ptype); |
|
From: Florian G. <re...@us...> - 2008-01-03 22:06:13
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160 Modified Files: ChangeLog Log Message: some refactoring Index: ChangeLog =================================================================== RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ChangeLog 18 Dec 2007 15:08:50 -0000 1.20 --- ChangeLog 3 Jan 2008 22:04:44 -0000 1.21 *************** *** 2,5 **** --- 2,6 ---- Added version information to storage API (module) (FG) Added advanced error log facilities. (FG) + Added possibilities for cgi to read stored graph data from DB (FG) Fixed bug where part of the grid is painted on the border. (FG) Corrected bug where perfparsed does not close the client socket. Thanks to Tamas Erdei for the patch. (FG) |
|
From: Florian G. <re...@us...> - 2008-01-03 22:06:10
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160/modules Modified Files: Makefile.am Makefile.in libpp_storage.h storage_mysql.c Log Message: some refactoring Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 18 Dec 2007 15:10:34 -0000 1.21 --- Makefile.in 3 Jan 2008 22:04:44 -0000 1.22 *************** *** 332,338 **** top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! STORAGE_INCLUDES = ${GLIB_CFLAGS} -I${top_srcdir} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser '-DLOCALEDIR="$(datadir)/locale"' STORAGE_LIBS = ! STORAGE_LDFLAGS = -module @USE_DB_MYSQL_TRUE@GO_LIBPP_STORAGE_MYSQL = libpp_storage_mysql.la @USE_DB_POSTGRESQL_TRUE@GO_LIBPP_STORAGE_POSTGRESQL = libpp_storage_postgresql.la --- 332,341 ---- top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! ! # Perfparse storage module api. Change if API has changed. ! STORAGE_MODULE_API_VERSION = 2 ! STORAGE_INCLUDES = ${GLIB_CFLAGS} -I${top_srcdir} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser '-DLOCALEDIR="$(datadir)/locale"' -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION} STORAGE_LIBS = ! STORAGE_LDFLAGS = -module -version-info ${STORAGE_MODULE_API_VERSION}:0:0 @USE_DB_MYSQL_TRUE@GO_LIBPP_STORAGE_MYSQL = libpp_storage_mysql.la @USE_DB_POSTGRESQL_TRUE@GO_LIBPP_STORAGE_POSTGRESQL = libpp_storage_postgresql.la Index: libpp_storage.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/libpp_storage.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** libpp_storage.h 18 Dec 2007 15:08:50 -0000 1.4 --- libpp_storage.h 3 Jan 2008 22:04:44 -0000 1.5 *************** *** 28,33 **** #define __LIB_STORAGE__ - // versioning for storage modules to avoid loading of incompatible modules - #define STORAGE_MODULE_API_VERSION 2 #include <time.h> --- 28,31 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/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 3 Jan 2008 22:04:44 -0000 1.2 *************** *** 1,5 **** ! STORAGE_INCLUDES=${GLIB_CFLAGS} -I${top_srcdir} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser '-DLOCALEDIR="$(datadir)/locale"' STORAGE_LIBS= ! STORAGE_LDFLAGS=-module if USE_DB_MYSQL --- 1,9 ---- ! # Perfparse storage module api. Change if API has changed. ! STORAGE_MODULE_API_VERSION=2 ! ! STORAGE_INCLUDES=${GLIB_CFLAGS} -I${top_srcdir} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser '-DLOCALEDIR="$(datadir)/locale"' -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION} STORAGE_LIBS= ! ! STORAGE_LDFLAGS=-module -version-info ${STORAGE_MODULE_API_VERSION}:0:0 if USE_DB_MYSQL Index: storage_mysql.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** storage_mysql.c 18 Dec 2007 15:08:50 -0000 1.21 --- storage_mysql.c 3 Jan 2008 22:04:44 -0000 1.22 *************** *** 5,9 **** * $Id$ * ! * Copyright (c) 2004-2007 Ben Clewett, Florian Gleixner * * License: --- 5,9 ---- * $Id$ * ! * Copyright (c) 2004-2008 Ben Clewett, Florian Gleixner * * License: *************** *** 68,74 **** void storage_mysql_periodic_cleanup(storage_module_t *); - void purge_all_metricid_data(int); - void purge_all_serviceid_data(int); - static int validate_host(storage_module_t*this, const char *); static int validate_service(storage_module_t*this, const char *, const char *); --- 68,71 ---- *************** *** 370,378 **** pp_log_func; /* delete all data of objects that are marked as deleted */ ! GSList *tmplist2,*tmplist=NULL; ! int *p=NULL; ! time_t dps=DEL_POLICY_UNDEFINED; ! time_t t=time(NULL); ! // connect again to mysql since this is a forked process --- 367,371 ---- pp_log_func; /* delete all data of objects that are marked as deleted */ ! // connect again to mysql since this is a forked process *************** *** 380,504 **** pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"MySQL version: %s\n", query_char("SELECT VERSION()")); ! // find metric ids to delete completely ! g_string_printf(s_SQL, "SELECT metric_id from perfdata_service_metric where is_deleted=1"); ! query(s_SQL->str); ! ! while ((result_row = mysql_fetch_row(query_result))) { ! p = (int *)malloc(sizeof(int)); ! *p = iData(0); ! pp_log(__FILE__,__LINE__,LOG_DEBUG,"metric_id %d is marked for deletion\n",iData(0)); ! tmplist=g_slist_append(tmplist,p); ! } ! ! tmplist2=tmplist; ! while(tmplist2) { ! purge_all_metricid_data(*(int *)tmplist2->data); ! tmplist2=g_slist_next(tmplist2); ! } ! ! g_slist_free(tmplist); ! tmplist2=tmplist=NULL; ! ! // find service ids to delete completely ! g_string_printf(s_SQL, "SELECT service_id from perfdata_service where is_deleted=1"); ! query(s_SQL->str); ! ! while ((result_row = mysql_fetch_row(query_result))) { ! p = (int *)malloc(sizeof(int)); ! *p = iData(0); ! pp_log(__FILE__,__LINE__,LOG_DEBUG,"service_id %d is marked for deletion\n",iData(0)); ! tmplist=g_slist_append(tmplist,p); ! } ! ! tmplist2=tmplist; ! while(tmplist2) { ! purge_all_serviceid_data(*(int *)tmplist2->data); ! tmplist2=g_slist_next(tmplist2); ! } ! ! g_slist_free(tmplist); ! tmplist2=tmplist=NULL; - /* walk through all services and metrics and purge old data */ - t_policyinfo *raw_policyinfo=NULL; - - g_string_printf(s_SQL,"SELECT service_id,service_description,host_id,policy_name,delete_policy_seconds,raw_delete_policy_individual FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id"); - query(s_SQL->str); - - while ((result_row = mysql_fetch_row(query_result))) { - raw_policyinfo = (t_policyinfo *)malloc(sizeof(t_policyinfo)); - raw_policyinfo->iPolicySource=DEL_POLICY_SOURCE_NONE; - raw_policyinfo->iServiceId = iData(0); - raw_policyinfo->sServiceDesc=strdup(sData(1)); - raw_policyinfo->iHostId=iData(2); - raw_policyinfo->sPolicyName=strdup(sData(3)); - raw_policyinfo->iPolicySeconds=DEL_POLICY_UNDEFINED; - - if(!isNull(5)) { - raw_policyinfo->iPolicySeconds=iData(5); - raw_policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE; - } else if (!isNull(4)){ - raw_policyinfo->iPolicySeconds=iData(4); - raw_policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE_GROUP; - } - - tmplist=g_slist_append(tmplist,raw_policyinfo); - } - - tmplist2=tmplist; - - while(tmplist2) { - raw_policyinfo=(t_policyinfo *) tmplist2->data; - if(raw_policyinfo->iPolicySource==DEL_POLICY_SOURCE_NONE) { // get policy info from host or hostgroup - getRawHostPolicy(raw_policyinfo); - } - - pp_log(__FILE__,__LINE__,LOG_DEBUG,"service_id %d raw policy info (ServiceDesc: %s,HostId: %d, PolicyName: %s, PolicySeconds: %d, PolicySource: %d) in temporary list\n" - ,raw_policyinfo->iServiceId,raw_policyinfo->sServiceDesc, - raw_policyinfo->iHostId,raw_policyinfo->sPolicyName, - raw_policyinfo->iPolicySeconds, - raw_policyinfo->iPolicySource); - //todo: now purge data - - if(raw_policyinfo->iPolicySeconds>1) { - dps=t-raw_policyinfo->iPolicySeconds; - pp_log_fl(LOG_INFO,_("Purging raw data older than %s from service '%s', ServiceId %d due to "), - asctime(localtime(&dps)),raw_policyinfo->sServiceDesc, - raw_policyinfo->iServiceId); - switch(raw_policyinfo->iPolicySource) { - case DEL_POLICY_SOURCE_SERVICE: - pp_log_fl(LOG_INFO,_("individual service setting\n")); - break; - case DEL_POLICY_SOURCE_HOST: - pp_log_fl(LOG_INFO,_("individual host setting\n")); - break; - case DEL_POLICY_SOURCE_HOSTGROUP: - pp_log_fl(LOG_INFO,_("individual hostgroup setting\n")); - break; - case DEL_POLICY_SOURCE_SERVICE_GROUP: - pp_log_fl(LOG_INFO,_("group '%s' setting in service.\n"),raw_policyinfo->sPolicyName); - break; - case DEL_POLICY_SOURCE_HOST_GROUP: - pp_log_fl(LOG_INFO,_("group '%s' setting in host.\n"),raw_policyinfo->sPolicyName); - break; - case DEL_POLICY_SOURCE_HOSTGROUP_GROUP: - pp_log_fl(LOG_INFO,_("group '%s' setting in hostgroup.\n"),raw_policyinfo->sPolicyName); - break; - case DEL_POLICY_SOURCE_DEFAULT: - pp_log_fl(LOG_INFO,_("default setting.\n")); - default: - pp_log_fl(LOG_FATAL,_("This is a error. This line should not be executed.\n")); - } - - - g_string_printf(s_SQL,"DELETE FROM perfdata_service_raw WHERE service_id=%d and ctime < %d", - raw_policyinfo->iServiceId,(int) dps); - query(s_SQL->str); - } - tmplist2=g_slist_next(tmplist2); - } --- 373,384 ---- pp_log(__FILE__,__LINE__,LOG_DEBUG_SQL,"MySQL version: %s\n", query_char("SELECT VERSION()")); ! purge_all_deleted_metrics(); ! purge_all_deleted_services(); /* walk through all services and metrics and purge old data */ + purge_raw_by_policy(); + purge_bin_by_policy(); *************** *** 513,531 **** *******************************************************/ - void purge_all_metricid_data(int iMid) { - pp_log_func; - pp_log(__FILE__,__LINE__,LOG_INFO,"Deleting all data from metric id %d\n",iMid); - g_string_printf(s_SQL,"DELETE from perfdata_service_bin WHERE metric_id=%d",iMid); - query_no_return(s_SQL->str); - } - - void purge_all_serviceid_data(int iSid) { - pp_log_func; - pp_log(__FILE__,__LINE__,LOG_INFO,"Deleting all data from service id %d\n",iSid); - g_string_printf(s_SQL,"DELETE from perfdata_service_raw WHERE service_id=%d",iSid); - query_no_return(s_SQL->str); - } - - /******************************************************** * --- 393,396 ---- |
|
From: Florian G. <re...@us...> - 2008-01-03 22:06:09
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160/perfparse Modified Files: Makefile.am Makefile.in storage.h Log Message: some refactoring Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 18 Dec 2007 15:10:34 -0000 1.21 --- Makefile.in 3 Jan 2008 22:04:44 -0000 1.22 *************** *** 267,274 **** top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @USE_DB_MYSQL_TRUE@GO_MYSQL = mysql @USE_DB_POSTGRESQL_TRUE@GO_POSTGRESSQL = postgresql PERFPARSE_MODULES_LOG2ANY = ${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot ! PERFPARSE_CFLAGS = '-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} PERFPARSE_LIBS = -L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@ PERFPARSE_LDFLAGS = --- 267,277 ---- top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + + # Perfparse storage module api. Change if API has changed. + STORAGE_MODULE_API_VERSION = 2 @USE_DB_MYSQL_TRUE@GO_MYSQL = mysql @USE_DB_POSTGRESQL_TRUE@GO_POSTGRESSQL = postgresql PERFPARSE_MODULES_LOG2ANY = ${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot ! PERFPARSE_CFLAGS = '-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION} PERFPARSE_LIBS = -L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@ PERFPARSE_LDFLAGS = Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/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 3 Jan 2008 22:04:44 -0000 1.2 *************** *** 1,2 **** --- 1,6 ---- + # Perfparse storage module api. Change if API has changed. + STORAGE_MODULE_API_VERSION=2 + + if USE_DB_MYSQL GO_MYSQL = mysql *************** *** 9,13 **** PERFPARSE_MODULES_LOG2ANY=${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot ! PERFPARSE_CFLAGS='-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} PERFPARSE_LIBS=-L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@ PERFPARSE_LDFLAGS= --- 13,17 ---- PERFPARSE_MODULES_LOG2ANY=${GO_MYSQL} ${GO_POSTGRESQL} stdout socket_output file_output gnuplot ! PERFPARSE_CFLAGS='-DSYSCONFDIR="${sysconfdir}"' '-DLOCALEDIR="$(datadir)/locale"' ${ZLIB_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/libpp_common -I${top_srcdir}/libnagios_perfdata_parser -I${top_srcdir}/modules -I${top_srcdir} -DSTORAGE_MODULE_API_VERSION=${STORAGE_MODULE_API_VERSION} PERFPARSE_LIBS=-L${top_builddir}/libpp_common -lpp_common -L${top_builddir}/libnagios_perfdata_parser -lnagios_perfdata_parser ${GLIB_LIBS} @LTLIBINTL@ PERFPARSE_LDFLAGS= Index: storage.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** storage.h 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- storage.h 3 Jan 2008 22:04:44 -0000 1.2 *************** *** 3,8 **** * storage.h - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) ! * Last Modified: 2004-09-01 * * License: --- 3,10 ---- * storage.h - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * ! * $Id$ * * License: |
