Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Added missing default declaration of omd_site variable (equal to omd_root)

by Lars Michelsen

Module: check_mk Branch: master Commit: b3e3650df3e919955715f1fb0b6c60905cdc6646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3e3650df3e919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:09:49 2016 +0200 Added missing default declaration of omd_site variable (equal to omd_root) --- modules/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 4e98004..8e6ff18 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -90,6 +90,7 @@ if '--profile' in sys.argv[1:]: # are we running OMD? If yes, honor local/ hierarchy omd_root = os.getenv("OMD_ROOT", None) +omd_site = os.getenv("OMD_SITE", None) if omd_root: local_share = omd_root + "/local/share/check_mk" local_checks_dir = local_share + "/checks"

8 years, 5 months

3401 FIX Fix sorting and grouping hosts by their IPv4 address

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c54949314075a8025c35a03982feefe318e243f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c54949314075a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 09:26:11 2016 +0200 3401 FIX Fix sorting and grouping hosts by their IPv4 address --- .werks/3401 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 25 ++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.werks/3401 b/.werks/3401 new file mode 100644 index 0000000..8666cc2 --- /dev/null +++ b/.werks/3401 @@ -0,0 +1,10 @@ +Title: Fix sorting and grouping hosts by their IPv4 address +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461050749 + + diff --git a/ChangeLog b/ChangeLog index 1f92a08..6195bf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -211,6 +211,7 @@ * 3118 FIX: Availability view now takes daylight saving time into account * 3395 FIX: Fix performance issue when many BI aggregations are active... * 3398 FIX: Fix exception in Matrix layout if it contains certain complex columns + * 3401 FIX: Fix sorting and grouping hosts by their IPv4 address WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index c60b68c..e6daa25 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -224,7 +224,6 @@ multisite_sorters['svc_perf_val10'] = { # Host declare_1to1_sorter("alias", cmp_num_split) declare_1to1_sorter("host_address", cmp_ip_address) -declare_1to1_sorter("host_ipv4_address", cmp_ip_address) declare_1to1_sorter("host_address_family", cmp_simple_number) declare_1to1_sorter("host_plugin_output", cmp_simple_string) declare_1to1_sorter("host_perf_data", cmp_simple_string) @@ -257,6 +256,30 @@ declare_1to1_sorter("host_contacts", cmp_string_list) declare_1to1_sorter("host_contact_groups", cmp_string_list) declare_1to1_sorter("host_servicelevel", cmp_simple_number) + +def cmp_host_ipv4_address(r1, r2): + def get_address(row): + custom_vars = dict(zip(row["host_custom_variable_names"], + row["host_custom_variable_values"])) + return custom_vars.get("ADDRESS_4", "") + + def split_ip(ip): + try: + return tuple(int(part) for part in ip.split('.')) + except: + return ip + + v1, v2 = split_ip(get_address(r1)), split_ip(get_address(r2)) + return cmp(v1, v2) + + +multisite_sorters["host_ipv4_address"] = { + "title" : _("Host IPv4 address"), + "cmp" : cmp_host_ipv4_address, + "columns" : [ "host_custom_variable_names", "host_custom_variable_values"], +} + + def cmp_host_problems(r1, r2): return cmp(r1["host_num_services"] - r1["host_num_services_ok"] - r1["host_num_services_pending"], r2["host_num_services"] - r2["host_num_services_ok"] - r2["host_num_services_pending"])

8 years, 5 months

fixed incompatibility of werk 3114 (agent encryption) with nagios core

by Sebastian Herbord

Module: check_mk Branch: master Commit: 90ef16e20ffb3b1ab0e2cbae91fe3927813dfe0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90ef16e20ffb3b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 19 09:13:45 2016 +0200 fixed incompatibility of werk 3114 (agent encryption) with nagios core --- modules/nagios.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/nagios.py b/modules/nagios.py index 8219f81..47ca245 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -1189,6 +1189,9 @@ no_discovery_possible = None # TCP and SNMP port of agent output.write("def agent_port_of(hostname):\n return %d\n\n" % agent_port_of(hostname)) + # agent encryption + output.write("def agent_encryption_settings(hostname):\n return %r\n\n" % agent_encryption_settings(hostname)) + # Exit code of Check_MK in case of various errors output.write("def exit_code_spec(hostname):\n return %r\n\n" % exit_code_spec(hostname))

8 years, 5 months

3400 FIX local: do not crash in P mode if performance data contains a unit of measurement

by Mathias Kettner

Module: check_mk Branch: master Commit: 963bb8e60ee45e5aa8441be5f94c4549f088df50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=963bb8e60ee45e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 08:53:52 2016 +0200 3400 FIX local: do not crash in P mode if performance data contains a unit of measurement --- .werks/3400 | 10 ++++++++++ ChangeLog | 1 + checks/local | 12 +++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/3400 b/.werks/3400 new file mode 100644 index 0000000..0a02009 --- /dev/null +++ b/.werks/3400 @@ -0,0 +1,10 @@ +Title: local: do not crash in P mode if performance data contains a unit of measurement +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461048810 + + diff --git a/ChangeLog b/ChangeLog index 2f50127..1f92a08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 3409 FIX: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates * 3399 FIX: statgrab_mem, hr_mem: Fix display of total installed memory in graph * 3384 FIX: eltek_battery: Fixed broken check due to wrong spelled include file + * 3400 FIX: local: do not crash in P mode if performance data contains a unit of measurement Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/local b/checks/local index 0785aaf..58bf27e 100644 --- a/checks/local +++ b/checks/local @@ -40,6 +40,16 @@ def local_compute_state(perfdata): texts = [] + # 16MB -> 16.0 + def float_ignore_uom(value): + while value: + if value[-1] not in "012345678.-": + value = value[:-1] + else: + return float(value) + return 0.0 + + def outof_levels(value, levels): if levels == None: return @@ -59,7 +69,7 @@ def local_compute_state(perfdata): if len(entry) < 3: continue # No levels attached varname = entry[0] - value = float(entry[1]) + value = float_ignore_uom(entry[1]) warn = entry[2] if len(entry) >= 4: crit = entry[3]

8 years, 5 months

Fixed childs -> children

by Mathias Kettner

Module: check_mk Branch: master Commit: f0d48d7bcdbd0a17184f7eeb3371ffec86dd4825 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0d48d7bcdbd0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 08:42:07 2016 +0200 Fixed childs -> children --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9547a0f..e888ce4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1634,8 +1634,8 @@ multisite_painters["host_parents"] = { } multisite_painters["host_childs"] = { - "title" : _("Host's childs"), - "short" : _("childs"), + "title" : _("Host's children"), + "short" : _("children"), "columns" : [ "host_childs" ], "paint" : lambda row: paint_host_list(row["site"], row["host_childs"]), }

8 years, 5 months

3384 FIX eltek_battery: Fixed broken check due to wrong spelled include file

by Lars Michelsen

Module: check_mk Branch: master Commit: 086021780b75183630fc942345bb34605a478656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=086021780b7518… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 16:25:45 2016 +0200 3384 FIX eltek_battery: Fixed broken check due to wrong spelled include file --- .werks/3384 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3384 b/.werks/3384 new file mode 100644 index 0000000..1161128 --- /dev/null +++ b/.werks/3384 @@ -0,0 +1,10 @@ +Title: eltek_battery: Fixed broken check due to wrong spelled include file +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460989532 + + diff --git a/ChangeLog b/ChangeLog index 943d5f0..2f50127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,6 +156,7 @@ * 3122 FIX: netapp_fcpio: the rules for this check are now actually used... * 3409 FIX: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates * 3399 FIX: statgrab_mem, hr_mem: Fix display of total installed memory in graph + * 3384 FIX: eltek_battery: Fixed broken check due to wrong spelled include file Multisite: * 3187 notification view: new filter for log command via regex

8 years, 5 months

Added missing abstract method declarations found so far

by Lars Michelsen

Module: check_mk Branch: master Commit: 29ce44088c7348f033edf6e7f31cac27f69b7c2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29ce44088c7348… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 17:13:15 2016 +0200 Added missing abstract method declarations found so far --- web/htdocs/watolib.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7b87839..67a6c33 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -542,10 +542,18 @@ class BaseFolder(WithPermissionsAndAttributes): html.write("</ul></div>\n") + def name(self): + raise NotImplementedError() + + def title(self): raise NotImplementedError() + def subfolder(self, name): + raise NotImplementedError() + + def has_subfolders(self): raise NotImplementedError() @@ -554,6 +562,34 @@ class BaseFolder(WithPermissionsAndAttributes): raise NotImplementedError() + def move_subfolder_to(self, subfolder, target_folder): + raise NotImplementedError() + + + def create_subfolder(self, name, title, attributes): + raise NotImplementedError() + + + def edit_url(self, backfolder=None): + raise NotImplementedError() + + + def edit(self, new_title, new_attributes): + raise NotImplementedError() + + + def locked(self): + raise NotImplementedError() + + + def create_hosts(self, entries): + raise NotImplementedError() + + + def site_id(self): + raise NotImplementedError() + + #. # .--Folder--------------------------------------------------------------. # | _____ _ _ |

8 years, 5 months

Fix label of EC invert matching feature

by Mathias Kettner

Module: check_mk Branch: master Commit: ad6640a0b9f82902dc35e627b028d9d4b6369a6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad6640a0b9f829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 18 15:14:49 2016 +0200 Fix label of EC invert matching feature --- web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 951b3c8..e4f5403 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -663,7 +663,7 @@ vs_mkeventd_rule = Dictionary( ( "invert_matching", Checkbox( title = _("Invert matching"), - label = _("Negate match: Execute this rule if the following conditions are not fulfilled."), + label = _("Negate match: Execute this rule if the upper conditions are not fulfilled."), help = _("By activating this checkbox the complete combined rule conditions will be inverted. That " "means that this rule with be executed, if at least on of the conditions does not match. " "This can e.g. be used for skipping a rule pack if the message text does not contain <tt>ORA-</tt>. "

8 years, 5 months

Make status socket handling more robust by using a timeout.

by Sven Panne

Module: check_mk Branch: master Commit: bc1952de4ebe526885cfefcfead0575eacc02083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc1952de4ebe52… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 18 14:47:36 2016 +0200 Make status socket handling more robust by using a timeout. --- bin/mkeventd | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/mkeventd b/bin/mkeventd index 90bec36..0ec60c5 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2515,6 +2515,7 @@ class StatusServer: readable = select.select(listen_list, [], [], 0.2)[0] for s in readable: client_socket, addr_info = s.accept() + client_socket.settimeout(3) before = time.time() g_perfcounters.count("connects") if addr_info:

8 years, 5 months

Updated bug entries #2489

by Mathias Kettner

Module: check_mk Branch: master Commit: b4f93d4814a39fb878937f4103b4ad0bd20d9023 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4f93d4814a39f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 18 14:39:13 2016 +0200 Updated bug entries #2489 --- .bugs/2489 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2489 b/.bugs/2489 new file mode 100644 index 0000000..5426d17 --- /dev/null +++ b/.bugs/2489 @@ -0,0 +1,13 @@ +Title: Bulk edit for hosts seems to contain checkbox state when it should not +Component: wato +State: open +Date: 2016-04-18 14:38:33 +Targetversion: 1.2.8 +Class: bug + +Wenn man mehrere Hosts für einen bulk edit markiert hatte und die Änderungen +mit „Save & Finish“ übernommen hat und dann andere Hosts markiert +um dann dafür einen bulk edit zu machen werden genau die Änderungen aus +der vorhergehenden Änderung vorgelegt. Bug oder Feature? Auf jeden Fall +verwirrend, weil in der Regel die Hosts des zweiten Durchganges andere +Merkmale bekommen sollen.

8 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016