Menu
▾
▴
perfparse-cvs — CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(19) |
Oct
(10) |
Nov
(14) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(5) |
Mar
(33) |
Apr
(31) |
May
(3) |
Jun
(30) |
Jul
(4) |
Aug
(26) |
Sep
(23) |
Oct
|
Nov
(6) |
Dec
(56) |
| 2008 |
Jan
(12) |
Feb
(9) |
Mar
(2) |
Apr
(8) |
May
(2) |
Jun
(3) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
|
Nov
(16) |
Dec
(4) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(36) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Florian G. <re...@us...> - 2006-12-16 00:00:51
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7850 Modified Files: storage_mysql.c Log Message: Fixed sql for database changes Index: storage_mysql.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** storage_mysql.c 24 Aug 2006 14:22:06 -0000 1.8 --- storage_mysql.c 16 Dec 2006 00:00:49 -0000 1.9 *************** *** 446,452 **** g_string_printf(s_SQL, ! "INSERT INTO perfdata_service (host_id, service_description, raw_delete_policy_type, service_id) VALUES ('%d'", iHostID); ! g_string_append_printf(s_SQL, ", '%s', 'host', %d)", sql_escape(sService,PERCENT_ESCAPE_CHAR), iTestService); query(s_SQL->str); --- 446,452 ---- g_string_printf(s_SQL, ! "INSERT INTO perfdata_service (host_id, service_description, service_id) VALUES ('%d'", iHostID); ! g_string_append_printf(s_SQL, ", '%s', %d)", sql_escape(sService,PERCENT_ESCAPE_CHAR), iTestService); query(s_SQL->str); *************** *** 512,520 **** iTestMetric++; ! g_string_printf(s_SQL, "INSERT INTO perfdata_service_metric (service_id, metric, unit, bin_delete_policy_type, metric_id) VALUES ('%d'", iServiceID); g_string_append_printf(s_SQL, ", '%s'", sql_escape(sMetric,PERCENT_ESCAPE_CHAR)); ! g_string_append_printf(s_SQL, ", '%s', 'host', %d)", sql_escape(sUnit,PERCENT_ESCAPE_CHAR), iTestMetric); query(s_SQL->str); --- 512,520 ---- iTestMetric++; ! g_string_printf(s_SQL, "INSERT INTO perfdata_service_metric (service_id, metric, unit, metric_id) VALUES ('%d'", iServiceID); g_string_append_printf(s_SQL, ", '%s'", sql_escape(sMetric,PERCENT_ESCAPE_CHAR)); ! g_string_append_printf(s_SQL, ", '%s', %d)", sql_escape(sUnit,PERCENT_ESCAPE_CHAR), iTestMetric); query(s_SQL->str); *************** *** 542,546 **** static int bResult; ! g_string_printf(s_SQL, "SELECT m.bin_delete_policy FROM perfdata_service_metric m, perfdata_service s, perfdata_host h WHERE h.host_id=s.host_id AND s.service_id = m.service_id and h.host_name='%s'", sql_escape(sHost, PERCENT_ESCAPE_CHAR)); g_string_append_printf(s_SQL, " AND s.service_description = '%s'", --- 542,546 ---- static int bResult; ! g_string_printf(s_SQL, "SELECT m.bin_delete_policy_individual, p.delete_policy_seconds FROM perfdata_service_metric m, perfdata_service s, perfdata_host h, perfdata_delete_policy p WHERE h.host_id=s.host_id AND s.service_id = m.service_id and m.bin_delete_policy_id=p.policy_id and h.host_name='%s'", sql_escape(sHost, PERCENT_ESCAPE_CHAR)); g_string_append_printf(s_SQL, " AND s.service_description = '%s'", *************** *** 912,917 **** } - - - - --- 912,913 ---- |
|
From: Florian G. <re...@us...> - 2006-12-12 23:44:21
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26324/db_tools Modified Files: convert.c convert.h Log Message: some db conversion work Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** convert.c 11 Dec 2006 23:44:48 -0000 1.10 --- convert.c 12 Dec 2006 23:44:18 -0000 1.11 *************** *** 141,157 **** if (version < 0.20) { ! int steps=5; ! printf (_("Warning, this stage may take some time:\n")); ! printf (_("[Step 1/%d] Creating new group table:\n"),steps); ! query ("create table perfdata_groups \ (group_id INT AUTO_INCREMENT PRIMARY KEY, \ group_name VARCHAR(75) UNIQUE) type=InnoDB \ select group_name from perfdata_host_group"); ! printf (_("[Step 2/%d] Dropping foreign key from perfdata_host to perfdata_host_group table.\n"),steps); ! DropForeignKey ("perfdata_host", "perfdata_host_group"); ! printf (_("[Step 3/%d] Dropping table perfdata_host_group\n"),steps); ! query ("drop table perfdata_host_group"); ! printf(_("[Step 4/%d] Creating group mapping table perfdata_host_groups\n"),steps); ! query ("CREATE TABLE IF NOT EXISTS perfdata_host_groups ( \ group_id INT, \ FOREIGN KEY perfdata_host_groups_ibfk_1 (group_id) \ --- 141,186 ---- if (version < 0.20) { ! int i_steps=20; ! int i=0; ! char *s_cont_step=getRegistry("dummy","pp/database/conversion_step",NULL); ! int i_cont_step=0; ! if(s_cont_step != NULL) { ! i_cont_step=atoi(s_cont_step); ! printf(_("Previous database conversion not complete. Continuing with step %d.\n"), ! i_cont_step); ! } ! ! if(i_cont_step < i_steps) { ! printf (_("Warning, this stage may take some time:\n")); ! } ! ! if(i_cont_step < i++) { ! ! printf (_("[Step %d/%d] Creating new group table:\n"),i,i_steps); ! query ("create table perfdata_groups \ (group_id INT AUTO_INCREMENT PRIMARY KEY, \ group_name VARCHAR(75) UNIQUE) type=InnoDB \ select group_name from perfdata_host_group"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf (_("[Step %d/%d] Dropping foreign key from perfdata_host to perfdata_host_group table.\n"),i,i_steps); ! if(!DropForeignKey ("perfdata_host", "perfdata_host_group")) { ! printf("Foreign Key not found!\nExiting.\n"); ! exit(1); ! } ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf (_("[Step %d/%d] Dropping table perfdata_host_group\n"),i,i_steps); ! query ("drop table perfdata_host_group"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Creating group mapping table perfdata_host_groups\n"),i,i_steps); ! query ("CREATE TABLE IF NOT EXISTS perfdata_host_groups ( \ group_id INT, \ FOREIGN KEY perfdata_host_groups_ibfk_1 (group_id) \ *************** *** 161,170 **** REFERENCES perfdata_host(host_id) ON DELETE CASCADE \ ) type=InnoDB;"); ! printf(_("[Step 5/%d] Filling table perfdata_host_groups\n"),steps); ! query ("insert into perfdata_host_groups(group_id,host_id) \ select g.group_id, h.host_id from perfdata_groups g,\ perfdata_host h where g.group_name=h.group_name"); ! } --- 190,266 ---- REFERENCES perfdata_host(host_id) ON DELETE CASCADE \ ) type=InnoDB;"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Filling table perfdata_host_groups\n"),i,i_steps); ! query ("insert into perfdata_host_groups(group_id,host_id) \ select g.group_id, h.host_id from perfdata_groups g,\ perfdata_host h where g.group_name=h.group_name"); + setConversionStep(i); + } ! /* ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 1\n"),i,i_steps); ! if(!DropForeignKey ("perfdata_service_raw", "perfdata_host")) { ! printf("Foreign Key not found!\nExiting.\n"); ! exit(1); ! } ! setConversionStep(i); ! } ! ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 2\n"),i,i_steps); ! if(!DropForeignKey ("perfdata_service_metric", "perfdata_host")) { ! printf("Foreign Key not found!\nExiting.\n"); ! exit(1); ! } ! setConversionStep(i); ! } ! */ ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 3\n"),i,i_steps); ! if(!DropForeignKey ("perfdata_service", "perfdata_host")) { ! printf("Foreign Key not found!\nExiting.\n"); ! exit(1); ! } ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 4\n"),i,i_steps); ! if(!DropKey ("perfdata_host", "host_id")) { ! printf("Key not found!\nExiting.\n"); ! exit(1); ! } ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 5\n"),i,i_steps); ! query("alter table perfdata_host drop primary key"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 6\n"),i,i_steps); ! query("alter table perfdata_host add constraint unique key perfdata_host_ix0 (host_name)"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Fixing keys of perfdata_host table pt. 7\n"),i,i_steps); ! query("alter table perfdata_host modify column host_id INT AUTO_INCREMENT PRIMARY KEY"); ! setConversionStep(i); ! } ! ! if(i_cont_step < i++) { ! printf(_("[Step %d/%d] Dropping group_name from perfdata_host table\n"),i,i_steps); ! query("alter table perfdata_host drop column group_name"); ! setConversionStep(i); ! } } *************** *** 197,200 **** --- 293,352 ---- + void setConversionStep(int i) { + char s_i[4]; + snprintf(s_i,3,"%d",i); + setRegistry("dummy","pp/database/conversion_step",s_i,time(NULL)); + } + + int DropKey(char *sTableName, char *sColumnName) { + GString *querystr = g_string_new (""); + GString *resultstr = g_string_new (""); + char *tmpstr; + regex_t preg_struct; + regex_t *preg = &preg_struct; + GString *regex = g_string_new (""); + size_t nmatch = 10; + regmatch_t pmatch[10]; + int i; + + + g_string_printf (querystr, "show create table %s", sTableName); + query (querystr->str); + if ((result_row = mysql_fetch_row (query_result))) + { + g_string_assign (resultstr, result_row[1]); + g_string_printf (regex, + ".*KEY `(\\S+)` \\(`%s`\\).*", // todo: exclude foreign keys + sColumnName); + i = regcomp (preg, regex->str, REG_EXTENDED | REG_ICASE); + i = regexec (preg, resultstr->str, nmatch, pmatch, + REG_NOTEOL); + if (i == REG_NOMATCH) + { + return (FALSE); + } + else + { + for (i = 1; i < nmatch; i++) // pmatch[0] contains the whole search + { + if (pmatch[i].rm_so != -1 + && pmatch[i].rm_eo != -1) + { + tmpstr = resultstr->str + pmatch[i].rm_eo; + *tmpstr = '\0'; + printf ("Match %d so: %d, eo:%d String %s\n", i, + pmatch[i].rm_so, pmatch[i].rm_eo,resultstr->str+pmatch[i].rm_so); + g_string_printf (querystr, + "ALTER TABLE %s DROP KEY %s", + sTableName, resultstr->str + pmatch[i].rm_so); + query (querystr->str); + } + } + } + } + return(TRUE); + } + + int DropForeignKey (char *TableName, char *ForeignTableName) Index: convert.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** convert.h 7 Dec 2006 23:47:13 -0000 1.3 --- convert.h 12 Dec 2006 23:44:18 -0000 1.4 *************** *** 32,35 **** --- 32,37 ---- void install_database(void); int DropForeignKey(char *TableName, char *ForeignTableName); + int DropKey(char *sTableName, char *sColumnName); + void setConversionStep(int i); #endif |
|
From: Florian G. <re...@us...> - 2006-12-12 23:44:20
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26324/scripts Modified Files: mysql_create.sql Log Message: some db conversion work Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mysql_create.sql 2 Dec 2006 21:31:11 -0000 1.8 --- mysql_create.sql 12 Dec 2006 23:44:18 -0000 1.9 *************** *** 38,42 **** CREATE TABLE IF NOT EXISTS perfdata_host ( ! host_id INT PRIMARY KEY, host_name VARCHAR(75) UNIQUE, raw_delete_policy_id INTEGER, --- 38,42 ---- CREATE TABLE IF NOT EXISTS perfdata_host ( ! host_id INT AUTO_INCREMENT PRIMARY KEY, host_name VARCHAR(75) UNIQUE, raw_delete_policy_id INTEGER, |
|
From: Florian G. <re...@us...> - 2006-12-11 23:44:49
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9539 Modified Files: convert.c Log Message: more work Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** convert.c 7 Dec 2006 23:47:13 -0000 1.9 --- convert.c 11 Dec 2006 23:44:48 -0000 1.10 *************** *** 141,152 **** if (version < 0.20) { printf (_("Warning, this stage may take some time:\n")); ! printf (_("Creating new group table:\n")); ! query ("create table perfdata_groups (group_id INT AUTO_INCREMENT PRIMARY KEY, group_name VARCHAR(75) UNIQUE) type=InnoDB select group_name from perfdata_host_group"); ! printf (_ ! ("Dropping foreign key from perfdata_host to perfdata_host_group table.\n")); DropForeignKey ("perfdata_host", "perfdata_host_group"); ! printf (_("Dropping table perfdata_host_group\n")); query ("drop table perfdata_host_group"); } --- 141,170 ---- if (version < 0.20) { + int steps=5; printf (_("Warning, this stage may take some time:\n")); ! printf (_("[Step 1/%d] Creating new group table:\n"),steps); ! query ("create table perfdata_groups \ ! (group_id INT AUTO_INCREMENT PRIMARY KEY, \ ! group_name VARCHAR(75) UNIQUE) type=InnoDB \ ! select group_name from perfdata_host_group"); ! printf (_("[Step 2/%d] Dropping foreign key from perfdata_host to perfdata_host_group table.\n"),steps); DropForeignKey ("perfdata_host", "perfdata_host_group"); ! printf (_("[Step 3/%d] Dropping table perfdata_host_group\n"),steps); query ("drop table perfdata_host_group"); + printf(_("[Step 4/%d] Creating group mapping table perfdata_host_groups\n"),steps); + query ("CREATE TABLE IF NOT EXISTS perfdata_host_groups ( \ + group_id INT, \ + FOREIGN KEY perfdata_host_groups_ibfk_1 (group_id) \ + REFERENCES perfdata_groups(group_id) ON DELETE CASCADE, \ + host_id INT, \ + FOREIGN KEY perfdata_host_groups_ibfk_2 (host_id) \ + REFERENCES perfdata_host(host_id) ON DELETE CASCADE \ + ) type=InnoDB;"); + printf(_("[Step 5/%d] Filling table perfdata_host_groups\n"),steps); + query ("insert into perfdata_host_groups(group_id,host_id) \ + select g.group_id, h.host_id from perfdata_groups g,\ + perfdata_host h where g.group_name=h.group_name"); + + } *************** *** 157,161 **** * Create where missing */ ! checkTables (); /* --- 175,180 ---- * Create where missing */ ! /* disabled for the moment */ ! // checkTables (); /* *************** *** 214,219 **** && pmatch[i].rm_eo != -1) { ! tmpstr = resultstr->str + ! pmatch[i].rm_eo; *tmpstr = '\0'; /*printf ("Match %d so: %d, eo:%d String %s\n", i, --- 233,237 ---- && pmatch[i].rm_eo != -1) { ! tmpstr = resultstr->str + pmatch[i].rm_eo; *tmpstr = '\0'; /*printf ("Match %d so: %d, eo:%d String %s\n", i, *************** *** 221,227 **** g_string_printf (querystr, "ALTER TABLE %s DROP FOREIGN KEY %s", ! TableName, ! resultstr->str + ! pmatch[i].rm_so); query (querystr->str); } --- 239,243 ---- g_string_printf (querystr, "ALTER TABLE %s DROP FOREIGN KEY %s", ! TableName, resultstr->str + pmatch[i].rm_so); query (querystr->str); } |
|
From: Florian G. <re...@us...> - 2006-12-07 23:47:15
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv861/db_tools Modified Files: convert.h convert.c Log Message: Made DropForeignKey working Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** convert.c 7 Dec 2006 00:14:03 -0000 1.8 --- convert.c 7 Dec 2006 23:47:13 -0000 1.9 *************** *** 40,174 **** #include <regex.h> ! /* Domain to use: */ #define SERVICE "service" ! void addIdFields(); ! void checkTables(); ! void addTableHostGroup(void); ! void addTableDeletePolicy(void); ! void addTableRegistry(void); [...1218 lines suppressed...] ! void ! addTableRawSummaryData () ! { ! g_string_assign (s_SQL, ! "CREATE TABLE IF NOT EXISTS perfdata_raw_summary_data (" ! "service_id INT NOT NULL ," "epoch INT NOT NULL ," ! "epoch_start INT NOT NULL ," ! "last_ctime INT NOT NULL ," ! "last_nagios_status INT default NULL," ! "count INT NOT NULL ," "sum_uptime INT NOT NULL ," ! "sum_warntime INT NOT NULL ," ! "sum_criticaltime INT NOT NULL ," ! "sum_undeftime INT NOT NULL ," ! "PRIMARY KEY (service_id,epoch,epoch_start)," ! "FOREIGN KEY (service_id, epoch) REFERENCES perfdata_raw_summary (service_id, epoch)" ! ") TYPE=InnoDB"); ! query_no_return (s_SQL->str); } Index: convert.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** convert.h 30 Oct 2006 21:35:06 -0000 1.2 --- convert.h 7 Dec 2006 23:47:13 -0000 1.3 *************** *** 31,35 **** void autoConvert(); void install_database(void); ! void DropForeignKey(char *TableName, char *ForeignTableName); #endif --- 31,35 ---- void autoConvert(); void install_database(void); ! int DropForeignKey(char *TableName, char *ForeignTableName); #endif |
|
From: Florian G. <re...@us...> - 2006-12-07 00:14:05
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5894 Modified Files: convert.c Log Message: dived into regex Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** convert.c 6 Dec 2006 13:45:30 -0000 1.7 --- convert.c 7 Dec 2006 00:14:03 -0000 1.8 *************** *** 141,145 **** regex_t *preg=&preg_struct; char regex[512]; ! size_t nmatch=0; regmatch_t pmatch[10]; int i; --- 141,145 ---- regex_t *preg=&preg_struct; char regex[512]; ! size_t nmatch=10; regmatch_t pmatch[10]; int i; *************** *** 157,162 **** i=regexec(preg,resultstr,nmatch,pmatch,REG_NOTEOL); printf("Returncode matching the pattern is %d\n",i); if(i==0) { ! printf("Jumpin in matches\n"); for (i=0;i<nmatch;i++) { printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); --- 157,165 ---- i=regexec(preg,resultstr,nmatch,pmatch,REG_NOTEOL); printf("Returncode matching the pattern is %d\n",i); + if(i==REG_NOMATCH) { + printf("That means: no match!\n"); + } if(i==0) { ! printf("Jumpin in matches. nmatch=%d\n",nmatch); for (i=0;i<nmatch;i++) { printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); |
|
From: Florian G. <re...@us...> - 2006-12-06 13:45:35
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32584 Modified Files: convert.c Log Message: tmp Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** convert.c 5 Dec 2006 22:17:10 -0000 1.6 --- convert.c 6 Dec 2006 13:45:30 -0000 1.7 *************** *** 157,162 **** i=regexec(preg,resultstr,nmatch,pmatch,REG_NOTEOL); printf("Returncode matching the pattern is %d\n",i); ! for (i=0;i<nmatch;i++) { ! printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); } } --- 157,165 ---- i=regexec(preg,resultstr,nmatch,pmatch,REG_NOTEOL); printf("Returncode matching the pattern is %d\n",i); ! if(i==0) { ! printf("Jumpin in matches\n"); ! for (i=0;i<nmatch;i++) { ! printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); ! } } } |
|
From: Florian G. <re...@us...> - 2006-12-05 22:17:13
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18434/db_tools Modified Files: convert.c Log Message: start db conversion program Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** convert.c 2 Dec 2006 21:31:09 -0000 1.5 --- convert.c 5 Dec 2006 22:17:10 -0000 1.6 *************** *** 138,162 **** GString *querystr=g_string_new(""); char *resultstr; ! regex_t *preg; char regex[512]; ! size_t nmatch; regmatch_t pmatch[10]; int i; g_string_printf(querystr,"show create table %s",TableName); query(querystr->str); - #ifdef USE_DB_MYSQL while ((result_row = mysql_fetch_row(query_result))) { ! #elif defined USE_DB_POSTGRESQL ! numberOfRows = rows(); ! for (currentRow=0;currentRow<numberOfRows;currentRow++){ ! #endif ! resultstr=result_row[0]; printf("Resultstring: %s\n",resultstr); ! snprintf(regex,511,"CONSTRAINT `(\\S+)` FOREIGN KEY \\S+ REFERENCES `%s`",ForeignTableName); printf("Using regex to find FK: %s\n",regex); ! regcomp(preg, regex,REG_EXTENDED|REG_ICASE); ! regexec(preg,resultstr,nmatch,pmatch,0); ! for (i=0;i<=nmatch;i++) { printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); } --- 138,161 ---- GString *querystr=g_string_new(""); char *resultstr; ! regex_t preg_struct; ! regex_t *preg=&preg_struct; char regex[512]; ! size_t nmatch=0; regmatch_t pmatch[10]; int i; + g_string_printf(querystr,"show create table %s",TableName); query(querystr->str); while ((result_row = mysql_fetch_row(query_result))) { ! resultstr=result_row[1]; printf("Resultstring: %s\n",resultstr); ! snprintf(regex,511,".*CONSTRAINT `(\\S+)` FOREIGN KEY \\S+ REFERENCES `%s`.*",ForeignTableName); printf("Using regex to find FK: %s\n",regex); ! i=regcomp(preg, regex,REG_EXTENDED|REG_ICASE); ! printf("Returncode compiling the pattern is %d\n",i); ! i=regexec(preg,resultstr,nmatch,pmatch,REG_NOTEOL); ! printf("Returncode matching the pattern is %d\n",i); ! for (i=0;i<nmatch;i++) { printf("Match %d so: %d, eo:%d\n",i,pmatch[i].rm_so,pmatch[i].rm_eo); } |
|
From: Florian G. <re...@us...> - 2006-12-05 21:30:37
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1364 Modified Files: database_schema_v20.odp Log Message: changes in delete policy Index: database_schema_v20.odp =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/database/database_schema_v20.odp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsvt0wFq and /tmp/cvsiGamkM differ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:32:49
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22556 Added Files: edit_delete_policies.tpl.html Log Message: forgot that one --- NEW FILE: edit_delete_policies.tpl.html --- <HTML> <HEAD> <TITLE> PerfParse</TITLE> <BODY BGcolor="#EEFFFF" TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td width=60><img src="<{$http_image_path}>/perfparse-logo-sm.png" border=0></td> <td align=center><font face="Arial, Helvetica" size=2> <b><{tr}>Edit Delete Policies<{/tr}></b><br> <a href="perfparse.php"><{tr}>Return to main menu<{/tr}></a><br> </td> <td width=60 align=right><font face="Arial, Helvetica" size=1><{$version}></td> </tr> </table> </td></tr></table></p> <{if $sql_error}> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <{$sql_error}> </td></tr></table> </p> <{/if}> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <form method="get"> <input type=hidden name="page" value="edit_delete_policies"> <tr> <td align=center width="33%"><font face="Arial, Helvetica" size=2> <{tr}>Create a delete policy template<{/tr}>: </td> <td> <font face="Arial, Helvetica" size=2> <{tr}>Name<{/tr}>: <input type="text" name="create_policy" size="25" /><br /> <input type=submit value="<{tr}>Enter<{/tr}>"> </td><td> <font face="Arial, Helvetica" size=2> <{tr}>Days<{/tr}>: <input type="text" name="create_policy_days" size="4" value="0"/> <{tr}>Hours<{/tr}>: <input type="text" name="create_policy_hours" size="2" value="0"/> <{tr}>Minutes<{/tr}>: <input type="text" name="create_policy_minutes" size="2" value="0"/> <{tr}>Seconds<{/tr}>: <input type="text" name="create_policy_seconds" size="2" value="0"/> </td> </tr> </form> <form method="get"> <input type=hidden name="page" value="edit_delete_policies"> <tr> <td align=center width="33%"><font face="Arial, Helvetica" size=2> <{tr}>Delete a delete policy template<{/tr}>: </td> <td> <font face="Arial, Helvetica" size=2> <select name="delete_policy"> <{foreach from=$policies item=policy}> <option value="<{$policy.policy_id}>"><{$policy.policy_name}></option> <{/foreach}> </select> <input type=submit value="<{tr}>Enter<{/tr}>"> </td> </tr> </form> <form method="get"> <input type=hidden name="page" value="edit_delete_policies"> <tr> <td align=center width="33%"><font face="Arial, Helvetica" size=2> <{tr}>Edit delete policy template<{/tr}>: </td> <td> <font face="Arial, Helvetica" size=2> <{if $group_id}> <{tr}>Selected group: <{/tr}><{$groups.$group_id}><br /> <{tr}>Select another group: <{/tr}> <{/if}> <select name="group_id"> <{foreach from=$groups key=groupId item=group_name}> <option value="<{$groupId}>" <{if $groupId == $group_id}>selected="selected"<{/if}>><{$group_name}></option> <{/foreach}> </select> <input type=submit value="<{tr}>Enter<{/tr}>"> </td> </tr> </form> </table> </td></tr></table></p> <{if $group_id}> <form method="get"> <input type=hidden name="page" value="edit_host_list"> <input type=hidden name="group_id" value="<{$group_id}>"> <input type=hidden name="action" value="add_host"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td align=center width="33%"><font face="Arial, Helvetica" size=2> Add new Host to Group: </td> <td> <select name="host_id"> <{foreach from=$notin_group_hosts item=hostinfo}> <option value="<{$hostinfo.host_id}>"><{$hostinfo.host_name}></option> <{/foreach}> </select> <input type=submit value="<{tr}>Enter<{/tr}>"> </td> </tr> </table> </td></tr></table></p> </form> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> <table width="100%" border=0 cellpadding=0 cellspacing=0> <tr> <td align=center><font face="Arial, Helvetica" size=2> <b>Host List</b><br> </td> </tr> </table> <table width="100%" border=1 cellpadding=2 cellspacing=0> <tr bgcolor="#FFFFCC"> <td align=center><font face="Arial, Helvetica" size=2><b>Host Name</b></td> <td align=center width="1%"><font face="Arial, Helvetica" size=2><b>Remove</td> </tr> <{foreach from=$group_hosts item=hostinfo}> <tr bgcolor="#FFFFFF"> <td><font face="Arial, Helvetica" size=2><{$hostinfo.host_name}></td> <td align=center><font face="Arial, Helvetica" size=2><a href="perfparse.php?page=edit_host_list&group_id=<{$group_id}>&action=remove_host&host_id=<{$hostinfo.host_id}>"><{tr}>Remove<{/tr}></a> </td> </tr> <{/foreach}> </table></tr></td></table></p> <{/if}> </body></html> |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:44
|
Update of /cvsroot/perfparse/_perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640 Modified Files: Makefile.in aclocal.m4 configure configure.ac Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: aclocal.m4 =================================================================== RCS file: /cvsroot/perfparse/_perfparse/aclocal.m4,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** aclocal.m4 17 Aug 2006 13:57:17 -0000 1.13 --- aclocal.m4 2 Dec 2006 21:31:08 -0000 1.14 *************** *** 1,3 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --- 1,3 ---- ! # generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, *************** *** 14,18 **** # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- [...2340 lines suppressed...] *** 6233,6237 **** deplibs= wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=-v linker_flags=-v --- 6005,6008 ---- *************** *** 6406,6410 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- --- 6177,6181 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.5])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:08 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ Index: configure.ac =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure.ac,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure.ac 12 Sep 2006 15:30:49 -0000 1.20 --- configure.ac 2 Dec 2006 21:31:08 -0000 1.21 *************** *** 4,8 **** # # # Copyright (c) 2004 Yves Mettier <yme...@li...> # ! # Last Modified: 2005-01-17 # # # # License: # --- 4,8 ---- # # # Copyright (c) 2004 Yves Mettier <yme...@li...> # ! # $Id$ # # # License: # Index: configure =================================================================== RCS file: /cvsroot/perfparse/_perfparse/configure,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure 12 Sep 2006 15:30:49 -0000 1.21 --- configure 2 Dec 2006 21:31:08 -0000 1.22 *************** *** 288,293 **** for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ! if (echo_test_string=`eval $cmd`) 2>/dev/null && ! echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then --- 288,293 ---- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ! if (echo_test_string="`eval $cmd`") 2>/dev/null && [...6468 lines suppressed...] # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ --- 19268,19272 ---- # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ *************** *** 18339,18345 **** LTCC=$lt_LTCC - # LTCC compiler flags. - LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_RC --- 19386,19389 ---- |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:43
|
Update of /cvsroot/perfparse/_perfparse/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/config Modified Files: Makefile.in perfparse.cfg.example Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:09 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ Index: perfparse.cfg.example =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config/perfparse.cfg.example,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** perfparse.cfg.example 26 Sep 2005 14:36:34 -0000 1.1.1.1 --- perfparse.cfg.example 2 Dec 2006 21:31:09 -0000 1.2 *************** *** 98,101 **** --- 98,102 ---- DB_Pass = "nagios" DB_Host = "127.0.0.1" + DB_Type = "mysql" # misc |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:40
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/cgi Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:09 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(perfchart_png_SOURCES) $(perfgant_png_SOURCES) $(perfparse_cgi_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/contrib Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/contrib/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:09 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/phpgui Modified Files: Makefile.in perfparse.php utils.php Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: utils.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** utils.php 29 Nov 2006 14:06:02 -0000 1.30 --- utils.php 2 Dec 2006 21:31:11 -0000 1.31 *************** *** 153,156 **** --- 153,163 ---- } + function have_group_id(&$db,$group) { + $query='SELECT count(*) FROM perfdata_groups where group_id=?'; + $ret=$db->GetOne($query,array($group)); + return($ret); + } + + function get_metric_props(&$db,$metricId) { $query ='SELECT s.service_id, s.service_description, m.metric_id, m.metric, '; *************** *** 275,282 **** where hg.group_id=? and h.host_id=hg.host_id'; ! $ret=$db->GetCol($query,array($groupId)); return($ret); } // get all metrics and the metric details for all hosts of a given group Id. --- 282,299 ---- where hg.group_id=? and h.host_id=hg.host_id'; ! $ret=$db->GetAll($query,array($groupId)); return($ret); } + // get hostids and hostnames not in a given groupid + function get_notin_groupId_hostinfos(&$db,$groupId) { + $query ='SELECT h.host_name, h.host_id from perfdata_host h + where h.host_id not in + (select host_id from perfdata_host_groups where group_id=?)'; + $ret=$db->GetAll($query,array($groupId)); + return($ret); + } + + // get all metrics and the metric details for all hosts of a given group Id. *************** *** 448,451 **** --- 465,515 ---- } + function add_hostid_to_groupid(&$db,$group_id,$host_id) { + $query='insert into perfdata_host_groups (group_id,host_id) + values(?,?)'; + $db->Execute($query,array($group_id,$host_id)); + if ($db->ErrorNo() != 0) { + return(false); + } else { + return(true); + } + } + + + function remove_hostid_from_groupid(&$db,$group_id,$host_id) { + $query='delete from perfdata_host_groups where group_id=? and + host_id=?'; + $db->Execute($query,array($group_id,$host_id)); + if ($db->ErrorNo() != 0) { + return(false); + } else { + return(true); + } + } + + + // Delete policy functions + + + function get_delete_policies(&$db) { + $query='select policy_id,policy_name,delete_policy_seconds + from perfdata_delete_policy'; + $res=$db->GetAll($query); + return($res); + } + + function create_delete_policy(&$db,$policy,$seconds) { + $query='insert into perfdata_delete_policy + (policy_name,delete_policy_seconds) values (?,?)'; + $db->Execute($query,array($policy,$seconds)); + return($db->ErrorNo()); + } + + function delete_delete_policy(&$db,$policy_id) { + $query='delete from perfdata_delete_policy where policy_id=?'; + $db->Execute($query,array($policy_id)); + return($db->ErrorNo()); + } + function get_graph_details(&$db,$id) { $query='SELECT * from perfdata_graphs where id=?'; Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.6 --- Makefile.in 2 Dec 2006 21:31:11 -0000 1.7 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ Index: perfparse.php =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** perfparse.php 29 Nov 2006 14:06:02 -0000 1.42 --- perfparse.php 2 Dec 2006 21:31:11 -0000 1.43 *************** *** 430,446 **** get_request_var('host_id','int',''); - $groups=get_groups($db); - if(!($group_name)) $group_name=''; ! if(!empty($group_name)) { ! $group_hosts=get_group_hosts($db,$group_name); $group_hosts_count=count($group_hosts); $smarty->assign_by_ref('group_hosts',$group_hosts); $smarty->assign('group_hosts_count',$group_hosts_count); } ! // TODO: handle add host, remove host actions ! ! $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; --- 430,461 ---- get_request_var('host_id','int',''); ! ! // handle add host and remove host action ! ! if(have_host_id($db,$host_id) && have_group_id($db,$group_id)) { ! switch($action) { ! case "add_host": ! add_hostid_to_groupid($db,$group_id,$host_id); ! break; ! case "remove_host": ! remove_hostid_from_groupid($db,$group_id,$host_id); ! break; ! } ! } ! ! // get group and host infos ! $groups=get_groups($db); ! if(!empty($group_id)) { ! $group_hosts=get_groupId_hostinfos($db,$group_id); ! $notin_group_hosts=get_notin_groupId_hostinfos($db,$group_id); $group_hosts_count=count($group_hosts); $smarty->assign_by_ref('group_hosts',$group_hosts); + $smarty->assign_by_ref('notin_group_hosts',$notin_group_hosts); $smarty->assign('group_hosts_count',$group_hosts_count); } ! // print_r($groups); ! $smarty->assign_by_ref('groups',$groups); $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; *************** *** 474,477 **** --- 489,523 ---- $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); break; + case 'edit_delete_policies': + // handle create policy template: + get_request_var('create_policy','string',''); + if(!empty($create_policy)) { + get_request_var('create_policy_days','int',0); + get_request_var('create_policy_hours','int',0); + get_request_var('create_policy_minutes','int',0); + get_request_var('create_policy_seconds','int',0); + $create_policy_seconds=$create_policy_seconds+ + 60*$create_policy_minutes+ + 3600*$create_policy_hours+ + 86400*$create_policy_days; + if(create_delete_policy($db,$create_policy,$create_policy_seconds)!=0) { + $smarty->assign('sql_error',$db->ErrorMsg()); + } + } + + // handle delete policy template + get_request_var('delete_policy','int',false); + if($delete_policy) { + if(delete_delete_policy($db,$delete_policy)!=0) { + $smarty->assign('sql_error',$db->ErrorMsg()); + } + } + + // load infos for display + $policies=get_delete_policies($db); + $smarty->assign_by_ref('policies',$policies); + + $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html'); + break; case 'read_nag_config': // load modified naupy class |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/libpp_mysql Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(libpp_mysql_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/phpgui/templates Modified Files: edit_host_list.tpl.html Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: edit_host_list.tpl.html =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_host_list.tpl.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_host_list.tpl.html 29 Nov 2006 14:06:02 -0000 1.2 --- edit_host_list.tpl.html 2 Dec 2006 21:31:11 -0000 1.3 *************** *** 19,23 **** </td></tr></table></p> <form method="get"> ! <input type=hidden name="edit_host_list" value="1"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> --- 19,23 ---- </td></tr></table></p> <form method="get"> ! <input type=hidden name="page" value="edit_host_list"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> *************** *** 28,43 **** </td> <td> ! <select name="group_name"> ! <option selected>bsb</option> </select> ! <input type=submit value="Enter"> </td></form> </tr> </table> </td></tr></table></p> <form method="get"> ! <input type=hidden name="edit_host_list" value="1"> ! <input type=hidden name="group_name" value="bsb"> ! <input type=hidden name="add" value="1"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> --- 28,52 ---- </td> <td> ! <font face="Arial, Helvetica" size=2> ! <{if $group_id}> ! <{tr}>Selected group: <{/tr}><{$groups.$group_id}><br /> ! <{tr}>Select another group: <{/tr}> ! <{/if}> ! <select name="group_id"> ! <{foreach from=$groups key=groupId item=group_name}> ! <option value="<{$groupId}>" <{if $groupId == $group_id}>selected="selected"<{/if}>><{$group_name}></option> ! <{/foreach}> </select> ! ! <input type=submit value="<{tr}>Enter<{/tr}>"> </td></form> </tr> </table> </td></tr></table></p> + <{if $group_id}> <form method="get"> ! <input type=hidden name="page" value="edit_host_list"> ! <input type=hidden name="group_id" value="<{$group_id}>"> ! <input type=hidden name="action" value="add_host"> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> *************** *** 48,58 **** </td> <td> ! <select name="host_name"> ! <option>www.opus-bayern.de<option>bvbx5<option>bvbx7<option>bsbrouter<option>bvbd206<option>bvbnt1<option>hp10.vd17.de<option>bvbx6<option>bvbc01<option>bvbnt3<option>somehostname<option>bayreuth </select> ! <input type=submit value="Enter"> ! </td></form> </tr> </table> </td></tr></table></p> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> --- 57,71 ---- </td> <td> ! <select name="host_id"> ! <{foreach from=$notin_group_hosts item=hostinfo}> ! <option value="<{$hostinfo.host_id}>"><{$hostinfo.host_name}></option> ! <{/foreach}> ! </select> ! <input type=submit value="<{tr}>Enter<{/tr}>"> ! </td> </tr> </table> </td></tr></table></p> + </form> <p align=center> <table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td> *************** *** 69,87 **** <td align=center width="1%"><font face="Arial, Helvetica" size=2><b>Remove</td> </tr> <tr bgcolor="#FFFFFF"> ! <td><font face="Arial, Helvetica" size=2>bvbsw01</td> ! <td align=center><font face="Arial, Helvetica" size=2>&host_name=bvbsw01">Remove</a> ! </td> ! </tr> ! <tr bgcolor="#FFFFFF"> ! <td><font face="Arial, Helvetica" size=2>www.bsb-muenchen.de</td> ! <td align=center><font face="Arial, Helvetica" size=2>&host_name=%2E">Remove</a> ! </td> ! </tr> ! <tr bgcolor="#FFFFFF"> ! <td><font face="Arial, Helvetica" size=2>gw-server</td> ! <td align=center><font face="Arial, Helvetica" size=2>&host_name=%2D">Remove</a> </td> </tr> </table></tr></td></table></p> </body></html> --- 82,93 ---- <td align=center width="1%"><font face="Arial, Helvetica" size=2><b>Remove</td> </tr> + <{foreach from=$group_hosts item=hostinfo}> <tr bgcolor="#FFFFFF"> ! <td><font face="Arial, Helvetica" size=2><{$hostinfo.host_name}></td> ! <td align=center><font face="Arial, Helvetica" size=2><a href="perfparse.php?page=edit_host_list&group_id=<{$group_id}>&action=remove_host&host_id=<{$hostinfo.host_id}>"><{tr}>Remove<{/tr}></a> </td> </tr> + <{/foreach}> </table></tr></td></table></p> + <{/if}> </body></html> |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/libpp_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/libpp_common Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_common/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(libpp_common_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/scripts Modified Files: Makefile.in mysql_create.sql Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:11 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ Index: mysql_create.sql =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mysql_create.sql 6 Sep 2006 21:58:41 -0000 1.7 --- mysql_create.sql 2 Dec 2006 21:31:11 -0000 1.8 *************** *** 18,25 **** # CREATE TABLE IF NOT EXISTS perfdata_delete_policy ( ! policy_name VARCHAR(20) NOT NULL PRIMARY KEY, ! delete_policy INT DEFAULT NULL ) TYPE=InnoDB; --- 18,28 ---- # + # TODO: Check if we need servicegroups like in nagios 2.6 + CREATE TABLE IF NOT EXISTS perfdata_delete_policy ( ! policy_id INT AUTO_INCREMENT PRIMARY KEY, ! policy_name VARCHAR(20) NOT NULL UNIQUE, ! delete_policy_seconds INT DEFAULT NULL ) TYPE=InnoDB; *************** *** 37,53 **** host_id INT PRIMARY KEY, host_name VARCHAR(75) UNIQUE, ! raw_delete_policy INTEGER, ! raw_delete_policy_name VARCHAR(20) DEFAULT NULL, ! raw_delete_policy_type ENUM('user','template') NOT NULL, ! INDEX host_ix1 (raw_delete_policy_name), ! FOREIGN KEY (raw_delete_policy_name) ! REFERENCES perfdata_delete_policy (policy_name) ON DELETE SET NULL, ! bin_delete_policy INTEGER, ! bin_delete_policy_name VARCHAR(20) DEFAULT NULL, ! bin_delete_policy_type ENUM('user','template') NOT NULL, ! INDEX host_ix2 (bin_delete_policy_name), ! FOREIGN KEY (bin_delete_policy_name) ! REFERENCES perfdata_delete_policy (policy_name) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 --- 40,54 ---- host_id INT PRIMARY KEY, host_name VARCHAR(75) UNIQUE, ! raw_delete_policy_id INTEGER, ! raw_delete_individual INTEGER, ! INDEX host_ix1 (raw_delete_policy_id), ! FOREIGN KEY perfdata_host_ibfk_1 (raw_delete_policy_id) ! REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, ! bin_delete_policy_id INTEGER, ! bin_delete_policy_individual INTEGER, ! INDEX host_ix2 (bin_delete_policy_id), ! FOREIGN KEY perfdata_host_ibfk_2 (bin_delete_policy_id) ! REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 *************** *** 59,65 **** CREATE TABLE IF NOT EXISTS perfdata_host_groups ( group_id INT, ! FOREIGN KEY (group_id) REFERENCES perfdata_groups(group_id) ON DELETE CASCADE, host_id INT, ! FOREIGN KEY (host_id) REFERENCES perfdata_host(host_id) ON DELETE CASCADE ) type=InnoDB; --- 60,68 ---- CREATE TABLE IF NOT EXISTS perfdata_host_groups ( group_id INT, ! FOREIGN KEY perfdata_host_groups_ibfk_1 (group_id) ! REFERENCES perfdata_groups(group_id) ON DELETE CASCADE, host_id INT, ! FOREIGN KEY perfdata_host_groups_ibfk_2 (host_id) ! REFERENCES perfdata_host(host_id) ON DELETE CASCADE ) type=InnoDB; *************** *** 71,90 **** CREATE TABLE IF NOT EXISTS perfdata_service ( service_id INT PRIMARY KEY, - UNIQUE(service_id), host_id INT NOT NULL, service_description VARCHAR(75) NOT NULL, UNIQUE (host_id, service_description), INDEX service_ix0 (host_id), ! FOREIGN KEY (host_id) REFERENCES perfdata_host (host_id) ON DELETE RESTRICT, last_perfdata_raw INTEGER DEFAULT NULL, UNIQUE INDEX service_ix1 (last_perfdata_raw), ! raw_delete_policy INTEGER DEFAULT NULL, ! raw_delete_policy_name VARCHAR(20) DEFAULT NULL, ! raw_delete_policy_type ENUM('template','user','host') NOT NULL, ! INDEX service_ix2 (raw_delete_policy_name), ! FOREIGN KEY (raw_delete_policy_name) ! REFERENCES perfdata_delete_policy (policy_name) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 --- 74,91 ---- CREATE TABLE IF NOT EXISTS perfdata_service ( service_id INT PRIMARY KEY, host_id INT NOT NULL, service_description VARCHAR(75) NOT NULL, UNIQUE (host_id, service_description), INDEX service_ix0 (host_id), ! FOREIGN KEY perfdata_service_ibfk_1 (host_id) REFERENCES perfdata_host (host_id) ON DELETE RESTRICT, last_perfdata_raw INTEGER DEFAULT NULL, UNIQUE INDEX service_ix1 (last_perfdata_raw), ! raw_delete_policy_id INTEGER DEFAULT NULL, ! raw_delete_policy_individual INTEGER, ! INDEX service_ix2 (raw_delete_policy_id), ! FOREIGN KEY perfdata_service_ibfk_2 (raw_delete_policy_iD) ! REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 *************** *** 132,141 **** last_perfdata_bin INTEGER, UNIQUE INDEX perfdata_metric_ix1 (last_perfdata_bin), ! bin_delete_policy INTEGER DEFAULT NULL, ! bin_delete_policy_name VARCHAR(20) DEFAULT NULL, ! bin_delete_policy_type ENUM('template','user','host') NOT NULL, ! INDEX metric_ix2 (bin_delete_policy_name), ! FOREIGN KEY (bin_delete_policy_name) ! REFERENCES perfdata_delete_policy (policy_name) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 --- 133,141 ---- last_perfdata_bin INTEGER, UNIQUE INDEX perfdata_metric_ix1 (last_perfdata_bin), ! bin_delete_policy_id INTEGER , ! bin_delete_policy_individual INTEGER, ! INDEX metric_ix2 (bin_delete_policy_id), ! FOREIGN KEY perfdata_service_metric_ifk_1 (bin_delete_policy_id) ! REFERENCES perfdata_delete_policy (policy_id) ON DELETE SET NULL, is_deleted TINYINT DEFAULT 0 *************** *** 170,174 **** # Binary Summary Data # Delete policy and frequency in Hours. ! # CREATE TABLE IF NOT EXISTS perfdata_bin_summary_del_policy ( --- 170,174 ---- # Binary Summary Data # Delete policy and frequency in Hours. ! # Todo: rework the tables before real use! CREATE TABLE IF NOT EXISTS perfdata_bin_summary_del_policy ( |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/libpp_postgresql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/libpp_postgresql Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libpp_postgresql/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(libpp_postgresql_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/modules Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/modules/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(libpp_storage_file_output_la_SOURCES) $(libpp_storage_gnuplot_la_SOURCES) $(libpp_storage_mysql_la_SOURCES) $(libpp_storage_postgresql_la_SOURCES) $(libpp_storage_print_la_SOURCES) $(libpp_storage_socket_output_la_SOURCES) $(libpp_storage_stdout_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/m4 Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/m4/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:16
|
Update of /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/libnagios_perfdata_parser Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(libnagios_perfdata_parser_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:15
|
Update of /cvsroot/perfparse/_perfparse/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/images Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/images/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.17 --- Makefile.in 2 Dec 2006 21:31:09 -0000 1.18 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ |
|
From: Florian G. <re...@us...> - 2006-12-02 21:31:15
|
Update of /cvsroot/perfparse/_perfparse/perfparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20640/perfparse Modified Files: Makefile.in Log Message: Changes in database schema: delete policy uses a id instead of name and in the other tables are only 2 entries for the delete policy. Made group editing work in php gui, started phpgui delete policy editing. Started database conversion program for new schema .... Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/perfparse/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 17 Aug 2006 13:57:17 -0000 1.16 --- Makefile.in 2 Dec 2006 21:31:10 -0000 1.17 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ *************** *** 15,18 **** --- 15,20 ---- @SET_MAKE@ + SOURCES = $(perfparse_log2any_SOURCES) $(perfparsed_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ |
