Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: FIX: BI - Fixed cache reload after monitoring daemon restart

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa8f5c360face492d8474c6d403ad06399fa8524 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa8f5c360face4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 08:33:47 2012 +0200 FIX: BI - Fixed cache reload after monitoring daemon restart --- web/htdocs/bi.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index f1231bd..f6dbc32 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -206,16 +206,17 @@ def compile_forest(user, only_hosts = None, only_groups = None): def log(s): file(config.bi_compile_log, "a").write(s) - if g_compiled_everything: - log('PID: %d - Already compiled everything\n' % os.getpid()) - return # In this case simply skip further compilations - new_config_information = cache_needs_update() - if new_config_information: # config changed are Nagios restarted, clear cache - global g_cache + if new_config_information: + # config changed or monitoring daemon restarted, clear cache g_cache = {} global g_config_information g_config_information = new_config_information + g_compiled_everything = False + + if g_compiled_everything: + log('PID: %d - Already compiled everything\n' % os.getpid()) + return # In this case simply skip further compilations # OPTIMIZE: All users that have the permissing bi.see_all # can use the same cache.

12 years, 2 months

Check_MK Git: check_mk: BI: Fixed classic aggregation compilation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a17d7149429b5bf6473c1357f5d86da6cc691098 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17d7149429b5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 16:46:10 2012 +0200 BI: Fixed classic aggregation compilation --- web/htdocs/bi.py | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 555b80a..f1231bd 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -118,8 +118,10 @@ NT_PLACEHOLDER = 4 # temporary dummy entry needed for REMAINING # global variables -g_cache = {} # per-user cache -g_config_information = None # for invalidating cache after config change +g_cache = {} # per-user cache +g_config_information = None # for invalidating cache after config change +did_compilation = False # Is set to true if anything has been compiled +g_compiled_everything = False # Is set to true if all aggregations have been compiled # Load the static configuration of all services and hosts (including tags) # without state. @@ -188,8 +190,8 @@ def aggregation_groups(): else: # classic mode: precompile all and display only groups with members - bi.compile_forest(config.user_id) - group_names = list(set([ group for group, trees in bi.g_user_cache["forest"].items() if trees ])) + compile_forest(config.user_id) + group_names = list(set([ group for group, trees in g_user_cache["forest"].items() if trees ])) return sorted(group_names, cmp = lambda a,b: cmp(a.lower(), b.lower())) @@ -199,7 +201,14 @@ def aggregation_groups(): # aggregation functions are still left as names. That way the forest # printable (and storable in Python syntax to a file). def compile_forest(user, only_hosts = None, only_groups = None): - global g_cache, g_user_cache + global g_cache, g_user_cache, g_compiled_everything + + def log(s): + file(config.bi_compile_log, "a").write(s) + + if g_compiled_everything: + log('PID: %d - Already compiled everything\n' % os.getpid()) + return # In this case simply skip further compilations new_config_information = cache_needs_update() if new_config_information: # config changed are Nagios restarted, clear cache @@ -245,13 +254,19 @@ def compile_forest(user, only_hosts = None, only_groups = None): # check wether or not hosts are not compiled yet only_hosts = to_compile(only_hosts, 'hosts') if not only_hosts: + log('PID: %d - All requested hosts have already been compiled\n' % os.getpid()) return # Nothing to do - everything is cached if only_groups and cache['compiled_groups']: only_groups = to_compile(only_groups, 'groups') if not only_groups: + log('PID: %d - All requested groups have already been compiled\n' % os.getpid()) return # Nothing to do - everything is cached + # Set a flag that anything has been compiled in this call + global did_compilation + did_compilation = True + # Load all (needed) services load_services(cache, only_hosts) @@ -337,6 +352,8 @@ def compile_forest(user, only_hosts = None, only_groups = None): cache['compiled_hosts'] = set(g_services.keys()) cache['compiled_groups'] = set(cache['forest'].keys()) + g_compiled_everything = True + # Remember successful compile in cache g_cache[user] = cache @@ -350,13 +367,14 @@ def compile_forest(user, only_hosts = None, only_groups = None): num_services += len(val[1]) after = time.time() - file(config.bi_compile_log, "a").write( - "This request:\n" + + log("This request:\n" " User: %s, Only-Groups: %r, Only-Hosts: %s\n" " PID: %d, Processed %d services on %d hosts in %.3f seconds.\n" "\n" " %d compiled multi aggrs, %d compiled host aggrs, %d compiled groups\n" "Cache:\n" + " Everything compiled: %r\n" " %d compiled multi aggrs, %d compiled host aggrs, %d compiled groups\n" "Config:\n" " Multi-Aggregations: %d, Host-Aggregations: %d\n" @@ -370,6 +388,7 @@ def compile_forest(user, only_hosts = None, only_groups = None): num_new_multi_aggrs, num_new_host_aggrs, only_groups and len(only_groups) or 0, + g_compiled_everything, num_total_aggr - len(cache['compiled_hosts']), len(cache['compiled_hosts']), len(cache['compiled_groups']),

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'bi'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a9bdbbcd5c52e4c612be85a14a8f4e977dcfa0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a9bdbbcd5c52e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:37:17 2012 +0200 Merge branch 'bi' ---

