Menu
▾
▴
perfparse-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(19) |
Oct
(10) |
Nov
(14) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(5) |
Mar
(33) |
Apr
(31) |
May
(3) |
Jun
(30) |
Jul
(4) |
Aug
(26) |
Sep
(23) |
Oct
|
Nov
(6) |
Dec
(56) |
| 2008 |
Jan
(12) |
Feb
(9) |
Mar
(2) |
Apr
(8) |
May
(2) |
Jun
(3) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
|
Nov
(16) |
Dec
(4) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(36) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Florian G. <re...@us...> - 2007-06-13 13:56:12
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/cgi Modified Files: perfgant.c Log Message: use gnu extensions - and remove compiler warnings Index: perfgant.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfgant.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** perfgant.c 12 Jun 2007 23:39:09 -0000 1.7 --- perfgant.c 13 Jun 2007 13:56:12 -0000 1.8 *************** *** 25,28 **** --- 25,30 ---- *****************************************************************************/ + // #define _GNU_SOURCE + #include <config.h> #include <stdio.h> #include <stdlib.h> *************** *** 41,45 **** #include "cgi.h" - #include <config.h> #include <gettext.h> #include <locale.h> --- 43,46 ---- |
|
From: Florian G. <re...@us...> - 2007-06-12 23:39:10
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4165 Modified Files: configure Log Message: perfgant renovation Index: configure =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure 15 Apr 2007 23:39:52 -0000 1.26 --- configure 12 Jun 2007 23:39:08 -0000 1.27 *************** *** 33235,33241 **** echo echo 'WARNING WARNING WARNING WARNING WARNING WARNING WARNING' ! echo 'Perfparse CGI is now perfparse.cgi.' echo 'If you have upgrading, the development team suggests' ! echo 'that you remove your old perfgraph.cgi to avoid' echo 'any confusion.' echo --- 33235,33241 ---- echo echo 'WARNING WARNING WARNING WARNING WARNING WARNING WARNING' ! echo 'Perfparse CGI has been replaced by a PHP webinterface.' echo 'If you have upgrading, the development team suggests' ! echo 'that you remove your old cgi files to avoid' echo 'any confusion.' echo |
|
From: Florian G. <re...@us...> - 2007-06-12 23:39:09
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4165/cgi Modified Files: perfgant.c Log Message: perfgant renovation Index: perfgant.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfgant.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** perfgant.c 12 Jun 2007 15:11:09 -0000 1.6 --- perfgant.c 12 Jun 2007 23:39:09 -0000 1.7 *************** *** 65,70 **** const int iBorder = 30; const int iSideBorder = 50; ! const int iRowHeight = 20; ! const int iRowGap = 10; int black, white, blue, lblue, red, grey0, grey1, grey2, yellow; --- 65,72 ---- const int iBorder = 30; const int iSideBorder = 50; ! double dRowHeight = 20.0; ! double dRowGap = 10.0; ! int iRowHeight = 20; ! int iRowGap = 10; int black, white, blue, lblue, red, grey0, grey1, grey2, yellow; *************** *** 162,165 **** --- 164,168 ---- time_t t; + // draw vertical lines and scale every 2 hours at top and button for (i = 0; i < 25; i++) { d = (double)i * 3600; *************** *** 178,197 **** } for (i = 0; i < iDays; i++) { ! t = i * DAY1 + tFromMidnight; ! r = localtime(&t); // sprintf(s, "%04d-%02d-%02d", r->tm_year + 1900, r->tm_mon + 1, r->tm_mday); ! sprintf(s, "%02d-%02d", r->tm_mon + 1, r->tm_mday); ! gdImageString(gant, gdFontSmall, 8, i * (iRowHeight + iRowGap) + iBorder + 12,(unsigned char*) s, black); ! switch (r->tm_wday) { ! case 0: strncpy(s, _("Sun"),4); break; ! case 1: strncpy(s, _("Mon"),4); break; ! case 2: strncpy(s, _("Tue"),4); break; ! case 3: strncpy(s, _("Wed"),4); break; ! case 4: strncpy(s, _("Thu"),4); break; ! case 5: strncpy(s, _("Fri"),4); break; ! case 6: strncpy(s, _("Sat"),4); break; ! } ! gdImageString(gant, gdFontSmall, iWidth - iSideBorder + 15, i * (iRowHeight + iRowGap) + iBorder + 12,(unsigned char*) s, black); } --- 181,205 ---- } + // draw scales left and right + int last_scale=-30; for (i = 0; i < iDays; i++) { ! if((int) round(i*(dRowHeight + dRowGap)) - last_scale >20) { ! last_scale=(int) round(i*(dRowHeight + dRowGap)); ! t = i * DAY1 + tFromMidnight; ! r = localtime(&t); // sprintf(s, "%04d-%02d-%02d", r->tm_year + 1900, r->tm_mon + 1, r->tm_mday); ! sprintf(s, "%02d-%02d", r->tm_mon + 1, r->tm_mday); ! gdImageString(gant, gdFontSmall, 8, (int) round(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); ! switch (r->tm_wday) { ! case 0: strncpy(s, _("Sun"),4); break; ! case 1: strncpy(s, _("Mon"),4); break; ! case 2: strncpy(s, _("Tue"),4); break; ! case 3: strncpy(s, _("Wed"),4); break; ! case 4: strncpy(s, _("Thu"),4); break; ! case 5: strncpy(s, _("Fri"),4); break; ! case 6: strncpy(s, _("Sat"),4); break; ! } ! gdImageString(gant, gdFontSmall, iWidth - iSideBorder + 15, (int) round(i*(dRowHeight + dRowGap)) + iBorder + 12,(unsigned char*) s, black); ! } } *************** *** 326,331 **** gdImageFilledRectangle(gant, x0, y0, x1, y1, iStateColour[iState]); ! gdImageLine(gant, x0, y0, x1, y0, black); ! gdImageLine(gant, x0, y1, x1, y1, black); --- 334,341 ---- gdImageFilledRectangle(gant, x0, y0, x1, y1, iStateColour[iState]); ! if(iRowHeight > 1) { ! gdImageLine(gant, x0, y0, x1, y0, black); ! gdImageLine(gant, x0, y1, x1, y1, black); ! } *************** *** 334,337 **** --- 344,348 ---- int getX(time_t t) { + /* static double d; *************** *** 345,348 **** --- 356,364 ---- return (int)d + iSideBorder; + */ + + struct tm* ptT; + ptT=localtime(&t); + return iSideBorder+(int) (ptT->tm_hour*3600+ptT->tm_min*60+ptT->tm_sec)*(iWidth - iSideBorder * 2)/DAY1; } *************** *** 350,354 **** int getY(time_t t) { ! return getDay(t) * (iRowHeight + iRowGap) + iBorder + iRowGap; } --- 366,370 ---- int getY(time_t t) { ! return (int) round(getDay(t)*(dRowHeight + dRowGap)) + iBorder + iRowGap; } *************** *** 435,439 **** iDays = (int)(tToMidnight - tFromMidnight) / DAY1; ! iHeight = iBorder * 2 + iRowHeight * iDays + iRowGap * (iDays + 1); #ifdef DEBUG --- 451,462 ---- iDays = (int)(tToMidnight - tFromMidnight) / DAY1; ! iHeight = iBorder * 2 + iRowHeight * iDays + (int) round(dRowGap) * (iDays + 1); ! if(iHeight > 600) { ! iHeight=600; ! dRowHeight=2*((double)iHeight - 2* (double)iBorder)/(3* (double)iDays+1); ! dRowGap=dRowHeight/2; ! } ! iRowHeight=(int) round(dRowHeight); ! iRowGap=(int) round(dRowGap); #ifdef DEBUG |
|
From: Florian G. <re...@us...> - 2007-06-12 15:11:18
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1174/cgi Modified Files: perfgant.c Log Message: make raw_plugin report work with new db schema Index: perfgant.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfgant.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** perfgant.c 6 Jun 2007 13:26:43 -0000 1.5 --- perfgant.c 12 Jun 2007 15:11:09 -0000 1.6 *************** *** 57,63 **** /* CGI in */ - char *sHost; - char *sService; - char *sFrom, *sTo; int iServiceId; --- 57,60 ---- *************** *** 81,85 **** void drawGant(); void drawHeadings(); - time_t getTime(char *sSQLDate); void drawBox(time_t t0, time_t t1, int iState); int getY(time_t t); --- 78,81 ---- *************** *** 103,106 **** --- 99,104 ---- CONFIG_ITEM_ID_DB_DATABASE, CONFIG_ITEM_ID_DB_HOST, + CONFIG_ITEM_ID_DB_PORT, + CONFIG_ITEM_ID_DB_SOCKET, CONFIG_ITEM_ID_DEFAULT_USER_PERMISSIONS_POLICY, CONFIG_ITEM_ID_DEFAULT_USER_PERMISSIONS_HOST_GROUP, *************** *** 219,223 **** g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE service_id = %d", iServiceId); #endif ! g_string_append_printf(s_SQL, " AND ctime BETWEEN %d AND %d", tFrom, tTo); g_string_append_printf(s_SQL, " ORDER BY ctime"); query(s_SQL->str); --- 217,221 ---- g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE service_id = %d", iServiceId); #endif ! g_string_append_printf(s_SQL, " AND ctime BETWEEN %d AND %d", (int) tFrom, (int) tTo); g_string_append_printf(s_SQL, " ORDER BY ctime"); query(s_SQL->str); *************** *** 234,238 **** iState = iData(2); } else { ! iState = 0; if (strstr(sData(1), "Connection refused")) iState = 2; else if (strstr(sData(1), "OK")) iState = 0; --- 232,236 ---- iState = iData(2); } else { ! iState = 3; // if we dont know, we set it to unknown if (strstr(sData(1), "Connection refused")) iState = 2; else if (strstr(sData(1), "OK")) iState = 0; *************** *** 245,251 **** else if (strstr(sData(1), "UNKNOWN")) iState = 3; } #ifdef USE_DB_MYSQL ! t1 = (time_t)iData(3); #elif defined USE_DB_POSTGRESQL t1 = tData(0); --- 243,250 ---- else if (strstr(sData(1), "UNKNOWN")) iState = 3; } + #ifdef USE_DB_MYSQL ! t1 = (time_t)iData(0); #elif defined USE_DB_POSTGRESQL t1 = tData(0); *************** *** 411,439 **** void getCGI() { ! char s[20]; getCGIDBVars(); /* Graph details */ - sHost = strdup(scgi("host")); - sService = strdup(scgi("service")); iServiceId = atoi(scgi("service_id")); ! sFrom = strdup(scgi("from")); ! sTo = strdup(scgi("to")); ! tFrom = getTime(sFrom); ! tTo = getTime(sTo); ! ! strcpy(s, sFrom); ! s[10] = 0; ! sprintf(s, "%s 00:00:00", s); ! tFromMidnight = getTime(s); ! strcpy(s, sTo); ! s[10] = 0; ! sprintf(s, "%s 23:59:59", s); ! tToMidnight = getTime(s) + 1; iDays = (int)(tToMidnight - tFromMidnight) / DAY1; --- 410,436 ---- void getCGI() { ! struct tm *t; getCGIDBVars(); /* Graph details */ iServiceId = atoi(scgi("service_id")); ! // use unix timestamps now ! tFrom = atoi(scgi("from")); ! tTo = atoi(scgi("to")); ! t=localtime(&tFrom); ! t->tm_sec=0; ! t->tm_min=0; ! t->tm_hour=0; ! tFromMidnight = mktime(t); ! t=localtime(&tTo); ! t->tm_sec=59; ! t->tm_min=59; ! t->tm_hour=23; ! tToMidnight = mktime(t)+1; iDays = (int)(tToMidnight - tFromMidnight) / DAY1; *************** *** 441,445 **** #ifdef DEBUG ! fprintf(f, "\"%s\" -> \"%s\" = %ld hours = %d days.\n", sFrom, sTo, (tToMidnight - tFromMidnight) / 3600, iDays); #endif --- 438,442 ---- #ifdef DEBUG ! fprintf(f, "\"%s\" -> \"%s\" = %ld hours = %d days.\n", ctime(tFrom), ctime(tTo), (tToMidnight - tFromMidnight) / 3600, iDays); #endif *************** *** 464,537 **** - time_t getTime(char *sSQLDate) - /* format "YY-MM-DD hh:mm:ss" */ - { - struct tm recTime; - static int iOffset = -1; - time_t tOut; - char s[5]; - - if (strlen(sSQLDate) < 18) { - int i; - for (i = strlen(sSQLDate) + 1; i < 19; i++) sSQLDate[i] = 0; - } - - // Year: - s[0] = sSQLDate[0]; - s[1] = sSQLDate[1]; - s[2] = sSQLDate[2]; - s[3] = sSQLDate[3]; - s[4] = 0; - iYear = atoi(s); - recTime.tm_year = iYear - 1900; - - // Month: - s[0] = sSQLDate[5]; - s[1] = sSQLDate[6]; - s[2] = 0; - iMonth = atoi(s); - recTime.tm_mon = iMonth - 1; - - // Month Day: - s[0] = sSQLDate[8]; - s[1] = sSQLDate[9]; - s[2] = 0; - iDay = atoi(s); - recTime.tm_mday = iDay; - - // Hours: - s[0] = sSQLDate[11]; - s[1] = sSQLDate[12]; - s[2] = 0; - recTime.tm_hour = atoi(s); - - // Minuts: - s[0] = sSQLDate[14]; - s[1] = sSQLDate[15]; - s[2] = 0; - recTime.tm_min = atoi(s); - - // Seconds: - s[0] = sSQLDate[17]; - s[1] = sSQLDate[18]; - s[2] = 0; - recTime.tm_sec = atoi(s); - recTime.tm_isdst = 0; - - tOut = mktime(&recTime); - - if (iOffset == -1) { - struct tm *r; - r = localtime(&tOut); - r->tm_isdst = 0; - iOffset = (int)mktime(r) - tOut; - } - - return tOut - iOffset; - - } - - - /*************************************** * --- 461,464 ---- |
|
From: Florian G. <re...@us...> - 2007-06-12 15:11:14
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1174/phpgui Modified Files: perfparse.php Log Message: make raw_plugin report work with new db schema Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** perfparse.php 6 Jun 2007 13:08:31 -0000 1.48 --- perfparse.php 12 Jun 2007 15:11:09 -0000 1.49 *************** *** 401,406 **** } // get data to display in table ! $raw_hist=get_raw_history($db,$service_id,$from,$to,$type); // echo "<pre>";print_r($raw_hist);echo "</pre>"; $smarty->assign_by_ref('raw_hist',$raw_hist); --- 401,414 ---- } + // unix timestamps + // todo: check for input errors + // todo: better input format for user interface + $ifrom=strtotime($from); + $ito=strtotime($to); + $smarty->assign('ifrom',$ifrom); + $smarty->assign('ito',$ito); + // get data to display in table ! $raw_hist=get_raw_history($db,$service_id,$ifrom,$ito,$type); // echo "<pre>";print_r($raw_hist);echo "</pre>"; $smarty->assign_by_ref('raw_hist',$raw_hist); |
|
From: Florian G. <re...@us...> - 2007-06-12 15:11:14
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1174/phpgui/templates Modified Files: raw_history.tpl.html Log Message: make raw_plugin report work with new db schema Index: raw_history.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/raw_history.tpl.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** raw_history.tpl.html 6 Jun 2007 13:08:31 -0000 1.5 --- raw_history.tpl.html 12 Jun 2007 15:11:10 -0000 1.6 *************** *** 42,46 **** <a href="perfparse.php"><{tr}>Return to main menu<{/tr}></a> </font></td> ! <td width=60 align=right><font face="Arial, Helvetica" size="1">v0.105.6</font></td> </tr> </table> --- 42,46 ---- <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> *************** *** 117,121 **** <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}> </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> --- 117,121 ---- <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> *************** *** 126,130 **** <{* 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=<{$servicei_id|escape:"url"}>&from=<{$from|escape:"url"}>&to=<{$to|escape:"url"}>" border=0></p> <{* todo: fill with real data *}> <p align=center><table width=600 border=1 cellspacing=0 cellpadding=2 bgcolor="#FFFFFF"> --- 126,130 ---- <{* 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=<{$ito|escape:"url"}>" border=0></p> <{* todo: fill with real data *}> <p align=center><table width=600 border=1 cellspacing=0 cellpadding=2 bgcolor="#FFFFFF"> |
|
From: Florian G. <re...@us...> - 2007-06-06 13:26:42
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10332/cgi Modified Files: perfgant.c Log Message: in the middle of a conversion Index: perfgant.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfgant.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** perfgant.c 27 Apr 2007 21:25:45 -0000 1.4 --- perfgant.c 6 Jun 2007 13:26:43 -0000 1.5 *************** *** 3,7 **** * perfgant.c - Displays a gant chart of state changes * ! * Copyright (c) 2004 Ben Clewett * $Id$ * --- 3,8 ---- * perfgant.c - Displays a gant chart of state changes * ! * Copyright (c) 2004-2007 Ben Clewett, Florian Gleixner ! * * $Id$ * *************** *** 59,62 **** --- 60,64 ---- char *sService; char *sFrom, *sTo; + int iServiceId; time_t tFrom, tTo, tFromMidnight, tToMidnight; *************** *** 213,223 **** time_t t0 = 0, t1 = 0; #ifdef USE_DB_MYSQL ! g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status, UNIX_TIMESTAMP(ctime) FROM perfdata_service_raw WHERE host_name = '%s'", sHost); #elif defined USE_DB_POSTGRESQL ! g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE host_name = '%s'", sHost); #endif ! g_string_append_printf(s_SQL, " AND service_description = '%s'", sService); ! g_string_append_printf(s_SQL, " AND ctime BETWEEN '%s' AND '%s'", sFrom, sTo); ! g_string_append_printf(s_SQL, " ORDER BY perfdata_service_raw.ctime"); query(s_SQL->str); --- 215,224 ---- time_t t0 = 0, t1 = 0; #ifdef USE_DB_MYSQL ! g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE service_id = %d", iServiceId); #elif defined USE_DB_POSTGRESQL ! g_string_printf(s_SQL, "SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE service_id = %d", iServiceId); #endif ! g_string_append_printf(s_SQL, " AND ctime BETWEEN %d AND %d", tFrom, tTo); ! g_string_append_printf(s_SQL, " ORDER BY ctime"); query(s_SQL->str); *************** *** 418,421 **** --- 419,424 ---- sService = strdup(scgi("service")); + iServiceId = atoi(scgi("service_id")); + sFrom = strdup(scgi("from")); sTo = strdup(scgi("to")); |
|
From: Florian G. <re...@us...> - 2007-06-06 13:08:32
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527/phpgui/templates Modified Files: all_bin.tpl.html all_raw.tpl.html raw_history.tpl.html Log Message: continue work on DB conversion and php gui. Index: all_raw.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_raw.tpl.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** all_raw.tpl.html 5 Jun 2007 22:46:59 -0000 1.9 --- all_raw.tpl.html 6 Jun 2007 13:08:31 -0000 1.10 *************** *** 82,89 **** <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.service_description}> </td> <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.state}> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2><nobr> <{$item.ctime}> </td> <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.txt_data}> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <a href="perfparse.php?page=raw_history&host_name=<{$item.host_name_url}>&service_id=<{$item.service_id}>"><{tr}>All<{/tr}></a> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <a href="perfparse.php?page=raw_history_summary&host_name=<{$item.host_name_url}>&service_id=<{$item.service_id}>"><{tr}>Summary<{/tr}></a> </td> </tr> <{/foreach}> --- 82,89 ---- <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.service_description}> </td> <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.state}> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2><nobr> <{$item.ctime|date_format:"%c"}> </td> <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <{$item.txt_data}> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <a href="perfparse.php?page=raw_history&service_id=<{$item.service_id}>"><{tr}>All<{/tr}></a> </td> ! <td <{if $item.state == "CRITICAL"}>bgcolor="#FF8888"<{else}>bgcolor="#FFFFFF"<{/if}>><font face="Arial, Helvetica" size=2> <a href="perfparse.php?page=raw_history_summary&service_id=<{$item.service_id}>"><{tr}>Summary<{/tr}></a> </td> </tr> <{/foreach}> Index: raw_history.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/raw_history.tpl.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** raw_history.tpl.html 8 Apr 2006 23:59:47 -0000 1.4 --- raw_history.tpl.html 6 Jun 2007 13:08:31 -0000 1.5 *************** *** 51,55 **** <table width="100%" border=0 cellpadding=0 cellspacing=0> <form method=get name="graph"> - <input type=hidden name="host_name" value="<{$host_name|escape:"url"}>"> <input type=hidden name="service_id" value="<{$service_id|escape:"url"}>"> <input type=hidden name="page" value="raw_history"> --- 51,54 ---- *************** *** 111,117 **** <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&host_name=<{$host_name|escape:"url"}>&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&host_name=<{$host_name|escape:"url"}>&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&host_name=<{$host_name|escape:"url"}>&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&host_name=<{$host_name|escape:"url"}>&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}> --- 110,116 ---- <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}> *************** *** 126,130 **** <{/if}> <{* todo: relative time and correction of date input *}> ! <p align="center"><img src="cgi-bin/perfgant.png?host=<{$host_name|escape:"url"}>&service=<{$service|escape:"url"}>&from=<{$from|escape:"url"}>&to=<{$to|escape:"url"}>" border=0></p> <{* todo: fill with real data *}> <p align=center><table width=600 border=1 cellspacing=0 cellpadding=2 bgcolor="#FFFFFF"> --- 125,130 ---- <{/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=<{$servicei_id|escape:"url"}>&from=<{$from|escape:"url"}>&to=<{$to|escape:"url"}>" border=0></p> <{* todo: fill with real data *}> <p align=center><table width=600 border=1 cellspacing=0 cellpadding=2 bgcolor="#FFFFFF"> Index: all_bin.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_bin.tpl.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** all_bin.tpl.html 5 Mar 2007 10:59:46 -0000 1.9 --- all_bin.tpl.html 6 Jun 2007 13:08:31 -0000 1.10 *************** *** 98,102 **** </td> <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.metric}> </td> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2><nobr> <{$item.ctime}> </td> <td bgcolor="#FFFFFF" align=right><font face="Arial, Helvetica" size=2> <{$item.value}> </td> <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.unit}> </td> --- 98,102 ---- </td> <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.metric}> </td> ! <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2><nobr> <{$item.ctime|date_format:"%c"}> </td> <td bgcolor="#FFFFFF" align=right><font face="Arial, Helvetica" size=2> <{$item.value}> </td> <td bgcolor="#FFFFFF"><font face="Arial, Helvetica" size=2> <{$item.unit}> </td> |
|
From: Florian G. <re...@us...> - 2007-06-06 13:08:32
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527/phpgui Modified Files: perfparse.php utils.php Log Message: continue work on DB conversion and php gui. Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** utils.php 5 Jun 2007 22:46:59 -0000 1.36 --- utils.php 6 Jun 2007 13:08:31 -0000 1.37 *************** *** 390,394 **** } ! if($normal==false || $warning==false || $critical==false || $unknown==false) { $query.=' AND nagios_status in ('; $interieur=array(); --- 390,398 ---- } ! if($normal==false && $warning==false && $critical==false && $unknown==false) { ! return(array()); ! } ! ! if($normal==false || $warning==false || $critical==false || $unknown==false) { $query.=' AND nagios_status in ('; $interieur=array(); *************** *** 601,607 **** } ! function get_servicename_from_id(&$db,$serviceid) { ! $query='select service_description from perfdata_service where service_id=?'; ! $ret=$db->GetOne($query,array($serviceid)); return($ret); } --- 605,612 ---- } ! function get_info_from_service_id(&$db,$serviceid) { ! $query= 'select s.service_description, s.host_id, s.is_deleted, h.host_name '; ! $query.='from perfdata_service s, perfdata_host h where s.service_id=? and h.host_id=s.host_id'; ! $ret=$db->GetRow($query,array($serviceid)); return($ret); } *************** *** 613,617 **** } ! function get_raw_history($db,$host_name,$service,$from,$to,$type=0,$sort='ctime.asc') { // type: value="0" All events value="1" Change in Events value="2" Summary Only $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); --- 618,622 ---- } ! function get_raw_history($db,$service_id,$from,$to,$type=0,$sort='ctime.asc') { // type: value="0" All events value="1" Change in Events value="2" Summary Only $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); *************** *** 626,636 **** ! $query='SELECT ctime, txt_data, nagios_status FROM perfdata_service_raw WHERE host_name=?'; ! $query.=' AND service_description = ?'; ! $query.=' AND ctime BETWEEN ? AND ?'; $queryc=$query.' order by ctime asc'; $query.=' order by '.$sorts[0].' '.$sorts[1]; ! $res=$db->Execute($query,array($host_name,$service,$from,$to)); $ret=array(); $ret['count']=0; --- 631,646 ---- ! $query='SELECT r.ctime, r.txt_data, r.nagios_status, s.service_description, h.host_name FROM '; ! $query.='perfdata_service_raw r, perfdata_service s, perfdata_host h '; ! $query.='WHERE r.service_id=? '; ! $query.='AND r.service_id=s.service_id '; ! $query.='AND s.host_id=h.host_id '; ! $query.='AND r.ctime BETWEEN ? AND ?'; $queryc=$query.' order by ctime asc'; $query.=' order by '.$sorts[0].' '.$sorts[1]; ! if(!$res=$db->Execute($query,array($service_id,$from,$to))) { ! echo "SQL-Error in query $query : ".$db->ErrorMsg(); ! } $ret=array(); $ret['count']=0; *************** *** 667,671 **** $ret['statesummtime']=array(0,0,0,0); ! $res=$db->Execute($queryc,array($host_name,$service,$from,$to)); while($r=$res->FetchRow()) { $utime=mktime_YmdHM($r['ctime']); --- 677,681 ---- $ret['statesummtime']=array(0,0,0,0); ! $res=$db->Execute($queryc,array($service_id,$from,$to)); while($r=$res->FetchRow()) { $utime=mktime_YmdHM($r['ctime']); Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** perfparse.php 5 Jun 2007 22:46:59 -0000 1.47 --- perfparse.php 6 Jun 2007 13:08:31 -0000 1.48 *************** *** 383,387 **** case 'raw_history_summary': get_request_var('type','int',0); - get_request_var('host_name','string',''); get_request_var('service_id','string',''); get_request_var('timerange','char','r'); --- 383,386 ---- *************** *** 390,404 **** get_request_var('from','string',strftime('%Y-%m-%d %H:%M',time()-7*86400)); get_request_var('to','string',strftime('%Y-%m-%d %H:%M',time())); ! $service=get_servicename_from_id($db,$service_id); $smarty->assign('service',$service); if($timerange=='r') { ! $from=rel_to_abs_timerange($relativedays,$relativetime); $to=strftime('%Y-%m-%d %H:%M',time()); ! $smarty->assign('from',$from); ! $smarty->assign('to',$to); } // get data to display in table ! $raw_hist=get_raw_history($db,$host_name,$service,$from,$to,$type); // echo "<pre>";print_r($raw_hist);echo "</pre>"; $smarty->assign_by_ref('raw_hist',$raw_hist); --- 389,406 ---- get_request_var('from','string',strftime('%Y-%m-%d %H:%M',time()-7*86400)); get_request_var('to','string',strftime('%Y-%m-%d %H:%M',time())); ! $service_info=get_info_from_service_id($db,$service_id); ! $service=$service_info['service_description']; ! $host_name=$service_info['host_name']; $smarty->assign('service',$service); + $smarty->assign('host_name',$host_name); if($timerange=='r') { ! $from=rel_to_abs_timerange($relativedays,$relativetime); $to=strftime('%Y-%m-%d %H:%M',time()); ! $smarty->assign('from',$from); ! $smarty->assign('to',$to); } // get data to display in table ! $raw_hist=get_raw_history($db,$service_id,$from,$to,$type); // echo "<pre>";print_r($raw_hist);echo "</pre>"; $smarty->assign_by_ref('raw_hist',$raw_hist); |
|
From: Florian G. <re...@us...> - 2007-06-06 13:08:32
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527/modules Modified Files: storage_mysql.c Log Message: continue work on DB conversion and php gui. Index: storage_mysql.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** storage_mysql.c 6 Jun 2007 09:53:14 -0000 1.13 --- storage_mysql.c 6 Jun 2007 13:08:31 -0000 1.14 *************** *** 580,584 **** g_string_printf(s_SQL, "INSERT INTO perfdata_service_raw (service_id, ctime, txt_data, nagios_status) VALUES (%d", iServiceID); ! g_string_append_printf(s_SQL, ",FROM_UNIXTIME(%ld)", data->time); g_string_append_printf(s_SQL, ",'%s'", --- 580,584 ---- g_string_printf(s_SQL, "INSERT INTO perfdata_service_raw (service_id, ctime, txt_data, nagios_status) VALUES (%d", iServiceID); ! g_string_append_printf(s_SQL, ",%ld", data->time); g_string_append_printf(s_SQL, ",'%s'", |
|
From: Florian G. <re...@us...> - 2007-06-06 09:53:16
|
Update of /cvsroot/perfparse/_perfparse/libpp_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29306/libpp_common Modified Files: clean_tools.c libpp_common.h log.c Log Message: enhance error logging Index: log.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/log.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** log.c 24 Aug 2006 14:36:45 -0000 1.2 --- log.c 6 Jun 2007 09:53:14 -0000 1.3 *************** *** 3,7 **** * log.c - API to the config file used by PerfParse suit. * ! * Copyright (c) 2004 Yves Mettier <yme...@li...> * * $Id$ --- 3,8 ---- * log.c - API to the config file used by PerfParse suit. * ! * Copyright (c) 2004-2007 Yves Mettier <yme...@li...> ! * Florian Gleixner * * $Id$ *************** *** 66,70 **** ! int pp_log (char *file, int line, char *fmt, ...) { va_list args; --- 67,71 ---- ! int pp_log (char *file, int line, int severity, char *fmt, ...) { va_list args; *************** *** 141,146 **** fd = log_file_fopen(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG), t,config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)); if(!fd) fd = stderr; #ifdef LOG_DEBUG_INFORMATION ! fprintf(fd, "%s [%12s:%-5d %-6ld] %s\n", log_date, file, line, (long)getpid(), message); #else fprintf(fd, "%s [pid %-6ld] %s\n", log_date, (long)getpid(), message); --- 142,148 ---- fd = log_file_fopen(config_get_value_as_string(CONFIG_ITEM_ID_ERROR_LOG), t,config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)); if(!fd) fd = stderr; + // todo: add option for severity in config #ifdef LOG_DEBUG_INFORMATION ! fprintf(fd, "%s [%12s:%-5d Pid: %-6ld severity: %d ] %s\n", log_date, file, line, (long)getpid(), severity, message); #else fprintf(fd, "%s [pid %-6ld] %s\n", log_date, (long)getpid(), message); Index: libpp_common.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/libpp_common.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** libpp_common.h 24 Aug 2006 14:36:45 -0000 1.5 --- libpp_common.h 6 Jun 2007 09:53:14 -0000 1.6 *************** *** 3,7 **** * libpp_common.h - API to the config file used by PerfParse suit. * ! * Copyright (c) 2004 Yves Mettier <yme...@li...> * * $Id$ --- 3,8 ---- * libpp_common.h - API to the config file used by PerfParse suit. * ! * Copyright (c) 2004-2007 Yves Mettier <yme...@li...> ! * Florian Gleixner * * $Id$ *************** *** 52,57 **** #define CONFIG_FILE "perfparse.cfg" FILE* log_file_fopen(char*name, time_t tm, int rotate); ! int pp_log (char *file, int line, char *fmt, ...); extern char *pp_log_file; extern int pp_log_count; --- 53,65 ---- #define CONFIG_FILE "perfparse.cfg" + #define LOG_DEBUG 10 + #define LOG_INFO 4 + #define LOG_WARNING 3 + #define LOG_ERROR 2 + #define LOG_CRITICAL 1 + #define LOG_FATAL 1 + FILE* log_file_fopen(char*name, time_t tm, int rotate); ! int pp_log (char *file, int line, int severity, char *fmt, ...); extern char *pp_log_file; extern int pp_log_count; Index: clean_tools.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/clean_tools.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** clean_tools.c 28 Oct 2006 19:52:29 -0000 1.3 --- clean_tools.c 6 Jun 2007 09:53:14 -0000 1.4 *************** *** 3,7 **** * clean_tools.c - Logfile compression/rotation. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * * $Id$ --- 3,8 ---- * clean_tools.c - Logfile compression/rotation. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner * * $Id$ *************** *** 49,53 **** if(-1 == (fd = open(name, O_RDONLY))) { ! pp_log(__FILE__,__LINE__, _("Could not open file '%s'"), name); l = -1; } else { --- 50,54 ---- if(-1 == (fd = open(name, O_RDONLY))) { ! pp_log(__FILE__,__LINE__,LOG_WARNING, _("Could not open file '%s'"), name); l = -1; } else { *************** *** 65,74 **** unlink(name); } else if(l == -1) { ! pp_log(__FILE__,__LINE__, _("An error occured while reading file '%s' (%s)"), name, strerror(errno)); unlink(name_gz); } else if(l == -2) { ! pp_log(__FILE__,__LINE__, _("An error occured while writing file '%s'"), name_gz); } else { ! pp_log(__FILE__,__LINE__, _("An error occured while compressing file '%s'. This should not occur. This is a bug. Please report it to the development team. (l=%d)"), name_gz,l); l = -3; } --- 66,75 ---- unlink(name); } else if(l == -1) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("An error occured while reading file '%s' (%s)"), name, strerror(errno)); unlink(name_gz); } else if(l == -2) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("An error occured while writing file '%s'"), name_gz); } else { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("An error occured while compressing file '%s'. This should not occur. This is a bug. Please report it to the development team. (l=%d)"), name_gz,l); l = -3; } *************** *** 100,104 **** if(NULL == (dh = opendir(path))) { ! pp_log(__FILE__,__LINE__, _("Could not open directory '%s'"), path); return(-1); } --- 101,105 ---- if(NULL == (dh = opendir(path))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not open directory '%s'"), path); return(-1); } |
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29306/perfparse Modified Files: log_reader.c perfparse-common.c perfparse-log2any.c perfparsed.c server_parser.c storage.c storage_history.c Log Message: enhance error logging Index: server_parser.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/server_parser.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** server_parser.c 23 Dec 2006 00:03:46 -0000 1.2 --- server_parser.c 6 Jun 2007 09:53:14 -0000 1.3 *************** *** 3,7 **** * server_parser.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * $Id$ * --- 3,9 ---- * server_parser.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * * $Id$ * *************** *** 222,226 **** if(tm_start <= 0) tm_start += tm_end; switch((pid=fork())) { ! case -1: pp_log(__FILE__,__LINE__,_("Could not fork")); exit(EXIT_FAILURE); case 0: line = history_get_lines_first(tm_start,tm_end,str[0],str[1],str[2]); --- 224,228 ---- if(tm_start <= 0) tm_start += tm_end; switch((pid=fork())) { ! case -1: pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not fork")); exit(EXIT_FAILURE); case 0: line = history_get_lines_first(tm_start,tm_end,str[0],str[1],str[2]); Index: perfparsed.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/perfparsed.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** perfparsed.c 23 Dec 2006 00:03:46 -0000 1.4 --- perfparsed.c 6 Jun 2007 09:53:14 -0000 1.5 *************** *** 3,7 **** * perfparsed.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * $Id$ * --- 3,9 ---- * perfparsed.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * * $Id$ * *************** *** 59,63 **** if (pid < 0) { ! pp_log(__FILE__,__LINE__, _("daemonize failed (fork problem : errno=%d msg=%s)"),errno,strerror(errno)); exit(EXIT_FAILURE); } --- 61,65 ---- if (pid < 0) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("daemonize failed (fork problem : errno=%d msg=%s)"),errno,strerror(errno)); exit(EXIT_FAILURE); } *************** *** 72,76 **** if (pid < 0) { ! pp_log(__FILE__,__LINE__, _("daemonize failed (fork problem : errno=%d msg=%s)"),errno,strerror(errno)); exit(EXIT_FAILURE); } --- 74,78 ---- if (pid < 0) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("daemonize failed (fork problem : errno=%d msg=%s)"),errno,strerror(errno)); exit(EXIT_FAILURE); } *************** *** 89,93 **** umask (022); if(0 != chdir (LOCALSTATEDIR)) { ! pp_log(__FILE__,__LINE__, _("daemonize failed (could not chdir('%s') : errno=%d msg=%s)"),LOCALSTATEDIR, errno,strerror(errno)); exit(EXIT_FAILURE); } --- 91,95 ---- umask (022); if(0 != chdir (LOCALSTATEDIR)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("daemonize failed (could not chdir('%s') : errno=%d msg=%s)"),LOCALSTATEDIR, errno,strerror(errno)); exit(EXIT_FAILURE); } *************** *** 107,114 **** pid = strtol(tmp,NULL,10); if((0 == pid) && (EINVAL == errno)) { ! pp_log(__FILE__,__LINE__, _("File '%s' is corrupted"),lock_file); exit (EXIT_FAILURE); } ! pp_log(__FILE__,__LINE__, _("Perfparsed already running with PID %d"),pid); exit (EXIT_SUCCESS); } --- 109,116 ---- pid = strtol(tmp,NULL,10); if((0 == pid) && (EINVAL == errno)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("File '%s' is corrupted"),lock_file); exit (EXIT_FAILURE); } ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Perfparsed already running with PID %d"),pid); exit (EXIT_SUCCESS); } *************** *** 165,173 **** if(!strcmp(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG),"-")) { ! pp_log(__FILE__,__LINE__,_("Stdin not authorized as the perf data input source")); exit(EXIT_FAILURE); } if(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG)[0] == '>') { ! pp_log(__FILE__,__LINE__,_("Client socket not authorized as the perf data input source")); exit(EXIT_FAILURE); } --- 167,175 ---- if(!strcmp(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG),"-")) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Stdin not authorized as the perf data input source")); exit(EXIT_FAILURE); } if(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG)[0] == '>') { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Client socket not authorized as the perf data input source")); exit(EXIT_FAILURE); } *************** *** 176,184 **** if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE) && (config_option == CONFIG_OPTION_NONE)) { daemonize(config_get_value_as_string(CONFIG_ITEM_ID_DAEMON_LOCK)); ! pp_log(__FILE__,__LINE__, _("Perfparsed successfully daemonized (pid=%ld)"),getpid()); } if(0 == storage_init(NULL)) { ! pp_log(__FILE__,__LINE__,_("No module was loaded. Check the Storage_Module_Load config option.")); exit(EXIT_FAILURE); } --- 178,186 ---- if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE) && (config_option == CONFIG_OPTION_NONE)) { daemonize(config_get_value_as_string(CONFIG_ITEM_ID_DAEMON_LOCK)); ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed successfully daemonized (pid=%ld)"),getpid()); } if(0 == storage_init(NULL)) { ! pp_log(__FILE__,__LINE__,LOG_WARNING,_("No module was loaded. Check the Storage_Module_Load config option.")); exit(EXIT_FAILURE); } *************** *** 201,205 **** service_log_source = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG); if(service_log_source[0] && (0 > (open_log_source(service_log_source)))) { ! pp_log(__FILE__,__LINE__,_("Could not open log source ('%s') configured in Service_Log"),service_log_source); exit(EXIT_FAILURE); } --- 203,207 ---- service_log_source = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG); if(service_log_source[0] && (0 > (open_log_source(service_log_source)))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not open log source ('%s') configured in Service_Log"),service_log_source); exit(EXIT_FAILURE); } *************** *** 243,247 **** break; default : ! pp_log(__FILE__,__LINE__,_("This is a bug. This code should never be executed")); } } --- 245,249 ---- break; default : ! pp_log(__FILE__,__LINE__,LOG_FATAL,_("This is a bug. This code should never be executed")); } } *************** *** 251,255 **** while(0 < waitpid(-1,NULL,WNOHANG)); } ! pp_log(__FILE__,__LINE__,_("This is a bug. This code should never be executed")); close_all_log_sources(); log_reader_remove_signal_handler(); --- 253,257 ---- while(0 < waitpid(-1,NULL,WNOHANG)); } ! pp_log(__FILE__,__LINE__,LOG_FATAL,_("This is a bug. This code should never be executed")); close_all_log_sources(); log_reader_remove_signal_handler(); Index: storage.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** storage.c 5 Jun 2007 22:46:59 -0000 1.4 --- storage.c 6 Jun 2007 09:53:14 -0000 1.5 *************** *** 3,7 **** * storage.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * * $Id$ --- 3,8 ---- * storage.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner * * $Id$ *************** *** 60,64 **** libpath = g_strdup_printf("%s/libpp_storage_%s." SHLIBEXT,config_get_value_as_string(CONFIG_ITEM_ID_STORAGE_MODULES_DIR),storage_name); if(NULL == (storage_module_handle = dlopen(libpath, RTLD_LAZY))) { ! pp_log(__FILE__,__LINE__, _("storage_%s module failed to load (msg='%s')\n"),storage_name, dlerror()); exit(EXIT_FAILURE); } --- 61,65 ---- libpath = g_strdup_printf("%s/libpp_storage_%s." SHLIBEXT,config_get_value_as_string(CONFIG_ITEM_ID_STORAGE_MODULES_DIR),storage_name); if(NULL == (storage_module_handle = dlopen(libpath, RTLD_LAZY))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("storage_%s module failed to load (msg='%s')\n"),storage_name, dlerror()); exit(EXIT_FAILURE); } *************** *** 67,71 **** storage_module_init_cb = dlsym(storage_module_handle, "storage_module_init"); if(NULL == storage_module_init_cb) { ! pp_log(__FILE__,__LINE__, _("storage_%s module failed to initialize\n"),storage_name); exit(EXIT_FAILURE); } --- 68,72 ---- storage_module_init_cb = dlsym(storage_module_handle, "storage_module_init"); if(NULL == storage_module_init_cb) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("storage_%s module failed to initialize\n"),storage_name); exit(EXIT_FAILURE); } *************** *** 73,77 **** sm_new = storage_module_init_cb(); if(NULL == sm_new) { ! pp_log(__FILE__,__LINE__, _("storage_%s module failed to initialize itself\n"),storage_name); exit(EXIT_FAILURE); } --- 74,78 ---- sm_new = storage_module_init_cb(); if(NULL == sm_new) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("storage_%s module failed to initialize itself\n"),storage_name); exit(EXIT_FAILURE); } *************** *** 79,83 **** if(NULL == (sme=malloc(sizeof(storage_module_element_t)))) { ! pp_log(__FILE__,__LINE__, _("Not enough memory (malloc failed)\n")); exit(EXIT_FAILURE); } --- 80,84 ---- if(NULL == (sme=malloc(sizeof(storage_module_element_t)))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Not enough memory (malloc failed)\n")); exit(EXIT_FAILURE); } *************** *** 94,98 **** storage_modules->prev = NULL; } ! pp_log(__FILE__,__LINE__, _("storage_%s module successfully loaded\n"),storage_name); } --- 95,99 ---- storage_modules->prev = NULL; } ! pp_log(__FILE__,__LINE__,LOG_INFO, _("storage_%s module successfully loaded\n"),storage_name); } *************** *** 173,177 **** int r = this->module->store_line(this->module,log_line); if(0 != r) { ! pp_log(__FILE__,__LINE__, _("Could not store a line with storage module '%s' (check permissions, connection parameters...)"), this->module->id); #ifdef PERFPARSED exit(EXIT_FAILURE); --- 174,178 ---- 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); *************** *** 211,215 **** } #ifdef PERFPARSED ! pp_log(__FILE__,__LINE__, _("Perfparsed stopped\n")); #endif } --- 212,216 ---- } #ifdef PERFPARSED ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed stopped\n")); #endif } *************** *** 258,262 **** switch(pid = fork()) { case -1: ! pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup cannot start (fork failed)\n")); break; case 0: --- 259,263 ---- switch(pid = fork()) { case -1: ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Perfparsed : periodic cleanup cannot start (fork failed)\n")); break; case 0: *************** *** 267,271 **** } } ! pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)) { /* Error log */ --- 268,272 ---- } } ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_ERROR_LOG_ROTATE)) { /* Error log */ *************** *** 273,277 **** 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__, _("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); --- 274,278 ---- 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); *************** *** 280,292 **** if(config_get_value_as_boolean(CONFIG_ITEM_ID_DROP_FILE_ROTATE)) { /* Drop file */ ! pp_log(__FILE__,__LINE__, _("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 */ for(this=storage_modules; this; this = this->next) { ! pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup of storage modules\n")); if(this->module->enabled && this->module->periodic_cleanup) this->module->periodic_cleanup(this->module); } ! pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup finished\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE)) { exit(EXIT_SUCCESS); --- 281,293 ---- 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 */ for(this=storage_modules; this; this = this->next) { ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup of storage modules\n")); if(this->module->enabled && this->module->periodic_cleanup) this->module->periodic_cleanup(this->module); } ! pp_log(__FILE__,__LINE__,LOG_INFO, _("Perfparsed : periodic cleanup finished\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE)) { exit(EXIT_SUCCESS); *************** *** 318,322 **** if(NULL == (fd = fopen(file,"w"))) { ! pp_log(__FILE__,__LINE__,_("Could not dump modules status\n")); return; } else { --- 319,323 ---- if(NULL == (fd = fopen(file,"w"))) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not dump modules status\n")); return; } else { Index: log_reader.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/log_reader.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** log_reader.c 13 Mar 2007 21:59:50 -0000 1.5 --- log_reader.c 6 Jun 2007 09:53:14 -0000 1.6 *************** *** 3,7 **** * log_reader.c - Reads Log from file, socket or pipe. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * $Id$ * --- 3,9 ---- * log_reader.c - Reads Log from file, socket or pipe. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * * $Id$ * *************** *** 91,99 **** switch(errno) { case EBADF: ! pp_log(__FILE__,__LINE__,_("fd is not a valid file descriptor or is not open for writing.")); exit(EXIT_FAILURE); break; default: ! pp_log(__FILE__,__LINE__,_("Unknown error!")); exit(EXIT_FAILURE); break; --- 93,101 ---- switch(errno) { case EBADF: ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("fd is not a valid file descriptor or is not open for writing.")); exit(EXIT_FAILURE); break; default: ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Unknown error!")); exit(EXIT_FAILURE); break; *************** *** 179,191 **** config_item_id_service_log_position_mark_path = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH); if(!strcmp(config_item_id_service_log_position_mark_path, "")) { ! pp_log(__FILE__,__LINE__, _("No position mark path was specified. Either disable saving the position or specify a mark path.")); exit(EXIT_FAILURE); } if(stat(config_item_id_service_log_position_mark_path, &buf)) { ! pp_log(__FILE__,__LINE__, _("Dir '%s' is not available (errno=%d; msg='%s')"), config_item_id_service_log_position_mark_path, errno, strerror(errno)); return(-1); } if(!(buf.st_mode & S_IFDIR)) { ! pp_log(__FILE__,__LINE__, _("Dir '%s' is not a directory"), config_item_id_service_log_position_mark_path); return(-1); } --- 181,193 ---- config_item_id_service_log_position_mark_path = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH); if(!strcmp(config_item_id_service_log_position_mark_path, "")) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("No position mark path was specified. Either disable saving the position or specify a mark path.")); exit(EXIT_FAILURE); } if(stat(config_item_id_service_log_position_mark_path, &buf)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Dir '%s' is not available (errno=%d; msg='%s')"), config_item_id_service_log_position_mark_path, errno, strerror(errno)); return(-1); } if(!(buf.st_mode & S_IFDIR)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Dir '%s' is not a directory"), config_item_id_service_log_position_mark_path); return(-1); } *************** *** 198,202 **** fd = fopen(config_item_id_service_log_position_mark_file, "r"); if(NULL == fd) { ! pp_log(__FILE__,__LINE__,_("Could not open '%s'"), config_item_id_service_log_position_mark_file); return(-1); } --- 200,204 ---- fd = fopen(config_item_id_service_log_position_mark_file, "r"); if(NULL == fd) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not open '%s'"), config_item_id_service_log_position_mark_file); return(-1); } *************** *** 208,212 **** log_fd[n]->file_pos = -1; fclose(fd); ! pp_log(__FILE__,__LINE__,_("Could not read log file position in '%s'"), config_item_id_service_log_position_mark_file); return(-1); } --- 210,214 ---- log_fd[n]->file_pos = -1; fclose(fd); ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not read log file position in '%s'"), config_item_id_service_log_position_mark_file); return(-1); } *************** *** 219,223 **** log_fd[n]->file_last_line_hash = -1; fclose(fd); ! pp_log(__FILE__,__LINE__,_("Could not read log line hash in '%s'"), config_item_id_service_log_position_mark_file); return(-1); } --- 221,225 ---- log_fd[n]->file_last_line_hash = -1; fclose(fd); ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not read log line hash in '%s'"), config_item_id_service_log_position_mark_file); return(-1); } *************** *** 238,250 **** config_item_id_service_log_position_mark_path = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH); if(!strcmp(config_item_id_service_log_position_mark_path, "")) { ! pp_log(__FILE__,__LINE__, _("No position mark path was specified. Either disable saving the position or specify a mark path.")); exit(EXIT_FAILURE); } if(stat(config_item_id_service_log_position_mark_path, &buf)) { ! pp_log(__FILE__,__LINE__, _("Dir '%s' is not available (errno=%d; msg='%s')"), config_item_id_service_log_position_mark_path, errno, strerror(errno)); return(-1); } if(!(buf.st_mode & S_IFDIR)) { ! pp_log(__FILE__,__LINE__, _("Dir '%s' is not a directory"), config_item_id_service_log_position_mark_path); return(-1); } --- 240,252 ---- config_item_id_service_log_position_mark_path = config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH); if(!strcmp(config_item_id_service_log_position_mark_path, "")) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("No position mark path was specified. Either disable saving the position or specify a mark path.")); exit(EXIT_FAILURE); } if(stat(config_item_id_service_log_position_mark_path, &buf)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Dir '%s' is not available (errno=%d; msg='%s')"), config_item_id_service_log_position_mark_path, errno, strerror(errno)); return(-1); } if(!(buf.st_mode & S_IFDIR)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Dir '%s' is not a directory"), config_item_id_service_log_position_mark_path); return(-1); } *************** *** 257,261 **** fd = fopen(config_item_id_service_log_position_mark_file, "w"); if(NULL == fd) { ! pp_log(__FILE__,__LINE__,_("Could not open '%s' for writing"), config_item_id_service_log_position_mark_file); return(-1); } --- 259,263 ---- fd = fopen(config_item_id_service_log_position_mark_file, "w"); if(NULL == fd) { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("Could not open '%s' for writing"), config_item_id_service_log_position_mark_file); return(-1); } *************** *** 279,287 **** log_fd_len +=5; log_fd = realloc(log_fd, (log_fd_len)*sizeof(log_fd_t*)); ! if(NULL == log_fd) { pp_log(__FILE__,__LINE__, _("Not enough memory")); exit(EXIT_FAILURE); } for(j=i; j<log_fd_len; j++) log_fd[j] = NULL; } log_fd[i] = malloc(sizeof(log_fd_t)); ! if(NULL == log_fd[i]) { pp_log(__FILE__,__LINE__, _("Not enough memory")); exit(EXIT_FAILURE); } log_fd[i]->buffer = g_string_new(""); --- 281,289 ---- log_fd_len +=5; log_fd = realloc(log_fd, (log_fd_len)*sizeof(log_fd_t*)); ! if(NULL == log_fd) { pp_log(__FILE__,__LINE__,LOG_ERROR, _("Not enough memory")); exit(EXIT_FAILURE); } for(j=i; j<log_fd_len; j++) log_fd[j] = NULL; } log_fd[i] = malloc(sizeof(log_fd_t)); ! if(NULL == log_fd[i]) { pp_log(__FILE__,__LINE__,LOG_ERROR, _("Not enough memory")); exit(EXIT_FAILURE); } log_fd[i]->buffer = g_string_new(""); *************** *** 311,315 **** if(NULL == p) { ! pp_log(__FILE__,__LINE__, _("Could not parse host:port server address ('%s')"), filename+1); free(host); return(-1); --- 313,317 ---- if(NULL == p) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not parse host:port server address ('%s')"), filename+1); free(host); return(-1); *************** *** 318,322 **** port = strtol(p+1,NULL,10); if(port <= 0) { ! pp_log(__FILE__,__LINE__, _("Could not parse host:port server address ('%s')"), filename+1); free(host); return(-1); --- 320,324 ---- port = strtol(p+1,NULL,10); if(port <= 0) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not parse host:port server address ('%s')"), filename+1); free(host); return(-1); *************** *** 327,331 **** if ((address = gethostbyname (host)) == NULL) { ! pp_log(__FILE__,__LINE__, _("Could not find host '%s'."), host); free(host); return(-1); --- 329,333 ---- if ((address = gethostbyname (host)) == NULL) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not find host '%s'."), host); free(host); return(-1); *************** *** 338,342 **** if ((log_fd[i]->fd = socket (AF_INET, SOCK_STREAM, 6)) == -1) { ! pp_log(__FILE__,__LINE__, _("Could not create a new socket to host '%s'."), host); free(host); log_fd[i]->fd = -1; --- 340,344 ---- if ((log_fd[i]->fd = socket (AF_INET, SOCK_STREAM, 6)) == -1) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not create a new socket to host '%s'."), host); free(host); log_fd[i]->fd = -1; *************** *** 348,352 **** if ((client_sockaddr_in = malloc (sizeof (struct sockaddr_in))) == NULL) { ! pp_log(__FILE__,__LINE__, _("Could not allocate memory for new socket to host '%s'."), host); free(host); log_fd[i]->fd = -1; --- 350,354 ---- if ((client_sockaddr_in = malloc (sizeof (struct sockaddr_in))) == NULL) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not allocate memory for new socket to host '%s'."), host); free(host); log_fd[i]->fd = -1; *************** *** 364,368 **** { free (client_sockaddr_in); ! pp_log(__FILE__,__LINE__, _("Could not connect the socket to the server '%s'."), host); free(host); log_fd[i]->fd = -1; --- 366,370 ---- { free (client_sockaddr_in); ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not connect the socket to the server '%s'."), host); free(host); log_fd[i]->fd = -1; *************** *** 384,392 **** log_fd[i]->fd = mkfifo(filename+1, 0660); if(0 != log_fd[i]->fd) { ! pp_log(__FILE__,__LINE__, _("Could not create fifo '%s'"), filename+1); return(-1); } } else if(!(buf.st_mode & S_IFIFO)) { ! pp_log(__FILE__,__LINE__, _("'%s' exists and is not a pipe"), filename+1); return(-1); } --- 386,394 ---- log_fd[i]->fd = mkfifo(filename+1, 0660); if(0 != log_fd[i]->fd) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not create fifo '%s'"), filename+1); return(-1); } } else if(!(buf.st_mode & S_IFIFO)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("'%s' exists and is not a pipe"), filename+1); return(-1); } *************** *** 394,398 **** log_fd[i]->fd = open(filename+1, O_RDWR); if(log_fd[i]->fd < 0 ) { ! pp_log(__FILE__,__LINE__, _("Could not open ('%s')"), filename+1); return(-1); } --- 396,400 ---- log_fd[i]->fd = open(filename+1, O_RDWR); if(log_fd[i]->fd < 0 ) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not open ('%s')"), filename+1); return(-1); } *************** *** 405,409 **** log_fd[i]->fd = open(filename, O_RDONLY); if(log_fd[i]->fd < 0 ) { ! pp_log(__FILE__,__LINE__, _("Could not open ('%s')"), filename); return(-1); } --- 407,411 ---- log_fd[i]->fd = open(filename, O_RDONLY); if(log_fd[i]->fd < 0 ) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not open ('%s')"), filename); return(-1); } *************** *** 426,432 **** lseek(log_fd[i]->fd,0,SEEK_SET); } else { ! #ifdef DEBUG ! pp_log(__FILE__, __LINE__, _("Start reading log file from file pos %d"), log_fd[i]->file_pos); ! #endif } g_string_free(buffer,TRUE); --- 428,432 ---- lseek(log_fd[i]->fd,0,SEEK_SET); } else { ! pp_log(__FILE__, __LINE__,LOG_INFO, _("Start reading log file from file pos %d"), log_fd[i]->file_pos); } g_string_free(buffer,TRUE); *************** *** 459,463 **** if ((log_fd[i]->fd = socket (PF_INET, SOCK_STREAM, 0)) < 0) { ! pp_log (__FILE__, __LINE__, _("Could not create socket")); exit (EXIT_FAILURE); } --- 459,463 ---- if ((log_fd[i]->fd = socket (PF_INET, SOCK_STREAM, 0)) < 0) { ! pp_log (__FILE__, __LINE__,LOG_ERROR, _("Could not create socket")); exit (EXIT_FAILURE); } *************** *** 471,480 **** if (bind (log_fd[i]->fd, (struct sockaddr *) &sockname, sizeof (struct sockaddr_in)) < 0) { ! pp_log (__FILE__, __LINE__, _("Failure on bind()")); exit (EXIT_FAILURE); } if (listen (log_fd[i]->fd, FD_SETSIZE) < 0) { /* Because we use select(), we can not accept more connections than FD_SET_SIZE */ ! pp_log (__FILE__, __LINE__, _("Failure on listen()")); exit (EXIT_FAILURE); } --- 471,480 ---- if (bind (log_fd[i]->fd, (struct sockaddr *) &sockname, sizeof (struct sockaddr_in)) < 0) { ! pp_log (__FILE__, __LINE__,LOG_ERROR, _("Failure on bind()")); exit (EXIT_FAILURE); } if (listen (log_fd[i]->fd, FD_SETSIZE) < 0) { /* Because we use select(), we can not accept more connections than FD_SET_SIZE */ ! pp_log (__FILE__, __LINE__,LOG_ERROR, _("Failure on listen()")); exit (EXIT_FAILURE); } *************** *** 577,581 **** } close_all_log_sources(); ! pp_log(__FILE__,__LINE__, _("Caught signal (%s)"),gettext(sigstr[sigstrid])); exit(EXIT_FAILURE); } --- 577,581 ---- } close_all_log_sources(); ! pp_log(__FILE__,__LINE__,LOG_WARNING, _("Caught signal (%s)"),gettext(sigstr[sigstrid])); exit(EXIT_FAILURE); } Index: storage_history.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage_history.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** storage_history.c 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- storage_history.c 6 Jun 2007 09:53:14 -0000 1.2 *************** *** 3,8 **** * storage_history.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) ! * Last Modified: 2004-10-27 * * License: --- 3,9 ---- * storage_history.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * Last Modified: $Id$ * * License: Index: perfparse-log2any.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/perfparse-log2any.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** perfparse-log2any.c 24 Aug 2006 15:27:36 -0000 1.3 --- perfparse-log2any.c 6 Jun 2007 09:53:14 -0000 1.4 *************** *** 3,7 **** * perfparse-log2any.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * * $Id$ --- 3,8 ---- * perfparse-log2any.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner * * $Id$ *************** *** 156,165 **** if(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG)[0] == '|') { ! pp_log(__FILE__,__LINE__,_("FIFO not authorized as the perf data input source")); exit(EXIT_FAILURE); } if(0 == storage_init(argv[0])) { ! pp_log(__FILE__,__LINE__,_("No module was loaded. Check the Storage_Module_Load config option.")); exit(EXIT_FAILURE); } --- 157,166 ---- if(config_get_value_as_string(CONFIG_ITEM_ID_SERVICE_LOG)[0] == '|') { ! pp_log(__FILE__,__LINE__,LOG_ERROR,_("FIFO not authorized as the perf data input source")); exit(EXIT_FAILURE); } if(0 == storage_init(argv[0])) { ! pp_log(__FILE__,__LINE__,LOG_WARNING,_("No module was loaded. Check the Storage_Module_Load config option.")); exit(EXIT_FAILURE); } Index: perfparse-common.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/perfparse-common.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** perfparse-common.c 24 Aug 2006 12:27:25 -0000 1.2 --- perfparse-common.c 6 Jun 2007 09:53:14 -0000 1.3 *************** *** 3,7 **** * perfparse-common.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) * * $Id$ --- 3,8 ---- * perfparse-common.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner * * $Id$ |
|
From: Florian G. <re...@us...> - 2007-06-06 09:53:16
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29306/modules Modified Files: storage_gnuplot.c storage_mysql.c storage_socket_output.c Log Message: enhance error logging Index: storage_socket_output.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_socket_output.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** storage_socket_output.c 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- storage_socket_output.c 6 Jun 2007 09:53:14 -0000 1.2 *************** *** 3,8 **** * storage_print.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004 Yves Mettier (yme...@li...) ! * Last Modified: 2004-09-01 * * License: --- 3,9 ---- * storage_print.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2004-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * Last Modified: $Id$ * * License: *************** *** 53,57 **** write(socket_id, "\n", 1); } else { ! pp_log(__FILE__,__LINE__, _("Socket not connected")); return(-1); } --- 54,58 ---- write(socket_id, "\n", 1); } else { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Socket not connected")); return(-1); } *************** *** 70,74 **** tmp = malloc(sizeof(char)*l); if(NULL == tmp) { ! pp_log(__FILE__,__LINE__, _("Not enough memory")); exit(EXIT_FAILURE); } --- 71,75 ---- tmp = malloc(sizeof(char)*l); if(NULL == tmp) { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Not enough memory")); exit(EXIT_FAILURE); } *************** *** 77,81 **** free(tmp); } else { ! pp_log(__FILE__,__LINE__, _("Socket not connected")); return(-1); } --- 78,82 ---- free(tmp); } else { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Socket not connected")); return(-1); } *************** *** 99,103 **** if(sig == SIGPIPE) { socket_close(); ! pp_log(__FILE__,__LINE__, _("Connection break (SIGPIPE caught)")); } } --- 100,104 ---- if(sig == SIGPIPE) { socket_close(); ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Connection break (SIGPIPE caught)")); } } *************** *** 125,129 **** if ((address = gethostbyname (host)) == NULL) { ! pp_log(__FILE__,__LINE__, _("Could not find host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; --- 126,130 ---- if ((address = gethostbyname (host)) == NULL) { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Could not find host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; *************** *** 137,141 **** if ((socket_id = socket (AF_INET, SOCK_STREAM, 6)) == -1) { ! pp_log(__FILE__,__LINE__, _("Could not create a new socket to host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; --- 138,142 ---- if ((socket_id = socket (AF_INET, SOCK_STREAM, 6)) == -1) { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Could not create a new socket to host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; *************** *** 147,151 **** if ((client_sockaddr_in = malloc (sizeof (struct sockaddr_in))) == NULL) { ! pp_log(__FILE__,__LINE__, _("Could not allocate memory for new socket to host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; --- 148,152 ---- if ((client_sockaddr_in = malloc (sizeof (struct sockaddr_in))) == NULL) { ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Could not allocate memory for new socket to host '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; *************** *** 170,174 **** { free (client_sockaddr_in); ! pp_log(__FILE__,__LINE__, _("Could not connect the socket to the server '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; --- 171,175 ---- { free (client_sockaddr_in); ! pp_log(__FILE__,__LINE__, LOG_ERROR,_("Could not connect the socket to the server '%s'. Plugin storage_socket_output disabled"), host); this->enabled=0; socket_id = -1; Index: storage_gnuplot.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_gnuplot.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** storage_gnuplot.c 26 Sep 2005 14:36:33 -0000 1.1.1.1 --- storage_gnuplot.c 6 Jun 2007 09:53:14 -0000 1.2 *************** *** 3,8 **** * storage_gnuplot.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2005 Yves Mettier (yme...@li...) ! * Last Modified: 2005-01-06 * * License: --- 3,9 ---- * storage_gnuplot.c - Parse Nagios data and store in relational database. * ! * Copyright (c) 2005-2007 Yves Mettier (yme...@li...) ! * Florian Gleixner ! * Last Modified: $Id$ * * License: *************** *** 68,72 **** char*filename = config_get_value_as_string(CONFIG_ITEM_ID_STORAGE_GNUPLOT_OUTPUT_FILE); if(! filename[0]) { ! pp_log(__FILE__,__LINE__, _("Empty file name for gnuplot output")); this->enabled = 0; return(-1); --- 69,73 ---- char*filename = config_get_value_as_string(CONFIG_ITEM_ID_STORAGE_GNUPLOT_OUTPUT_FILE); if(! filename[0]) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Empty file name for gnuplot output")); this->enabled = 0; return(-1); *************** *** 76,80 **** if(log_fd == NULL) { ! pp_log(__FILE__,__LINE__, _("Could not create file '%s' (errno=%s)"), filename,strerror(errno)); this->enabled = 0; return(-1); --- 77,81 ---- if(log_fd == NULL) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, _("Could not create file '%s' (errno=%s)"), filename,strerror(errno)); this->enabled = 0; return(-1); Index: storage_mysql.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** storage_mysql.c 1 Jun 2007 08:51:05 -0000 1.12 --- storage_mysql.c 6 Jun 2007 09:53:14 -0000 1.13 *************** *** 111,117 **** int storage_mysql_connect(struct storage_module_t *this) { ! if(NULL == this->params) {pp_log(__FILE__,__LINE__,_("Malloc failed")); exit(EXIT_FAILURE); } MYSQL_USER_PARAMS(this->params)->statistics = malloc(sizeof(mysql_statistics_t)); ! if(NULL == MYSQL_USER_PARAMS(this->params)->statistics) {pp_log(__FILE__,__LINE__,_("Malloc failed")); exit(EXIT_FAILURE); } MYSQL_USER_PARAMS(this->params)->statistics->iAddedHost = 0; MYSQL_USER_PARAMS(this->params)->statistics->iAddedService = 0; --- 111,117 ---- int storage_mysql_connect(struct storage_module_t *this) { ! if(NULL == this->params) {pp_log(__FILE__,__LINE__,LOG_ERROR,_("Malloc failed")); exit(EXIT_FAILURE); } MYSQL_USER_PARAMS(this->params)->statistics = malloc(sizeof(mysql_statistics_t)); ! if(NULL == MYSQL_USER_PARAMS(this->params)->statistics) {pp_log(__FILE__,__LINE__,LOG_ERROR,_("Malloc failed")); exit(EXIT_FAILURE); } MYSQL_USER_PARAMS(this->params)->statistics->iAddedHost = 0; MYSQL_USER_PARAMS(this->params)->statistics->iAddedService = 0; *************** *** 143,147 **** gchar *str = db_version_error(); this->enabled = 0; ! pp_log(__FILE__, __LINE__, "%s", str); g_free(str); exit(EXIT_FAILURE); --- 143,147 ---- gchar *str = db_version_error(); this->enabled = 0; ! pp_log(__FILE__, __LINE__,LOG_ERROR, "%s", str); g_free(str); exit(EXIT_FAILURE); |
|
From: Florian G. <re...@us...> - 2007-06-06 09:53:16
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29306/libpp_mysql Modified Files: dbms.c del_policy.c Log Message: enhance error logging Index: dbms.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/dbms.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dbms.c 9 Apr 2007 22:39:09 -0000 1.5 --- dbms.c 6 Jun 2007 09:53:14 -0000 1.6 *************** *** 86,90 **** void pp_mysql_default_sql_failure(char*f,int l, const char*str, const char *error) { ! pp_log(f,l,"%s (%s)",str,error); exit(EXIT_FAILURE); } --- 86,90 ---- void pp_mysql_default_sql_failure(char*f,int l, const char*str, const char *error) { ! pp_log(f,l,LOG_ERROR,"%s (%s)",str,error); exit(EXIT_FAILURE); } *************** *** 229,233 **** if(NULL == sql_failure) sql_failure = pp_mysql_default_sql_failure; if (!mysql_init (&db_mysql)) { ! pp_log(__FILE__,__LINE__, "Cannot initialise MySQL"); sql_failure(__FILE__, __LINE__, "CONNECT", "Cannot initialise MySQL"); exit(EXIT_FAILURE); --- 229,233 ---- if(NULL == sql_failure) sql_failure = pp_mysql_default_sql_failure; if (!mysql_init (&db_mysql)) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, "Cannot initialise MySQL"); sql_failure(__FILE__, __LINE__, "CONNECT", "Cannot initialise MySQL"); exit(EXIT_FAILURE); *************** *** 266,270 **** if (bTerminate) { ! pp_log(__FILE__,__LINE__, "Error %s: %s", s_SQL->str, mysql_error(&db_mysql)); sql_failure(__FILE__, __LINE__, s_SQL->str, mysql_error(&db_mysql)); exit(EXIT_FAILURE); --- 266,270 ---- if (bTerminate) { ! pp_log(__FILE__,__LINE__,LOG_ERROR, "Error %s: %s", s_SQL->str, mysql_error(&db_mysql)); sql_failure(__FILE__, __LINE__, s_SQL->str, mysql_error(&db_mysql)); exit(EXIT_FAILURE); Index: del_policy.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** del_policy.c 23 Dec 2006 00:03:46 -0000 1.2 --- del_policy.c 6 Jun 2007 09:53:14 -0000 1.3 *************** *** 243,247 **** /* FIXME: used to be a call to fail() */ ! pp_log(__FILE__,__LINE__, "Unknown template type '%d' requested.", iType); exit(EXIT_FAILURE); --- 243,247 ---- /* FIXME: used to be a call to fail() */ ! pp_log(__FILE__,__LINE__, LOG_ERROR,"Unknown template type '%d' requested.", iType); exit(EXIT_FAILURE); *************** *** 255,259 **** /* FIXME: used to be a call to fail() */ ! pp_log(__FILE__,__LINE__, "Unknown template type '%s' requested.", sIn); exit(EXIT_FAILURE); } --- 255,259 ---- /* FIXME: used to be a call to fail() */ ! pp_log(__FILE__,__LINE__, LOG_ERROR,"Unknown template type '%s' requested.", sIn); exit(EXIT_FAILURE); } |
|
From: Florian G. <re...@us...> - 2007-06-05 22:47:00
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10151/perfparse Modified Files: storage.c Log Message: continue database conversion Index: storage.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/storage.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** storage.c 23 Dec 2006 00:03:46 -0000 1.3 --- storage.c 5 Jun 2007 22:46:59 -0000 1.4 *************** *** 273,277 **** 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)); ! 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); g_free(pattern); --- 273,278 ---- 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__, _("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); g_free(pattern); *************** *** 279,288 **** --- 280,292 ---- if(config_get_value_as_boolean(CONFIG_ITEM_ID_DROP_FILE_ROTATE)) { /* Drop file */ + pp_log(__FILE__,__LINE__, _("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 */ for(this=storage_modules; this; this = this->next) { + pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup of storage modules\n")); if(this->module->enabled && this->module->periodic_cleanup) this->module->periodic_cleanup(this->module); } + pp_log(__FILE__,__LINE__, _("Perfparsed : periodic cleanup finished\n")); if(config_get_value_as_boolean(CONFIG_ITEM_ID_DAEMONIZE)) { exit(EXIT_SUCCESS); |
|
From: Florian G. <re...@us...> - 2007-06-05 22:47:00
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10151/phpgui/templates Modified Files: all_raw.tpl.html Log Message: continue database conversion Index: all_raw.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_raw.tpl.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** all_raw.tpl.html 5 Mar 2007 10:59:46 -0000 1.8 --- all_raw.tpl.html 5 Jun 2007 22:46:59 -0000 1.9 *************** *** 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_name==$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 >=0}> <table width="100%" border=1 cellspacing=0 cellpadding=2> <tr> |
|
From: Florian G. <re...@us...> - 2007-06-05 22:47:00
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10151/phpgui Modified Files: perfparse.php utils.php Log Message: continue database conversion Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** utils.php 1 Jun 2007 10:54:04 -0000 1.35 --- utils.php 5 Jun 2007 22:46:59 -0000 1.36 *************** *** 339,342 **** --- 339,343 ---- 'service_description_url' => $t['service_description'], 'metric' => $t['metric'], + 'metric_id' => $t['metric_id'], 'ctime' => $t['ctime'], 'value' => $t['value'], *************** *** 365,369 **** } ! function get_group_raw(&$db,$group,$sort,$normal,$warning,$critical,$unknown) { $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); // sort order. set default sort order to escape maicious input --- 366,370 ---- } ! function get_group_raw(&$db,$group_id,$sort,$normal,$warning,$critical,$unknown) { $statearray=array('OK','WARNING','CRITICAL','UNKNOWN'); // sort order. set default sort order to escape maicious input *************** *** 377,386 **** } ! $query ='SELECT h.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id '; ! $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h, perfdata_host_groups hg, perfdata_groups g '; ! $query.='WHERE g.group_name=? and g.group_id=hg.group_id and hg.host_id=h.host_id and h.host_id=s.host_id and r.id = s.last_perfdata_raw'; ! $bindvars=array($group); if($normal==false || $warning==false || $critical==false || $unknown==false) { ! $query.='AND nagios_status in ('; $interieur=array(); if($normal==true) {$interieur[]='?'; $bindvars[]=0;} --- 378,395 ---- } ! if($group_id>0) { ! $query ='SELECT h.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id '; ! $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h, perfdata_host_groups hg, perfdata_groups g '; ! $query.='WHERE hg.group_id=? and g.group_id=hg.group_id and hg.host_id=h.host_id and h.host_id=s.host_id and r.id = s.last_perfdata_raw'; ! $bindvars=array($group_id); ! } else { ! $query ='SELECT h.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id '; ! $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h '; ! $query.='WHERE h.host_id=s.host_id and r.id = s.last_perfdata_raw'; ! $bindvars=array(); ! } ! if($normal==false || $warning==false || $critical==false || $unknown==false) { ! $query.=' AND nagios_status in ('; $interieur=array(); if($normal==true) {$interieur[]='?'; $bindvars[]=0;} *************** *** 391,395 **** } ! $query.='order by '.$sorts[0].' '.$sorts[1]; $res=$db->Execute($query,$bindvars); $ret=array(); --- 400,406 ---- } ! $query.=' order by '.$sorts[0].' '.$sorts[1]; ! // print($query); ! $res=$db->Execute($query,$bindvars); $ret=array(); Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** perfparse.php 1 Jun 2007 10:54:03 -0000 1.46 --- perfparse.php 5 Jun 2007 22:46:59 -0000 1.47 *************** *** 374,378 **** $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); $smarty->assign_by_ref('groupraw',$groupraw); } --- 374,378 ---- $smarty->assign_by_ref('groupmetrics',$groupmetrics); // todo: continue here db schema conversion } else { ! $groupraw=get_group_raw($db,$group_id,$sort,$normal,$warning,$critical,$unknown); $smarty->assign_by_ref('groupraw',$groupraw); } |
|
From: Florian G. <re...@us...> - 2007-06-05 20:16:26
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18937 Modified Files: configure.ac Log Message: remove old cgis in configure script Index: configure.ac =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure.ac,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.ac 15 Apr 2007 23:39:52 -0000 1.24 --- configure.ac 5 Jun 2007 20:16:26 -0000 1.25 *************** *** 480,486 **** echo echo 'WARNING WARNING WARNING WARNING WARNING WARNING WARNING' ! echo 'Perfparse CGI is now perfparse.cgi.' echo 'If you have upgrading, the development team suggests' ! echo 'that you remove your old perfgraph.cgi to avoid' echo 'any confusion.' echo --- 480,486 ---- echo echo 'WARNING WARNING WARNING WARNING WARNING WARNING WARNING' ! echo 'Perfparse CGI has been replaced by a PHP webinterface.' echo 'If you have upgrading, the development team suggests' ! echo 'that you remove your old cgi files to avoid' echo 'any confusion.' echo |
|
From: Florian G. <re...@us...> - 2007-06-01 10:54:04
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11048 Modified Files: perfparse.php utils.php Log Message: fix workflow in edit policies and made schema changes in utils working Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** utils.php 22 Feb 2007 16:26:54 -0000 1.34 --- utils.php 1 Jun 2007 10:54:04 -0000 1.35 *************** *** 377,384 **** } ! $query ='SELECT s.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id '; ! $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h '; ! $query.='WHERE r.id = s.last_perfdata_raw AND s.host_name = h.host_name '; ! $query.='AND h.group_name=? '; $bindvars=array($group); if($normal==false || $warning==false || $critical==false || $unknown==false) { --- 377,383 ---- } ! $query ='SELECT h.host_name, s.service_description, r.ctime, r.txt_data, nagios_status, s.service_id '; ! $query.='FROM perfdata_service s, perfdata_service_raw r, perfdata_host h, perfdata_host_groups hg, perfdata_groups g '; ! $query.='WHERE g.group_name=? and g.group_id=hg.group_id and hg.host_id=h.host_id and h.host_id=s.host_id and r.id = s.last_perfdata_raw'; $bindvars=array($group); if($normal==false || $warning==false || $critical==false || $unknown==false) { *************** *** 424,427 **** --- 423,427 ---- die(); } + // echo "<pre>"; print_r($ret); echo "</pre>"; return($ret); } Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** perfparse.php 29 Dec 2006 23:19:24 -0000 1.45 --- perfparse.php 1 Jun 2007 10:54:03 -0000 1.46 *************** *** 520,523 **** --- 520,524 ---- $smarty->assign('sql_error',$db->ErrorMsg()); } + $smarty->assign('edit_policy',false); // switch to create policy after editing } else { // policy was created |
|
From: Florian G. <re...@us...> - 2007-06-01 08:51:05
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28012/cgi Modified Files: perfchart.c Log Message: ctime is now a unix timestamp Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** perfchart.c 31 May 2007 14:58:31 -0000 1.10 --- perfchart.c 1 Jun 2007 08:51:05 -0000 1.11 *************** *** 359,363 **** #ifdef USE_DB_MYSQL ! g_string_printf(s_SQL, "SELECT UNIX_TIMESTAMP(ctime), value, warn, critical FROM perfdata_service_bin WHERE metric_id = %d", sMetricId); #elif defined USE_DB_POSTGRESQL --- 359,363 ---- #ifdef USE_DB_MYSQL ! g_string_printf(s_SQL, "SELECT ctime, value, warn, critical FROM perfdata_service_bin WHERE metric_id = %d", sMetricId); #elif defined USE_DB_POSTGRESQL *************** *** 365,370 **** sMetricId); #endif ! g_string_append_printf(s_SQL, " AND ctime BETWEEN '%s' AND '%s' ORDER BY ctime", ! sFrom, sTo); /* Note:- Not using standard cursor. That loads everything into memory, too heavey. */ --- 365,370 ---- sMetricId); #endif ! g_string_append_printf(s_SQL, " AND ctime BETWEEN %ld AND %ld ORDER BY ctime", ! tFrom, tTo); /* Note:- Not using standard cursor. That loads everything into memory, too heavey. */ |
|
From: Florian G. <re...@us...> - 2007-06-01 08:51:05
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28012/modules Modified Files: storage_mysql.c Log Message: ctime is now a unix timestamp Index: storage_mysql.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** storage_mysql.c 20 Dec 2006 22:57:47 -0000 1.11 --- storage_mysql.c 1 Jun 2007 08:51:05 -0000 1.12 *************** *** 5,9 **** * $Id$ * ! * Copyright (c) 2004 Ben Clewett * * License: --- 5,9 ---- * $Id$ * ! * Copyright (c) 2004-2007 Ben Clewett, Florian Gleixner * * License: *************** *** 660,664 **** g_string_printf(s_SQL, "INSERT INTO perfdata_service_bin (metric_id, ctime, value, warn, critical, state) VALUES (%d", iMetricID); ! g_string_append_printf(s_SQL, ", FROM_UNIXTIME(%ld), %s", data->time, getSafeD(perf->d[PERF_VALUE_VALUE])); --- 660,664 ---- g_string_printf(s_SQL, "INSERT INTO perfdata_service_bin (metric_id, ctime, value, warn, critical, state) VALUES (%d", iMetricID); ! g_string_append_printf(s_SQL, ", %ld, %s", data->time, getSafeD(perf->d[PERF_VALUE_VALUE])); |
|
From: Florian G. <re...@us...> - 2007-05-31 14:58:32
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11190 Modified Files: ChangeLog Log Message: Fixed bug where part of the grid is painted on the border. Index: ChangeLog =================================================================== RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ChangeLog 13 Mar 2007 21:59:49 -0000 1.17 --- ChangeLog 31 May 2007 14:58:31 -0000 1.18 *************** *** 1,3 **** --- 1,4 ---- Version 0.106.2 + 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) Image link corrected in "Read Nagios config" (Cedric Temple) |
|
From: Florian G. <re...@us...> - 2007-05-31 14:58:32
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11190/cgi Modified Files: perfchart.c Log Message: Fixed bug where part of the grid is painted on the border. Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** perfchart.c 27 Apr 2007 21:20:06 -0000 1.9 --- perfchart.c 31 May 2007 14:58:31 -0000 1.10 *************** *** 3,7 **** * perfchart.c - Displays graphs of data. * ! * Copyright (c) 2004 Ben Clewett * * $Id$ --- 3,7 ---- * perfchart.c - Displays graphs of data. * ! * Copyright (c) 2004-2007 Ben Clewett, Florian Gleixner * * $Id$ *************** *** 1010,1014 **** for (t = tFromMidnight + (3600 * 24); t <= tTo; t += (3600 * 24)) { x = xTranslate(t); ! gdImageLine(graph, x, iBorder, x, iHeight - iBotBorder - 1, grey2); } --- 1010,1015 ---- for (t = tFromMidnight + (3600 * 24); t <= tTo; t += (3600 * 24)) { x = xTranslate(t); ! if (x > iBorder * 2) ! gdImageLine(graph, x, iBorder, x, iHeight - iBotBorder - 1, grey2); } |
|
From: Cedric T. <ced...@us...> - 2007-05-29 10:04:28
|
Update of /cvsroot/perfparse/_perfparse-phpgui/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2546/phpgui/lang Modified Files: fr.php Log Message: French translation Index: fr.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/lang/fr.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fr.php 5 Mar 2007 10:59:47 -0000 1.1 --- fr.php 29 May 2007 10:04:16 -0000 1.2 *************** *** 1,4 **** --- 1,74 ---- <?php $language = array( + 'Raw Nagios Plugin Report' => 'Report sur les donné brutes Nagios', + 'Click to return to main menu' => 'Retour au menu principal', + 'Select Host Group' => 'Sélectionner le groupe', + 'Host' => 'Equipement', + 'Service' => 'Service', + 'Data Analysis Options' => 'Options d\'analyse des données', + 'Graph Binary Data' => 'Graphiques sur les données binaires', + 'View and Graph Binary Data' => 'Voir et grapher les données binaires', + 'Group' => 'Groupe', + 'View Raw Plugin Data' => 'Voir les données brutes', + 'View Stored Graphs' => 'Voir les graphiques enregistrés', + 'Administration' => 'Administration', + 'View / Edit Host Groups' => 'Voir / Editer les groupes', + 'View / Edit Host Groups List' => 'Voir / Editer la liste des groupes', + 'View / Edit Deletion Policy Templates'=> 'Voir / Editer les modèles de politique de purge', + 'View / Edit Hosts Deletion Policy'=> 'Voir / Editer les politiques de purge pour les équipements', + 'View / Edit Binary Data Deletion Policy'=> 'Voir / Editer les politiques de purge des données binaires', + 'View / Edit Raw Data Deletion Policy'=> 'Voir / Editer les politiques de purge des données brutes', + 'Read Nagios Configuration'=> 'Lire la configuration Nagios', + 'Select Host to Graph' => 'Sélectionner le host à tracer', + 'submit' => 'Valider', + 'All hosts of group' => 'Tous les hosts du groupe', + 'Select group' => 'Sélectionner le groupe', + 'Enter' => 'Entrer', + 'Options' => 'Options', + 'Show States' => 'Etats', + 'Normal' => 'Normal', + 'Warning' => 'Warning', + 'Critical' => 'Critical', + 'Unknown' => 'Unknown', + 'Refresh Time' => 'Rafraichissement', + 'Seconds' => 'Secondes', + 'Zero = Disabled' => 'Zero = Désactivé', + 'Save' => 'Sauvegarder', + 'Please select a Metric to Analyse' => 'électionner la métrique à analyser', + 'Graph' => 'Graphique', + 'Metric' => 'Métrique', + 'Last Reading' => 'Dernière information', + 'Value' => 'Valeur', + 'Unit' => 'Unité', + 'State' => 'Etat', + 'Stored Graphs' => 'Graphiques enregistrés', + 'ID' => 'ID', + 'Title' => 'Titre', + 'View' => 'Voir', + 'Add New Group' => 'Ajouter un groupe', + 'Groups' => 'Groupes', + 'Group Name' => 'Nom du groupe', + 'Host Count' => 'Nombre de hosts', + 'Delete' => 'Effacer', + 'Host List' => 'Liste des hosts', + 'Edit' => 'Editer', + 'Edit a Host Group List' => 'Edition d\'un groupe de host', + 'Return to main menu' => 'Retour au menu principal', + 'Edit Host Groups' => 'Modifier les groupes', + 'Selected group' => 'Groupe sélectionné', + 'Select another group' => 'Changer de groupe', + 'Add new Host to Group' => 'Ajouter un nouvel host au groupe', + 'Host Name' => 'Nom du host', + 'Remove' => 'Enlever', + 'Edit Delete Policies' => 'Edition des politiques de purge', + 'Create a delete policy template' => 'Création d\'une politique de purge', + 'Name' => 'Nom', + 'Comment' => 'Commentaire', + 'Days' => 'Jours', + 'Minutes' => 'Minutes', + 'Hours' => 'Heures', + 'Delete Policies List' => 'Liste des politiques de purge', + 'Policy Name' => 'Nom de la politique', + 'Read Nagios Config' => 'Lecture de la configuration Nagios', ); ?> |
|
From: Florian G. <re...@us...> - 2007-04-27 21:39:42
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21684 Modified Files: Makefile.am Makefile.in Log Message: drop old cgi Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 28 Mar 2007 22:54:27 -0000 1.19 --- Makefile.in 27 Apr 2007 21:39:41 -0000 1.20 *************** *** 63,71 **** CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = ! @USE_DB_MYSQL_TRUE@am__EXEEXT_1 = perfparse.cgi$(EXEEXT) \ ! @USE_DB_MYSQL_TRUE@ perfchart.png$(EXEEXT) \ @USE_DB_MYSQL_TRUE@ perfgant.png$(EXEEXT) ! @USE_DB_POSTGRESQL_TRUE@am__EXEEXT_2 = perfparse.cgi$(EXEEXT) \ ! @USE_DB_POSTGRESQL_TRUE@ perfchart.png$(EXEEXT) \ @USE_DB_POSTGRESQL_TRUE@ perfgant.png$(EXEEXT) am__installdirs = "$(DESTDIR)$(cgidir)" --- 63,69 ---- CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = ! @USE_DB_MYSQL_TRUE@am__EXEEXT_1 = perfchart.png$(EXEEXT) \ @USE_DB_MYSQL_TRUE@ perfgant.png$(EXEEXT) ! @USE_DB_POSTGRESQL_TRUE@am__EXEEXT_2 = perfchart.png$(EXEEXT) \ @USE_DB_POSTGRESQL_TRUE@ perfgant.png$(EXEEXT) am__installdirs = "$(DESTDIR)$(cgidir)" *************** *** 87,103 **** perfgant_png_DEPENDENCIES = $(am__DEPENDENCIES_4) \ $(am__DEPENDENCIES_1) - am_perfparse_cgi_OBJECTS = perfparse_cgi-perfgraph.$(OBJEXT) \ - perfparse_cgi-cgi.$(OBJEXT) \ - perfparse_cgi-cgi_bin_report.$(OBJEXT) \ - perfparse_cgi-cgi_del_policy.$(OBJEXT) \ - perfparse_cgi-cgi_bin_summary_policy.$(OBJEXT) \ - perfparse_cgi-cgi_graph.$(OBJEXT) \ - perfparse_cgi-cgi_host_groups.$(OBJEXT) \ - perfparse_cgi-cgi_intro.$(OBJEXT) \ - perfparse_cgi-cgi_raw_report.$(OBJEXT) \ - perfparse_cgi-cgi_select_object.$(OBJEXT) \ - perfparse_cgi-object_users.$(OBJEXT) - perfparse_cgi_OBJECTS = $(am_perfparse_cgi_OBJECTS) - perfparse_cgi_DEPENDENCIES = $(am__DEPENDENCIES_4) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp --- 85,88 ---- *************** *** 111,118 **** LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! SOURCES = $(perfchart_png_SOURCES) $(perfgant_png_SOURCES) \ ! $(perfparse_cgi_SOURCES) ! DIST_SOURCES = $(perfchart_png_SOURCES) $(perfgant_png_SOURCES) \ ! $(perfparse_cgi_SOURCES) ETAGS = etags CTAGS = ctags --- 96,101 ---- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! SOURCES = $(perfchart_png_SOURCES) $(perfgant_png_SOURCES) ! DIST_SOURCES = $(perfchart_png_SOURCES) $(perfgant_png_SOURCES) ETAGS = etags CTAGS = ctags *************** *** 289,296 **** target_os = @target_os@ target_vendor = @target_vendor@ ! @USE_DB_MYSQL_TRUE@MYSQL_CGI = perfparse.cgi perfchart.png perfgant.png @USE_DB_MYSQL_TRUE@USE_MYSQL_CFLAGS = ${MYSQL_CFLAGS} -I${top_srcdir}/libpp_mysql @USE_DB_MYSQL_TRUE@USE_MYSQL_LIBS = -L${top_builddir}/libpp_mysql -lpp_mysql ${MYSQL_LIBS} ! @USE_DB_POSTGRESQL_TRUE@POSTGRESQL_CGI = perfparse.cgi perfchart.png perfgant.png @USE_DB_POSTGRESQL_TRUE@USE_POSTGRESQL_CFLAGS = ${POSTGRESQL_CFLAGS} -I${top_srcdir}/libpp_postgresql @USE_DB_POSTGRESQL_TRUE@USE_POSTGRESQL_LIBS = -L${top_builddir}/libpp_postgresql -lpp_postgresql ${POSTGRESQL_LIBS} --- 272,279 ---- target_os = @target_os@ target_vendor = @target_vendor@ ! @USE_DB_MYSQL_TRUE@MYSQL_CGI = perfchart.png perfgant.png @USE_DB_MYSQL_TRUE@USE_MYSQL_CFLAGS = ${MYSQL_CFLAGS} -I${top_srcdir}/libpp_mysql @USE_DB_MYSQL_TRUE@USE_MYSQL_LIBS = -L${top_builddir}/libpp_mysql -lpp_mysql ${MYSQL_LIBS} ! @USE_DB_POSTGRESQL_TRUE@POSTGRESQL_CGI = perfchart.png perfgant.png @USE_DB_POSTGRESQL_TRUE@USE_POSTGRESQL_CFLAGS = ${POSTGRESQL_CFLAGS} -I${top_srcdir}/libpp_postgresql @USE_DB_POSTGRESQL_TRUE@USE_POSTGRESQL_LIBS = -L${top_builddir}/libpp_postgresql -lpp_postgresql ${POSTGRESQL_LIBS} *************** *** 298,312 **** CGI_LIBS = ${USE_MYSQL_LIBS} ${USE_POSTGRESQL_LIBS} -L${top_builddir}/libpp_common -lpp_common ${GLIB_LIBS} @LTLIBINTL@ perfparse_cgi_SOURCES = \ ! perfgraph.c perfgraph.h \ ! cgi.c cgi.h \ ! cgi_bin_report.c cgi_bin_report.h \ ! cgi_del_policy.c cgi_del_policy.h \ ! cgi_bin_summary_policy.c cgi_bin_summary_policy.h \ ! cgi_graph.c cgi_graph.h \ ! cgi_host_groups.c cgi_host_groups.h \ ! cgi_intro.c cgi_intro.h \ ! cgi_raw_report.c cgi_raw_report.h \ ! cgi_select_object.c cgi_select_object.h \ ! object_users.c object_users.h perfparse_cgi_LDADD = ${CGI_LIBS} --- 281,285 ---- CGI_LIBS = ${USE_MYSQL_LIBS} ${USE_POSTGRESQL_LIBS} -L${top_builddir}/libpp_common -lpp_common ${GLIB_LIBS} @LTLIBINTL@ perfparse_cgi_SOURCES = \ ! cgi.c cgi.h perfparse_cgi_LDADD = ${CGI_LIBS} *************** *** 385,391 **** @rm -f perfgant.png$(EXEEXT) $(LINK) $(perfgant_png_LDFLAGS) $(perfgant_png_OBJECTS) $(perfgant_png_LDADD) $(LIBS) - perfparse.cgi$(EXEEXT): $(perfparse_cgi_OBJECTS) $(perfparse_cgi_DEPENDENCIES) - @rm -f perfparse.cgi$(EXEEXT) - $(LINK) $(perfparse_cgi_LDFLAGS) $(perfparse_cgi_OBJECTS) $(perfparse_cgi_LDADD) $(LIBS) mostlyclean-compile: --- 358,361 ---- *************** *** 399,413 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfgant_png-cgi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfgant_png-perfgant.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_bin_report.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_del_policy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_graph.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_host_groups.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_intro.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_raw_report.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-cgi_select_object.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-object_users.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perfparse_cgi-perfgraph.Po@am__quote@ .c.o: --- 369,372 ---- *************** *** 488,645 **** @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfgant_png_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfgant_png-cgi.obj `if test -f 'cgi.c'; then $(CYGPATH_W) 'cgi.c'; else $(CYGPATH_W) '$(srcdir)/cgi.c'; fi` - perfparse_cgi-perfgraph.o: perfgraph.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-perfgraph.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo" -c -o perfparse_cgi-perfgraph.o `test -f 'perfgraph.c' || echo '$(srcdir)/'`perfgraph.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo" "$(DEPDIR)/perfparse_cgi-perfgraph.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='perfgraph.c' object='perfparse_cgi-perfgraph.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-perfgraph.o `test -f 'perfgraph.c' || echo '$(srcdir)/'`perfgraph.c - - perfparse_cgi-perfgraph.obj: perfgraph.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-perfgraph.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo" -c -o perfparse_cgi-perfgraph.obj `if test -f 'perfgraph.c'; then $(CYGPATH_W) 'perfgraph.c'; else $(CYGPATH_W) '$(srcdir)/perfgraph.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo" "$(DEPDIR)/perfparse_cgi-perfgraph.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-perfgraph.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='perfgraph.c' object='perfparse_cgi-perfgraph.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-perfgraph.obj `if test -f 'perfgraph.c'; then $(CYGPATH_W) 'perfgraph.c'; else $(CYGPATH_W) '$(srcdir)/perfgraph.c'; fi` - - perfparse_cgi-cgi.o: cgi.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi.Tpo" -c -o perfparse_cgi-cgi.o `test -f 'cgi.c' || echo '$(srcdir)/'`cgi.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi.Tpo" "$(DEPDIR)/perfparse_cgi-cgi.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi.c' object='perfparse_cgi-cgi.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi.o `test -f 'cgi.c' || echo '$(srcdir)/'`cgi.c - - perfparse_cgi-cgi.obj: cgi.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi.Tpo" -c -o perfparse_cgi-cgi.obj `if test -f 'cgi.c'; then $(CYGPATH_W) 'cgi.c'; else $(CYGPATH_W) '$(srcdir)/cgi.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi.Tpo" "$(DEPDIR)/perfparse_cgi-cgi.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi.c' object='perfparse_cgi-cgi.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi.obj `if test -f 'cgi.c'; then $(CYGPATH_W) 'cgi.c'; else $(CYGPATH_W) '$(srcdir)/cgi.c'; fi` - - perfparse_cgi-cgi_bin_report.o: cgi_bin_report.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_bin_report.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo" -c -o perfparse_cgi-cgi_bin_report.o `test -f 'cgi_bin_report.c' || echo '$(srcdir)/'`cgi_bin_report.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_bin_report.c' object='perfparse_cgi-cgi_bin_report.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_bin_report.o `test -f 'cgi_bin_report.c' || echo '$(srcdir)/'`cgi_bin_report.c - - perfparse_cgi-cgi_bin_report.obj: cgi_bin_report.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_bin_report.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo" -c -o perfparse_cgi-cgi_bin_report.obj `if test -f 'cgi_bin_report.c'; then $(CYGPATH_W) 'cgi_bin_report.c'; else $(CYGPATH_W) '$(srcdir)/cgi_bin_report.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_bin_report.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_bin_report.c' object='perfparse_cgi-cgi_bin_report.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_bin_report.obj `if test -f 'cgi_bin_report.c'; then $(CYGPATH_W) 'cgi_bin_report.c'; else $(CYGPATH_W) '$(srcdir)/cgi_bin_report.c'; fi` - - perfparse_cgi-cgi_del_policy.o: cgi_del_policy.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_del_policy.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo" -c -o perfparse_cgi-cgi_del_policy.o `test -f 'cgi_del_policy.c' || echo '$(srcdir)/'`cgi_del_policy.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_del_policy.c' object='perfparse_cgi-cgi_del_policy.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_del_policy.o `test -f 'cgi_del_policy.c' || echo '$(srcdir)/'`cgi_del_policy.c - - perfparse_cgi-cgi_del_policy.obj: cgi_del_policy.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_del_policy.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo" -c -o perfparse_cgi-cgi_del_policy.obj `if test -f 'cgi_del_policy.c'; then $(CYGPATH_W) 'cgi_del_policy.c'; else $(CYGPATH_W) '$(srcdir)/cgi_del_policy.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_del_policy.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_del_policy.c' object='perfparse_cgi-cgi_del_policy.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_del_policy.obj `if test -f 'cgi_del_policy.c'; then $(CYGPATH_W) 'cgi_del_policy.c'; else $(CYGPATH_W) '$(srcdir)/cgi_del_policy.c'; fi` - - perfparse_cgi-cgi_bin_summary_policy.o: cgi_bin_summary_policy.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_bin_summary_policy.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo" -c -o perfparse_cgi-cgi_bin_summary_policy.o `test -f 'cgi_bin_summary_policy.c' || echo '$(srcdir)/'`cgi_bin_summary_policy.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_bin_summary_policy.c' object='perfparse_cgi-cgi_bin_summary_policy.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_bin_summary_policy.o `test -f 'cgi_bin_summary_policy.c' || echo '$(srcdir)/'`cgi_bin_summary_policy.c - - perfparse_cgi-cgi_bin_summary_policy.obj: cgi_bin_summary_policy.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_bin_summary_policy.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo" -c -o perfparse_cgi-cgi_bin_summary_policy.obj `if test -f 'cgi_bin_summary_policy.c'; then $(CYGPATH_W) 'cgi_bin_summary_policy.c'; else $(CYGPATH_W) '$(srcdir)/cgi_bin_summary_policy.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_bin_summary_policy.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_bin_summary_policy.c' object='perfparse_cgi-cgi_bin_summary_policy.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_bin_summary_policy.obj `if test -f 'cgi_bin_summary_policy.c'; then $(CYGPATH_W) 'cgi_bin_summary_policy.c'; else $(CYGPATH_W) '$(srcdir)/cgi_bin_summary_policy.c'; fi` - - perfparse_cgi-cgi_graph.o: cgi_graph.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_graph.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo" -c -o perfparse_cgi-cgi_graph.o `test -f 'cgi_graph.c' || echo '$(srcdir)/'`cgi_graph.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_graph.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_graph.c' object='perfparse_cgi-cgi_graph.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_graph.o `test -f 'cgi_graph.c' || echo '$(srcdir)/'`cgi_graph.c - - perfparse_cgi-cgi_graph.obj: cgi_graph.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_graph.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo" -c -o perfparse_cgi-cgi_graph.obj `if test -f 'cgi_graph.c'; then $(CYGPATH_W) 'cgi_graph.c'; else $(CYGPATH_W) '$(srcdir)/cgi_graph.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_graph.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_graph.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_graph.c' object='perfparse_cgi-cgi_graph.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_graph.obj `if test -f 'cgi_graph.c'; then $(CYGPATH_W) 'cgi_graph.c'; else $(CYGPATH_W) '$(srcdir)/cgi_graph.c'; fi` - - perfparse_cgi-cgi_host_groups.o: cgi_host_groups.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_host_groups.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo" -c -o perfparse_cgi-cgi_host_groups.o `test -f 'cgi_host_groups.c' || echo '$(srcdir)/'`cgi_host_groups.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_host_groups.c' object='perfparse_cgi-cgi_host_groups.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_host_groups.o `test -f 'cgi_host_groups.c' || echo '$(srcdir)/'`cgi_host_groups.c - - perfparse_cgi-cgi_host_groups.obj: cgi_host_groups.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_host_groups.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo" -c -o perfparse_cgi-cgi_host_groups.obj `if test -f 'cgi_host_groups.c'; then $(CYGPATH_W) 'cgi_host_groups.c'; else $(CYGPATH_W) '$(srcdir)/cgi_host_groups.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_host_groups.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_host_groups.c' object='perfparse_cgi-cgi_host_groups.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_host_groups.obj `if test -f 'cgi_host_groups.c'; then $(CYGPATH_W) 'cgi_host_groups.c'; else $(CYGPATH_W) '$(srcdir)/cgi_host_groups.c'; fi` - - perfparse_cgi-cgi_intro.o: cgi_intro.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_intro.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo" -c -o perfparse_cgi-cgi_intro.o `test -f 'cgi_intro.c' || echo '$(srcdir)/'`cgi_intro.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_intro.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_intro.c' object='perfparse_cgi-cgi_intro.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_intro.o `test -f 'cgi_intro.c' || echo '$(srcdir)/'`cgi_intro.c - - perfparse_cgi-cgi_intro.obj: cgi_intro.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_intro.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo" -c -o perfparse_cgi-cgi_intro.obj `if test -f 'cgi_intro.c'; then $(CYGPATH_W) 'cgi_intro.c'; else $(CYGPATH_W) '$(srcdir)/cgi_intro.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_intro.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_intro.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_intro.c' object='perfparse_cgi-cgi_intro.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_intro.obj `if test -f 'cgi_intro.c'; then $(CYGPATH_W) 'cgi_intro.c'; else $(CYGPATH_W) '$(srcdir)/cgi_intro.c'; fi` - - perfparse_cgi-cgi_raw_report.o: cgi_raw_report.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_raw_report.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo" -c -o perfparse_cgi-cgi_raw_report.o `test -f 'cgi_raw_report.c' || echo '$(srcdir)/'`cgi_raw_report.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_raw_report.c' object='perfparse_cgi-cgi_raw_report.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_raw_report.o `test -f 'cgi_raw_report.c' || echo '$(srcdir)/'`cgi_raw_report.c - - perfparse_cgi-cgi_raw_report.obj: cgi_raw_report.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_raw_report.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo" -c -o perfparse_cgi-cgi_raw_report.obj `if test -f 'cgi_raw_report.c'; then $(CYGPATH_W) 'cgi_raw_report.c'; else $(CYGPATH_W) '$(srcdir)/cgi_raw_report.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_raw_report.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_raw_report.c' object='perfparse_cgi-cgi_raw_report.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_raw_report.obj `if test -f 'cgi_raw_report.c'; then $(CYGPATH_W) 'cgi_raw_report.c'; else $(CYGPATH_W) '$(srcdir)/cgi_raw_report.c'; fi` - - perfparse_cgi-cgi_select_object.o: cgi_select_object.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_select_object.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo" -c -o perfparse_cgi-cgi_select_object.o `test -f 'cgi_select_object.c' || echo '$(srcdir)/'`cgi_select_object.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_select_object.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_select_object.c' object='perfparse_cgi-cgi_select_object.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_select_object.o `test -f 'cgi_select_object.c' || echo '$(srcdir)/'`cgi_select_object.c - - perfparse_cgi-cgi_select_object.obj: cgi_select_object.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-cgi_select_object.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo" -c -o perfparse_cgi-cgi_select_object.obj `if test -f 'cgi_select_object.c'; then $(CYGPATH_W) 'cgi_select_object.c'; else $(CYGPATH_W) '$(srcdir)/cgi_select_object.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo" "$(DEPDIR)/perfparse_cgi-cgi_select_object.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-cgi_select_object.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cgi_select_object.c' object='perfparse_cgi-cgi_select_object.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-cgi_select_object.obj `if test -f 'cgi_select_object.c'; then $(CYGPATH_W) 'cgi_select_object.c'; else $(CYGPATH_W) '$(srcdir)/cgi_select_object.c'; fi` - - perfparse_cgi-object_users.o: object_users.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-object_users.o -MD -MP -MF "$(DEPDIR)/perfparse_cgi-object_users.Tpo" -c -o perfparse_cgi-object_users.o `test -f 'object_users.c' || echo '$(srcdir)/'`object_users.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-object_users.Tpo" "$(DEPDIR)/perfparse_cgi-object_users.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-object_users.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='object_users.c' object='perfparse_cgi-object_users.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-object_users.o `test -f 'object_users.c' || echo '$(srcdir)/'`object_users.c - - perfparse_cgi-object_users.obj: object_users.c - @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT perfparse_cgi-object_users.obj -MD -MP -MF "$(DEPDIR)/perfparse_cgi-object_users.Tpo" -c -o perfparse_cgi-object_users.obj `if test -f 'object_users.c'; then $(CYGPATH_W) 'object_users.c'; else $(CYGPATH_W) '$(srcdir)/object_users.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/perfparse_cgi-object_users.Tpo" "$(DEPDIR)/perfparse_cgi-object_users.Po"; else rm -f "$(DEPDIR)/perfparse_cgi-object_users.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='object_users.c' object='perfparse_cgi-object_users.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(perfparse_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o perfparse_cgi-object_users.obj `if test -f 'object_users.c'; then $(CYGPATH_W) 'object_users.c'; else $(CYGPATH_W) '$(srcdir)/object_users.c'; fi` - mostlyclean-libtool: -rm -f *.lo --- 447,450 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/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 27 Apr 2007 21:39:41 -0000 1.2 *************** *** 1,4 **** if USE_DB_MYSQL ! MYSQL_CGI = perfparse.cgi perfchart.png perfgant.png USE_MYSQL_CFLAGS=${MYSQL_CFLAGS} -I${top_srcdir}/libpp_mysql USE_MYSQL_LIBS=-L${top_builddir}/libpp_mysql -lpp_mysql ${MYSQL_LIBS} --- 1,4 ---- if USE_DB_MYSQL ! MYSQL_CGI = perfchart.png perfgant.png USE_MYSQL_CFLAGS=${MYSQL_CFLAGS} -I${top_srcdir}/libpp_mysql USE_MYSQL_LIBS=-L${top_builddir}/libpp_mysql -lpp_mysql ${MYSQL_LIBS} *************** *** 6,10 **** if USE_DB_POSTGRESQL ! POSTGRESQL_CGI = perfparse.cgi perfchart.png perfgant.png USE_POSTGRESQL_CFLAGS=${POSTGRESQL_CFLAGS} -I${top_srcdir}/libpp_postgresql USE_POSTGRESQL_LIBS=-L${top_builddir}/libpp_postgresql -lpp_postgresql ${POSTGRESQL_LIBS} --- 6,10 ---- if USE_DB_POSTGRESQL ! POSTGRESQL_CGI = perfchart.png perfgant.png USE_POSTGRESQL_CFLAGS=${POSTGRESQL_CFLAGS} -I${top_srcdir}/libpp_postgresql USE_POSTGRESQL_LIBS=-L${top_builddir}/libpp_postgresql -lpp_postgresql ${POSTGRESQL_LIBS} *************** *** 17,31 **** perfparse_cgi_SOURCES=\ ! perfgraph.c perfgraph.h \ ! cgi.c cgi.h \ ! cgi_bin_report.c cgi_bin_report.h \ ! cgi_del_policy.c cgi_del_policy.h \ ! cgi_bin_summary_policy.c cgi_bin_summary_policy.h \ ! cgi_graph.c cgi_graph.h \ ! cgi_host_groups.c cgi_host_groups.h \ ! cgi_intro.c cgi_intro.h \ ! cgi_raw_report.c cgi_raw_report.h \ ! cgi_select_object.c cgi_select_object.h \ ! object_users.c object_users.h perfparse_cgi_LDADD=${CGI_LIBS} --- 17,21 ---- perfparse_cgi_SOURCES=\ ! cgi.c cgi.h perfparse_cgi_LDADD=${CGI_LIBS} |
