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 Gleixner <redflo@us...> - 2008-11-09 00:14:42
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/libpp_mysql
Modified Files:
Makefile.in
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia
Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile.in 3 Jan 2008 22:04:44 -0000 1.23
--- Makefile.in 9 Nov 2008 00:14:31 -0000 1.24
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 75,79 ****
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- 75,79 ----
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I.@...@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 115,118 ****
--- 115,119 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
***************
*** 173,176 ****
--- 174,178 ----
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 302,307 ****
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
--- 304,309 ----
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
***************
*** 311,316 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
--- 313,318 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
***************
*** 397,402 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 399,404 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 410,415 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
--- 412,417 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
***************
*** 421,431 ****
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 423,432 ----
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:42
|
Update of /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/libnagios_perfdata_parser
Modified Files:
Makefile.in
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia
Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in 3 Jan 2008 22:04:44 -0000 1.22
--- Makefile.in 9 Nov 2008 00:14:31 -0000 1.23
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 75,79 ****
$(AM_CFLAGS) $(CFLAGS) $(libnagios_perfdata_parser_la_LDFLAGS) \
$(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- 75,79 ----
$(AM_CFLAGS) $(CFLAGS) $(libnagios_perfdata_parser_la_LDFLAGS) \
$(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I.@...@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 115,118 ****
--- 115,119 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
***************
*** 173,176 ****
--- 174,178 ----
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 300,305 ****
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
--- 302,307 ----
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
***************
*** 309,314 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
--- 311,316 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
***************
*** 364,369 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 366,371 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 377,382 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
--- 379,384 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
***************
*** 388,398 ****
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 390,399 ----
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:42
|
Update of /cvsroot/perfparse/_perfparse/modules
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/modules
Modified Files:
Makefile.in storage_mysql.c
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia
Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in 3 Jan 2008 22:04:44 -0000 1.22
--- Makefile.in 9 Nov 2008 00:14:31 -0000 1.23
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 137,141 ****
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_storage_stdout_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- 137,141 ----
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_storage_stdout_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I.@...@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 189,192 ****
--- 189,193 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
***************
*** 247,250 ****
--- 248,252 ----
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 415,420 ****
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
--- 417,422 ----
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
***************
*** 424,429 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
--- 426,431 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
***************
*** 602,607 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 604,609 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 615,620 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
--- 617,622 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
***************
*** 626,636 ****
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 628,637 ----
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
Index: storage_mysql.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** storage_mysql.c 24 Apr 2008 22:29:09 -0000 1.23
--- storage_mysql.c 9 Nov 2008 00:14:31 -0000 1.24
***************
*** 518,526 ****
static int *iMetricID, iTestMetric;
! static char sHash[200];
static char *sKey;
/* Have we seen this one before? */
! sprintf(sHash, "%100s:%45s:%45s", sMetric, sService, sHost);
iMetricID = g_tree_lookup(validated_metrics, sHash);
if (iMetricID) return *iMetricID;
--- 518,526 ----
static int *iMetricID, iTestMetric;
! static char sHash[251];
static char *sKey;
/* Have we seen this one before? */
! sprintf(sHash, "%75s:%75s:%100s", sMetric, sService, sHost);
iMetricID = g_tree_lookup(validated_metrics, sHash);
if (iMetricID) return *iMetricID;
|
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/scripts In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/scripts Modified Files: Makefile.in Log Message: Fixed a buffer overflow with long service/metric names (FG) Thanks to Jamie Garcia Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/scripts/Makefile.in,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.in 18 Dec 2007 15:10:34 -0000 1.23 --- Makefile.in 9 Nov 2008 00:14:32 -0000 1.24 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 87,90 **** --- 87,91 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 145,148 **** --- 146,150 ---- MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ + NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ |
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/images In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/images Modified Files: Makefile.in Log Message: Fixed a buffer overflow with long service/metric names (FG) Thanks to Jamie Garcia Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/images/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile.in 18 Dec 2007 15:10:33 -0000 1.22 --- Makefile.in 9 Nov 2008 00:14:31 -0000 1.23 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 94,97 **** --- 94,98 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 152,155 **** --- 153,157 ---- MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ + NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ |
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/libpp_common
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/libpp_common
Modified Files:
Makefile.in
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia
Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_common/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in 3 Jan 2008 22:04:44 -0000 1.22
--- Makefile.in 9 Nov 2008 00:14:31 -0000 1.23
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 75,79 ****
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_common_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- 75,79 ----
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libpp_common_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I.@...@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 115,118 ****
--- 115,119 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
***************
*** 173,176 ****
--- 174,178 ----
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 302,307 ****
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
--- 304,309 ----
if test -f $$p; then \
f=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
***************
*** 311,316 ****
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
--- 313,318 ----
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
***************
*** 389,394 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 391,396 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 402,407 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
--- 404,409 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
***************
*** 413,423 ****
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 415,424 ----
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/m4 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/m4 Modified Files: Makefile.in Log Message: Fixed a buffer overflow with long service/metric names (FG) Thanks to Jamie Garcia Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/m4/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 18 Dec 2007 15:10:33 -0000 1.21 --- Makefile.in 9 Nov 2008 00:14:31 -0000 1.22 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 83,86 **** --- 83,87 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 141,144 **** --- 142,146 ---- MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ + NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ |
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/db_tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/db_tools
Modified Files:
Makefile.in
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia
Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/db_tools/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in 18 Dec 2007 15:10:33 -0000 1.22
--- Makefile.in 9 Nov 2008 00:14:31 -0000 1.23
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 88,92 ****
perfparse_db_tool_OBJECTS = $(am_perfparse_db_tool_OBJECTS)
perfparse_db_tool_DEPENDENCIES = $(am__DEPENDENCIES_4)
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- 88,92 ----
perfparse_db_tool_OBJECTS = $(am_perfparse_db_tool_OBJECTS)
perfparse_db_tool_DEPENDENCIES = $(am__DEPENDENCIES_4)
! DEFAULT_INCLUDES = -I.@...@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
***************
*** 130,133 ****
--- 130,134 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
***************
*** 188,191 ****
--- 189,193 ----
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 332,337 ****
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
--- 334,339 ----
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
***************
*** 475,480 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
--- 477,482 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
***************
*** 488,493 ****
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
--- 490,495 ----
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
***************
*** 499,509 ****
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 501,510 ----
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/phpgui Modified Files: Makefile.am Makefile.in Log Message: Fixed a buffer overflow with long service/metric names (FG) Thanks to Jamie Garcia Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 30 Jun 2008 00:55:14 -0000 1.17 --- Makefile.in 9 Nov 2008 00:14:32 -0000 1.18 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 94,97 **** --- 94,98 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 152,155 **** --- 153,157 ---- MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ + NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ *************** *** 269,272 **** --- 271,275 ---- templates/mainmenu.tpl.html \ templates/raw_history.tpl.html \ + templates/raw_history_summary.tpl.html \ templates/read_nag_config.tpl.html \ templates/saved_graphs.tpl.html \ Index: Makefile.am =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 11 Apr 2008 12:54:24 -0000 1.10 --- Makefile.am 9 Nov 2008 00:14:32 -0000 1.11 *************** *** 32,35 **** --- 32,36 ---- templates/mainmenu.tpl.html \ templates/raw_history.tpl.html \ + templates/raw_history_summary.tpl.html \ templates/read_nag_config.tpl.html \ templates/saved_graphs.tpl.html \ |
|
From: Florian Gleixner <redflo@us...> - 2008-11-09 00:14:41
|
Update of /cvsroot/perfparse/_perfparse/config In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/config Modified Files: Makefile.in Log Message: Fixed a buffer overflow with long service/metric names (FG) Thanks to Jamie Garcia Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse/config/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 18 Dec 2007 15:10:33 -0000 1.21 --- Makefile.in 9 Nov 2008 00:14:31 -0000 1.22 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 99,102 **** --- 99,103 ---- DEFS = @DEFS@ DEPDIR = @DEPDIR@ + DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ *************** *** 157,160 **** --- 158,162 ---- MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LIBS = @MYSQL_LIBS@ + NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ |
|
From: Florian Gleixner <redflo@us...> - 2008-08-14 20:34:03
|
Update of /cvsroot/perfparse/_perfparse/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21878/cgi Modified Files: perfchart.c Log Message: fix bug where average display is broken. Introduced by db conversion. Index: perfchart.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/cgi/perfchart.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** perfchart.c 3 Dec 2007 20:08:23 -0000 1.16 --- perfchart.c 14 Aug 2008 20:34:12 -0000 1.17 *************** *** 383,387 **** #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. */ --- 383,387 ---- #endif g_string_append_printf(s_SQL, " AND ctime BETWEEN %ld AND %ld ORDER BY ctime", ! getTime(sFrom), getTime(sTo)); /* Note:- Not using standard cursor. That loads everything into memory, too heavey. */ |
|
From: Florian Gleixner <redflo@us...> - 2008-07-04 00:17:06
|
Update of /cvsroot/perfparse/_perfparse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1098
Modified Files:
ChangeLog
Log Message:
latest bugfixes
Index: ChangeLog
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog 30 Jun 2008 00:55:14 -0000 1.24
--- ChangeLog 4 Jul 2008 00:17:13 -0000 1.25
***************
*** 1,3 ****
--- 1,4 ----
Version 1.0 beta 1
+ Fixed some sorting issues in PHP UI (FG)
Fixed Memory leak with long metric labels (Need rewrite log parser?) (FG)
Perfparse daemon deletes now old data (FG)
|
|
From: Florian Gleixner <redflo@us...> - 2008-07-04 00:02:28
|
Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28283/phpgui
Modified Files:
utils.php
Log Message:
More sorting predefaults
Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** utils.php 3 Jul 2008 23:50:43 -0000 1.50
--- utils.php 4 Jul 2008 00:02:34 -0000 1.51
***************
*** 351,354 ****
--- 351,363 ----
$query.='m.last_perfdata_bin=b.id ';
$query.='order by '.$sorts[0].' '.$sorts[1];
+ if($sorts[0]!="host_name") {
+ $query.=',host_name asc';
+ }
+ if($sorts[0]!="service_description") {
+ $query.=',service_description asc';
+ }
+ if($sorts[0]!="metric") {
+ $query.=',metric asc';
+ }
// do the query
***************
*** 431,436 ****
$query.=' order by '.$sorts[0].' '.$sorts[1];
// RFE from Christian Vieser: Sort service description
if($sorts[0]!="service_description") {
! $query.=', service_description asc';
}
--- 440,448 ----
$query.=' order by '.$sorts[0].' '.$sorts[1];
// RFE from Christian Vieser: Sort service description
+ if($sorts[0]!="host_name") {
+ $query.=',host_name asc';
+ }
if($sorts[0]!="service_description") {
! $query.=',service_description asc';
}
|
|
From: Florian Gleixner <redflo@us...> - 2008-07-03 23:50:37
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252/phpgui/templates
Modified Files:
all_bin.tpl.html all_raw.tpl.html
Log Message:
Fixed biug while sorting in raw and bin reports. Added RFS from Christian Viesser about sorting service. Fixed default sort order (ascending hosts).
Index: all_raw.tpl.html
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_raw.tpl.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** all_raw.tpl.html 23 Jan 2008 22:33:53 -0000 1.11
--- all_raw.tpl.html 3 Jul 2008 23:50:43 -0000 1.12
***************
*** 43,56 ****
<tr>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=host%5Fname%2Easc">
<img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=host%5Fname%2Edesc">
<img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a>
{tr}Host{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=service%5Fdescription%2Easc">
<img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=service%5Fdescription%2Edesc">
<img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a>
{tr}Service{/tr}
--- 43,56 ----
<tr>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=host%5Fname%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=host%5Fname%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a>
{tr}Host{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=service%5Fdescription%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=service%5Fdescription%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a>
{tr}Service{/tr}
***************
*** 60,73 ****
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=ctime%2Easc">
<img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=ctime%2Edesc">
<img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a>
{tr}Last Reading{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=txt_data%2Easc">
<img src="{$http_image_path}inc{if $sort=="txt_data.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_name={$group_name}&sort=txt_data%2Edesc">
<img src="{$http_image_path}dec{if $sort=="txt_data.desc"}1{else}0{/if}.png" border=0></a>
{tr}Plugin Output{/tr}
--- 60,73 ----
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=ctime%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=ctime%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a>
{tr}Last Reading{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=txt_data%2Easc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}inc{if $sort=="txt_data.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_raw&group_id={$group_id}&sort=txt_data%2Edesc&normal={$normal}&warning={$warning}&critical={$critical}&unknown={$unknown}">
<img src="{$http_image_path}dec{if $sort=="txt_data.desc"}1{else}0{/if}.png" border=0></a>
{tr}Plugin Output{/tr}
Index: all_bin.tpl.html
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/all_bin.tpl.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** all_bin.tpl.html 23 Jan 2008 22:33:53 -0000 1.11
--- all_bin.tpl.html 3 Jul 2008 23:50:43 -0000 1.12
***************
*** 43,56 ****
<tr>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=host%5Fname%2Easc">
<img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=host%5Fname%2Edesc">
<img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a>
{tr}Host{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=service%5Fdescription%2Easc">
<img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=service%5Fdescription%2Edesc">
<img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a>
{tr}Service{/tr}
--- 43,56 ----
<tr>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=host%5Fname%2Easc">
<img src="{$http_image_path}inc{if $sort=="host_name.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=host%5Fname%2Edesc">
<img src="{$http_image_path}dec{if $sort=="host_name.desc"}1{else}0{/if}.png" border=0></a>
{tr}Host{/tr}
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=service%5Fdescription%2Easc">
<img src="{$http_image_path}inc{if $sort=="service_description.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=service%5Fdescription%2Edesc">
<img src="{$http_image_path}dec{if $sort=="service_description.desc"}1{else}0{/if}.png" border=0></a>
{tr}Service{/tr}
***************
*** 60,87 ****
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=metric%2Easc">
<img src="{$http_image_path}inc{if $sort=="metric.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=metric%2Edesc">
<img src="{$http_image_path}dec{if $sort=="metric.desc"}1{else}0{/if}.png" border=0></a>
{tr}Metric{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=ctime%2Easc">
<img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=ctime%2Edesc">
<img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a>
{tr}Last Reading{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=value%2Easc">
<img src="{$http_image_path}inc{if $sort=="value.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=value%2Edesc">
<img src="{$http_image_path}dec{if $sort=="value.desc"}1{else}0{/if}.png" border=0></a>
{tr}Value{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=unit%2Easc">
<img src="{$http_image_path}inc{if $sort=="unit.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_name={$group_name}&sort=unit%2Edesc">
<img src="{$http_image_path}dec{if $sort=="unit.desc"}1{else}0{/if}.png" border=0></a>
{tr}Unit{/tr}
--- 60,87 ----
</td>
<td bgcolor="#FFFFCC" align=center><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=metric%2Easc">
<img src="{$http_image_path}inc{if $sort=="metric.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=metric%2Edesc">
<img src="{$http_image_path}dec{if $sort=="metric.desc"}1{else}0{/if}.png" border=0></a>
{tr}Metric{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=ctime%2Easc">
<img src="{$http_image_path}inc{if $sort=="ctime.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=ctime%2Edesc">
<img src="{$http_image_path}dec{if $sort=="ctime.desc"}1{else}0{/if}.png" border=0></a>
{tr}Last Reading{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=value%2Easc">
<img src="{$http_image_path}inc{if $sort=="value.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=value%2Edesc">
<img src="{$http_image_path}dec{if $sort=="value.desc"}1{else}0{/if}.png" border=0></a>
{tr}Value{/tr}
</td>
<td bgcolor="#FFFFCC" align=center width="1%"><font face="Arial, Helvetica" size=2>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=unit%2Easc">
<img src="{$http_image_path}inc{if $sort=="unit.asc"}1{else}0{/if}.png" border=0></a>
! <a href="perfparse.php?page=all_bin&group_id={$group_id}&sort=unit%2Edesc">
<img src="{$http_image_path}dec{if $sort=="unit.desc"}1{else}0{/if}.png" border=0></a>
{tr}Unit{/tr}
|
|
From: Florian Gleixner <redflo@us...> - 2008-07-03 23:50:36
|
Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252/phpgui
Modified Files:
perfparse.php utils.php
Log Message:
Fixed biug while sorting in raw and bin reports. Added RFS from Christian Viesser about sorting service. Fixed default sort order (ascending hosts).
Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** utils.php 6 May 2008 22:58:19 -0000 1.49
--- utils.php 3 Jul 2008 23:50:43 -0000 1.50
***************
*** 430,434 ****
$query.=' order by '.$sorts[0].' '.$sorts[1];
! // print($query);
$res=$db->Execute($query,$bindvars);
--- 430,437 ----
$query.=' order by '.$sorts[0].' '.$sorts[1];
! // RFE from Christian Vieser: Sort service description
! if($sorts[0]!="service_description") {
! $query.=', service_description asc';
! }
$res=$db->Execute($query,$bindvars);
Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** perfparse.php 6 May 2008 22:58:19 -0000 1.64
--- perfparse.php 3 Jul 2008 23:50:43 -0000 1.65
***************
*** 382,386 ****
if(get_request_var('group_id','int','-1') &&
(array_key_exists($group_id,$groups) || $group_id == 0)) {
! get_request_var('sort','string','host_name.desc');
if ($page == 'all_bin') {
--- 382,386 ----
if(get_request_var('group_id','int','-1') &&
(array_key_exists($group_id,$groups) || $group_id == 0)) {
! get_request_var('sort','string','host_name.asc');
if ($page == 'all_bin') {
|
|
From: Florian Gleixner <redflo@us...> - 2008-06-30 00:55:07
|
Update of /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15416/libnagios_perfdata_parser
Modified Files:
log_parser.c
Log Message:
Fixed bug where memory leaks when metric label is long
Index: log_parser.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libnagios_perfdata_parser/log_parser.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** log_parser.c 24 Aug 2006 14:36:45 -0000 1.5
--- log_parser.c 30 Jun 2008 00:55:14 -0000 1.6
***************
*** 3,7 ****
* log_parser.c - Parse Nagios data and store in relational database.
*
! * Copyright (c) 2004 Yves Mettier (ymettier@...)
*
* $Id$
--- 3,8 ----
* log_parser.c - Parse Nagios data and store in relational database.
*
! * Copyright (c) 2004-2008 Yves Mettier (ymettier@...)
! * Florian Gleixner
*
* $Id$
***************
*** 80,83 ****
--- 81,85 ----
perf_fields_new (void)
{
+ //pp_log_func;
perf_fields_t * data;
data = malloc(sizeof(perf_fields_t));
***************
*** 96,99 ****
--- 98,102 ----
const char* perf_value_get_range(const char*str, double *start,double *end, int *is_inverted) {
+ //pp_log_func;
const char*p;
char *p1;
***************
*** 133,136 ****
--- 136,140 ----
int perf_get_next(log_line_t *data, perf_fields_t *p) {
+ //pp_log_func;
char*p1,*p2,*p3;
int l;
***************
*** 161,165 ****
/* Reallocate memory for label if necessary */
l = p2-p1;
! if(l>= p->label_len) {
p->label_len += 20;
p->label = realloc(p->label,p->label_len*sizeof(char));
--- 165,169 ----
/* Reallocate memory for label if necessary */
l = p2-p1;
! while(l>= p->label_len) {
p->label_len += 20;
p->label = realloc(p->label,p->label_len*sizeof(char));
***************
*** 278,281 ****
--- 282,286 ----
int perfstring_to_perfvalue_but_without_service_state(const char*str, perf_value_t *p) {
+ //pp_log_func;
const char*p1;
char *p2;
***************
*** 344,347 ****
--- 349,353 ----
int perfstring_to_perfvalue(const char*str, perf_value_t *p) {
+ //pp_log_func;
int r;
int inside;
***************
*** 366,369 ****
--- 372,376 ----
int line_split(char *line, log_line_t *data)
{
+ //pp_log_func;
int i;
char*p;
|
|
From: Florian Gleixner <redflo@us...> - 2008-06-30 00:55:07
|
Update of /cvsroot/perfparse/_perfparse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15416
Modified Files:
ChangeLog
Log Message:
Fixed bug where memory leaks when metric label is long
Index: ChangeLog
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog 7 Jan 2008 22:56:31 -0000 1.23
--- ChangeLog 30 Jun 2008 00:55:14 -0000 1.24
***************
*** 1,3 ****
--- 1,4 ----
Version 1.0 beta 1
+ Fixed Memory leak with long metric labels (Need rewrite log parser?) (FG)
Perfparse daemon deletes now old data (FG)
More works in the PHP interface (FG)
|
|
From: Florian Gleixner <redflo@us...> - 2008-06-30 00:55:06
|
Update of /cvsroot/perfparse/_perfparse-phpgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15416/phpgui Modified Files: Makefile.in Log Message: Fixed bug where memory leaks when metric label is long Index: Makefile.in =================================================================== RCS file: /cvsroot/perfparse/_perfparse-phpgui/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 13 Feb 2008 22:50:32 -0000 1.16 --- Makefile.in 30 Jun 2008 00:55:14 -0000 1.17 *************** *** 277,280 **** --- 277,281 ---- templates/edit_host_list.tpl.html \ templates/select_metric.tpl.html \ + templates/tabber.tpl.html \ templates/default.css \ templates_c/index.php \ |
|
From: Florian Gleixner <redflo@us...> - 2008-05-06 23:08:40
|
Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13604
Modified Files:
perfparse.php utils.php
Log Message:
Make Edit Group Deletion Policies work
Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** utils.php 24 Apr 2008 22:29:09 -0000 1.48
--- utils.php 6 May 2008 22:58:19 -0000 1.49
***************
*** 560,580 ****
function get_delete_policy_parsed(&$db,$id) {
$policyinfo=get_delete_policy($db,$id);
! $s=$policyinfo['delete_policy_seconds'];
! if($s<0) { // infinity
! $policyinfo['policy_seconds']=-1;
! $policyinfo['policy_minutes']=0;
! $policyinfo['policy_hours']=0;
! $policyinfo['policy_days']=0;
! return($policyinfo);
! }
! $policyinfo['policy_seconds']=$s%60;
! $s=floor($s/60);
! $policyinfo['policy_minutes']=$s%60;
! $s=floor($s/60);
! $policyinfo['policy_hours']=$s%24;
! $policyinfo['policy_days']=floor($s/24);
return($policyinfo);
}
--- 560,587 ----
function get_delete_policy_parsed(&$db,$id) {
$policyinfo=get_delete_policy($db,$id);
! $parsed=parse_seconds_to_time($policyinfo['delete_policy_seconds']);
! $policyinfo=array_merge($policyinfo,$parsed);
return($policyinfo);
}
+ // Takes a integer as input, interpretes as seconds of a time difference and returns a array
+ // where the time difference is more human readable in days, hours, minutes and seconds
+ function parse_seconds_to_time($seconds) {
+ if($seconds<0) { // infinity
+ $ret['seconds']=-1;
+ $ret['minutes']=0;
+ $ret['hours']=0;
+ $ret['days']=0;
+ } else {
+ $ret['seconds']=$seconds%60;
+ $seconds=floor($seconds/60);
+ $ret['minutes']=$seconds%60;
+ $seconds=floor($seconds/60);
+ $ret['hours']=$seconds%24;
+ $ret['days']=floor($seconds/24);
+ }
+ return($ret);
+ }
+
***************
*** 688,692 ****
function get_group_bin_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.bin_delete_policy_id=d.policy_id where g.group_id=? ';
--- 695,699 ----
function get_group_bin_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds,d.policy_id from
perfdata_groups g left join
perfdata_delete_policy d on g.bin_delete_policy_id=d.policy_id where g.group_id=? ';
***************
*** 695,699 ****
}
if($res['policy_name']!==NULL) {
! return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
}
return(array('source'=>'none'));
--- 702,707 ----
}
if($res['policy_name']!==NULL) {
! return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'],
! 'policy_id'=>$res['policy_id']));
}
return(array('source'=>'none'));
***************
*** 702,706 ****
function get_group_raw_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.raw_delete_policy_id=d.policy_id where g.group_id=? ';
--- 710,714 ----
function get_group_raw_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds,d.policy_id from
perfdata_groups g left join
perfdata_delete_policy d on g.raw_delete_policy_id=d.policy_id where g.group_id=? ';
***************
*** 709,717 ****
}
if($res['policy_name']!==NULL) {
! return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
}
return(array('source'=>'none'));
}
function get_group_bin_del_policy_from_hostid(&$db,$host_id) {
--- 717,755 ----
}
if($res['policy_name']!==NULL) {
! return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds'],
! 'policy_id'=>$res['policy_id']));
}
return(array('source'=>'none'));
}
+ function set_group_bin_del_policy(&$db,$group_id,$policy_id) {
+ // sanitize
+ $group_id=(int) $group_id;
+ if(empty($policy_id) or $policy_id===NULL) {
+ $policy_id=NULL;
+ } else {
+ $policy_id=(int) $policy_id;
+ }
+ $query='update perfdata_groups set bin_delete_policy_id=? where group_id=?';
+ if(!$res=$db->Execute($query,array($policy_id,$group_id))) {
+ return(FALSE);
+ }
+ return(TRUE);
+ }
+
+ function set_group_raw_del_policy(&$db,$group_id,$policy_id) {
+ // sanitize
+ $group_id=(int) $group_id;
+ if(empty($policy_id) or $policy_id===NULL) {
+ $policy_id=NULL;
+ } else {
+ $policy_id=(int) $policy_id;
+ }
+ $query='update perfdata_groups set raw_delete_policy_id=? where group_id=?';
+ if(!$res=$db->Execute($query,array($policy_id,$group_id))) {
+ return(FALSE);
+ }
+ return(TRUE);
+ }
function get_group_bin_del_policy_from_hostid(&$db,$host_id) {
Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** perfparse.php 1 Apr 2008 19:22:26 -0000 1.63
--- perfparse.php 6 May 2008 22:58:19 -0000 1.64
***************
*** 611,615 ****
--- 611,669 ----
break;
+ case 'edit_group_delete_policies':
+ get_request_var('edited','int',FALSE);
+ if($edited) {
+ get_request_var('change_bin_del_policy','array');
+ get_request_var('change_raw_del_policy','array');
+ if(isset($_REQUEST['change_all'])) {
+ // read every value and set it
+ foreach($change_bin_del_policy as $groupId=>$policyId) {
+ set_group_bin_del_policy($db,$groupId,$policyId);
+ }
+ foreach($change_raw_del_policy as $groupId=>$policyId) {
+ set_group_raw_del_policy($db,$groupId,$policyId);
+ }
+ } else {
+ get_request_var('change_del_policy','array');
+ foreach($change_del_policy as $groupId=>$dummy) {
+ set_group_bin_del_policy($db,$groupId,$change_bin_del_policy[$groupId]);
+ set_group_raw_del_policy($db,$groupId,$change_raw_del_policy[$groupId]);
+ }
+ }
+ }
+
+
+ // Get data for displaying table
+ $policyinfos=get_delete_policies($db);
+ $groupinfos=get_groups($db);
+ foreach($groupinfos as $groupid => $groupname) {
+ $groupinfos[$groupid]=array('groupname'=>$groupname);
+ $t=get_group_bin_del_policy($db,$groupid);
+ if($t['source'] != 'none') {
+ $parsed=parse_seconds_to_time($t['policy_seconds']); // not needed?
+ $t=array_merge($t,$parsed);
+ $groupinfos[$groupid]['bin_policy']=$t;
+ } else {
+ $groupinfos[$groupid]['bin_policy']['policy_name']='';
+ $groupinfos[$groupid]['bin_policy']['policy_seconds']='';
+ }
+ $t=get_group_raw_del_policy($db,$groupid);
+ if($t['source'] != 'none') {
+ $parsed=parse_seconds_to_time($t['policy_seconds']); // not needed?
+ $t=array_merge($t,$parsed);
+ $groupinfos[$groupid]['raw_policy']=$t;
+ } else {
+ $groupinfos[$groupid]['raw_policy']['policy_name']='';
+ $groupinfos[$groupid]['raw_policy']['policy_seconds']='';
+ }
+ }
+
+
+ $smarty->assign_by_ref('groupinfos',$groupinfos);
+ $smarty->assign_by_ref('policyinfos',$policyinfos);
+ $smarty->display($config['PHP_Style'].$_REQUEST['page'].'.tpl.html');
+ break;
+
case 'show_effective_del_policies':
// get all needed object names and ids
|
|
From: Florian Gleixner <redflo@us...> - 2008-05-06 23:08:40
|
Update of /cvsroot/perfparse/_perfparse-phpgui/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13604/templates
Modified Files:
edit_default_delete_policies.tpl.html
edit_delete_policies.tpl.html
Added Files:
edit_group_delete_policies.tpl.html
Log Message:
Make Edit Group Deletion Policies work
Index: edit_default_delete_policies.tpl.html
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_default_delete_policies.tpl.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_default_delete_policies.tpl.html 23 Jan 2008 22:33:53 -0000 1.3
--- edit_default_delete_policies.tpl.html 6 May 2008 22:58:19 -0000 1.4
***************
*** 56,60 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_days" size="4" value="{$bin_policy.policy_days}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 56,60 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_days" size="4" value="{$bin_policy.days}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 62,66 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_hours" size="2" value="{$bin_policy.policy_hours}"/>
</td>
</tr>
--- 62,66 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_hours" size="2" value="{$bin_policy.hours}"/>
</td>
</tr>
***************
*** 71,75 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_minutes" size="2" value="{$bin_policy.policy_minutes}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 71,75 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_minutes" size="2" value="{$bin_policy.minutes}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 77,81 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_seconds" size="2" value="{$bin_policy.policy_seconds}"/>
</td>
</tr>
--- 77,81 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_bin_policy_seconds" size="2" value="{$bin_policy.seconds}"/>
</td>
</tr>
***************
*** 107,111 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_days" size="4" value="{$raw_policy.policy_days}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 107,111 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_days" size="4" value="{$raw_policy.days}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 113,117 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_hours" size="2" value="{$raw_policy.policy_hours}"/>
</td>
</tr>
--- 113,117 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_hours" size="2" value="{$raw_policy.hours}"/>
</td>
</tr>
***************
*** 122,126 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_minutes" size="2" value="{$raw_policy.policy_minutes}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 122,126 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_minutes" size="2" value="{$raw_policy.minutes}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 128,132 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_seconds" size="2" value="{$raw_policy.policy_seconds}"/>
</td>
</tr>
--- 128,132 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="def_raw_policy_seconds" size="2" value="{$raw_policy.seconds}"/>
</td>
</tr>
--- NEW FILE: edit_group_delete_policies.tpl.html ---
<HTML>
<!-- $Id: edit_group_delete_policies.tpl.html,v 1.1 2008/05/06 22:58:19 redflo Exp $ -->
<HEAD>
<TITLE>PerfParse</TITLE>
{include file="tabber.tpl.html"}
</HEAD>
<BODY>
<!-- Header -->
<p align=center>
<span class="logo">
<table class="logotext">
<tr><td>
<img src="{$http_image_path}perfparse-logo-sm.png" border=0>
</td><td>
<b>{tr}Edit Group Deletion Policies{/tr}</b><br />
<a href="perfparse.php">{tr}Click to return to main menu{/tr}.</a>
</td><td class="normtext" width="20%">
{$version}
</td>
</tr>
</table>
</span>
<br />
</p>
<!-- Error Window -->
{if $sql_error}
<p align=center>
<table width=600 border=1 cellpadding=5 cellspacing=0 bgcolor="#CCCCCC"><tr><td>
{$sql_error}
</td></tr></table>
</p>
{/if}
<!-- Edit default policies -->
<form method="post">
<input type=hidden name="page" value="edit_group_delete_policies">
<input type=hidden name="edited" value="1">
<p align=center>
<table width=600>
<tr><th>{tr}Group Name{/tr}</th>
<th>{tr}Bin Deletion Policy{/tr}</th>
<th>{tr}Raw Deletion Policy{/tr}</th>
<th>{tr}Action{/tr}</th></tr>
{foreach from=$groupinfos item=groupInfo key=groupId}
<tr>
<td>{$groupInfo.groupname}</td>
<td><select name="change_bin_del_policy[{$groupId}]">
<option value="" {if $groupInfo.bin_policy.policy_id == ""}selected="selected"{/if}>
{tr}None{/tr}</option>
{foreach from=$policyinfos item=policyInfo}
<option value="{$policyInfo.policy_id}" {if $groupInfo.bin_policy.policy_id == $policyInfo.policy_id}selected="selected"{/if}>
{$policyInfo.policy_name}</option>
{/foreach}
</td>
<td><select name="change_raw_del_policy[{$groupId}]">
<option value="" {if $groupInfo.raw_policy.policy_id == ""}selected="selected"{/if}>
{tr}None{/tr}</option>
{foreach from=$policyinfos item=policyInfo}
<option value="{$policyInfo.policy_id}" {if $groupInfo.raw_policy.policy_id == $policyInfo.policy_id}selected="selected"{/if}>
{$policyInfo.policy_name}</option>
{/foreach}
</td>
<td><input type="submit" name="change_del_policy[{$groupId}]" value="{tr}Set{/tr}" /></td>
</tr>
{/foreach}
<tr><td><input type="submit" name="change_all" value="{tr}Set all{/tr}" /></td></tr>
</table>
</form>
</body></html>
Index: edit_delete_policies.tpl.html
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/templates/edit_delete_policies.tpl.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** edit_delete_policies.tpl.html 28 Jan 2008 01:14:36 -0000 1.6
--- edit_delete_policies.tpl.html 6 May 2008 22:58:19 -0000 1.7
***************
*** 73,77 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_days" size="4" value="{if $edit_policy}{$epolicy.policy_days}{else}0{/if}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 73,77 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_days" size="4" value="{if $edit_policy}{$epolicy.days}{else}0{/if}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 79,83 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_hours" size="2" value="{if $edit_policy}{$epolicy.policy_hours}{else}0{/if}"/>
</td>
</tr>
--- 79,83 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_hours" size="2" value="{if $edit_policy}{$epolicy.hours}{else}0{/if}"/>
</td>
</tr>
***************
*** 94,98 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_minutes" size="2" value="{if $edit_policy}{$epolicy.policy_minutes}{else}0{/if}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
--- 94,98 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_minutes" size="2" value="{if $edit_policy}{$epolicy.minutes}{else}0{/if}"/>
</td><td>
<font face="Arial, Helvetica" size=2>
***************
*** 100,104 ****
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_seconds" size="2" value="{if $edit_policy}{$epolicy.policy_seconds}{else}0{/if}"/>
</td>
</tr>
--- 100,104 ----
</td><td>
<font face="Arial, Helvetica" size=2>
! <input type="text" name="create_policy_seconds" size="2" value="{if $edit_policy}{$epolicy.seconds}{else}0{/if}"/>
</td>
</tr>
|
|
From: Florian Gleixner <redflo@us...> - 2008-04-24 22:29:29
|
Update of /cvsroot/perfparse/_perfparse/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195/scripts
Modified Files:
mysql_create.sql
Log Message:
make deletion policies less complex. No individual settings in objects allowed any more.
Index: mysql_create.sql
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/scripts/mysql_create.sql,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mysql_create.sql 28 Sep 2007 21:53:16 -0000 1.27
--- mysql_create.sql 24 Apr 2008 22:29:09 -0000 1.28
***************
*** 63,69 ****
REFERENCES perfdata_instances(instance_id),
raw_delete_policy_id INTEGER,
- raw_delete_policy_individual INTEGER,
bin_delete_policy_id INTEGER,
- bin_delete_policy_individual INTEGER,
FOREIGN KEY perfdata_groups_ibfk_2 (bin_delete_policy_id)
REFERENCES perfdata_delete_policy(policy_id)
--- 63,67 ----
***************
*** 78,82 ****
host_name VARCHAR(100) UNIQUE,
raw_delete_policy_id INTEGER,
- raw_delete_policy_individual INTEGER,
INDEX host_ix1 (raw_delete_policy_id),
FOREIGN KEY perfdata_host_ibfk_1 (raw_delete_policy_id)
--- 76,79 ----
***************
*** 84,88 ****
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)
--- 81,84 ----
***************
*** 125,129 ****
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)
--- 121,124 ----
***************
*** 176,180 ****
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)
--- 171,174 ----
|
|
From: Florian Gleixner <redflo@us...> - 2008-04-24 22:29:29
|
Update of /cvsroot/perfparse/_perfparse/libpp_mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195/libpp_mysql
Modified Files:
del_policy.c del_policy.h
Log Message:
make deletion policies less complex. No individual settings in objects allowed any more.
Index: del_policy.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** del_policy.c 17 Feb 2008 23:09:58 -0000 1.11
--- del_policy.c 24 Apr 2008 22:29:09 -0000 1.12
***************
*** 236,243 ****
if(ptype==GET_BIN) {
! g_string_printf(s_SQL, "SELECT bin_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.bin_delete_policy_id=p.policy_id WHERE host_id = '%d'",
policyinfo->iHostId);
} else {
! g_string_printf(s_SQL, "SELECT raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.raw_delete_policy_id=p.policy_id WHERE host_id = '%d'",
policyinfo->iHostId);
}
--- 236,243 ----
if(ptype==GET_BIN) {
! g_string_printf(s_SQL, "SELECT policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.bin_delete_policy_id=p.policy_id WHERE host_id = '%d'",
policyinfo->iHostId);
} else {
! g_string_printf(s_SQL, "SELECT policy_name,delete_policy_seconds FROM perfdata_host h left join perfdata_delete_policy p on h.raw_delete_policy_id=p.policy_id WHERE host_id = '%d'",
policyinfo->iHostId);
}
***************
*** 245,252 ****
query(s_SQL->str);
result_row = mysql_fetch_row(query_result);
! if(!isNull(0)) {
! policyinfo->iPolicySeconds=iData(0);
! policyinfo->iPolicySource=DEL_POLICY_SOURCE_HOST;
! } else if (!isNull(2)) {
policyinfo->sPolicyName=strdup(sData(1));
policyinfo->iPolicySeconds=iData(2);
--- 245,249 ----
query(s_SQL->str);
result_row = mysql_fetch_row(query_result);
! if (!isNull(1)) {
policyinfo->sPolicyName=strdup(sData(1));
policyinfo->iPolicySeconds=iData(2);
***************
*** 279,287 ****
if(ptype==GET_BIN){
! g_string_printf(s_SQL,"SELECT g.bin_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.bin_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'",
! policyinfo->iHostId);
} else {
! g_string_printf(s_SQL,"SELECT g.raw_delete_policy_individual,policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.raw_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'",
! policyinfo->iHostId);
}
--- 276,284 ----
if(ptype==GET_BIN){
! g_string_printf(s_SQL,"SELECT policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.bin_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'",
! policyinfo->iHostId);
} else {
! g_string_printf(s_SQL,"SELECT policy_name,delete_policy_seconds FROM perfdata_host_groups hg, perfdata_groups g left join perfdata_delete_policy p on g.raw_delete_policy_id=p.policy_id WHERE g.group_id=hg.group_id AND hg.host_id = '%d'",
! policyinfo->iHostId);
}
***************
*** 292,303 ****
while((result_row = mysql_fetch_row(query_result))) {
! if(!isNull(0)) { // individual settings before group settings
! if(iData(0)>maxdel || iData(0)==DEL_POLICY_INFINITY) {
! maxdel=iData(0);
! policyinfo->iPolicySeconds=iData(0);
! policyinfo->iPolicySource=DEL_POLICY_SOURCE_HOSTGROUP;
! // shall we store the group name somewhere? no. not yet.
! }
! } else if (!isNull(2)) {
if(iData(2)>maxdel || iData(2)==DEL_POLICY_INFINITY) {
maxdel=iData(2);
--- 289,293 ----
while((result_row = mysql_fetch_row(query_result))) {
! if (!isNull(1)) {
if(iData(2)>maxdel || iData(2)==DEL_POLICY_INFINITY) {
maxdel=iData(2);
***************
*** 315,318 ****
--- 305,309 ----
}
+ // nothing found? Get defaults.
if(policyinfo->iPolicySource==DEL_POLICY_SOURCE_NONE) {
policyinfo->iPolicySeconds=getDefaultPolicy(ptype);
***************
*** 467,473 ****
if(ptype==GET_RAW) {
! g_string_printf(s_SQL,"SELECT service_id,service_description,host_id,policy_name,delete_policy_seconds,raw_delete_policy_individual FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id");
} else {
! g_string_printf(s_SQL,"SELECT metric_id,metric,host_id,policy_name,delete_policy_seconds,bin_delete_policy_individual FROM perfdata_service s, perfdata_service_metric m LEFT JOIN perfdata_delete_policy d ON m.bin_delete_policy_id=d.policy_id where s.service_id=m.service_id");
}
query(s_SQL->str);
--- 458,464 ----
if(ptype==GET_RAW) {
! g_string_printf(s_SQL,"SELECT service_id,service_description,host_id,policy_name,delete_policy_seconds FROM perfdata_service s LEFT JOIN perfdata_delete_policy d ON s.raw_delete_policy_id=d.policy_id");
} else {
! g_string_printf(s_SQL,"SELECT metric_id,metric,host_id,policy_name,delete_policy_seconds FROM perfdata_service s, perfdata_service_metric m LEFT JOIN perfdata_delete_policy d ON m.bin_delete_policy_id=d.policy_id where s.service_id=m.service_id");
}
query(s_SQL->str);
***************
*** 491,498 ****
policyinfo->iPolicySeconds=DEL_POLICY_UNDEFINED;
! if(!isNull(5)) {
! policyinfo->iPolicySeconds=iData(5);
! policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE;
! } else if (!isNull(4)){
policyinfo->iPolicySeconds=iData(4);
policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE_GROUP;
--- 482,486 ----
policyinfo->iPolicySeconds=DEL_POLICY_UNDEFINED;
! if (!isNull(4)){
policyinfo->iPolicySeconds=iData(4);
policyinfo->iPolicySource=DEL_POLICY_SOURCE_SERVICE_GROUP;
***************
*** 538,550 ****
}
switch(policyinfo->iPolicySource) {
- case DEL_POLICY_SOURCE_SERVICE:
- pp_log_fl(LOG_INFO,_("individual service setting\n"));
- break;
- case DEL_POLICY_SOURCE_HOST:
- pp_log_fl(LOG_INFO,_("individual host setting\n"));
- break;
- case DEL_POLICY_SOURCE_HOSTGROUP:
- pp_log_fl(LOG_INFO,_("individual hostgroup setting\n"));
- break;
case DEL_POLICY_SOURCE_SERVICE_GROUP:
pp_log_fl(LOG_INFO,_("group '%s' setting in service.\n"),policyinfo->sPolicyName);
--- 526,529 ----
Index: del_policy.h
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_mysql/del_policy.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** del_policy.h 3 Jan 2008 22:04:44 -0000 1.7
--- del_policy.h 24 Apr 2008 22:29:09 -0000 1.8
***************
*** 47,57 ****
enum {
DEL_POLICY_SOURCE_NONE,
- DEL_POLICY_SOURCE_METRIC,
DEL_POLICY_SOURCE_METRIC_GROUP,
- DEL_POLICY_SOURCE_SERVICE,
DEL_POLICY_SOURCE_SERVICE_GROUP,
- DEL_POLICY_SOURCE_HOST,
DEL_POLICY_SOURCE_HOST_GROUP,
- DEL_POLICY_SOURCE_HOSTGROUP,
DEL_POLICY_SOURCE_HOSTGROUP_GROUP,
DEL_POLICY_SOURCE_DEFAULT};
--- 47,53 ----
|
|
From: Florian Gleixner <redflo@us...> - 2008-04-24 22:29:29
|
Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195/phpgui
Modified Files:
utils.php
Log Message:
make deletion policies less complex. No individual settings in objects allowed any more.
Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** utils.php 3 Dec 2007 20:39:03 -0000 1.47
--- utils.php 24 Apr 2008 22:29:09 -0000 1.48
***************
*** 647,658 ****
function get_metric_bin_del_policy(&$db,$metric_id) {
! $query='select bin_delete_policy_individual,policy_name,delete_policy_seconds from perfdata_service_metric
left join perfdata_delete_policy on bin_delete_policy_id=policy_id where metric_id=?';
if(!$res=$db->GetRow($query,array($metric_id))) {
return(FALSE);
}
- if($res['bin_delete_policy_individual']!==NULL) {
- return(array('source'=>'Individual','policy_seconds'=>$res['bin_delete_policy_individual']));
- }
if($res['policy_name']!==NULL) {
return(array('source'=>'Metric Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
--- 647,655 ----
function get_metric_bin_del_policy(&$db,$metric_id) {
! $query='select policy_name,delete_policy_seconds from perfdata_service_metric
left join perfdata_delete_policy on bin_delete_policy_id=policy_id where metric_id=?';
if(!$res=$db->GetRow($query,array($metric_id))) {
return(FALSE);
}
if($res['policy_name']!==NULL) {
return(array('source'=>'Metric Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
***************
*** 663,667 ****
function get_host_bin_del_policy(&$db,$host_id) {
// if policy set in host
! $query='select h.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from
perfdata_host h left join
perfdata_delete_policy d on h.bin_delete_policy_id=d.policy_id where h.host_id=? ';
--- 660,664 ----
function get_host_bin_del_policy(&$db,$host_id) {
// if policy set in host
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_host h left join
perfdata_delete_policy d on h.bin_delete_policy_id=d.policy_id where h.host_id=? ';
***************
*** 669,675 ****
return(FALSE);
}
- if($res['bin_delete_policy_individual']!==NULL) {
- return(array('source'=>'Host Individual','policy_seconds'=>$res['bin_delete_policy_individual']));
- }
if($res['policy_name']!==NULL) {
return(array('source'=>'Host Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
--- 666,669 ----
***************
*** 680,684 ****
function get_host_raw_del_policy(&$db,$host_id) {
// if policy set in host
! $query='select h.raw_delete_policy_individual,d.policy_name,d.delete_policy_seconds from
perfdata_host h left join
perfdata_delete_policy d on h.raw_delete_policy_id=d.policy_id where h.host_id=? ';
--- 674,678 ----
function get_host_raw_del_policy(&$db,$host_id) {
// if policy set in host
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_host h left join
perfdata_delete_policy d on h.raw_delete_policy_id=d.policy_id where h.host_id=? ';
***************
*** 686,692 ****
return(FALSE);
}
- if($res['raw_delete_policy_individual']!==NULL) {
- return(array('source'=>'Host Individual','policy_seconds'=>$res['raw_delete_policy_individual']));
- }
if($res['policy_name']!==NULL) {
return(array('source'=>'Host Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
--- 680,683 ----
***************
*** 697,701 ****
function get_group_bin_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.bin_delete_policy_id=d.policy_id where g.group_id=? ';
--- 688,692 ----
function get_group_bin_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.bin_delete_policy_id=d.policy_id where g.group_id=? ';
***************
*** 703,709 ****
return(FALSE);
}
- if($res['bin_delete_policy_individual']!==NULL) {
- return(array('source'=>'Group Individual','policy_seconds'=>$res['bin_delete_policy_individual']));
- }
if($res['policy_name']!==NULL) {
return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
--- 694,697 ----
***************
*** 714,718 ****
function get_group_raw_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select g.raw_delete_policy_individual,d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.raw_delete_policy_id=d.policy_id where g.group_id=? ';
--- 702,706 ----
function get_group_raw_del_policy(&$db,$group_id) {
// if policy set in group
! $query='select d.policy_name,d.delete_policy_seconds from
perfdata_groups g left join
perfdata_delete_policy d on g.raw_delete_policy_id=d.policy_id where g.group_id=? ';
***************
*** 720,726 ****
return(FALSE);
}
- if($res['raw_delete_policy_individual']!==NULL) {
- return(array('source'=>'Group Individual','policy_seconds'=>$res['raw_delete_policy_individual']));
- }
if($res['policy_name']!==NULL) {
return(array('source'=>'Group Policy','policy_name'=>$res['policy_name'],'policy_seconds'=>$res['delete_policy_seconds']));
--- 708,711 ----
***************
*** 733,737 ****
// if policy is set in group. If more than one group match, then the group with the longest policy matches.
// Individual settings match first.
! $query='select g.bin_delete_policy_individual,d.policy_name,d.delete_policy_seconds
from perfdata_host h, perfdata_host_groups gh,
perfdata_groups g left join perfdata_delete_policy d on
--- 718,722 ----
// if policy is set in group. If more than one group match, then the group with the longest policy matches.
// Individual settings match first.
! $query='select d.policy_name,d.delete_policy_seconds
from perfdata_host h, perfdata_host_groups gh,
perfdata_groups g left join perfdata_delete_policy d on
***************
*** 742,745 ****
--- 727,731 ----
}
print_r($res);
+ // TODO: not finished?!
}
|
|
From: Florian Gleixner <redflo@us...> - 2008-04-24 22:29:29
|
Update of /cvsroot/perfparse/_perfparse/doc/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195/doc/database Modified Files: database_schema_v20.odp Log Message: make deletion policies less complex. No individual settings in objects allowed any more. Index: database_schema_v20.odp =================================================================== RCS file: /cvsroot/perfparse/_perfparse/doc/database/database_schema_v20.odp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsXDFtYg and /tmp/cvsiO1dfu differ |
|
From: Florian Gleixner <redflo@us...> - 2008-04-24 22:29:29
|
Update of /cvsroot/perfparse/_perfparse/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195/modules
Modified Files:
storage_mysql.c
Log Message:
make deletion policies less complex. No individual settings in objects allowed any more.
Index: storage_mysql.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** storage_mysql.c 3 Jan 2008 22:04:44 -0000 1.22
--- storage_mysql.c 24 Apr 2008 22:29:09 -0000 1.23
***************
*** 572,580 ****
static int isSaveBinAllowed(char *sHost, char *sService, char *sMetric)
{
pp_log_func;
/* Check policy to find out if we are allowed to save this metric */
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'",
--- 572,581 ----
static int isSaveBinAllowed(char *sHost, char *sService, char *sMetric)
{
+ // TODO: Check Policies of Service/Host/Hostgroup also.
pp_log_func;
/* Check policy to find out if we are allowed to save this metric */
static int bResult;
! g_string_printf(s_SQL, "SELECT 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'",
***************
*** 587,591 ****
if (rows() == 0) return TRUE;
! if (!result_row[0] || iData(0) > 0 || iData(1) > 0)
bResult = TRUE;
else
--- 588,592 ----
if (rows() == 0) return TRUE;
! if (!result_row[0] || iData(0) > 0 )
bResult = TRUE;
else
|