Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4883 FIX juniper_trpz_aps_sessions: Fixed performance data handling if running on cluster

by Simon Betz

Module: check_mk Branch: master Commit: 6d7469e30e849d9e808f63b4e48a64112e1fe46e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d7469e30e849d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 30 10:03:49 2017 +0200 4883 FIX juniper_trpz_aps_sessions: Fixed performance data handling if running on cluster Change-Id: Idd682b804be05069bd837b661bbb35f64f8c3c5b --- .werks/4883 | 11 +++ checks/juniper_trpz_aps_sessions | 192 ++++++++++++++++++++------------------- 2 files changed, 110 insertions(+), 93 deletions(-) diff --git a/.werks/4883 b/.werks/4883 new file mode 100644 index 0000000..a372113 --- /dev/null +++ b/.werks/4883 @@ -0,0 +1,11 @@ +Title: juniper_trpz_aps_sessions: Fixed performance data handling if running on cluster +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0p8 +Date: 1498808308 + + diff --git a/checks/juniper_trpz_aps_sessions b/checks/juniper_trpz_aps_sessions index db5c2b7..da84605 100644 --- a/checks/juniper_trpz_aps_sessions +++ b/checks/juniper_trpz_aps_sessions @@ -57,25 +57,30 @@ def parse_juniper_trpz_aps_sessions(info): parsed = {} for access_points, radios in zip(info[::2], info[1::2]): - for node, end_oid, status, name in access_points: - # 10 means that that accesspoint is located on the - # other cluster part. Use clustered_services to see all APs - if int(status) != 10: - name = name.replace('AP-','') - parsed.setdefault(name, {}) - parsed[name].setdefault(node, {}) - parsed[name][node] = { - 'end_oid' : end_oid, - 'status' : int(status), - 'radios' : {}, - } + for node_info, end_oid, status, name in access_points: + name = name.replace('AP-','') + parsed.setdefault(name, { + 'end_oid' : end_oid, + 'radios' : {}, + }) + + if status != "10": + # 10 means that that accesspoint is located on the + # other cluster part. Use custered_services to see all APs + parsed[name].update({ + 'status' : status, + 'active_node' : node_info, }) + else: + parsed[name].setdefault("passive_node", node_info) for data in radios: + radio_node = data[0] radio_oid, radio_number = data[1].rsplit('.', 1) for ap_name, ap_data in parsed.items(): - if radio_oid == ap_data.get(data[0], {}).get('end_oid'): - ap_data[data[0]]['radios'][radio_number] = { - 'counters' : data[2:-2], + if radio_oid == ap_data.get('end_oid') and \ + radio_node == ap_data.get('active_node'): + ap_data['radios'][radio_number] = { + 'counters' : data[1:-2], 'sessions' : data[-2], 'noise_floor' : data[-1], } @@ -87,88 +92,89 @@ def inventory_juniper_trpz_aps_sessions(parsed): # A failover condition occurs when a primary controller goes down or fails for any reason. # Then, a second controller takes over the operation. # Failover is also called controller redundancy. - return [ (key, None) for key in parsed ] + return [ (key, None) for key, values in parsed.items() if values.get('status') ] def check_juniper_trpz_aps_sessions(item, _no_params, parsed): - if item in parsed: - ap_states = { - 1 : (2, "cleared"), - 2 : (1, "init"), - 3 : (2, "boot started"), - 4 : (2, "image downloaded"), - 5 : (2, "connect failed"), - 6 : (1, "configuring"), - 7 : (0, "operational"), - 10 : (0, "redundant"), - 20 : (2, "conn outage"), - } - - infotexts = [] - state = 0 - data = parsed[item] - now = time.time() - ap_rates = [0, 0, 0, 0, 0, 0, 0, 0, 0] - ap_sessions = 0 - noise_floor_radios = [] - - for node, ap_data in data.items(): - node_info = "" - if node is not None: - node_info += "[%s] " % node - - state, state_readable = ap_states[ap_data['status']] - infotexts.append("%sStatus: %s" % (node_info, state_readable)) - - for radio_number, radio_data in ap_data['radios'].items(): - try: - radio_data_noise_floor = int(radio_data['noise_floor']) - noise_floor_radios.append(radio_data_noise_floor) - except: - radio_data_noise_floor = "None" - - try: - radio_data_sessions = int(radio_data['sessions']) - ap_sessions += radio_data_sessions - except: - radio_data_sessions = "None" - - radio_rates = [0, 0, 0, 0, 0, 0, 0, 0, 0] - for nr, counter in enumerate(radio_data['counters']): - try: - radio_rate = get_rate("juniper_trpz_aps_sessions.%s.%s.%d" \ - % (item, radio_number, nr), now, int(counter)) - radio_rates.append(radio_rate) - ap_rates[nr] += radio_rate - except: - pass - - infotexts.append(("Radio %s: Input: %s/s, Output: %s/s, " + \ - "Errors: %d, Resets: %d, Retries: %d, Sessions: %s, Noise: %s dBm") % \ - ( radio_number, - get_bytes_human_readable(radio_rates[5]), - get_bytes_human_readable(radio_rates[1] + radio_rates[3]), - radio_rates[6], radio_rates[7], radio_rates[8], - radio_data_sessions, radio_data_noise_floor )) - - perfdata = [ - ("if_out_unicast", ap_rates[0]), - ("if_out_unicast_octets", ap_rates[1]), - ("if_out_non_unicast", ap_rates[2]), - ("if_out_non_unicast_octets", ap_rates[3]), - ("if_in_pkts", ap_rates[4]), - ("if_in_octets", ap_rates[5]), - ("wlan_physical_errors", ap_rates[6]), - ("wlan_resets", ap_rates[7]), - ("wlan_retries", ap_rates[8]), - ("total_sessions", ap_sessions), ] - if noise_floor_radios: - perfdata.append(("noise_floor", max(noise_floor_radios))) - - yield state, ", ".join(infotexts), perfdata - - else: + if item not in parsed: yield 1, "Access point not reachable" + return + + data = parsed[item] + state, ap_status = { + "1" : (2, "cleared"), + "2" : (1, "init"), + "3" : (2, "boot started"), + "4" : (2, "image downloaded"), + "5" : (2, "connect failed"), + "6" : (1, "configuring"), + "7" : (0, "operational"), + "10" : (0, "redundant"), + "20" : (2, "conn outage"), + }.get(data.get('status'), (3, 'unknown')) + + nodes_info = "" + if data.get('active_node') is not None: + nodes_info += data['active_node'] + if data.get('passive_node') is not None: + nodes_info += "/%s" % data['passive_node'] + if nodes_info: + nodes_info = "[%s] " % nodes_info + yield state, "%sStatus: %s" % (nodes_info, ap_status) + + now = time.time() + infotexts = [] + ap_rates = [0, 0, 0, 0, 0, 0, 0, 0, 0] + ap_sessions = 0 + noise_floor_radios = [] + + for radio_number, radio_data in data.get('radios', {}).items(): + try: + radio_data_noise_floor = int(radio_data['noise_floor']) + noise_floor_radios.append(radio_data_noise_floor) + except: + radio_data_noise_floor = "None" + + try: + radio_data_sessions = int(radio_data['sessions']) + ap_sessions += radio_data_sessions + except: + radio_data_sessions = "None" + + radio_rates = [0, 0, 0, 0, 0, 0, 0, 0, 0] + for nr, counter in enumerate(radio_data['counters']): + try: + radio_rate = get_rate("juniper_trpz_aps_sessions.%s.%s.%d" % \ + (item, radio_number, nr), now, int(counter)) + radio_rates.append(radio_rate) + ap_rates[nr] += radio_rate + except: + pass + + infotexts.append(("Radio %s: Input: %s/s, Output: %s/s, " + \ + "Errors: %d, Resets: %d, Retries: %d, Sessions: %s, Noise: %s dBm") % \ + (radio_number, + get_bytes_human_readable(radio_rates[5]), + get_bytes_human_readable(radio_rates[1] + radio_rates[3]), + radio_rates[6], radio_rates[7], radio_rates[8], + radio_data_sessions, radio_data_noise_floor)) + + perfdata = [ + ("if_out_unicast", ap_rates[0]), + ("if_out_unicast_octets", ap_rates[1]), + ("if_out_non_unicast", ap_rates[2]), + ("if_out_non_unicast_octets", ap_rates[3]), + ("if_in_pkts", ap_rates[4]), + ("if_in_octets", ap_rates[5]), + ("wlan_physical_errors", ap_rates[6]), + ("wlan_resets", ap_rates[7]), + ("wlan_retries", ap_rates[8]), + ("total_sessions", ap_sessions), ] + + if noise_floor_radios: + perfdata.append(("noise_floor", max(noise_floor_radios))) + + yield 0, ", ".join(infotexts), perfdata check_info["juniper_trpz_aps_sessions"] = {