12 years, 2 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d708fbc90a06976fa7ba922c73e073b488c0805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d708fbc90a069… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:38:21 2012 +0200 Updated changelog --- ChangeLog | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3185383..8f4f376 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,9 +2,7 @@ Event Console: * Moved source of Event Console into Check_MK project -1.2.0p3: - Mulitisite - * Added "view" parameter to dashlet_pnpgraph webservice + Multisite: * BI: Added missing localizations * BI: Added option bit_precompile_on_demand to split compilations of the aggregations in several fragments. If possible only the needed @@ -14,6 +12,10 @@ * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations +1.2.0p3: + Mulitisite + * Added "view" parameter to dashlet_pnpgraph webservice + WATO * Added "profile" option to be configurable via browser * FIX: It is now possible to create clusters in empty folders

12 years, 2 months

Check_MK Git: check_mk: Added "profile" option to be configurable via browser

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b838f88290ad5b9e33950f6954becd9516aa27de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b838f88290ad5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 08:43:43 2012 +0200 Added "profile" option to be configurable via browser --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70846eb..2c6144b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ aggregation compilations WATO + * Added "profile" option to be configurable via browser * FIX: It is now possible to create clusters in empty folders * FIX: Fixed problem with complaining empty ListOf() valuespecs diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0f8cd83..f89d887 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -52,6 +52,21 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "profile", + Checkbox( + title = _("Profile requests"), + label = _("enable profile mode"), + help = _("It is possible to profile the rendering process of Multisite pages. This " + "Is done using the Python module cProfile. When enabled two files are placed " + "into the Multisite var directory named <code>multisite.profile</code> and " + "<code>multisite.profile.py</code>. By executing the later file you can get " + "runtime statistics about the last processed page."), + default_value = False + ), + domain = "multisite" +) + +register_configvar(group, "debug_livestatus_queries", Checkbox(title = _("Debug Livestatus queries"), label = _("enable debug of Livestatus queries"), @@ -237,7 +252,7 @@ register_configvar(group, Optional( Filename( label = _("Absolute path to log file"), - default = defaults.var_dir + '/bi-compile.log', + default = defaults.var_dir + '/web/bi-compile.log', ), title = _("Logfile for BI compilation diagnostics"), label = _("Activate logging of BI compilations into a logfile"),

12 years, 2 months

Check_MK Git: check_mk: Some small performance improvement

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 800273c90235068e30db3f85e1bebb8bc9e93f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=800273c9023506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 10:03:56 2012 +0200 Some small performance improvement --- web/htdocs/htmllib.py | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 69257fa..9805478 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -87,25 +87,20 @@ def attrencode(value): # is saving more then 90% of the total HTML generating time # on more complex pages! def urlencode_vars(vars): - output = "" + output = [] for varname, value in vars: - if output != "": - output += "&" - if type(value) == int: value = str(value) elif type(value) == unicode: value = value.encode("utf-8") - output += varname - output += "=" try: # urllib is not able to encode non-Ascii characters. Yurks - output += urllib.quote(value) + output.append(varname + '=' + urllib.quote(value)) except: - output += urlencode(value) # slow but working + output.append(varname + '=' + urlencode(value)) # slow but working - return output + return '&'.join(output) def urlencode(value): if type(value) == unicode: @@ -332,7 +327,7 @@ class html: # [('varname1', value1), ('varname2', value2) ] def makeuri(self, addvars, remove_prefix = None): - vars = [ (v, self.var(v)) for v in self.req.vars if not v.startswith("_") ] + vars = [ (v, self.var(v)) for v in self.req.vars if v[0] != "_" ] if remove_prefix != None: vars = [ i for i in vars if not i[0].startswith(remove_prefix) ] return self.req.myfile + ".py?" + urlencode_vars(vars + addvars)

12 years, 2 months

Check_MK Git: check_mk: Added mkeventd to regular builds

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b1f77c2da72de015c8f84af1d9bad22304a699 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b1f77c2da72d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:34:39 2012 +0200 Added mkeventd to regular builds --- .gitignore | 1 + Makefile | 15 ++++++++++++--- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 126264 -> 127802 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes mkeventd/bin/mkeventd | 2 +- 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 94e5851..77041d6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ check_mk-*.spec check_mk-*.tar.gz mk-livestatus-*.tar.gz +mkeventd-*.tar.gz rpm.buildroot/ rpm.topdir/ *.rpm diff --git a/Makefile b/Makefile index ca14915..2dab40c 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ help: @echo "make headers --> create/update fileheades" @echo "make healspaces --> remove trailing spaces in code" -dist: mk-livestatus +dist: mk-livestatus mk-eventd @echo "--------------------------------------------------------------------------" @echo -n "Checking permissions... with find -not -perm -444..." && [ -z "$$(find -not -perm -444)" ] && echo OK @echo "Making $(DISTNAME)" @@ -87,6 +87,11 @@ dist: mk-livestatus @echo " FINISHED. " @echo "==============================================================================" +mk-eventd: + tar -c $(TAROPTS) --exclude=.f12 \ + --transform 's,^mkeventd,mkeventd-$(VERSION),' \ + -zf mkeventd-$(VERSION).tar.gz mkeventd + mk-livestatus: if [ ! -e livestatus/configure ] ; then \ cd livestatus && aclocal && autoheader && automake -a && autoconf ; \ @@ -113,7 +118,7 @@ version: setversion: sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ for agent in agents/* ; do \ - if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins ] ; then \ + if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins -a "$$agent" != agents/hpux ] ; then \ sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ done ; \ @@ -121,6 +126,7 @@ setversion: sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ + sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ @@ -181,7 +187,10 @@ deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm $(NAME)-agent-logwatch-$(VERSIO clean: - rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe mk-livestatus-*.tar.gz $(NAME)-*.tar.gz *~ counters autochecks precompiled cache + rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \ + mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ + $(NAME)-*.tar.gz *~ counters autochecks \ + precompiled cache find -name "*~" | xargs rm -f mrproper: diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c8f316e..a1831b2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 41b3874..d301ec9 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 421a0b4..0eeee29 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f345677..22f202b 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 74486e6..373c198 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.0.0rc2" +VERSION="1.2.1i2" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ |

12 years, 2 months

Check_MK Git: check_mk: Switched version to 1.2.1i2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2a297deaebe28521f604be731232eabe1ab01bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2a297deaebe28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 28 09:56:43 2012 +0200 Switched version to 1.2.1i2 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 127803 -> 126264 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 19 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 91c2871..ca14915 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0p3 +VERSION = 1.2.1i2 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 4c1e96f..61f12a8 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -40,7 +40,7 @@ LOCALDIR=$MK_LIBDIR/local export LC_NUMERIC="en_US" echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 3dc4198..261e7b0 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 2a3ca9b..fd1dd26 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 069680a..f6441c5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index a943469..8f6c538 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 6512444..48e1f2a 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 3619bf6..c230ed6 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 8217395..c3094df 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.0p3" +$say "Version: 1.2.1i2" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 961e785..5cd24f2 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -41,7 +41,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0p3 +echo Version: 1.2.1i2 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7e20554..70ff29c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.0p3" +#define CHECK_MK_VERSION "1.2.1i2" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 32ecaa3..c8f316e 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index dd048ae..41b3874 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index de0ab57..421a0b4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 16d3021..4b02b35 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.0p3" +!define CHECK_MK_VERSION "1.2.1i2" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index cd51974..f345677 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 96a7de8..348cc14 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0p3-1_all.deb net optional +check-mk_1.2.1i2-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index f560801..86f5208 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.0p3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.1i2], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 58c1aca..c95659b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0p3 +VERSION=1.2.1i2 NAME=check_mk LANG= LC_ALL=

12 years, 2 months

Check_MK Git: check_mk: Moved source of Event Console into Check_MK project

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3225ee96b7c83d22f0562ea69ec347b906a9e4b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3225ee96b7c83d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 28 09:56:12 2012 +0200 Moved source of Event Console into Check_MK project --- ChangeLog | 4 + mkeventd/.f12 | 25 + mkeventd/.gitignore | 4 + mkeventd/bin/mkeventd | 2063 +++++++++++++++++++++ mkeventd/checks/check_mkevents | 24 + mkeventd/doc/treasures/query_events | 34 + mkeventd/lib/check_mkevents | 103 + mkeventd/omd/.f12 | 38 + mkeventd/omd/MKEVENTD.hook | 29 + mkeventd/omd/Makefile | 24 + mkeventd/omd/logrotate.conf | 12 + mkeventd/omd/mkeventd.init | 82 + mkeventd/src/.gitignore | 1 + mkeventd/src/Makefile | 6 + mkeventd/src/mkevent.c | 180 ++ mkeventd/web/htdocs/images/button_mkeventd_hi.png | Bin 0 -> 4021 bytes mkeventd/web/htdocs/images/button_mkeventd_lo.png | Bin 0 -> 4609 bytes mkeventd/web/htdocs/images/icon_ack.png | Bin 0 -> 4736 bytes mkeventd/web/htdocs/images/icon_clear.png | Bin 0 -> 2484 bytes mkeventd/web/htdocs/images/icon_counting.png | Bin 0 -> 2907 bytes mkeventd/web/htdocs/images/icon_delayed.png | Bin 0 -> 4812 bytes mkeventd/web/htdocs/images/icon_mkeventd.png | Bin 0 -> 4609 bytes mkeventd/web/htdocs/mkeventd.py | 171 ++ mkeventd/web/plugins/sidebar/mkeventd.py | 89 + mkeventd/web/plugins/views/mkeventd.py | 1009 ++++++++++ mkeventd/web/plugins/wato/mkeventd.py | 1492 +++++++++++++++ 26 files changed, 5390 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3225ee96b7…

12 years, 2 months

Check_MK Git: check_mk: Fixed wrong version declaration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b09ca2cfa23b7188a78e4984cbd3a902fc53ca32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b09ca2cfa23b71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 27 10:11:20 2012 +0200 Fixed wrong version declaration --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba688a5..416fc28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.0p3 +1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012