Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

Check_MK Git: check_mk: Fixed manpage of j4p_performance.mem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 871f493ce1a446082c74d4b4e89f4e95e7e555bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=871f493ce1a446… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 11:42:28 2012 +0200 Fixed manpage of j4p_performance.mem --- checkman/j4p_performance.mem | 4 ++-- web/plugins/wato/check_mk_configuration.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/checkman/j4p_performance.mem b/checkman/j4p_performance.mem index dc7af58..22f2ec1 100644 --- a/checkman/j4p_performance.mem +++ b/checkman/j4p_performance.mem @@ -30,7 +30,7 @@ item: examples: # Set default levels for heap memory to 500 MB / 800 MB - j4p_mem_default_levels = (500, 800) + j4p_performance_mem_default_levels = (500, 800) perfdata: Two variables: the heap memory usage and the non heap memory usage @@ -46,5 +46,5 @@ warning (int): The warning level for used memory in MB critical (int): The critical level for used memory in MB [configuration] -j4p_mem_default_levels (int, int): Default levels for memory usage in MB. This +j4p_performance_mem_default_levels (int, int): Default levels for memory usage in MB. This is preset to {(1000, 2000)}. diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7a7b1e8..8eed549 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -502,6 +502,19 @@ register_configvar(group, ), ) +register_configvar(group, + "logwatch_service_output", + DropdownChoice( + title = _("Service output of Logwatch"), + help = _("You can change the output of the logwatch service " + "between an view with oh"), + choices = [ + ( 'default' , _("Output last log message in service output") ), + ( 'small', _("Only print stats in service output")), + ], + default_value = 'default', + ), + ) register_configvar(group, "printer_supply_some_remaining_status",

12 years

Check_MK Git: check_mk: BI: Next steps in improving BI performance

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 335840680aca00f144d75ecb57ec64332955d721 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=335840680aca00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 16:16:21 2012 +0200 BI: Next steps in improving BI performance * BI: Added option bit_precompile_on_demand to split compilations of the aggregations in several fragments. If possible only the needed aggregations are compiled to reduce the time a user has to wait for BI based view. This optimizes BI related views which display information for a specific list of hosts or aggregation groups. * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations --- ChangeLog | 7 + web/htdocs/bi.py | 336 ++++++++++++++++++++-------- web/htdocs/config.py | 5 +- web/plugins/icons/builtin.py | 7 +- web/plugins/sidebar/bi.py | 5 +- web/plugins/views/bi.py | 3 +- web/plugins/views/builtin.py | 12 +- web/plugins/wato/check_mk_configuration.py | 29 +++ 8 files changed, 300 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=335840680a…

12 years

