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...> - 2006-12-02 21:31:15
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/db_tools Modified Files: Makefile.in convert.c perfparse-db-tool.c Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:09 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(check_perfparse_version_SOURCES) $(perfparse_db_purge_SOURCES) $(perfparse_db_tool_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** convert.c 30 Oct 2006 21:35:06 -0000 1.4 --- convert.c 2 Dec 2006 21:31:09 -0000 1.5 *************** *** 37,41 **** #include "db_macro_actions.h" #include <gettext.h> ! /* Domain to use: */ --- 37,42 ---- #include "db_macro_actions.h" #include <gettext.h> ! #include <sys/types.h> ! #include <regex.h> /* Domain to use: */ *************** *** 136,140 **** void DropForeignKey(char *TableName, char *ForeignTableName) { GString *querystr=g_string_new(""); ! GString *resultstr; g_string_printf(querystr,"show create table %s",TableName); query(querystr->str); --- 137,147 ---- void DropForeignKey(char *TableName, char *ForeignTableName) { GString *querystr=g_string_new(""); ! char *resultstr; ! regex_t *preg; ! char regex[512]; ! size_t nmatch; ! regmatch_t pmatch[10]; ! int i; ! g_string_printf(querystr,"show create table %s",TableName); query(querystr->str); *************** *** 145,150 **** for (currentRow=0;currentRow<numberOfRows;currentRow++){ #endif ! resultstr=g_string_new(result_row[0]); ! printf("Resultstring: %s\n",resultstr->str); } } --- 152,164 ---- for (currentRow=0;currentRow<numberOfRows;currentRow++){ #endif ! resultstr=result_row[0]; ! printf("Resultstring: %s\n",resultstr); ! snprintf(regex,511,"CONSTRAINT `(\\S+)` FOREIGN KEY \\S+ REFERENCES `%s`",ForeignTableName); ! printf("Using regex to find FK: %s\n",regex); ! regcomp(preg, regex,REG_EXTENDED|REG_ICASE); ! regexec(preg,resultstr,nmatch,pmatch,0); ! for (i=0;i<=nmatch;i++) { ! printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); ! } } } Index: perfparse-db-tool.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-tool.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** perfparse-db-tool.c 18 Aug 2006 09:05:21 -0000 1.2 --- perfparse-db-tool.c 2 Dec 2006 21:31:09 -0000 1.3 *************** *** 4,8 **** * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * Last Modified: 2004-05-28 * * License: --- 4,8 ---- * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * $Id$ * * License: |
|
From: Florian G. <re...@us...> - 2006-11-29 14:06:07
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12477/templates Modified Files: add_amend_host_group.tpl.html edit_host_list.tpl.html Log Message: fixed add_amend_host_group for new db schema Index: add_amend_host_group.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/add_amend_host_group.tpl.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** add_amend_host_group.tpl.html 21 Apr 2005 15:00:04 -0000 1.3 --- add_amend_host_group.tpl.html 29 Nov 2006 14:06:02 -0000 1.4 *************** *** 6,10 **** <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tbody><tr> ! <td width="60"><img src="images/perfparse-logo-sm.png" border="0"></td> <td align="center"><font face="Arial, Helvetica" size="2"> <b><{tr}>View / Edit Host Groups<{/tr}></b><br> --- 6,10 ---- <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tbody><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}>View / Edit Host Groups<{/tr}></b><br> *************** *** 51,58 **** <td><font face="Arial, Helvetica" size="2"><{$gr.group_name}></font></td> <td align="right"><font face="Arial, Helvetica" size="2"><{$gr.count}></font></td> ! <td align="center"><{if $gr.count == 0}><font face="Arial, Helvetica" size="2"><a href="perfparse.php?page=add_amend_host_group&delete=<{$gr.group_name}>"><{tr}>Delete<{/tr}></a></font><{/if}></td> ! <td align="center"><font face="Arial, Helvetica" size="2"><a href="perfparse.php?page=edit_host_list&group_name=<{$gr.group_name}>"><{tr}>Edit<{/tr}></a></font></td> </tr> <{/foreach}> </tbody></table></td></tr></tbody></table></p> </body></html> --- 51,65 ---- <td><font face="Arial, Helvetica" size="2"><{$gr.group_name}></font></td> <td align="right"><font face="Arial, Helvetica" size="2"><{$gr.count}></font></td> ! <td align="center"><{if $gr.count == 0}><font face="Arial, Helvetica" size="2"><a href="perfparse.php?page=add_amend_host_group&delete=<{$gr.group_id}>"><{tr}>Delete<{/tr}></a></font><{/if}></td> ! <td align="center"><font face="Arial, Helvetica" size="2"><a href="perfparse.php?page=edit_host_list&group_id=<{$gr.group_id}>"><{tr}>Edit<{/tr}></a></font></td> </tr> <{/foreach}> </tbody></table></td></tr></tbody></table></p> + <{if $sql_error}> + <p align="center"> + <table bgcolor="#cc3333" border="1" cellpadding="5" cellspacing="0" width="600"><tbody><tr><td> + <{$sql_error|escape}> + </td></tr></tbody></table> + <{/if}> + </body></html> Index: edit_host_list.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_host_list.tpl.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit_host_list.tpl.html 7 Jul 2006 13:55:43 -0000 1.1 --- edit_host_list.tpl.html 29 Nov 2006 14:06:02 -0000 1.2 *************** *** 8,12 **** <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> ! <td width=60><img src="images/perfparse-logo-sm.png" border=0></td> <td align=center><font face="Arial, Helvetica" size=2> <b><{tr}>Edit a Host Group List<{/tr}></b><br> --- 8,12 ---- <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 a Host Group List<{/tr}></b><br> |
|
From: Florian G. <re...@us...> - 2006-11-29 14:06:05
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12477 Modified Files: perfparse.php utils.php Log Message: fixed add_amend_host_group for new db schema Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** utils.php 10 Nov 2006 14:53:28 -0000 1.29 --- utils.php 29 Nov 2006 14:06:02 -0000 1.30 *************** *** 411,417 **** function get_groups_hostcount(&$db) { ! $query='SELECT g.group_name, count(h.host_name) as count '; ! $query.='from perfdata_host_group g left join perfdata_host h '; ! $query.='on g.group_name=h.group_name group by g.group_name'; $ret=$db->GetAll($query); // print_r($ret); --- 411,418 ---- function get_groups_hostcount(&$db) { ! $query='SELECT g.group_name,g.group_id , count(hg.host_id) as count '; ! $query.='from perfdata_groups g left join perfdata_host_groups hg '; ! $query.='on g.group_id=hg.group_id group by g.group_name,g.group_id '; ! $query.='order by g.group_name'; $ret=$db->GetAll($query); // print_r($ret); *************** *** 419,438 **** } ! function delete_group(&$db,$group_name) { // check if group is empty ! $query='SELECT count(*) from perfdata_host where group_name=?'; ! $count=$db->GetOne($query,array($group_name)); if ($count!=0) { ! return(false); } else { ! $query='delete from perfdata_host_group where group_name=?'; ! $db->Execute($query,array($group_name)); ! return(true); } } function add_group(&$db,$group_name) { ! $query='insert into perfdata_host_group (group_name) values (?)'; $db->Execute($query,array($group_name)); } --- 420,449 ---- } ! function delete_group_by_id(&$db,$group_id) { // check if group is empty ! $query='SELECT count(hg.host_id) from perfdata_host_groups hg ! where hg.group_id=?'; ! $count=$db->GetOne($query,array($group_id)); if ($count!=0) { ! return(false); } else { ! $query='delete from perfdata_groups where group_id=?'; ! $db->Execute($query,array($group_id)); ! if ($db->ErrorNo() != 0) { ! return(false); ! } else { ! return(true); ! } } } function add_group(&$db,$group_name) { ! $query='insert into perfdata_groups (group_name) values (?)'; $db->Execute($query,array($group_name)); + if ($db->ErrorNo() != 0) { + return(false); + } else { + return(true); + } } Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** perfparse.php 10 Nov 2006 14:53:28 -0000 1.41 --- perfparse.php 29 Nov 2006 14:06:02 -0000 1.42 *************** *** 407,417 **** case 'add_amend_host_group': if(isset($_REQUEST['delete'])) { ! // delete group if empty ! delete_group($db,$_REQUEST['delete']); } // handle add group here if(isset($_REQUEST['add_group_name']) && !empty($_REQUEST['add_group_name'])) { ! add_group($db,$_REQUEST['add_group_name']); } --- 407,421 ---- case 'add_amend_host_group': if(isset($_REQUEST['delete'])) { ! // delete group if empty ! if(!delete_group_by_id($db,$_REQUEST['delete'])) { ! $smarty->assign('sql_error',$db->ErrorMsg()); ! } } // handle add group here if(isset($_REQUEST['add_group_name']) && !empty($_REQUEST['add_group_name'])) { ! if(!add_group($db,$_REQUEST['add_group_name'])){ ! $smarty->assign('sql_error',$db->ErrorMsg()); ! } } *************** *** 422,428 **** break; case 'edit_host_list': ! get_request_var('group_name','string',''); get_request_var('action','string',''); ! get_request_var('host_name','string',''); $groups=get_groups($db); --- 426,432 ---- break; case 'edit_host_list': ! get_request_var('group_id','int',''); get_request_var('action','string',''); ! get_request_var('host_id','int',''); $groups=get_groups($db); |
|
From: Florian G. <re...@us...> - 2006-11-10 14:53:33
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14205/templates Modified Files: all_bin.tpl.html Log Message: group_id=0 means all groups Index: all_bin.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_bin.tpl.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** all_bin.tpl.html 9 Nov 2006 12:53:01 -0000 1.6 --- all_bin.tpl.html 10 Nov 2006 14:53:28 -0000 1.7 *************** *** 39,43 **** </table> </td></tr></table></p> ! <{if $group_id}> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> --- 39,43 ---- </table> </td></tr></table></p> ! <{if $group_id >= 0}> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> |
|
From: Florian G. <re...@us...> - 2006-11-10 14:53:31
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14205 Modified Files: perfparse.php utils.php Log Message: group_id=0 means all groups Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** utils.php 9 Nov 2006 16:02:50 -0000 1.28 --- utils.php 10 Nov 2006 14:53:28 -0000 1.29 *************** *** 280,284 **** ! // get all metrics and the metric details for all hosts of a given group name. // $sort defines the sort order of the resulting array function get_groupId_host_metrics(&$db,$groupId,$sort) { --- 280,285 ---- ! // get all metrics and the metric details for all hosts of a given group Id. ! // if group id is 0 then return results from all groups // $sort defines the sort order of the resulting array function get_groupId_host_metrics(&$db,$groupId,$sort) { *************** *** 292,303 **** $sorts[1]='asc'; } $query ='SELECT h.host_name,s.service_description,m.metric,b.ctime,value,m.unit,b.state from '; ! $query.='perfdata_service_metric m, perfdata_host h,perfdata_service_bin b, perfdata_service s, '; ! $query.='perfdata_host_groups hg WHERE '; ! $query.='hg.group_id=? AND hg.host_id=h.host_id AND '; $query.='h.host_id=s.host_id AND s.service_id=m.service_id AND '; $query.='m.last_perfdata_bin=b.id '; $query.='order by '.$sorts[0].' '.$sorts[1]; ! $res=$db->Execute($query,array($groupId)); $ret=array(); $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); --- 293,315 ---- $sorts[1]='asc'; } + + // build query $query ='SELECT h.host_name,s.service_description,m.metric,b.ctime,value,m.unit,b.state from '; ! $query.='perfdata_service_metric m, perfdata_host h,perfdata_service_bin b, perfdata_service s '; ! // group_id==0 means all groups ! if ($groupId == 0) { ! $query.=' WHERE '; ! $bindarray=array(); ! } else { ! $query.=', perfdata_host_groups hg WHERE '; ! $query.='hg.group_id=? AND hg.host_id=h.host_id AND '; ! $bindarray=array($groupId); ! } $query.='h.host_id=s.host_id AND s.service_id=m.service_id AND '; $query.='m.last_perfdata_bin=b.id '; $query.='order by '.$sorts[0].' '.$sorts[1]; ! ! // do the query ! $res=$db->Execute($query,$bindarray); $ret=array(); $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); *************** *** 332,335 **** --- 344,348 ---- die(); } + //echo "<pre>in ".__FILE__." line ".__LINE__." function ".__FUNCTION__.":\n";print_r($ret);echo "</pre>"; return($ret); } Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** perfparse.php 9 Nov 2006 16:02:50 -0000 1.40 --- perfparse.php 10 Nov 2006 14:53:28 -0000 1.41 *************** *** 365,369 **** get_request_var('refresh','int',0); // todo implement refresh ! if(get_request_var('group_id','int','-1') && array_key_exists($group_id,$groups)) { get_request_var('sort','string','host_name.desc'); --- 365,370 ---- get_request_var('refresh','int',0); // todo implement refresh ! if(get_request_var('group_id','int','-1') && ! (array_key_exists($group_id,$groups) || $group_id == 0)) { get_request_var('sort','string','host_name.desc'); |
|
From: Florian G. <re...@us...> - 2006-11-09 22:36:51
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17122/doc/database Modified Files: database_schema_v20.odp Log Message: more pretty Index: database_schema_v20.odp =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/database/database_schema_v20.odp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsIiaHHu and /tmp/cvsQb87ko differ |
|
From: Florian G. <re...@us...> - 2006-11-09 16:03:06
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv341 Modified Files: perfparse.php utils.php Log Message: more db schema conversion Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** utils.php 9 Nov 2006 12:53:01 -0000 1.27 --- utils.php 9 Nov 2006 16:02:50 -0000 1.28 *************** *** 280,284 **** ! function get_group_host_metrics(&$db,$group,$sort) { // sort order. set default sort order to escape maicious input $sorts=explode('.',$sort); --- 280,286 ---- ! // get all metrics and the metric details for all hosts of a given group name. ! // $sort defines the sort order of the resulting array ! function get_groupId_host_metrics(&$db,$groupId,$sort) { // sort order. set default sort order to escape maicious input $sorts=explode('.',$sort); *************** *** 290,308 **** $sorts[1]='asc'; } ! /* original query ! SELECT perfdata_host.host_name, perfdata_service.service_description, perfdata_service_metric.metric, perfdata_service_metric.unit, perfdata_service_bin.value, perfdata_service_bin.state, perfdata_service_bin.ctime" ! " FROM perfdata_host, perfdata_service, perfdata_service_metric, perfdata_service_bin" ! " WHERE perfdata_host.host_name = perfdata_service.host_name" ! " AND perfdata_service_metric.host_name = perfdata_service.host_name" ! " AND perfdata_service_metric.service_description = perfdata_service.service_description" ! " AND perfdata_service_bin.id = perfdata_service_metric.last_perfdata_bin" ! */ ! $query ='SELECT h.host_name,m.service_description,m.metric,b.ctime,value,m.unit,state from '; ! $query.='perfdata_service_metric m, perfdata_host h,perfdata_service_bin b '; ! $query.='WHERE '; ! $query.='m.host_name=h.host_name and m.host_name=b.host_name and '; ! $query.='m.last_perfdata_bin=b.id and h.group_name=? '; $query.='order by '.$sorts[0].' '.$sorts[1]; ! $res=$db->Execute($query,array($group)); $ret=array(); $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); --- 292,303 ---- $sorts[1]='asc'; } ! $query ='SELECT h.host_name,s.service_description,m.metric,b.ctime,value,m.unit,b.state from '; ! $query.='perfdata_service_metric m, perfdata_host h,perfdata_service_bin b, perfdata_service s, '; ! $query.='perfdata_host_groups hg WHERE '; ! $query.='hg.group_id=? AND hg.host_id=h.host_id AND '; ! $query.='h.host_id=s.host_id AND s.service_id=m.service_id AND '; ! $query.='m.last_perfdata_bin=b.id '; $query.='order by '.$sorts[0].' '.$sorts[1]; ! $res=$db->Execute($query,array($groupId)); $ret=array(); $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** perfparse.php 9 Nov 2006 12:53:01 -0000 1.39 --- perfparse.php 9 Nov 2006 16:02:50 -0000 1.40 *************** *** 365,375 **** get_request_var('refresh','int',0); // todo implement refresh ! if(get_request_var('group_name','string','') && in_array($group_name,$groups)) { get_request_var('sort','string','host_name.desc'); if ($page == 'all_bin') { ! $groupmetrics=get_group_host_metrics($db,$group_name,$sort); // echo"<pre>";print_r($groupmetrics);echo"</pre>"; ! $smarty->assign_by_ref('groupmetrics',$groupmetrics); } else { $groupraw=get_group_raw($db,$group_name,$sort,$normal,$warning,$critical,$unknown); --- 365,375 ---- get_request_var('refresh','int',0); // todo implement refresh ! if(get_request_var('group_id','int','-1') && array_key_exists($group_id,$groups)) { get_request_var('sort','string','host_name.desc'); if ($page == 'all_bin') { ! $groupmetrics=get_groupId_host_metrics($db,$group_id,$sort); // echo"<pre>";print_r($groupmetrics);echo"</pre>"; ! $smarty->assign_by_ref('groupmetrics',$groupmetrics); // todo: continue here db schema conversion } else { $groupraw=get_group_raw($db,$group_name,$sort,$normal,$warning,$critical,$unknown); |
|
From: Florian G. <re...@us...> - 2006-11-09 15:16:04
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14993 Added Files: database_schema_v20.odp Removed Files: database_schema_v20.sxi Log Message: use OO 2.0 --- NEW FILE: database_schema_v20.odp --- (This appears to be a binary file; contents omitted.) --- database_schema_v20.sxi DELETED --- |
|
From: Florian G. <re...@us...> - 2006-11-09 12:53:03
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27744 Modified Files: perfparse.php utils.php Log Message: in the middle of rewrite Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** utils.php 14 Sep 2006 14:02:06 -0000 1.26 --- utils.php 9 Nov 2006 12:53:01 -0000 1.27 *************** *** 227,240 **** function get_groups(&$db) { ! $query ='SELECT group_name from perfdata_host_group'; ! $ret=$db->GetCol($query); return($ret); } function get_group_hosts(&$db,$group) { ! $query ='SELECT host_name from perfdata_host where group_name=?'; $ret=$db->GetCol($query,array($group)); return($ret); } function get_group_host_metrics(&$db,$group,$sort) { --- 227,282 ---- function get_groups(&$db) { ! $query ='SELECT group_name,group_id from perfdata_groups'; ! $res=$db->Execute($query); ! $ret=array(); ! if($res) { ! while($t=$res->FetchRow()) { ! $ret[$t['group_id']]=$t['group_name']; ! } ! } else { ! echo "Error in query $query. Message: ".$db->ErrorMsg(); ! } ! ! // echo "<pre>in ".__FILE__." line ".__LINE__." function ".__FUNCTION__.":\n";print_r($ret);echo "</pre>"; ! return($ret); } + // get all hostnames from a given group name function get_group_hosts(&$db,$group) { ! $query ='SELECT h.host_name from perfdata_host h, perfdata_host_groups hg, ! perfdata_groups g where g.group_name=? and ! hg.group_id=g.group_id and ! h.host_id=hg.host_id'; $ret=$db->GetCol($query,array($group)); return($ret); } + + // get all hostnames from a given groupId + function get_groupId_hosts(&$db,$groupId) { + $query ='SELECT h.host_name from perfdata_host h, perfdata_host_groups hg + where hg.group_id=? and + h.host_id=hg.host_id'; + $ret=$db->GetCol($query,array($groupId)); + return($ret); + } + + // get all hostids from a given group id + function get_groupId_hostIds(&$db,$groupId) { + $query ='SELECT host_id from perfdata_host_groups + where group_id=?'; + $ret=$db->GetCol($query,array($groupId)); + return($ret); + } + + // get hostids and hostnames from a given groupid + function get_groupId_hostinfos(&$db,$groupId) { + $query ='SELECT h.host_name, h.host_id from perfdata_host h, perfdata_host_groups hg + where hg.group_id=? and + h.host_id=hg.host_id'; + $ret=$db->GetCol($query,array($groupId)); + return($ret); + } + function get_group_host_metrics(&$db,$group,$sort) { Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** perfparse.php 15 Sep 2006 06:34:53 -0000 1.38 --- perfparse.php 9 Nov 2006 12:53:01 -0000 1.39 *************** *** 54,58 **** // php-perfparse version ! $smarty->assign('version','perfparse 0.106.1 php-perfparse v.05'); // Parse perfparse.conf to get database variables --- 54,61 ---- // php-perfparse version ! $smarty->assign('version','perfparse 0.106.2'); ! ! //minimum Database schema version required ! $db_schema_version=20; // Parse perfparse.conf to get database variables |
|
From: Florian G. <re...@us...> - 2006-11-09 12:53:03
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27744/templates Modified Files: all_bin.tpl.html Log Message: in the middle of rewrite Index: all_bin.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_bin.tpl.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** all_bin.tpl.html 8 Apr 2006 23:59:47 -0000 1.5 --- all_bin.tpl.html 9 Nov 2006 12:53:01 -0000 1.6 *************** *** 27,35 **** </td> <td> ! <select name="group_name"> ! <option value="">-- <{tr}>Select group<{/tr}>: --</option> ! <option value="**ALL**"><<{tr}>All Groups<{/tr}>></option> <{foreach from=$groups key=key item=item}> ! <option value=<{$item}> <{if $group_name==$item}>selected=selected<{/if}>><{$item}></option> <{/foreach}> </select> --- 27,35 ---- </td> <td> ! <select name="group_id"> ! <option value="-1">-- <{tr}>Select group<{/tr}>: --</option> ! <option value="0"><<{tr}>All Groups<{/tr}>></option> <{foreach from=$groups key=key item=item}> ! <option value=<{$key}> <{if $group_id==$key}>selected=selected<{/if}>><{$item}></option> <{/foreach}> </select> *************** *** 39,43 **** </table> </td></tr></table></p> ! <{if $group_name}> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> --- 39,43 ---- </table> </td></tr></table></p> ! <{if $group_id}> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> |
|
From: Florian G. <re...@us...> - 2006-11-08 22:46:30
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14446 Modified Files: database_schema_v20.sxi Log Message: more documentation Index: database_schema_v20.sxi =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/database/database_schema_v20.sxi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsZdVOg1 and /tmp/cvseYeLCB differ |
|
From: Florian G. <re...@us...> - 2006-11-08 16:13:26
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31143 Added Files: database_schema_v20.sxi Log Message: begin drawing the database schema for v20 --- NEW FILE: database_schema_v20.sxi --- (This appears to be a binary file; contents omitted.) |
|
From: Florian G. <re...@us...> - 2006-11-08 15:15:55
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10312/database Added Files: database_schema_v19.png Log Message: added schema image from v19 database --- NEW FILE: database_schema_v19.png --- (This appears to be a binary file; contents omitted.) |
|
From: Florian G. <re...@us...> - 2006-11-08 15:07:40
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7308/database Log Message: Directory /cvsroot/perfparse/_perfparse/doc/database added to the repository |
|
From: Florian G. <re...@us...> - 2006-11-08 14:19:27
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22059 Modified Files: TODO Log Message: new todos Index: TODO =================================================================== RCS file: /cvsroot/perfparse/_perfparse/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 15 Sep 2006 10:56:43 -0000 1.3 --- TODO 8 Nov 2006 14:19:23 -0000 1.4 *************** *** 1,2 **** ! Use storage modules to get data for cgi/phpui similar to saving data. Getting Data should only use first storage module configured. ! Integrate ajax framework. Ideas: create tinyurls for graphs via ajax. Make menus more dynamic ... --- 1,4 ---- ! - make postgres working (scripts and executables) ! - finish database upgrade program ! - Use storage modules to get data for cgi/phpui similar to saving data. Getting Data should only use first storage module configured. ! - Integrate ajax framework. Ideas: create tinyurls for graphs via ajax. Make menus more dynamic ... |
|
From: Florian G. <re...@us...> - 2006-10-31 23:23:14
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11852 Modified Files: perfparse-db-purge.c Log Message: Even debug messages should be formatted right Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** perfparse-db-purge.c 31 Oct 2006 22:55:25 -0000 1.5 --- perfparse-db-purge.c 31 Oct 2006 23:23:08 -0000 1.6 *************** *** 153,157 **** sleep((int) ceil((float)(time(NULL)-iStartTime)/60.0)); // sleep one second for every minute #ifdef DEBUG ! printf("Sleeped %d seconds for other transactions",(int) ceil((float)(time(NULL)-iStartTime)/60.0)); #endif iStartTime=time(NULL); --- 153,157 ---- sleep((int) ceil((float)(time(NULL)-iStartTime)/60.0)); // sleep one second for every minute #ifdef DEBUG ! printf("Sleeped %d seconds for other transactions\n",(int) ceil((float)(time(NULL)-iStartTime)/60.0)); #endif iStartTime=time(NULL); |
|
From: Florian G. <re...@us...> - 2006-10-31 22:55:29
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1765 Modified Files: perfparse-db-purge.c Log Message: Added dynamic sleep to give other transactions the possibility to run. Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** perfparse-db-purge.c 31 Oct 2006 22:01:47 -0000 1.4 --- perfparse-db-purge.c 31 Oct 2006 22:55:25 -0000 1.5 *************** *** 42,45 **** --- 42,46 ---- #include <gettext.h> #include <locale.h> + #include <math.h> /* Debug / Output definitions: */ *************** *** 66,69 **** --- 67,72 ---- /* Accounting */ int iDeleted = 0; + time_t iStartTime; + /* Options */ int bNoRaw = FALSE; *************** *** 92,95 **** --- 95,102 ---- }; + // Start measuring time. The purge should make regular small pauses + // to make it possible for other transactions to write to the tables. + iStartTime=time(NULL); + setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); *************** *** 139,142 **** --- 146,162 ---- } + void check_need_for_sleep(void) + { + if(time(NULL)-iStartTime < 60) { + return; + } else { + sleep((int) ceil((float)(time(NULL)-iStartTime)/60.0)); // sleep one second for every minute + #ifdef DEBUG + printf("Sleeped %d seconds for other transactions",(int) ceil((float)(time(NULL)-iStartTime)/60.0)); + #endif + iStartTime=time(NULL); + } + } + /*************************************** * *************** *** 187,190 **** --- 207,211 ---- "WHERE perfdata_service.raw_delete_policy_type = 'host' " "AND perfdata_service.host_name = perfdata_host.host_name "); + check_need_for_sleep(); query_no_return("UPDATE perfdata_service_metric,perfdata_delete_policy " *************** *** 257,260 **** --- 278,282 ---- iCountMetric = query_int("SELECT COUNT(*) FROM perfdata_service_metric WHERE is_deleted = 1"); + check_need_for_sleep(); if (iCountHost == 0 && iCountService == 0 && iCountMetric == 0) { printf(_("+-----------------------------------------------------------------------------+\n")); *************** *** 324,327 **** --- 346,350 ---- } + check_need_for_sleep(); if (iCountService) { *************** *** 348,351 **** --- 371,375 ---- } + check_need_for_sleep(); if (iCountMetric) { *************** *** 366,369 **** --- 390,394 ---- } + check_need_for_sleep(); if (iCountHost) { *************** *** 390,393 **** --- 415,419 ---- } + check_need_for_sleep(); if (iCountService) { *************** *** 414,417 **** --- 440,444 ---- } + check_need_for_sleep(); if (iCountMetric) { *************** *** 432,435 **** --- 459,463 ---- } + check_need_for_sleep(); *************** *** 459,462 **** --- 487,491 ---- } + check_need_for_sleep(); if (iCountService) { *************** *** 482,485 **** --- 511,515 ---- } + check_need_for_sleep(); *************** *** 507,510 **** --- 537,541 ---- } + check_need_for_sleep(); *************** *** 531,534 **** --- 562,566 ---- } + check_need_for_sleep(); *************** *** 558,561 **** --- 590,594 ---- } + check_need_for_sleep(); if (iCountService) { *************** *** 582,585 **** --- 615,619 ---- } + check_need_for_sleep(); *************** *** 608,611 **** --- 642,646 ---- } + check_need_for_sleep(); *************** *** 633,636 **** --- 668,672 ---- } + check_need_for_sleep(); *************** *** 654,657 **** --- 690,694 ---- } + check_need_for_sleep(); /* Metrics */ *************** *** 680,683 **** --- 717,721 ---- } + check_need_for_sleep(); if (iCountService) { *************** *** 704,707 **** --- 742,746 ---- } + check_need_for_sleep(); if (iCountMetric) { *************** *** 720,723 **** --- 759,763 ---- } + check_need_for_sleep(); /* Service */ *************** *** 745,748 **** --- 785,789 ---- } + check_need_for_sleep(); *************** *** 766,769 **** --- 807,811 ---- } + check_need_for_sleep(); *************** *** 789,792 **** --- 831,835 ---- } + check_need_for_sleep(); *************** *** 795,798 **** --- 838,842 ---- printf(_("| %-66s %08d |\n"), _("Total Records deleted:"), iDelete); } + check_need_for_sleep(); } *************** *** 817,820 **** --- 861,865 ---- iDelete += iRowsAffected; iDeleted += iDelete; + check_need_for_sleep(); *************** *** 824,827 **** --- 869,873 ---- iDelete += iRowsAffected; iDeleted += iDelete; + check_need_for_sleep(); *************** *** 843,846 **** --- 889,893 ---- query("SELECT host_name, service_description, metric, bin_delete_policy FROM perfdata_service_metric WHERE bin_delete_policy IS NOT NULL"); + check_need_for_sleep(); #ifdef USE_DB_MYSQL while ((result_row = mysql_fetch_row(query_result))) { *************** *** 890,893 **** --- 937,941 ---- query_no_return(s_SQL->str); iDeleted += iRowsAffected; + check_need_for_sleep(); #endif *************** *** 914,917 **** --- 962,966 ---- query("SELECT host_name, service_description, raw_delete_policy FROM perfdata_service WHERE raw_delete_policy IS NOT NULL"); + check_need_for_sleep(); #ifdef USE_DB_MYSQL while ((result_row = mysql_fetch_row(query_result))) { *************** *** 965,968 **** --- 1014,1018 ---- query_no_return(s_SQL->str); iDeleted += iRowsAffected; + check_need_for_sleep(); #endif |
|
From: Florian G. <re...@us...> - 2006-10-31 22:01:51
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14557 Modified Files: perfparse-db-purge.c Log Message: #elseif -> #elif defined Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** perfparse-db-purge.c 31 Oct 2006 15:28:36 -0000 1.3 --- perfparse-db-purge.c 31 Oct 2006 22:01:47 -0000 1.4 *************** *** 262,266 **** #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); ! #elseif USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif --- 262,266 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif *************** *** 276,280 **** #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); ! #elseif USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif --- 276,280 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif *************** *** 286,290 **** printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); --- 286,290 ---- printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); *************** *** 314,318 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 314,318 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 338,342 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 338,342 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 380,384 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif --- 380,384 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif *************** *** 404,408 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif --- 404,408 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif *************** *** 449,453 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 449,453 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 472,476 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 472,476 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 497,501 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif --- 497,501 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif *************** *** 521,525 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif --- 521,525 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif *************** *** 548,552 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif --- 548,552 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 572,576 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif --- 572,576 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 598,602 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif --- 598,602 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 623,627 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif --- 623,627 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif *************** *** 670,674 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif --- 670,674 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif *************** *** 694,698 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif --- 694,698 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif *************** *** 735,739 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif --- 735,739 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif *************** *** 756,760 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif --- 756,760 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif *************** *** 779,783 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif --- 779,783 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif *************** *** 930,934 **** #ifdef USE_SOURCE_NAGIOS printf(_("| Service | Policy | Deleted |\n")); ! #elseif USE_SOURCE_ASNMTAP printf(_("| Unique Key | Policy | Deleted |\n")); #endif --- 930,934 ---- #ifdef USE_SOURCE_NAGIOS printf(_("| Service | Policy | Deleted |\n")); ! #elif defined USE_SOURCE_ASNMTAP printf(_("| Unique Key | Policy | Deleted |\n")); #endif *************** *** 989,991 **** } - --- 989,990 ---- |
|
From: Florian G. <re...@us...> - 2006-10-31 15:28:41
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv418 Modified Files: perfparse-db-purge.c Log Message: uncommented nagios output text and removed surrounding transaction since this transaction may run far too long Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** perfparse-db-purge.c 15 Nov 2005 10:28:13 -0000 1.2 --- perfparse-db-purge.c 31 Oct 2006 15:28:36 -0000 1.3 *************** *** 4,8 **** * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * Last Modified: 2004-05-28 * * License: --- 4,8 ---- * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * $Id$ * * License: *************** *** 147,153 **** void now_purge() { - if (!config_get_value_as_boolean(CONFIG_ITEM_ID_NO_TRANSACTIONS)) { - query("START TRANSACTION"); - } deleteDaysOld(); --- 147,150 ---- *************** *** 161,168 **** deleteRawData(); - if (!config_get_value_as_boolean(CONFIG_ITEM_ID_NO_TRANSACTIONS)) { - query("COMMIT"); - } - } --- 158,161 ---- *************** *** 268,275 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif --- 261,266 ---- *************** *** 284,291 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif --- 275,280 ---- *************** *** 295,303 **** #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); --- 284,290 ---- *************** *** 326,333 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 313,318 ---- *************** *** 352,359 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 337,342 ---- *************** *** 396,403 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif --- 379,384 ---- *************** *** 422,429 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif --- 403,408 ---- *************** *** 469,476 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 448,453 ---- *************** *** 494,501 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 471,476 ---- *************** *** 521,528 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif --- 496,501 ---- *************** *** 547,554 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif --- 520,525 ---- *************** *** 576,583 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif --- 547,552 ---- *************** *** 602,609 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif --- 571,576 ---- *************** *** 630,637 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif --- 597,602 ---- *************** *** 657,664 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif --- 622,627 ---- *************** *** 706,713 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif --- 669,674 ---- *************** *** 732,739 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif --- 693,698 ---- *************** *** 775,782 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif --- 734,739 ---- *************** *** 798,805 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif --- 755,760 ---- *************** *** 823,830 **** if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { #ifdef USE_SOURCE_NAGIOS - /* printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); #elseif USE_SOURCE_ASNMTAP - */ printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif --- 778,783 ---- *************** *** 865,868 **** --- 818,822 ---- iDeleted += iDelete; + g_string_printf(s_SQL, "DELETE FROM perfdata_service_bin WHERE ctime < NOW() - INTERVAL %d DAY", iDeleteDaysOld); *************** *** 871,874 **** --- 825,829 ---- iDeleted += iDelete; + if (config_get_value_as_boolean(CONFIG_ITEM_ID_DO_REPORT)) { printf(_(" %7d Records deleted. |\n"), iDelete); *************** *** 974,981 **** #ifdef USE_SOURCE_NAGIOS - /* printf(_("| Service | Policy | Deleted |\n")); #elseif USE_SOURCE_ASNMTAP - */ printf(_("| Unique Key | Policy | Deleted |\n")); #endif --- 929,934 ---- |
|
From: Florian G. <re...@us...> - 2006-10-30 21:35:12
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1270/db_tools Modified Files: convert.c convert.h Log Message: some small changes Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** convert.c 29 Oct 2006 22:29:34 -0000 1.3 --- convert.c 30 Oct 2006 21:35:06 -0000 1.4 *************** *** 112,115 **** --- 112,116 ---- printf(_("Creating new group table:\n")); query("create table perfdata_groups (group_id INT AUTO_INCREMENT PRIMARY KEY, group_name VARCHAR(75) UNIQUE) type=InnoDB select group_name from perfdata_host_group"); + DropForeignKey("perfdata_host","perfdata_host_group"); query("drop table perfdata_host_group"); } *************** *** 135,141 **** void DropForeignKey(char *TableName, char *ForeignTableName) { GString *querystr=g_string_new(""); ! GString *resultstr=g_string_new(""); g_string_printf(querystr,"show create table %s",TableName); ! query(querystr); } --- 136,151 ---- void DropForeignKey(char *TableName, char *ForeignTableName) { GString *querystr=g_string_new(""); ! GString *resultstr; g_string_printf(querystr,"show create table %s",TableName); ! query(querystr->str); ! #ifdef USE_DB_MYSQL ! while ((result_row = mysql_fetch_row(query_result))) { ! #elif defined USE_DB_POSTGRESQL ! numberOfRows = rows(); ! for (currentRow=0;currentRow<numberOfRows;currentRow++){ ! #endif ! resultstr=g_string_new(result_row[0]); ! printf("Resultstring: %s\n",resultstr->str); ! } } Index: convert.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** convert.h 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- convert.h 30 Oct 2006 21:35:06 -0000 1.2 *************** *** 4,8 **** * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * Last Modified: 2004-05-28 * * License: --- 4,8 ---- * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * $Id$ * * License: *************** *** 31,34 **** --- 31,35 ---- void autoConvert(); void install_database(void); + void DropForeignKey(char *TableName, char *ForeignTableName); #endif |
|
From: Florian G. <re...@us...> - 2006-10-29 22:29:50
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19049/db_tools Modified Files: convert.c Log Message: Start autoconvert to new db schema Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** convert.c 18 Aug 2006 09:05:21 -0000 1.2 --- convert.c 29 Oct 2006 22:29:34 -0000 1.3 *************** *** 108,111 **** --- 108,118 ---- } + if (version < 0.20) { + printf(_("Warning, this stage may take some time:\n")); + printf(_("Creating new group table:\n")); + query("create table perfdata_groups (group_id INT AUTO_INCREMENT PRIMARY KEY, group_name VARCHAR(75) UNIQUE) type=InnoDB select group_name from perfdata_host_group"); + query("drop table perfdata_host_group"); + } + /* Always check the tables */ /* Create where missing */ *************** *** 126,129 **** --- 133,142 ---- + void DropForeignKey(char *TableName, char *ForeignTableName) { + GString *querystr=g_string_new(""); + GString *resultstr=g_string_new(""); + g_string_printf(querystr,"show create table %s",TableName); + query(querystr); + } void addIdFields() *************** *** 419,423 **** - void addTableHostGroup(void) { --- 432,435 ---- |
|
From: Florian G. <re...@us...> - 2006-10-28 21:42:02
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6931/perfparse Modified Files: log_reader.c Log Message: Corrected comment, added Tag Index: log_reader.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/log_reader.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** log_reader.c 22 Mar 2006 11:25:44 -0000 1.2 --- log_reader.c 28 Oct 2006 21:41:59 -0000 1.3 *************** *** 1,8 **** /***************************************************************************** * ! * log_reader.c - Parse Nagios data and store in relational database. * * Copyright (c) 2004 Yves Mettier (yme...@li...) ! * Last Modified: 2004-08-25 * * License: --- 1,8 ---- /***************************************************************************** * ! * log_reader.c - Reads Log from file, socket or pipe. * * Copyright (c) 2004 Yves Mettier (yme...@li...) ! * $Id$ * * License: |
|
From: Florian G. <re...@us...> - 2006-10-28 20:36:47
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15321 Modified Files: dbms.h Log Message: added Id tag Index: dbms.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dbms.h 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- dbms.h 28 Oct 2006 20:36:43 -0000 1.2 *************** *** 4,8 **** * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * Last Modified: 2004-05-28 * * License: --- 4,8 ---- * * Copyright (c) 2004 Ben Clewett (per...@cl...) ! * $Id$ * * License: |
|
From: Florian G. <re...@us...> - 2006-10-28 20:08:49
|
Update of /cvsroot/perfparse/_perfparse/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4942/doc Modified Files: ARCHITECTURE Log Message: replaced tabs with spaces Index: ARCHITECTURE =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/ARCHITECTURE,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ARCHITECTURE 26 Sep 2005 14:36:32 -0000 1.1.1.1 --- ARCHITECTURE 28 Oct 2006 20:08:46 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! $Id$ *************** *** 11,28 **** socket ---------------- | | ! | (parser) (mysql) ! | /----------------- mysql db ! structure | | | (socket_output) ! \ |----------------- socket ! \ | ! \ (storage modules) | (file_output) ! -------------------------------------- files ! | ! | (stdout) ! |----------------- stdout ! | ! | (your module) ! \----------------- your storage system --- 11,28 ---- socket ---------------- | | ! | (parser) (mysql) ! | /----------------- mysql db ! structure | | | (socket_output) ! \ |----------------- socket ! \ | ! \ (storage modules) | (file_output) ! -------------------------------------- files ! | ! | (stdout) ! |----------------- stdout ! | ! | (your module) ! \----------------- your storage system |
|
From: Florian G. <re...@us...> - 2006-10-28 19:52:31
|
Update of /cvsroot/perfparse/_perfparse/libpp_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31599 Modified Files: clean_tools.c Log Message: fixed comment Index: clean_tools.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/clean_tools.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** clean_tools.c 24 Aug 2006 14:36:45 -0000 1.2 --- clean_tools.c 28 Oct 2006 19:52:29 -0000 1.3 *************** *** 1,5 **** /***************************************************************************** * ! * clean_tools.c - Parse Nagios data and store in relational database. * * Copyright (c) 2004 Yves Mettier (yme...@li...) --- 1,5 ---- /***************************************************************************** * ! * clean_tools.c - Logfile compression/rotation. * * Copyright (c) 2004 Yves Mettier (yme...@li...) |