6 years, 12 months

4878 FIX lnx_distro: Fixed wrong detected distribution name,

by Simon Betz

vendor and version Message-ID: <595600c6.VJnJHhgie+hq+g2Q%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3ae5cc40c3915f763808cc0a23648ef481666e35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ae5cc40c3915f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 30 09:30:40 2017 +0200 4878 FIX lnx_distro: Fixed wrong detected distribution name, vendor and version Change-Id: Id11b82e43413fe7e93cbb5c0967c6995af9d657c --- .werks/4878 | 21 ++++++ agents/plugins/mk_inventory.linux | 1 - inventory/lnx_distro | 148 ++++++++++++++++++-------------------- 3 files changed, 92 insertions(+), 78 deletions(-) diff --git a/.werks/4878 b/.werks/4878 new file mode 100644 index 0000000..98aa2bf --- /dev/null +++ b/.werks/4878 @@ -0,0 +1,21 @@ +Title: lnx_distro: Fixed wrong detected distribution name, vendor and version +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498568114 + +The agent plugin {{mk_inventory.linux}} collects +the content of following release files if available: +"/etc/gentoo-release", +"/etc/SuSE-release", +"/etc/oracle-release", +"/etc/redhat-release", +"/etc/lsb-release", +"/etc/debian_version" + +The first match in the related inventory plugin {{lnx_distro}} +determines name, vendor and version. The type is always "Linux". diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index ea8a53f..c8ab766 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -61,7 +61,6 @@ then for f in {/etc/{oracle-release,debian_version,gentoo-release,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do if [ -e $f ] ; then echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo - break fi done diff --git a/inventory/lnx_distro b/inventory/lnx_distro index a8575de..7aa3641 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -45,38 +45,34 @@ def inv_lnx_distro(info): - node = inv_tree("software.os.") + parsed = {} for line in info: - if line[0] == '/etc/lsb-release': - inv_lnx_parse_lsb_release(node, line[1:]) - elif line[0] == '/etc/debian_version': - inv_lnx_parse_debian(node, line[1]) - elif line[0] == '/etc/gentoo-release': - inv_lnx_parse_gentoo(node, line[1]) - elif line[0] == '/etc/redhat-release': - if line[1].startswith("Oracle"): - inv_lnx_parse_oracle_vm_server_release(node, line[1]) - else: - inv_lnx_parse_redhat_release(node, line[1]) - elif line[0] == '/etc/SuSE-release': - inv_lnx_parse_suse_release(node, line[1:]) - elif line[0] == '/usr/share/cma/version': - inv_lnx_parse_cma(node, line[1]) - elif line[0] == '/etc/oracle-release': - inv_lnx_parse_oracle_vm_server_release(node, line[1]) - - -def inv_lnx_parse_suse_release(node, line): - node["type"] = "linux" - node["vendor"] = "SuSE" + parsed.setdefault(line[0], line[1:]) + node = inv_tree("software.os.") + node["type"] = "Linux" + for file_name, handler in [ + ("/usr/share/cma/version", inv_lnx_parse_cma), + ("/etc/gentoo-release", inv_lnx_parse_gentoo), + ("/etc/SuSE-release", inv_lnx_parse_suse), + ("/etc/oracle-release", inv_lnx_parse_oracle_vm_server), + ("/etc/redhat-release", inv_lnx_parse_redhat), + ("/etc/lsb-release", inv_lnx_parse_lsb), + ("/etc/debian_version", inv_lnx_parse_debian), + ]: + if file_name in parsed: + handler(node, parsed[file_name]) + break + + +def inv_lnx_parse_suse(node, line): version = line[1].split()[-1] - if len(line) >= 3: patchlevel = line[2].split()[-1] else: patchlevel = "0" + node["vendor"] = "SuSE" node["version"] = "%s.%s" % (version, patchlevel) node["name"] = "%s.%s" % (line[0].split('(')[0].strip(), patchlevel) @@ -96,32 +92,31 @@ def inv_lnx_parse_suse_release(node, line): node["code_name"] = "Bottle" -# <<<lnx_distro:sep(124)>>> -# /etc/redhat-release|Oracle VM server release x.x.x -def inv_lnx_parse_oracle_vm_server_release(node, line): - node["type"] = "linux" - parts = line.split(" ") +def inv_lnx_parse_redhat(node, line): + entry = line[0] + if entry.startswith("Oracle"): + inv_lnx_parse_oracle_vm_server(node, line) + else: + parts = entry.split("(") + left = parts[0].strip() + node["code_name"] = parts[1].rstrip(")") + name, _release, version = left.rsplit(None, 2) + if name.startswith("Red Hat"): + node["vendor"] = "Red Hat" + node["version"] = version + node["name"] = left + + +def inv_lnx_parse_oracle_vm_server(node, line): + parts = line[0].split(" ") node["vendor"] = parts.pop(0) node["version"] = parts.pop(-1) node["name"] = " ".join(parts[:-1]) -def inv_lnx_parse_redhat_release(node, line): - node["type"] = "linux" - parts = line.split("(") - left = parts[0].strip() - node["code_name"] = parts[1].rstrip(")") - name, _release, version = left.rsplit(None, 2) - if name.startswith("Red Hat"): - node["vendor"] = "Red Hat" - node["version"] = version - node["name"] = left - - -def inv_lnx_parse_lsb_release(node, lines): - node["type"] = "linux" - for line in lines: - varname, value = line.split("=", 1) +def inv_lnx_parse_lsb(node, line): + for entry in line: + varname, value = entry.split("=", 1) value = value.strip("'").strip('"') if varname == "DISTRIB_ID": node["vendor"] = value @@ -133,53 +128,52 @@ def inv_lnx_parse_lsb_release(node, lines): node["name"] = value +# Do not overwrite Ubuntu information def inv_lnx_parse_debian(node, line): - node["type"] = "linux" - if "name" not in node: # Do not overwrite Ubuntu information - node["name"] = "Debian " + line - node["vendor"] = "Debian" - node["version"] = line - if line.startswith("2.0."): - node["code_name"] = "Hamm" - elif line.startswith("2.1."): - node["code_name"] = "Slink" - elif line.startswith("2.2."): - node["code_name"] = "Potato" - elif line.startswith("3.0."): - node["code_name"] = "Woody" - elif line.startswith("3.1."): - node["code_name"] = "Sarge" - elif line.startswith("4."): - node["code_name"] = "Etch" - elif line.startswith("5."): - node["code_name"] = "Lenny" - elif line.startswith("6."): - node["code_name"] = "Squeeze" - elif line.startswith("7."): - node["code_name"] = "Wheezy" - elif line.startswith("8."): - node["code_name"] = "Jessie" + entry = line[0] + node["name"] = "Debian " + entry + node["vendor"] = "Debian" + node["version"] = entry + if entry.startswith("2.0."): + node["code_name"] = "Hamm" + elif entry.startswith("2.1."): + node["code_name"] = "Slink" + elif entry.startswith("2.2."): + node["code_name"] = "Potato" + elif entry.startswith("3.0."): + node["code_name"] = "Woody" + elif entry.startswith("3.1."): + node["code_name"] = "Sarge" + elif entry.startswith("4."): + node["code_name"] = "Etch" + elif entry.startswith("5."): + node["code_name"] = "Lenny" + elif entry.startswith("6."): + node["code_name"] = "Squeeze" + elif entry.startswith("7."): + node["code_name"] = "Wheezy" + elif entry.startswith("8."): + node["code_name"] = "Jessie" def inv_lnx_parse_cma(node, line): - node["type"] = "linux" - node["name"] = "Check_MK Appliance " + line + node["name"] = "Check_MK Appliance " + line[1] node["vendor"] = "Mathias Kettner GmbH" - node["version"] = line + node["version"] = line[1] if "code_name" in node: del node["code_name"] def inv_lnx_parse_gentoo(node, line): - node["type"] = "linux" - node["name"] = line + entry = line[0] + node["name"] = entry node["vendor"] = "Gentoo" - parts = line.split(" ") + parts = entry.split(" ") node["version"] = parts.pop(-1) if "code_name" in node: del node["code_name"] inv_info['lnx_distro'] = { - "inv_function" : inv_lnx_distro, + "inv_function": inv_lnx_distro, }

6 years, 12 months

4924 Rulesets: Cloning rules opens the edit dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: e03d8fc39eda827b871aecbbd497afa7a6ab9874 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e03d8fc39eda82… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 08:39:39 2017 +0200 4924 Rulesets: Cloning rules opens the edit dialog When cloning rules in a WATO ruleset you nearly always want to edit the ruleset after cloning. Previously you had to clone the rule, find the cloned rule in the list again and open it for editing. This workflow has now been simplified: Like in other places of WATO you now click on clone which opens up the editor with the values of the origin rule. Once you save the editor the rule will be saved with the just edited values. Change-Id: I114cab0c81ee987f2715940469179ffa960efd35 --- .werks/4924 | 18 +++++++++++++++++ web/htdocs/wato.py | 56 +++++++++++++++++++++++++++++++++++++++++---------- web/htdocs/watolib.py | 10 ++++----- 3 files changed, 68 insertions(+), 16 deletions(-) diff --git a/.werks/4924 b/.werks/4924 new file mode 100644 index 0000000..8262000 --- /dev/null +++ b/.werks/4924 @@ -0,0 +1,18 @@ +Title: Rulesets: Cloning rules opens the edit dialog +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498804589 +Class: feature + +When cloning rules in a WATO ruleset you nearly always want to edit +the ruleset after cloning. + +Previously you had to clone the rule, find the cloned rule in the list +again and open it for editing. This workflow has now been simplified: + +Like in other places of WATO you now click on clone which opens up the +editor with the values of the origin rule. Once you save the editor +the rule will be saved with the just edited values. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3bd031e..d2c6df8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12610,13 +12610,6 @@ class ModeEditRuleset(WatoMode): else: return None # browser reload - elif action == "insert": # Clone a rule - if not html.check_transaction(): - return None # browser reload - ruleset.clone_rule(rule) - rulesets.save() - return - else: if not html.check_transaction(): return None # browser reload @@ -12784,8 +12777,18 @@ class ModeEditRuleset(WatoMode): ("rule_folder", folder.path()), ]) html.icon_button(edit_url, _("Edit this rule"), "edit") - self._rule_button("insert", _("Insert a copy of this rule in current folder"), - folder, rulenr) + + clone_url = folder_preserving_link([ + ("mode", "clone_rule"), + ("ruleset_back_mode", self._back_mode), + ("varname", self._name), + ("rulenr", rulenr), + ("host", self._hostname), + ("item", mk_repr(self._item)), + ("rule_folder", folder.path()), + ]) + html.icon_button(clone_url, _("Create a copy of this rule"), "clone") + html.element_dragger("tr", base_url=self._action_url("move_to", folder, rulenr)) self._rule_button("delete", _("Delete this rule"), folder, rulenr) @@ -13337,8 +13340,7 @@ class ModeEditRule(WatoMode): else: # Move rule to new folder during editing - self._ruleset.delete_rule(self._rule) - self._rulesets.save() + self._remove_from_orig_folder() # Set new folder self._rule.folder = new_rule_folder @@ -13383,6 +13385,11 @@ class ModeEditRule(WatoMode): self._rulesets.save() + def _remove_from_orig_folder(self): + self._ruleset.delete_rule(self._rule) + self._rulesets.save() + + def _success_message(self): return _("Edited rule in ruleset \"%s\" in folder \"%s\"") % \ (self._ruleset.title(), self._folder.alias_path()) @@ -13596,6 +13603,32 @@ class ModeEditRule(WatoMode): +class ModeCloneRule(ModeEditRule): + def __init__(self): + super(ModeCloneRule, self).__init__() + + + def _set_rule(self): + super(ModeCloneRule, self)._set_rule() + + self._orig_rule = self._rule + self._rule = self._orig_rule.clone() + + + def _save_rule(self): + if self._rule.folder == self._orig_rule.folder: + self._ruleset.insert_rule_after(self._rule, self._orig_rule) + else: + self._ruleset.append_rule(self._rule.folder(), self._rule) + + self._rulesets.save() + + + def _remove_from_orig_folder(self): + pass # Cloned rule is not yet in folder, don't try to remove + + + class ModeNewRule(ModeEditRule): _new = True @@ -16982,6 +17015,7 @@ modes = { "edit_ruleset" : ([], ModeEditRuleset), "new_rule" : ([], ModeNewRule), "edit_rule" : ([], ModeEditRule), + "clone_rule" : ([], ModeCloneRule), "host_groups" : (["groups"], ModeHostgroups), "service_groups" : (["groups"], ModeServicegroups), diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fbf56ea..c977998 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7470,11 +7470,11 @@ class Ruleset(object): self._on_change() - def clone_rule(self, rule): - index = self._rules[rule.folder.path()].index(rule) - self._rules[rule.folder.path()].insert(index, rule.clone()) - add_change("edit-ruleset", - _("Inserted new rule in ruleset '%s'") % self.title(), + def insert_rule_after(self, rule, after): + index = self._rules[rule.folder.path()].index(after) + 1 + self._rules[rule.folder.path()].insert(index, rule) + add_change("clone-ruleset", + _("Cloned rule in ruleset '%s'") % self.title(), sites=rule.folder.all_site_ids()) self._on_change()

6 years, 12 months

4925 Rule listing: Focussing rules after editing in list

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f1d654d9e2288abe5bcb365c7de8d0d58ceb0cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f1d654d9e2288… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 09:26:10 2017 +0200 4925 Rule listing: Focussing rules after editing in list When returning to the list of rules after editing a rule the browser is told to focus this rule in the viewport again. Change-Id: I8fb349cda37cd9ac90a38be920d4674f7f8e3ee6 --- .werks/4925 | 11 +++++++++++ web/htdocs/htmllib.py | 31 +++++++++++++++++++++++-------- web/htdocs/wato.py | 25 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/.werks/4925 b/.werks/4925 new file mode 100644 index 0000000..af523ef --- /dev/null +++ b/.werks/4925 @@ -0,0 +1,11 @@ +Title: Rule listing: Focussing rules after editing in list +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498807504 +Class: feature + +When returning to the list of rules after editing a rule the +browser is told to focus this rule in the viewport again. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3351d39..2d35c6f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1545,6 +1545,10 @@ class html(HTMLGenerator, RequestHandler): self.focus_object = (self.form_name, varname) + def set_focus_by_id(self, dom_id): + self.focus_object = dom_id + + def set_render_headfoot(self, render): self.render_headfoot = render @@ -1926,17 +1930,28 @@ class html(HTMLGenerator, RequestHandler): def bottom_focuscode(self): if self.focus_object: - formname, varname = self.focus_object - obj = formname + "." + varname - js_code = "\n" % (obj, obj, obj) + if type(self.focus_object) == tuple: + formname, varname = self.focus_object + obj_ident = formname + "." + varname + else: + obj_ident = "getElementById(\"%s\")" % self.focus_object + + js_code = "\n" % obj_ident self.javascript(js_code) + def focus_here(self): + self.a("", href="#focus_me", id_="focus_me") + self.set_focus_by_id("focus_me") + + def body_end(self): if self.have_help: self.javascript("enable_help();") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d2c6df8..4666224 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12541,6 +12541,28 @@ class ModeEditRuleset(WatoMode): else: self._hostname = None + self._just_edited_rule_from_vars() + + + # After actions like editing or moving a rule there is a rule that the user has been + # working before. Focus this rule row again to make multiple actions with a single + # rule easier to handle + def _just_edited_rule_from_vars(self): + if not html.has_var("rule_folder") or not html.has_var("rulenr"): + self._just_edited_rule = None + return + + rule_folder = Folder.folder(html.var("rule_folder")) + rulesets = FolderRulesets(rule_folder) + rulesets.load() + ruleset = rulesets.get(self._name) + + try: + rulenr = int(html.var("rulenr")) # rule number relative to folder + self._just_edited_rule = ruleset.get_rule(rule_folder, rulenr) + except (IndexError, TypeError, ValueError, KeyError): + self._just_edited_rule = None + def title(self): title = self._rulespec.title @@ -12716,6 +12738,9 @@ class ModeEditRuleset(WatoMode): table.row(css=" ".join(css) if css else None) + if self._just_edited_rule and self._just_edited_rule.folder == rule.folder and self._just_edited_rule.index() == rulenr: + html.focus_here() + # Rule matching if self._hostname: table.cell(_("Ma."))

6 years, 12 months

Fised test directory handling in new pylint checks

by Lars Michelsen

Module: check_mk Branch: master Commit: fbbec6e8799093078c65b9260a3397f32b9a670c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbbec6e8799093… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 16:54:55 2017 +0200 Fised test directory handling in new pylint checks Change-Id: I7e3f218c85bf73e06af7400ed9d9bc44d5f512ed --- tests/pylint/test_pylint_bakery_plugins.py | 8 +++----- tests/pylint/test_pylint_inventory_plugins.py | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/pylint/test_pylint_bakery_plugins.py b/tests/pylint/test_pylint_bakery_plugins.py index 799185c..517095e 100755 --- a/tests/pylint/test_pylint_bakery_plugins.py +++ b/tests/pylint/test_pylint_bakery_plugins.py @@ -6,10 +6,8 @@ import sys from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk -def test_pylint_bakery_plugins(): - base_path = pylint_cmk.get_test_dir() - - f = file(base_path + "/cmk-bakery-plugins.py", "w") +def test_pylint_bakery_plugins(pylint_test_dir): + f = file(pylint_test_dir + "/cmk-bakery-plugins.py", "w") pylint_cmk.add_file(f, os.path.realpath(os.path.join(cmc_path(), "cmk_base/cee/agent_bakery_plugins.py"))) @@ -19,5 +17,5 @@ def test_pylint_bakery_plugins(): f.close() - exit_code = pylint_cmk.run_pylint(base_path, cleanup_test_dir=True) + exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in agent bakery plugins" diff --git a/tests/pylint/test_pylint_inventory_plugins.py b/tests/pylint/test_pylint_inventory_plugins.py index c993330..ed2b5c7 100755 --- a/tests/pylint/test_pylint_inventory_plugins.py +++ b/tests/pylint/test_pylint_inventory_plugins.py @@ -6,10 +6,8 @@ import sys from testlib import repo_path import testlib.pylint_cmk as pylint_cmk -def test_pylint_inventory_plugins(): - base_path = pylint_cmk.get_test_dir() - - f = file(base_path + "/cmk-inventory-plugins.py", "w") +def test_pylint_inventory_plugins(pylint_test_dir): + f = file(pylint_test_dir + "/cmk-inventory-plugins.py", "w") # Fake data structures where checks register (See cmk_base/checks.py) f.write(""" @@ -55,5 +53,5 @@ def inv_tree(path, default_value=None): f.close() - exit_code = pylint_cmk.run_pylint(base_path, cleanup_test_dir=True) + exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in inventory plugins"

6 years, 12 months

mk_jolokia.exe: Initial version of the mk_jolokia plugin for Windows

by Konstantin Büttner

Module: check_mk Branch: master Commit: 29c6fcc0286d7818cd5af52cb2574ebc80dc70d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29c6fcc0286d78… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 29 16:12:51 2017 +0200 mk_jolokia.exe: Initial version of the mk_jolokia plugin for Windows Change-Id: I59a69bafdb642acaed0dfbb05a151aa4c6ff4e03 --- agents/windows/frozen_binaries/Makefile | 34 ++++++++++++++++++++++++++++++++ agents/windows/plugins/mk_jolokia.exe | Bin 0 -> 10088419 bytes 2 files changed, 34 insertions(+) diff --git a/agents/windows/frozen_binaries/Makefile b/agents/windows/frozen_binaries/Makefile index 1cbbc32..17b9362 100644 --- a/agents/windows/frozen_binaries/Makefile +++ b/agents/windows/frozen_binaries/Makefile @@ -37,5 +37,39 @@ mk_logwatch.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredis cp $(BUILD_DIR)/drive_c/compile/dist/mk_logwatch.exe ../plugins rm -rf $(BUILD_DIR) +mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x86.exe $(PLUGINS_DIR)/mk_jolokia + mkdir $(BUILD_DIR) ; \ + cd $(BUILD_DIR) ; \ + cp -pr $(CURDIR)/src/* . ; \ + cd $(BUILD_DIR) ; cabextract vcredist_x86.exe + cd $(BUILD_DIR) ; cabextract vc_red.cab + cd $(BUILD_DIR) ; export WINEPREFIX=$(BUILD_DIR) ; \ + wine vcredist_x86.exe /qb ; \ + wine msiexec /qn /i python-$(PYTHON_VERSION).msi ; \ + mv msvcr90.dll*VC90_CRT_x86* drive_c/Python27/msvcr90.dll ; \ + mv msvcp90.dll*VC90_CRT_x86* drive_c/Python27/msvcp90.dll ; \ + mv msvcm90.dll*VC90_CRT_x86* drive_c/Python27/msvcm90.dll ; \ + mv manifest*VC90_CRT_x86* drive_c/Python27/Microsoft.VC90.CRT.manifest ; \ + cp -r pip drive_c ; \ + cd drive_c/pip ; \ + wine c:\\Python27\\python.exe -m pip install --no-index --find-links="c:\\pip" * ; \ + mkdir $(BUILD_DIR)/drive_c/compile ; \ + cp $(PLUGINS_DIR)/mk_jolokia $(BUILD_DIR)/drive_c/compile/mk_jolokia.py ; \ + cd $(BUILD_DIR)/drive_c/compile ; \ + wine c:\\Python27\\Scripts\\pyinstaller.exe \ + --clean \ + --onefile \ + --upx-dir="C:\\upx" \ + --log-level=INFO \ + --hidden-import=cffi \ + mk_jolokia.py ; \ + if [ ! -e dist/mk_jolokia.exe ] ; \ + then \ + echo "ERROR: Failed to create venv_wine/drive_c/compile/dist/mk_jolokia.exe" ; \ + exit 1 ; \ + fi ; + cp $(BUILD_DIR)/drive_c/compile/dist/mk_jolokia.exe ../plugins + rm -rf $(BUILD_DIR) + clean: [ ! -d $(BUILD_DIR) ] || rm -rf $(BUILD_DIR) diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe new file mode 100755 index 0000000..553422b Binary files /dev/null and b/agents/windows/plugins/mk_jolokia.exe differ

6 years, 12 months

Improved werk text

by Sven Panne

Module: check_mk Branch: master Commit: 87b9212d0166bd08d26938fdc3e447f41228389f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b9212d0166bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 29 15:21:16 2017 +0200 Improved werk text Change-Id: Iab5a061c2937fa73c7de3b23f0bd14bd13f1dc5c --- .werks/4940 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.werks/4940 b/.werks/4940 index 19655a0..a8f44e9 100644 --- a/.werks/4940 +++ b/.werks/4940 @@ -1,4 +1,4 @@ -Title: Handle non-ASCII characters in event console messages +Title: Handle non-ASCII characters in event console messages submitted via Livestatus Level: 1 Component: ec Compatible: compat @@ -8,4 +8,5 @@ Date: 1498736427 Class: fix Messages containing non-ASCII characters were silently dropped in the event -console. This has been fixed. +console when they were sent via Livestatus, e.g. when using the Event Console +GUI's "Generate Event!" button. This has been fixed.

6 years, 12 months

Fixed name resolution of unknown hosts in tests

by Lars Michelsen

Module: check_mk Branch: master Commit: a53cdd3654b52411ce5b169058b0569bdb44bf52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a53cdd3654b524… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 15:10:01 2017 +0200 Fixed name resolution of unknown hosts in tests Change-Id: I6782470ba8ec364ba48bd1657afbe684752d0805 --- tests/cmk_base/test_modes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmk_base/test_modes.py b/tests/cmk_base/test_modes.py index 094202b..665ca18 100644 --- a/tests/cmk_base/test_modes.py +++ b/tests/cmk_base/test_modes.py @@ -566,7 +566,7 @@ def test_inventory_verbose(test_cfg, site): # '----------------------------------------------------------------------' def test_inventory_as_check_unknown_host(test_cfg, site): - p = site.execute(["cmk", "--inventory-as-check", "xyz"], + p = site.execute(["cmk", "--inventory-as-check", "xyz."], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert p.wait() == 1 @@ -627,7 +627,7 @@ def test_inventory_as_check(test_cfg, site): # '----------------------------------------------------------------------' def test_inventory_as_check_unknown_host(test_cfg, site): - p = site.execute(["cmk", "--check-discovery", "xyz"], + p = site.execute(["cmk", "--check-discovery", "xyz."], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() assert p.wait() == 1

6 years, 12 months

Fixed empty multi vlans

by Simon Betz

Module: check_mk Branch: master Commit: f12afa83fed35844be61ebeaa0584553faed8e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f12afa83fed358… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 29 15:06:17 2017 +0200 Fixed empty multi vlans Change-Id: I4f3be44133b3dc731a3c1defc0268c98bb98f63d --- inventory/cisco_vlans | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans index 3402b1e..9584403 100644 --- a/inventory/cisco_vlans +++ b/inventory/cisco_vlans @@ -69,6 +69,9 @@ def parse_multi_vlan(vlan_multi): if bit == '1': vlans.append(k*8 + l+1) + if not vlans: + return "" + infotexts = [] subinfo = vlans[:1] last_vlan = vlans[0]

6 years, 12 months

New commits on branch master

by git version control

URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a381f146b21b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 13:55:24 2017 +0200 Fixed left over g_hostname call Change-Id: If15b042ef51beb133396d0448d0c94eb640840f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09a8e267776b9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 28 16:28:57 2017 +0200 Cleaned up different cyclic dependencies in new modules Change-Id: I9bf2ac9936d8adb684f3e5bb9a8543fbec6eb10a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48f4f08b97c6a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 28 09:35:07 2017 +0200 Fixed test Change-Id: I1506c5795ae79d63a3234b9b0a1b66145a56d7dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7cb7651ab45df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 28 09:17:56 2017 +0200 Fixed merge issue Change-Id: I6bc9d2c46c38bc36eb3870d3d56212eb602ae1e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=229f05dabf0707… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 15 16:39:17 2017 +0200 Updated version in werks Change-Id: Id4de8e0b498a2ca1c36e1dddb8d7c3931b141ad1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f4e01fc9b5cdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 12 15:55:18 2017 +0200 Checks: Added validation that "includes" is a list Change-Id: I069430d1de42998036c83bad6740b9f347686d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27e0effc4bb730… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 11 16:29:45 2017 +0200 Transformed new modules code to cmk_base hierarchy - Reapplied change lost during rebase - Changed to new APIs Change-Id: If6aa388748a2b1f75307af1d1d7606176da3be12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7bc1779d4f68b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 08:20:05 2017 +0100 Fixed some issues found by the linter Change-Id: I3fd24e4b97a92a60b31ec5a665840cdbc2871407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cd9516a9da2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 08:13:33 2017 +0100 Checks: Changed g_hostname to host_name() Change-Id: I6f0604e8b826b02ec0a366ea154677ea0fab4826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766953eb3b86bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 15:45:42 2016 +0100 Fully replaced modules by cmk_base URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcc6a725391255… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 11:09:28 2016 +0100 Moved parent scan and ip lookup to cmk_base module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ea9dfac7949d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 17:14:19 2016 +0100 Moved cmc config settings to new place URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd7c90560d090… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 08:15:22 2017 +0100 Cleaned up issue after rebase Change-Id: I279b4d2af3bf397813afbb8fb9016a331e598218 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53594e175a63f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 17:58:02 2017 +0100 Precompile cmk_base files during .f12 Change-Id: Ifefb4fde505221cb3140dffff3fd35d53af5288e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e843fbcfb21f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 17:50:09 2017 +0100 4236 FIX Removed g_hostname and g_service_description from Check API In previous versions the check and inventory plugins of Check_MK could use the variable <tt>g_hostname</tt> to refer to the host that is currently being checked and <tt>g_service_description</tt> to get the description of the service that is currently being checked. Instead of those variables, you can now use the functions <tt>host_name()</tt> and <tt>service_description()</tt> Change-Id: Idc431595d8503d09c2474c8d9a599946a0e2429e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=994672f34d2352… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:42:09 2017 +0100 4235 FIX cmk command: Finally removed long deprecated -S/-H options Change-Id: I9f3f23649a25b88db0856988d43a614c71f24c59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74da66b6e9a1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:41:48 2017 +0100 4234 FIX Host/Service aggregation have been removed The long deprecated and rarely used aggregated host and services feature has been removed now. Change-Id: I5baa575a1fa2a985c29e26145960b9a56df41ee3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2f93772de4e78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 08:15:01 2017 +0100 Fixed not renamed host rrd directory during host renaming (CEE only) Change-Id: Ibf3dad9f69517387d8b5b3c4581435bcdb8dbc30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=495eb5ff870786… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 5 13:26:31 2017 +0100 Added some tests for the cmk command line calls (modes) Change-Id: If2786fc2d29e5b2f6e1ecefbd627d15ae49fcc38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0afd2d6878d7b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 5 13:26:18 2017 +0100 Testing for debug output now also warns about pprint calls Change-Id: I1017844995fe0bd2ccaeb8afab614647f8967783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=279773ad60b445… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 5 13:25:56 2017 +0100 Replaced some direct print statements from agent plugins Change-Id: If213385b6de75431bc040ec8c4b43546bde871c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd1f3a908a5a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 4 14:31:22 2017 +0100 Started documentation of the Check API. See "pydoc cmk_base.check_api" Change-Id: Iefb9bfd151ed0b0245bae3868cb2fca963f5d24c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6141816905d3c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 4 21:08:59 2017 +0100 checks: Use host_name() instead of g_hostname now Change-Id: I0f7c48f96065460b109bc6c734d6c39ddcfc67c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2476258790fd4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 3 15:58:44 2017 +0100 Prepared checks for separated contexts Change-Id: I40fd26d97c56c872f30da61627a064c071d4daff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15db1f44b9b81b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 3 15:32:45 2017 +0100 Started finally separating checks from eachother Change-Id: Ib91ba2b095cc932ab0e2955a7d27aed1cf69b5c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8362971e1aca6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 29 10:09:17 2016 +0100 Cleaned up some subprocess calls Change-Id: I84788a23b992507eb90b25d674cad3dc6cb2e507 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9dec39b2d67e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 16:00:11 2016 +0100 Small testing improvements Change-Id: I39b5383a1957644b0339e518088582991de88b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75f8e531b1c96e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 15:45:42 2016 +0100 Fully replaced modules by cmk_base Change-Id: I78521158041fbd48213cbfd8e05aac027600a7ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f60b13f3781af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 15:39:04 2016 +0100 Moved agent communication to cmk_base Change-Id: Ib122c269c31023f8615f448fd4d245fe6ccebe90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=909f8caab5ca90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 14:31:41 2016 +0100 Added plugin mechanism for cmk modes Change-Id: I975857e630766fd565655af60944ae4b4a8b3656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10192d86fdc850… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 14:02:54 2016 +0100 Moved backup,restore,donation modes to separate modules Change-Id: I446702867f32690b09946afea9d9a62f3e387fc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1cd631ee49b3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 13:50:26 2016 +0100 Added some first check test for the uptime check Change-Id: Id370d1c53d91dc86a5b0fae5a387ec2984777792 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49232fa522e787… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 13:36:12 2016 +0100 Moved some config creation stuff around; Cleaned up different things Change-Id: Ied4b211f506a10d9ac2dcf15ae27d51aeb11254e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a21abbf0945d34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 13:22:59 2016 +0100 Moved SNMP code to cmk_base modules Change-Id: Ic943e84b307ee820bee29015e44d1ab562e3450d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0733931c965930… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 11:48:33 2016 +0100 "soon" is now. Finally removed host/service aggregations Change-Id: I9f99e19dcca8ef79d302730dae108ee70f0f080e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217c083527f8bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 11:21:51 2016 +0100 Cleaned up some legacy code Change-Id: I6f474738fc3461fe52c32842c966d895df87f81a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=070ef59b1bc538… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 11:09:10 2016 +0100 Moved parent scan to cmk_base module Change-Id: I431ffc1982bc21460b9c1af8670adc066c9fca9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7f399ca96308… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 10:45:01 2016 +0100 Moved IP address lockup to cmk_base module Change-Id: I7f1ebbe439e68f970e846a068bdfc8c6a49739e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cb197f0a16dcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 28 10:11:35 2016 +0100 Moved crash reporting to cmk_base module Change-Id: Ibf861fe9901aa25339c0d52569e21a285fa049da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0b7546f3af52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 21:30:04 2016 +0100 cleaned up use of check_uses_snmp() function Change-Id: Iae5e6449c4b69547d3cc4007c18cd7c5e53d98e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce94c6903579c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 17:00:14 2016 +0100 Fixed issues after merge problem Change-Id: Ic9b43758b2bcd13e8f2719f83c3fb805ee47d981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=476a6f37347baf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 9 21:05:33 2016 +0100 Moved cmk_base specific exceptions to dedicated module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37a81c6ad8ac9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 9 17:20:06 2016 +0100 Added some more ruleset tests URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f0040a1879711… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 11:47:09 2016 +0100 Fixed different issues URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e68d14721c604f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 7 11:28:46 2016 +0100 moved duplicate host validation to helper function URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04d4d8293254a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 15:16:44 2016 +0100 Prefixed ruleset internal helper functions with "_" URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e64013a9303be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 15:05:19 2016 +0100 moved in_boolean_serviceconf_list to rulesets module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c02c3f3e7a5c4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 08:24:03 2016 +0100 Started implementing some ruleset tests URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793b4463212b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 15:43:07 2016 +0100 Fixed missing configuration vars in global settings URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beb794381c941f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 18:47:27 2016 +0100 Cleaned up config loading code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7511ff1356693… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 09:12:12 2016 +0100 Core configuration warnings need to go to stdout URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6480d0952e6b7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 30 08:32:42 2016 +0100 moved check configuration variables to checks module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac9ecedf6232d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 17:13:22 2016 +0100 Fixed loading of CEE config options URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=978b79b9d2288c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 16:26:15 2016 +0100 Moved a lot of host setting functions to config module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d145a41dc21540… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 15:12:55 2016 +0100 Fixed some issues URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89de8085d2ef1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 09:24:35 2016 +0100 Moved core config creation warnings to dedicated module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9225961ba984c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 22:51:57 2016 +0100 Moved piggyback stuff to dedicated module; Reduced duplicate hostname translation code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ca8411393834b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 22:22:06 2016 +0100 moved helper functions to config URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0f27e0c5d89d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 21:44:37 2016 +0100 Moved active check handling to cmk_base.checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dfb56083b47a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 21:26:41 2016 +0100 moved events specific function to events.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d1e52f10f3274… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 21:24:02 2016 +0100 Cleaned up fake_dns handling URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a7d4a99085a77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 17:19:21 2016 +0100 Minor code cleanup URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1f384e86d8cce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 17:14:48 2016 +0100 Fixed broken processing of check config variables URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f3cf54de7a124… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 16:03:41 2016 +0100 Tests: Fixed agent bakery plugin tests URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7beb8f7f50a847… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 28 15:46:44 2016 +0100 Moved inventory plugin handling to own module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25b8d48d53d673… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 20:30:02 2016 +0100 Fixed nagios precompile ; Fixed user overridden check parameter loading URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd03bd041b2b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 14:17:51 2016 +0100 Cleaned up default config registration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b69bedc41bb69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 13:54:58 2016 +0100 Changed default config registration to work modularized URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04f8f5e9f08212… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 13:37:34 2016 +0100 Cleaned up API violations in some checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c50ec005ee0d6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Nov 27 13:20:28 2016 +0100 Made some more needed function and vars available to checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1fd23cae4f119… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 21:46:39 2016 +0100 Cleaned up different issues after restructuring URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6249298b545a42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 21:19:40 2016 +0100 Moved global g_hostname and g_service_description URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=535b384561d955… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 21:02:09 2016 +0100 moved host_extra_conf to rulesets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bea187e2a6208b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 20:55:56 2016 +0100 Moved most of check helper functions to checks module URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15cf839b232f51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 20:48:52 2016 +0100 Made check not use undocumented worst_monitoring_state function URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4c39b0ad1fd02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 26 20:22:20 2016 +0100 Started moving checks/config/rulesets code to dedicated modules

6 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017