Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

Make our C compiler/header requirements explicit.

by Sven Panne

Module: check_mk Branch: master Commit: 64d942868517fdf1de57f7a8f6095944c95f9315 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d942868517fd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 1 11:11:46 2016 +0100 Make our C compiler/header requirements explicit. --- livestatus/src/Makefile.am | 2 +- livestatus/src/logger.c | 3 +++ livestatus/src/module.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index deab289..4cc5099 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -51,7 +51,7 @@ livestatus_so_SOURCES = \ ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc livestatus_so_CXXFLAGS = -std=c++11 -fPIC -livestatus_so_CFLAGS = -fPIC +livestatus_so_CFLAGS = -std=c99 -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) -rm -f plugin.so diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 168ecbd..3be66ee 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -22,6 +22,9 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// Needed for localtime_r +#define _XOPEN_SOURCE 500 + #include "logger.h" #include <errno.h> #include <pthread.h> diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 0671efd..59b0062 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -22,6 +22,9 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// Needed for strdup and S_ISSOCK +#define _XOPEN_SOURCE 500 + // IWYU pragma: no_include <bits/socket_type.h> #include "config.h" #include <errno.h>

8 years, 7 months

Fix profiling once more: do not depend on subdirectory

by Mathias Kettner

Module: check_mk Branch: master Commit: a6dd7c7f0a76f0e19770892bd601e6a5a5cf316c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6dd7c7f0a76f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 10:23:24 2016 +0100 Fix profiling once more: do not depend on subdirectory --- web/htdocs/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 1cad319..61f7769 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -226,7 +226,7 @@ def init_profiling(is_profiling): import cProfile # Ubuntu: install python-profiler when using this feature - profile_file = defaults.var_dir + "/profiling/multisite.profile" + profile_file = defaults.var_dir + "/multisite.profile" p = cProfile.Profile() p.runcall(handler, html.req, html.fields, True)

8 years, 7 months

Updated bug entries #2425

by Mathias Kettner

Module: check_mk Branch: master Commit: eb1fe440aa49943e617f528ea2a19396d7dc3f22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb1fe440aa4994… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 10:19:04 2016 +0100 Updated bug entries #2425 --- .bugs/2425 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.bugs/2425 b/.bugs/2425 new file mode 100644 index 0000000..b2dd797 --- /dev/null +++ b/.bugs/2425 @@ -0,0 +1,20 @@ +Title: Permissions for views and dashboards inconsistent +Component: multisite +State: open +Date: 2016-03-01 09:58:31 +Targetversion: 1.2.8 +Class: bug + +1. Views und Dashboards: +In beiden Fällen gibt es die Option, dass Ansicht oder Gesamtübersicht +für alle Benutzer sichtbar sein soll. Das Aktivieren bzw. Deaktivieren +hat allerdings unterschiedliche Auswirkungen auf die Auflistung in der +Berechtigungsmatrix. + +Views - Edit: +Make this view available for all users wird aktiviert -> View wird in +Berechtigungs-Matrix angezeigt. + +Dashboard - Edit: +Make this view available for all unsers wird nicht aktiviert -> +Dashboard wird in Berechtigungs-Matrix angezeigt.

8 years, 7 months

Finally cleaned up profiling again. Is now enabled / disabled by config again.

by Lars Michelsen

Module: check_mk Branch: master Commit: 77cb5c921a2c86e0671ed517495c897639b23384 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77cb5c921a2c86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 10:11:14 2016 +0100 Finally cleaned up profiling again. Is now enabled / disabled by config again. --- web/htdocs/index.py | 19 ++++++++++--------- web/htdocs/modules.py | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index a4487b1..1cad319 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -43,8 +43,8 @@ def handler(req, fields = None, is_profiling = False): response_code = apache.OK try: - init_profiling(req, fields, is_profiling) config.load_config() # load multisite.mk etc. + init_profiling(is_profiling) html.init_modes() # Make sure all plugins are avaiable as early as possible. At least @@ -221,23 +221,24 @@ def init_sys_path(): sys.path[0:0] = [ local_module_path, defaults.web_dir + "/htdocs" ] -def init_profiling(req, fields, is_profiling): - if not is_profiling and os.path.exists(defaults.var_dir + "/profiling"): +def init_profiling(is_profiling): + if not is_profiling and config.profile: import cProfile - # the profiler loses the memory about all modules. We need to hand over - # the request object in the apache module. + # Ubuntu: install python-profiler when using this feature profile_file = defaults.var_dir + "/profiling/multisite.profile" - retcode = cProfile.runctx( - "import index; " - "index.handler(profile_req, profile_fields, is_profiling=True)", - {'profile_req': req, 'profile_fields': fields}, {}, profile_file) + + p = cProfile.Profile() + p.runcall(handler, html.req, html.fields, True) + p.dump_stats(profile_file) + file(profile_file + ".py", "w").write( "#!/usr/bin/python\n" "import pstats\n" "stats = pstats.Stats(%r)\n" "stats.sort_stats('time').print_stats()\n" % profile_file) os.chmod(profile_file + ".py", 0755) + raise FinalizeRequest() diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index c3bac52..572e492 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -63,7 +63,7 @@ def init_modules(): module_names_prev = set(imports()) - # The config module is handled separate from the other modulesa + # The config module is handled separate from the other modules module_names_prev.add("config") # Load the list of internal hard coded modules

8 years, 7 months

Cleaned up profiling code again

by Lars Michelsen

Module: check_mk Branch: master Commit: e95ed330110fe3d5acec1605b408b03ed1d0f05c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95ed330110fe3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 09:22:03 2016 +0100 Cleaned up profiling code again --- web/htdocs/index.py | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index e35cd19..a4487b1 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -36,25 +36,6 @@ from html_mod_python import html_mod_python, FinalizeRequest # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, fields = None, is_profiling = False): - if not is_profiling and os.path.exists(defaults.var_dir + "/profiling"): - import cProfile - # the profiler loses the memory about all modules. We need to hand over - # the request object in the apache module. - # Ubuntu: install python-profiler when using this feature - profile_file = defaults.var_dir + "/profiling/multisite.profile" - retcode = cProfile.runctx( - "import index; " - "index.handler(profile_req, profile_fields, is_profiling=True)", - {'profile_req': req, 'profile_fields': fields}, {}, profile_file) - file(profile_file + ".py", "w").write( - "#!/usr/bin/python\n" - "import pstats\n" - "stats = pstats.Stats(%r)\n" - "stats.sort_stats('time').print_stats()\n" % profile_file) - os.chmod(profile_file + ".py", 0755) - return apache.OK - - # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and # store results in the request object for later usage. @@ -62,6 +43,7 @@ def handler(req, fields = None, is_profiling = False): response_code = apache.OK try: + init_profiling(req, fields, is_profiling) config.load_config() # load multisite.mk etc. html.init_modes() @@ -239,6 +221,26 @@ def init_sys_path(): sys.path[0:0] = [ local_module_path, defaults.web_dir + "/htdocs" ] +def init_profiling(req, fields, is_profiling): + if not is_profiling and os.path.exists(defaults.var_dir + "/profiling"): + import cProfile + # the profiler loses the memory about all modules. We need to hand over + # the request object in the apache module. + # Ubuntu: install python-profiler when using this feature + profile_file = defaults.var_dir + "/profiling/multisite.profile" + retcode = cProfile.runctx( + "import index; " + "index.handler(profile_req, profile_fields, is_profiling=True)", + {'profile_req': req, 'profile_fields': fields}, {}, profile_file) + file(profile_file + ".py", "w").write( + "#!/usr/bin/python\n" + "import pstats\n" + "stats = pstats.Stats(%r)\n" + "stats.sort_stats('time').print_stats()\n" % profile_file) + os.chmod(profile_file + ".py", 0755) + raise FinalizeRequest() + + # Early initialization upon first start of the application by the server def initialize(): init_sys_path()

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016