Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4517 FIX 4516 FIX check_mk_agent.openwrt: Escaped quotes in run_cached function used for ipmi-sensors command

by Simon Betz

Module: check_mk Branch: master Commit: d53a9c39997bc1a1b35345e508e28b8d45f806c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d53a9c39997bc1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:11:22 2017 +0100 4517 FIX 4516 FIX check_mk_agent.openwrt: Escaped quotes in run_cached function used for ipmi-sensors command Change-Id: Ia412d5a650d798fda794e91df26de6b5a1c025ea --- .werks/4517 | 11 +++++++++++ agents/check_mk_agent.openwrt | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4517 b/.werks/4517 new file mode 100644 index 0000000..871f4af --- /dev/null +++ b/.werks/4517 @@ -0,0 +1,11 @@ +Title: 4516 FIX check_mk_agent.openwrt: Escaped quotes in run_cached function used for ipmi-sensors command +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489399863 + + diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index e17b487..79edea5 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -411,7 +411,7 @@ then # At least with ipmi-sensors 0.7.16 this group is Power_Unit instead of "Power Unit" run_cached -s ipmi_sensors 300 "for class in Temperature Power_Unit Fan do - ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g \"$class\" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' # In case of a timeout immediately leave loop. if [ $? = 255 ] ; then break ; fi done"

7 years, 6 months

4496 The site ID can now be used as match condition

by Lars Michelsen

Module: check_mk Branch: master Commit: d920f74a52cfa703d5bf30654a800dcdd56ddc0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d920f74a52cfa7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 13 11:00:28 2017 +0100 4496 The site ID can now be used as match condition Setting the site ID as condition is now possible to be configured in notification rules. This is useful for setups where centralized notifications are used and you want to configured rules depending on the origin site. Change-Id: I3a061c5f5ff70ead97d111c5ab254668f2103725 --- .werks/4496 | 14 ++++++++++++++ modules/events.py | 15 +++++++++++++++ web/htdocs/wato.py | 12 ++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.werks/4496 b/.werks/4496 new file mode 100644 index 0000000..3597b9c --- /dev/null +++ b/.werks/4496 @@ -0,0 +1,14 @@ +Title: The site ID can now be used as match condition +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489399160 +Class: feature + +Setting the site ID as condition is now possible to be configured in +notification rules. This is useful for setups where centralized +notifications are used and you want to configured rules depending +on the origin site. + diff --git a/modules/events.py b/modules/events.py index 5c617d8..cfa9b8d 100644 --- a/modules/events.py +++ b/modules/events.py @@ -349,6 +349,7 @@ def complete_raw_context(raw_context, with_dump, event_log): def event_match_rule(rule, context): return \ + event_match_site(rule, context) or \ event_match_folder(rule, context) or \ event_match_hosttags(rule, context) or \ event_match_hostgroups(rule, context) or \ @@ -368,6 +369,20 @@ def event_match_rule(rule, context): event_match_servicelevel(rule, context) +def event_match_site(rule, context): + if "match_site" not in rule: + return + + required_site_ids = rule["match_site"] + + # Fallback to local site ID in case there is none in the context + site_id = context.get("OMD_SITE", omd_site()) + + if site_id not in required_site_ids: + return "The site '%s' is not in the required sites list: %s" % \ + (site_id, ",".join(required_site_ids)) + + def event_match_folder(rule, context): if "match_folder" in rule: mustfolder = rule["match_folder"] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 83bd489..8a1cc43 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7492,7 +7492,7 @@ def vs_notification_rule(userid = None): ), ], - optional_keys = [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", + optional_keys = [ "match_site", "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", "match_servicegroups", "match_exclude_servicegroups", "match_servicegroups_regex", "match_exclude_servicegroups_regex", "match_services", "match_exclude_services", "match_contacts", "match_contactgroups", @@ -7506,7 +7506,7 @@ def vs_notification_rule(userid = None): ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ - ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", + ( _("Conditions"), [ "match_site", "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", "match_servicegroups", "match_exclude_servicegroups", "match_servicegroups_regex", "match_exclude_servicegroups_regex", "match_services", "match_exclude_services", @@ -7524,6 +7524,14 @@ def vs_notification_rule(userid = None): def simple_host_rule_match_conditions(): return [ + ( "match_site", + DualListChoice( + title = _("Match site"), + help = _("This condition makes the rule match only notifications that have been " + "created on the selected sites."), + choices = config.site_choices, + ), + ), ( "match_folder", FolderChoice( title = _("Match folder"),

7 years, 6 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 324846f07787e4587f76b1e85fa9eab40d1c9e54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324846f07787e4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:08:10 2017 +0100 Reserved 20 Werk IDS Change-Id: I4a9cfaa3d26f4c10063215b0e80964b0ed8fb0ee --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b193f39..1313386 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4516 +4536

7 years, 6 months

4495 FIX mk_mysql.vbs: Fixed missing command if DB process runs as mysqld-nt.exe

by Simon Betz