Check_MK Git: check_mk: Added missing localizations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ddd96745e99cb75f164bf399299a56db4cb6374a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd96745e99cb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 08:37:36 2012 +0200 Added missing localizations --- ChangeLog | 1 + web/htdocs/bi.py | 67 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2152120..ba2a79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0p3 Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice + * BI: Added missing localizations WATO * FIX: It is now possible to create clusters in empty folders diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 79870d2..69ca6c0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -36,16 +36,29 @@ try: except NameError: from sets import Set as set - -config.declare_permission_section("bi", "BI - Check_MK Business Intelligence") -config.declare_permission("bi.see_all", - "See all hosts and services", - "With this permission set, the BI aggregation rules are applied to all " +# Datastructures and functions needed before plugins can be loaded +loaded_with_language = False + +# Load all view plugins +def load_plugins(): + global loaded_with_language + if loaded_with_language == current_language: + return + + config.declare_permission_section("bi", _("BI - Check_MK Business Intelligence")) + config.declare_permission("bi.see_all", + _("See all hosts and services"), + _("With this permission set, the BI aggregation rules are applied to all " "hosts and services - not only those the user is a contact for. If you " "remove this permissions then the user will see incomplete aggregation " - "trees with status based only on those items.", + "trees with status based only on those items."), [ "admin", "guest" ]) + # This must be set after plugin loading to make broken plugins raise + # exceptions all the time and not only the first time (when the plugins + # are loaded). + loaded_with_language = current_language + # ____ _ _ # / ___|___ _ __ ___| |_ __ _ _ __ | |_ ___ # | | / _ \| '_ \/ __| __/ _` | '_ \| __/ __| @@ -202,8 +215,8 @@ def compile_forest(user): for entry in config.aggregations: if len(entry) < 3: - raise MKConfigError("<h1>Invalid aggregation <tt>%s</tt></h1>" - "must have at least 3 entries (has %d)" % (entry, len(entry))) + raise MKConfigError(_("<h1>Invalid aggregation <tt>%s</tt>'</h1>" + "Must have at least 3 entries (has %d)") % (entry, len(entry))) group = entry[0] new_entries = compile_rule_node(entry[1:], 0) @@ -224,7 +237,7 @@ def compile_forest(user): # Aggregations by last part of title (assumed to be host name) name = aggr["title"].split()[-1] cache["aggregations_by_hostname"].setdefault(name, []).append((group, aggr)) - + # All single-host aggregations looked up per host if len(req_hosts) == 1: host = req_hosts[0] # pair of (site, host) @@ -252,8 +265,8 @@ def compile_rule_node(calllist, lvl): # Lookup rule source code rulename, arglist = calllist[-2:] if rulename not in config.aggregation_rules: - raise MKConfigError("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" - "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>" % + raise MKConfigError(_("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" + "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>") % (rulename, "</tt>, </tt>".join(config.aggregation_rules.keys()))) rule = config.aggregation_rules[rulename] @@ -288,7 +301,7 @@ def find_matching_services(what, calllist): required_tags = [] if len(calllist) == 0: - raise MKConfigError("Invalid syntax in FOREACH_...") + raise MKConfigError(_("Invalid syntax in FOREACH_...")) host_re = calllist[0] if what in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: @@ -419,7 +432,7 @@ def make_arginfo(arglist, args): expansion = MULTIPLE name = name[:-1] else: - raise MKConfigError("Invalid argument name %s. Must begin with 'a' or end with 's'." % name) + raise MKConfigError(_("Invalid argument name %s. Must begin with 'a' or end with 's'.") % name) arginfo[name] = (expansion, value) return arginfo @@ -469,24 +482,24 @@ def compile_aggregation_rule(rule, args, lvl = 0): g_remaining_refs = [] if len(rule) != 4: - raise MKConfigError("<h3>Invalid aggregation rule</h1>" + raise MKConfigError(_("<h3>Invalid aggregation rule</h1>" "Aggregation rules must contain four elements: description, argument list, " "aggregation function and list of nodes. Your rule has %d elements: " - "<pre>%s</pre>" % (len(rule), pprint.pformat(rule))) + "<pre>%s</pre>") % (len(rule), pprint.pformat(rule))) if lvl == 50: - raise MKConfigError("<h3>Depth limit reached</h3>" + raise MKConfigError(_("<h3>Depth limit reached</h3>" "The nesting level of aggregations is limited to 50. You either configured " - "too many levels or built an infinite recursion. This happened in rule <pre>%s</pre>" + "too many levels or built an infinite recursion. This happened in rule <pre>%s</pre>") % pprint.pformat(rule)) description, arglist, funcname, nodes = rule # check arguments and convert into dictionary if len(arglist) != len(args): - raise MKConfigError("<h1>Invalid rule usage</h1>" + raise MKConfigError(_("<h1>Invalid rule usage</h1>" "The rule '%s' needs %d arguments: <tt>%s</tt><br>" - "You've specified %d arguments: <tt>%s</tt>" % ( + "You've specified %d arguments: <tt>%s</tt>") % ( description, len(arglist), repr(arglist), len(args), repr(args))) arginfo = dict(zip(arglist, args)) @@ -714,7 +727,7 @@ def regex(r): try: rx = re.compile(r) except Exception, e: - raise MKConfigError("Invalid regular expression '%s': %s" % (r, e)) + raise MKConfigError(_("Invalid regular expression '%s': %s") % (r, e)) regex_cache[r] = rx return rx @@ -785,19 +798,19 @@ def execute_leaf_node(node, status_info): state = {"state":state, "output":output} if state_assumption != None: assumed_state = {"state":state_assumption, - "output" : "Assumed to be %s" % service_state_names[state_assumption]} + "output" : _("Assumed to be %s") % service_state_names[state_assumption]} else: assumed_state = None return (state, assumed_state, node) - return ({"state":MISSING, "output": "This host has no such service"}, None, node) + return ({"state":MISSING, "output": _("This host has no such service")}, None, node) else: aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN}[host_state] state = {"state":aggr_state, "output" : host_output} if state_assumption != None: assumed_state = {"state": state_assumption, - "output" : "Assumed to be %s" % host_state_names[state_assumption]} + "output" : _("Assumed to be %s") % host_state_names[state_assumption]} else: assumed_state = None return (state, assumed_state, node) @@ -811,7 +824,7 @@ def execute_rule_node(node, status_info): funcargs = parts[1:] func = config.aggregation_functions.get(funcname) if not func: - raise MKConfigError("Undefined aggregation function '%s'. Available are: %s" % + raise MKConfigError(_("Undefined aggregation function '%s'. Available are: %s") % (funcname, ", ".join(config.aggregation_functions.keys()))) # prepare information for aggregation function @@ -983,18 +996,18 @@ def aggr_running_on(nodes, regex): # if not found, then do normal aggregation with 'worst' if not mo or len(mo.groups()) == 0: state = config.aggregation_functions['worst'](nodes[1:]) - state["output"] += ", running nowhere" + state["output"] += _(", running nowhere") return state running_on = mo.groups()[0] for state, node in nodes[1:]: for site, host in node["reqhosts"]: if host == running_on: - state["output"] += ", running on %s" % running_on + state["output"] += _(", running on %s") % running_on return state # host we run on not found. Strange... - return {"state": UNKNOWN, "output": "running on unknown host '%s'" % running_on } + return {"state": UNKNOWN, "output": _("running on unknown host '%s'") % running_on } config.aggregation_functions['running_on'] = aggr_running_on

12 years

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

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

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

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

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

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

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits