Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4145 FIX Fixed exception when setting output_format in wrong case

by Lars Michelsen

Module: check_mk Branch: master Commit: e6b44a300d0c76c2c5d8d9ba74b3f421c69c6059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6b44a300d0c76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 10:04:39 2016 +0100 4145 FIX Fixed exception when setting output_format in wrong case Change-Id: I23f3f3c0b1ffcc99192209b53590e2b6a6a50be2 --- .werks/4145 | 9 +++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4145 b/.werks/4145 new file mode 100644 index 0000000..754a0f2 --- /dev/null +++ b/.werks/4145 @@ -0,0 +1,9 @@ +Title: Fixed exception when setting output_format in wrong case +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482311051 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2773636..7b1c519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... * 4004 FIX: Fixed exception when viewing availability of BI aggregations... * 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible + * 4145 FIX: Fixed exception when setting output_format in wrong case WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 308cd91..63fe99b 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -68,7 +68,7 @@ class html_mod_python(htmllib.html): self.set_http_header("Cache-Control", "no-cache") self.init_mobile() - self.set_output_format(self.var("output_format", "html")) + self.set_output_format(self.var("output_format", "html").lower()) def client_request_timeout(self):

7 years, 9 months

updated some manpages

by Simon Betz

Module: check_mk Branch: master Commit: 92a302cdef70d851f0de9e9019ed7a02c4ff4f27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92a302cdef70d8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 21 09:47:13 2016 +0100 updated some manpages Change-Id: I4f307fb6243891ba702da317b676d49794e1e2f9 --- checkman/netextreme_cpu_util | 2 +- checkman/netextreme_fan | 2 +- checkman/netextreme_psu | 2 +- checkman/netextreme_psu_in | 2 +- checkman/netextreme_psu_out | 2 +- checkman/netextreme_temp | 2 +- lib/man_pages.py | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/checkman/netextreme_cpu_util b/checkman/netextreme_cpu_util index c05c1c4..e540820 100644 --- a/checkman/netextreme_cpu_util +++ b/checkman/netextreme_cpu_util @@ -1,6 +1,6 @@ title: Extreme Networks Switch: CPU utilization agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/checkman/netextreme_fan b/checkman/netextreme_fan index d786e81..6894951 100644 --- a/checkman/netextreme_fan +++ b/checkman/netextreme_fan @@ -1,6 +1,6 @@ title: Extreme Networks Switch: Fan State and Speed agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/checkman/netextreme_psu b/checkman/netextreme_psu index c0ddd4a..dbfc538 100644 --- a/checkman/netextreme_psu +++ b/checkman/netextreme_psu @@ -1,6 +1,6 @@ title: Extreme Networks Switch: Power Supply agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/checkman/netextreme_psu_in b/checkman/netextreme_psu_in index e67f5d3..bbfaccb 100644 --- a/checkman/netextreme_psu_in +++ b/checkman/netextreme_psu_in @@ -1,6 +1,6 @@ title: Extreme Networks Switch: Input Power Supply agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/checkman/netextreme_psu_out b/checkman/netextreme_psu_out index 9ccc700..d326324 100644 --- a/checkman/netextreme_psu_out +++ b/checkman/netextreme_psu_out @@ -1,6 +1,6 @@ title: Extreme Networks Switch: Output Power Supply agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/checkman/netextreme_temp b/checkman/netextreme_temp index 6b12966..6208c93 100644 --- a/checkman/netextreme_temp +++ b/checkman/netextreme_temp @@ -1,6 +1,6 @@ title: Extreme Networks Switch: Temperature agents: snmp -catalog: hw/other +catalog: hw/network/netextreme license: GPL distribution: check_mk description: diff --git a/lib/man_pages.py b/lib/man_pages.py index c7e08bf..df301e7 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -110,6 +110,7 @@ catalog_titles = { "kemp" : "KEMP", "lancom" : "LANCOM Systems GmbH", "mikrotik" : "MikroTik", + "netextreme" : "Extreme Network", "netgear" : "Netgear", "palo_alto" : "Palo Alto Networks", "qnap" : "QNAP Systems",

7 years, 9 months

updated some manpages

by Simon Betz

Module: check_mk Branch: master Commit: 309493f33ca2328791b8731af7478bd2c43a2969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=309493f33ca232… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 21 09:40:57 2016 +0100 updated some manpages Change-Id: I314f4328f64a69eff36942709fb17f4333e8329e --- checkman/ispro_sensors_digital | 2 +- checkman/ispro_sensors_humid | 2 +- checkman/ispro_sensors_temp | 2 +- lib/man_pages.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checkman/ispro_sensors_digital b/checkman/ispro_sensors_digital index 7a0d1d0..b11290d 100644 --- a/checkman/ispro_sensors_digital +++ b/checkman/ispro_sensors_digital @@ -1,6 +1,6 @@ title: Interseptor Pro devices: Digital in sensors agents: snmp -catalog: hw/other +catalog: hw/environment/ispro license: GPL distribution: check_mk description: diff --git a/checkman/ispro_sensors_humid b/checkman/ispro_sensors_humid index 9bc3500..f2676bf 100644 --- a/checkman/ispro_sensors_humid +++ b/checkman/ispro_sensors_humid @@ -1,6 +1,6 @@ title: Interseptor Pro devices: Humidity sensors agents: snmp -catalog: hw/other +catalog: hw/environment/ispro license: GPL distribution: check_mk description: diff --git a/checkman/ispro_sensors_temp b/checkman/ispro_sensors_temp index 52e2aa8..1b72b3e 100644 --- a/checkman/ispro_sensors_temp +++ b/checkman/ispro_sensors_temp @@ -1,6 +1,6 @@ title: Interseptor Pro devices: Temperature sensors agents: snmp -catalog: hw/other +catalog: hw/environment/ispro license: GPL distribution: check_mk description: diff --git a/lib/man_pages.py b/lib/man_pages.py index aafddb2..c7e08bf 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -68,6 +68,7 @@ catalog_titles = { "emerson" : "EMERSON", "epson" : "Epson", "hwg" : "HW group", + "ispro" : "Interseptor Pro", "kentix" : "Kentix", "knuerr" : "Knuerr", "raritan" : "Raritan",

7 years, 9 months

Fixed ruleset search when icon_image rule is configured

by Lars Michelsen

Module: check_mk Branch: master Commit: ecf4eea189fdc28477f8545344dfe2c4488c6177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecf4eea189fdc2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 09:16:56 2016 +0100 Fixed ruleset search when icon_image rule is configured Change-Id: I201c8f11087e21c453ba8a53e7a1aa0b9927c623 --- web/htdocs/watolib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 484029b..728e23f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6739,7 +6739,8 @@ class Rule(object): return False if self.ruleset.valuespec() and \ - not match_search_expression(search_options, "rule_value", self.ruleset.valuespec().value_to_text(self.value)): + not match_search_expression(search_options, "rule_value", + "%s" % self.ruleset.valuespec().value_to_text(self.value)): return False if not match_one_of_search_expression(search_options, "rule_host_list", self.host_list):

7 years, 9 months

Fixed rule condition rendering after reccent HTML rewriting

by Lars Michelsen

Module: check_mk Branch: master Commit: afd8e9c26590cb783d949127cd92cc5e2afcc1b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afd8e9c26590cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 09:29:08 2016 +0100 Fixed rule condition rendering after reccent HTML rewriting Change-Id: I1e12769a5d052867fe5843d3705d4ff3af49dea9 --- web/htdocs/wato.py | 4 ++-- web/htdocs/watolib.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 87b13f5..181110e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12629,7 +12629,7 @@ class ModeEditRuleset(WatoMode): if len(text_list) == 1: condition += text_list[0] else: - condition += ", ".join(text_list[:-1]) + condition += ", ".join([ "%s" % s for s in text_list[:-1] ]) condition += _(" or ") + text_list[-1] # Other cases should not occur, e.g. list of explicit hosts @@ -12678,7 +12678,7 @@ class ModeEditRuleset(WatoMode): if len(text_list) == 1: condition += text_list[0] else: - condition += ", ".join(text_list[:-1]) + condition += ", ".join([ "%s" % s for s in text_list[:-1] ]) condition += _(" or ") + text_list[-1] if condition: diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 728e23f..205b8d5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6756,7 +6756,7 @@ class Rule(object): + (self.item_list or []) if self.ruleset.valuespec(): - to_search.append(self.ruleset.valuespec().value_to_text(self.value)) + to_search.append("%s" % self.ruleset.valuespec().value_to_text(self.value)) if not match_one_of_search_expression(search_options, "fulltext", to_search): return False

7 years, 9 months

Changed sites.mk and liveproxyd.mk writing to generic store functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 20eab289169888a9e1965843f8132ce69c34b11b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20eab289169888… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 09:06:45 2016 +0100 Changed sites.mk and liveproxyd.mk writing to generic store functions Change-Id: If26152ed210f2731ecfe62e5747807faaa0991db --- web/htdocs/watolib.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 2bd7724..484029b 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3233,13 +3233,7 @@ def load_sites(): def save_sites(sites, activate=True): make_nagios_directory(multisite_dir) - - # Important: even write out sites if it's empty. The global 'sites' - # variable will otherwise survive in the Python interpreter of the - # Apache processes. - out = create_user_file(sites_mk, "w") - out.write(wato_fileheader()) - out.write("sites = \\\n%s\n" % pprint.pformat(sites)) + store.save_to_mk_file(sites_mk, "sites", sites) # Do not activate when just the site's global settings have # been edited @@ -3261,8 +3255,6 @@ def save_sites(sites, activate=True): def save_liveproxyd_config(sites): path = cmk.paths.default_config_dir + "/liveproxyd.mk" - out = create_user_file(path, "w") - out.write(wato_fileheader()) conf = {} for siteid, siteconf in sites.items(): @@ -3270,7 +3262,8 @@ def save_liveproxyd_config(sites): if type(s) == tuple and s[0] == "proxy": conf[siteid] = s[1] - out.write("sites = \\\n%s\n" % pprint.pformat(conf)) + store.save_to_mk_file(path, "sites", conf) + try: pidfile = cmk.paths.livestatus_unix_socket + "proxyd.pid" pid = int(file(pidfile).read().strip())

7 years, 9 months

Fixed wrong text type

by Lars Michelsen

Module: check_mk Branch: master Commit: ebd03c721c464f6fe2048671d3bcab401a5f449c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd03c721c464f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 08:52:28 2016 +0100 Fixed wrong text type Change-Id: I30d8dd7b1ba064ce91917b7919de96b8dcd236b6 --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 2b5ceb1..2bd7724 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -5885,7 +5885,7 @@ class Rulespecs(object): if group_name.startswith(main_group_name + "/"): # TODO: Move this subgroup title calculation to some generic place sub_group_title = group_name.split("/", 1)[1] - choices.append((group_name, "  ⌙ %s" % sub_group_title)) + choices.append((group_name, u"  ⌙ %s" % sub_group_title)) return choices

7 years, 9 months

WATO: Cleaned up deprecated is_distributed() function

by Lars Michelsen

Module: check_mk Branch: master Commit: 573bb7b3cb1cd259ab9ff1182326567ab9728edf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=573bb7b3cb1cd2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 08:27:54 2016 +0100 WATO: Cleaned up deprecated is_distributed() function Change-Id: I52985e59bfd22b7b1a923eb17b2b7382ca0d6592 --- web/htdocs/wato.py | 40 ++++++++++++++++++---------------------- web/htdocs/watolib.py | 7 ------- web/plugins/userdb/ldap.py | 2 +- web/plugins/visuals/wato.py | 3 +-- 4 files changed, 20 insertions(+), 32 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2402969..87b13f5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -30,10 +30,6 @@ # and implement AJAX handlers. It uses classes, functions and globals # from watolib.py. -# CLEANUP: is_distributed() now always returns True. Remove all occurrances -# of this function as soon as we know that everything still works without -# the old "single" mode. - # .--README--------------------------------------------------------------. # | ____ _ | # | | _ \ ___ __ _ __| | _ __ ___ ___ | @@ -7930,7 +7926,7 @@ def mode_user_notifications(phase, profilemode): log_text = _("Deleted notification rule %d of user %s") % (nr, userid) notification_rule_start_async_repl = False - if profilemode and is_distributed(): + if profilemode and has_wato_slave_sites(): notification_rule_start_async_repl = True log_audit(None, log_what, log_text) else: @@ -7953,7 +7949,7 @@ def mode_user_notifications(phase, profilemode): log_text = _("Changed position of notification rule %d of user %s") % (from_pos, userid) notification_rule_start_async_repl = False - if profilemode and is_distributed(): + if profilemode and has_wato_slave_sites(): notification_rule_start_async_repl = True log_audit(None, log_what, log_text) else: @@ -8052,7 +8048,7 @@ def mode_notification_rule(phase, profilemode): log_text = _("Changed notification rule %d") % edit_nr + suffix notification_rule_start_async_repl = False - if profilemode and is_distributed(): + if profilemode and has_wato_slave_sites(): notification_rule_start_async_repl = True log_audit(None, log_what, log_text) return # don't redirect to other page @@ -8799,21 +8795,21 @@ def mode_sites(phase): # will be removed. test_sites = dict(configured_sites.items()) del test_sites[delid] - if is_distributed(test_sites): - # Make sure that site is not being used by hosts and folders - if delid in Folder.root_folder().all_site_ids(): - search_url = html.makeactionuri([ - ("host_search_change_site", "on"), - ("host_search_site", delid), - ("host_search", "1"), - ("folder", ""), - ("mode", "search"), - ("filled_in", "edit_host"), - ]) - raise MKUserError(None, - _("You cannot delete this connection. It has folders/hosts " - "assigned to it. You can use the <a href=\"%s\">host " - "search</a> to get a list of the hosts.") % search_url) + + # Make sure that site is not being used by hosts and folders + if delid in Folder.root_folder().all_site_ids(): + search_url = html.makeactionuri([ + ("host_search_change_site", "on"), + ("host_search_site", delid), + ("host_search", "1"), + ("folder", ""), + ("mode", "search"), + ("filled_in", "edit_host"), + ]) + raise MKUserError(None, + _("You cannot delete this connection. It has folders/hosts " + "assigned to it. You can use the <a href=\"%s\">host " + "search</a> to get a list of the hosts.") % search_url) c = wato_confirm(_("Confirm deletion of site %s") % delid, _("Do you really want to delete the connection to the site %s?") % delid) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3e21cca..2b5ceb1 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3510,13 +3510,6 @@ def do_remote_automation(site, command, vars): return response -# Determine, if we have any slaves to distribute -# configuration to. -def is_distributed(sites = None): - # TODO: Remove all calls of this function - return True - - # Returns the ID of the default site. This is the site the main folder has # configured by default. It inherits to all folders and hosts which don't have # a site set on their own. diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 0a48111..6dcf32a 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1027,7 +1027,7 @@ class LDAPUserConnector(UserConnector): pw_changed = True # Synchronize new user profile to remote sites if needed - if pw_changed and not changed and wato.is_distributed(): + if pw_changed and not changed and wato.has_wato_slave_sites(): synchronize_profile_to_sites(self, user_id, user) if changed: diff --git a/web/plugins/visuals/wato.py b/web/plugins/visuals/wato.py index 7e3c860..bbdd897 100644 --- a/web/plugins/visuals/wato.py +++ b/web/plugins/visuals/wato.py @@ -38,8 +38,7 @@ class FilterWatoFile(Filter): # This filter is also available on slave sites with disabled WATO # To determine if this site is a slave we check the existance of the distributed_wato.mk # file and the absence of any site configuration - return (config.wato_enabled or\ - (not wato.is_distributed() and os.path.exists(cmk.paths.check_mk_config_dir + "/distributed_wato.mk")))\ + return (config.wato_enabled or wato.is_wato_slave_site()) def load_wato_data(self):

7 years, 9 months

Fixed typo, causing active checks to be installed in wrong place

by Lars Michelsen

Module: check_mk Branch: master Commit: 37cbb5088c537220a417fa0aac583dcbe441e922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37cbb5088c5372… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 08:25:34 2016 +0100 Fixed typo, causing active checks to be installed in wrong place Change-Id: I6c53660f394d893f0b93a2e864bf9829c34d46a7 --- scripts/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 61fa0c6..8b15d94 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -478,7 +478,7 @@ modulesdir=$sharedir/modules web_dir=$sharedir/web localedir=$sharedir/locale agentsdir=$sharedir/agents -activechecksdir=${check_icmp_pathr%/*} +activechecksdir=${check_icmp_path%/*} if [ -z "$YES" ] then

7 years, 9 months

4119 FIX check_mk_agent.solaris: fixed run_cached function

by Marcel Schulte

Module: check_mk Branch: master Commit: c81bef3de89e70f5c754f7fb65cc419da3977d36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c81bef3de89e70… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Dec 20 17:17:54 2016 +0100 4119 FIX check_mk_agent.solaris: fixed run_cached function Previously the run_cached function simply exited if cache file $CACHEFILE.new was too old. This has been fixed now, the function acts just like in the Linux agent - it removes the process of the file as well as the file itself. Change-Id: I886c524ac21280eae54531a66808ab407ab84dc7 --- .werks/4119 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4119 b/.werks/4119 new file mode 100644 index 0000000..c3fbb7c --- /dev/null +++ b/.werks/4119 @@ -0,0 +1,11 @@ +Title: check_mk_agent.solaris: fixed run_cached function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482250470 + +Previously the run_cached function simply exited if cache file $CACHEFILE.new was too old. +This has been fixed now, the function acts just like in the Linux agent - it removes the process of the file as well as the file itself. diff --git a/ChangeLog b/ChangeLog index 10af144..2773636 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ NOTE: Please refer to the migration notes! * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... * 4174 FIX: added missing perfometer for interface services + * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 1e73af4..f8b1b23 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -91,7 +91,8 @@ function run_cached () { if [ -e "$CACHEFILE.new" ] ; then AGE=$(file_age "$CACHEFILE.new") if [ $AGE -ge $((MAXAGE * 2)) ] ; then - return + fuser -k "$CACHEFILE.new" >/dev/null 2>&1 + rm -f "$CACHEFILE.new" fi fi

7 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016