Module: check_mk Branch: master Commit: eb95364d44c2b5f0393ee32921eea1584df0d049 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb95364d44c2b5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:04:02 2017 +0100 4495 FIX mk_mysql.vbs: Fixed missing command if DB process runs as mysqld-nt.exe Change-Id: I87d10d218af5fae151bad71db9ca462d67cf3e07 --- .werks/4495 | 11 +++++++++++ agents/windows/plugins/mk_mysql.vbs | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/4495 b/.werks/4495 new file mode 100644 index 0000000..7e68574 --- /dev/null +++ b/.werks/4495 @@ -0,0 +1,11 @@ +Title: mk_mysql.vbs: Fixed missing command if DB process runs as mysqld-nt.exe +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489399150 + + diff --git a/agents/windows/plugins/mk_mysql.vbs b/agents/windows/plugins/mk_mysql.vbs index 7999b41..f96691e 100644 --- a/agents/windows/plugins/mk_mysql.vbs +++ b/agents/windows/plugins/mk_mysql.vbs @@ -86,6 +86,7 @@ For Each instance In instances.Keys ' with the option --print-defaults cmd = instances.Item(instance) cmd = Replace(cmd, "mysqld.exe", "mysql.exe") + cmd = Replace(cmd, "mysqld-nt.exe", "mysql.exe") cmd = Left(cmd, InStrRev(cmd, " ")) & " --print-defaults" Set PROC = SHO.Exec(cmd) PROC.StdIn.Close() @@ -111,6 +112,7 @@ For Each instance In instances.Keys ' my.ini and instance name from the end of the command and add our config as --defaults-extra-file. cmd = instances.Item(instance) cmd = Replace(cmd, "mysqld""", "mysql""") + cmd = Replace(cmd, "mysqld-nt""", "mysql""") cmd = Replace(cmd, "mysql""", "mysql.exe""") cmd = Left(cmd, InStr(cmd, "mysql.exe""")+9) If cfg_file <> "" Then

7 years, 6 months

4494 FIX cisco_wlc, cisco_wlc_clients: Fixed missing OID for Cisco WLC 5520 Appliances

by Simon Betz

Module: check_mk Branch: master Commit: 4460a375487b1b2500980925d5f6fa2e80cfbbb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4460a375487b1b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 10:30:15 2017 +0100 4494 FIX cisco_wlc, cisco_wlc_clients: Fixed missing OID for Cisco WLC 5520 Appliances Change-Id: I90eb655c698043631963b8210d1b7b17768283f8 --- .werks/4494 | 11 +++++++++++ checks/cisco_wlc | 1 + checks/cisco_wlc_clients | 1 + 3 files changed, 13 insertions(+) diff --git a/.werks/4494 b/.werks/4494 new file mode 100644 index 0000000..92a8fdf --- /dev/null +++ b/.werks/4494 @@ -0,0 +1,11 @@ +Title: cisco_wlc, cisco_wlc_clients: Fixed missing OID for Cisco WLC 5520 Appliances +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489397305 + + diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 198d51c..019b3b3 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -68,6 +68,7 @@ check_info["cisco_wlc"] = { ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.9.1.1279", ".1.3.6.1.4.1.9.1.1293", + ".1.3.6.1.4.1.9.1.2170", ], "snmp_info" : (".1.3.6.1.4.1.14179.2.2.1.1", [ "3", diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index 23e2400..86ca33f 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -73,6 +73,7 @@ check_info["cisco_wlc_clients"] = { ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279", ".1.3.6.1.4.1.9.1.1293", + ".1.3.6.1.4.1.9.1.2170", ], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ "2",

7 years, 6 months

CME: Added new modules directory to test

by Lars Michelsen

Module: check_mk Branch: master Commit: c359df99d6af29fac81569f4b9a242472d3d0a09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c359df99d6af29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 13 10:11:23 2017 +0100 CME: Added new modules directory to test Change-Id: I43dc57835ee68736366b83adbf6d579d4bed7acb --- tests/testlib/pylint_cmk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 7ad92bb..f0e806d 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -11,7 +11,7 @@ import tempfile from pylint.reporters.text import ColorizedTextReporter, ParseableTextReporter from pylint.utils import Message -from testlib import repo_path, cmk_path, cmc_path +from testlib import repo_path, cmk_path, cmc_path, cme_path def ordered_module_files(): @@ -33,6 +33,7 @@ def ordered_module_files(): cmc_path() + "/modules/inline_snmp.py", cmc_path() + "/modules/agent_bakery.py", cmc_path() + "/modules/rrd.py", + cme_path() + "/modules/managed.py", ] modules = ordered_modules

7 years, 6 months

CME: All hosts have the CUSTOMER custom variable set now

by Lars Michelsen

Module: check_mk Branch: master Commit: cf90ef3fff1f521ea0a59ce0402abdc591eb75b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf90ef3fff1f52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 13 09:57:05 2017 +0100 CME: All hosts have the CUSTOMER custom variable set now Change-Id: I72fde3ebaf00c92874b9abb08a2b460fe36b204b --- modules/check_mk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 53b40a0..fc57835 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -272,7 +272,7 @@ config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try: modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'events', - 'alert_handling', 'cmc', 'inline_snmp', 'agent_bakery' ] + 'alert_handling', 'cmc', 'inline_snmp', 'agent_bakery', 'managed' ] for module in modules: if module_exists(module): load_module(module) @@ -2936,6 +2936,9 @@ def get_host_attributes(hostname, tags): if actions: attrs["_ACTIONS"] = ",".join(actions) + if cmk.is_managed_edition(): + attrs["_CUSTOMER"] = current_customer + return attrs

7 years, 6 months

CME: Customer are not allowed to login to the central site anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 2190f03b766bb7093ad91638452db294e2915d49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2190f03b766bb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 13 09:32:05 2017 +0100 CME: Customer are not allowed to login to the central site anymore Change-Id: I812767a73212947f94c2e79d3ab10c0e6038b00d --- web/htdocs/login.py | 6 ++++++ web/htdocs/userdb.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a189574..0dc45a6 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -268,6 +268,12 @@ def check_auth(mod_python_req): if (user_id is not None and type(user_id) != unicode) or user_id == u'': raise MKInternalError(_("Invalid user authentication")) + if user_id and not userdb.is_customer_user_allowed_to_login(user_id): + # A CME not assigned with the current sites customer + # is not allowed to login + auth_logger.debug("User '%s' is not allowed to login: Invalid customer" % user_id) + return None + return user_id diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 8fc965e..0fb9351 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -216,6 +216,20 @@ def is_automation_user(user_id): return os.path.isfile(cmk.paths.var_dir + "/web/" + user_id.encode("utf-8") + "/automation.secret") +def is_customer_user_allowed_to_login(user_id): + if not cmk.is_managed_edition(): + return True + + import managed + user = config.LoggedInUser(user_id) + customer_id = managed.get_customer_id(user.attributes) + + if managed.is_global(customer_id): + return True + + return managed.is_current_customer(customer_id) + + # This function is called very often during regular page loads so it has to be efficient # even when having a lot of users. # @@ -1174,6 +1188,11 @@ def hook_login(username, password): # Check whether or not the user exists (and maybe create it) create_non_existing_user(connection_id, username) + if not is_customer_user_allowed_to_login(username): + # A CME not assigned with the current sites customer + # is not allowed to login + return False + # Now, after successfull login (and optional user account # creation), check whether or not the user is locked. # In e.g. htpasswd connector this is checked by validating the

7 years, 6 months

4493 FIX mk_oracle.ps1: Now takes version into account which fixed wrong calculation of tablespaces

by Simon Betz

Module: check_mk Branch: master Commit: 969c43636340212c3e79d373ea135526abf993f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969c4363634021… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 08:00:45 2017 +0100 4493 FIX mk_oracle.ps1: Now takes version into account which fixed wrong calculation of tablespaces Change-Id: I31478990fe997618ce7b61a88c7ea961c4172006 --- .werks/4493 | 11 +++++++++++ agents/windows/plugins/mk_oracle.ps1 | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4493 b/.werks/4493 new file mode 100644 index 0000000..d8ffbe6 --- /dev/null +++ b/.werks/4493 @@ -0,0 +1,11 @@ +Title: mk_oracle.ps1: Now takes version into account which fixed wrong calculation of tablespaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489388435 + + diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 0188ab1..8a727a7 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -613,10 +613,12 @@ Function sql_tablespaces { ||'|'|| ONLINE_STATUS ||'|'|| BLOCK_SIZE ||'|'|| decode(tstatus,'READ ONLY', 'READONLY', tstatus) || '|' || free_blocks ||'|'|| contents + ||'|'|| iversion from v$database d , ( select f.file_name, f.tablespace_name, f.status fstatus, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, - f.ONLINE_STATUS, t.BLOCK_SIZE, t.status tstatus, nvl(sum(fs.blocks),0) free_blocks, t.contents + f.ONLINE_STATUS, t.BLOCK_SIZE, t.status tstatus, nvl(sum(fs.blocks),0) free_blocks, t.contents, + (select version from v$instance) iversion from dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) @@ -626,7 +628,8 @@ Function sql_tablespaces { UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', - t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks, 'TEMPORARY' + t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks, 'TEMPORARY', + (select version from v$instance) version from v$thread th, dba_temp_files f, dba_tablespaces t, v$temp_space_header sh WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status,

7 years, 6 months

4490 Reporting & scheduler: Date & time option is now available in time range options

by Simon Betz

Module: check_mk Branch: master Commit: 3a136876caaac92b902dd1e644da5ba946f241a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a136876caaac9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 10 07:55:35 2017 +0100 4490 Reporting & scheduler: Date & time option is now available in time range options Change-Id: I2998af90181e39938807f05505aa21364a38f232 --- .werks/4490 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4490 b/.werks/4490 new file mode 100644 index 0000000..57b298d --- /dev/null +++ b/.werks/4490 @@ -0,0 +1,10 @@ +Title: Reporting & scheduler: Date & time option is now available in time range options +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1489128658 +Class: feature + +

7 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017