Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: check_dns: Changed parameter style

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3b263fd30a4d149dc82f0b5ab802725528939aa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b263fd30a4d14… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 16 11:14:18 2014 +0200 check_dns: Changed parameter style --- .werks/179 | 2 +- checks/check_dns | 2 +- web/plugins/wato/active_checks.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.werks/179 b/.werks/179 index 1abd06a..9db99cb 100644 --- a/.werks/179 +++ b/.werks/179 @@ -5,6 +5,6 @@ Version: 1.2.5i5 Date: 1405453916 Class: feature -Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers. +Befor this change, it was only possible to define the ip of a dns server or use the the ip address of the host as dns server. Now it's also possible to omit this confiuration. In this case the check is done against the local dns servers configured on the monitoring server. This is usefull if you e.g. want check web domain names. diff --git a/checks/check_dns b/checks/check_dns index 049b7e4..80c1bdf 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -29,7 +29,7 @@ def check_dns_arguments(params): args = '-H %s' % quote_shell_string(description) if "server" in settings: - if settings["server"] != "use local configuration": + if settings["server"] != None: args += ' -s %s' % quote_shell_string(settings["server"]) else: args += " -s '$HOSTADDRESS$'" diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 400a260..8e140b1 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -180,7 +180,7 @@ register_rule(group, Alternative( title = _("DNS Server"), elements = [ - FixedValue( value="use local configuration", + FixedValue( value=None, totext=_("use local configuration"), title = _("Use local DNS configuration of monitoring site")), TextAscii( title = _("Specify DNS Server"),

10 years, 2 months

Check_MK Git: check_mk: sap: It is now possible to add multiple sap instances to the sap.cfg file

by Bastian Kuhn

Module: check_mk Branch: master Commit: 163ec8e40b8b292a9d5e7068385f092af961b728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=163ec8e40b8b29… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 16 11:57:10 2014 +0200 sap: It is now possible to add multiple sap instances to the sap.cfg file The cfg format has changed from dict to a list of dicts. See the sap.cfg for a example. The old config format is still working. --- .werks/180 | 9 +++ ChangeLog | 1 + agents/plugins/mk_sap | 215 ++++++++++++++++++++++++++----------------------- agents/sap/sap.cfg | 19 ++++- 4 files changed, 138 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=163ec8e40b…

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2137

by Lars Michelsen

Module: check_mk Branch: master Commit: 52e5c9b870323c7f6f05d3e40d67796be5dab4a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52e5c9b870323c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 10:15:54 2014 +0200 Updated bug entries #2137 --- .bugs/2137 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2137 b/.bugs/2137 new file mode 100644 index 0000000..fc51569 --- /dev/null +++ b/.bugs/2137 @@ -0,0 +1,13 @@ +Title: Foldable containers with Umlauts in titles are not expanded on load +Component: multisite +State: open +Date: 2014-07-16 10:13:33 +Targetversion: 1.2.5i1 +Class: bug + +When unicode strings with umlauts are used as titles for foldable containers, +the states are saved, but can not be read/parsed/compared correctly. This seems +to be related to the pprint.pformat() function which writes the unicode string +as key of a dict, but does not re-reads the value correctly as unicode string. + +It has happened here with the titles of the views snapin.

10 years, 2 months

Check_MK Git: check_mk: livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails

by Lars Michelsen

Module: check_mk Branch: master Commit: 7132c994fec7f655015d3d55ea826af932217902 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7132c994fec7f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 10:13:24 2014 +0200 livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails The tool livedump-mail-fetch which can be used to receive livedump results by fetching them from a mailbox e.g. via POP3 always assumed incoming mails to be encoded as quoted-printable. This change makes the mail parsing configurable. The default is still quoted printable, but can be set to "None" to assume plain text mails. --- .werks/1058 | 13 +++++++++++++ ChangeLog | 1 + doc/treasures/livedump/livedump-mail-fetch | 15 ++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/1058 b/.werks/1058 new file mode 100644 index 0000000..0aa25c2 --- /dev/null +++ b/.werks/1058 @@ -0,0 +1,13 @@ +Title: livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405498288 +Class: feature + +The tool livedump-mail-fetch which can be used to receive livedump results by fetching +them from a mailbox e.g. via POP3 always assumed incoming mails to be encoded as +quoted-printable. + +This change makes the mail parsing configurable. The default is still quoted printable, +but can be set to "None" to assume plain text mails. diff --git a/ChangeLog b/ChangeLog index 6516fc1..a94f5f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0999 allnet_ip_sensoric.pressure: New Check for Pressure Sensors in ALLNET IP Sensoric devices * 1082 windows agent: now also available as msi installer... * 0179 check_dns: It is now possible to use the local dns server in wato configuration... + * 1058 livedump-mail-fetch: Now supporting either quoted-printable or non encoded mails... * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch index af9a85b..d3b8f7f 100755 --- a/doc/treasures/livedump/livedump-mail-fetch +++ b/doc/treasures/livedump/livedump-mail-fetch @@ -24,6 +24,9 @@ omd_root = os.environ.get('OMD_ROOT') pop_server = "pop.yourmailserver.com" pop_user = "your-username(a)domain.com" pop_pass = "secretpassword" +# By default the mail body is treated to be encoded as "quoted-printable". +# In the other case no decoding is not performed. +encoding = "quoted-printable" M = poplib.POP3_SSL(pop_server) M.user(pop_user) @@ -56,16 +59,22 @@ if config_mails: mail_index, ident = config_mails[-1] code, mail, num = M.retr(mail_index) body_start_index = mail.index('') - body = quopri.decodestring('\n'.join(mail[body_start_index:])) + if encoding == 'quoted-printable': + body = quopri.decodestring('\n'.join(mail[body_start_index:])) + else: + body = '\n'.join(mail[body_start_index:]) - file("%s/etc/nagios/conf.d/remote-%s.cfg" % + file("%s/etc/nagios/conf.d/remote-%s.cfg" % (omd_root, ident), "w").write(body) if status_mails: for index in status_mails: code, mail, code = M.retr(index) body_start_index = mail.index('') - body = quopri.decodestring('\n'.join(mail[body_start_index:])) + if encoding == 'quoted-printable': + body = quopri.decodestring('\n'.join(mail[body_start_index:])) + else: + body = '\n'.join(mail[body_start_index:]) fd, path = tempfile.mkstemp('', 'c', "%s/tmp/nagios/checkresults" % omd_root) os.write(fd, body)

10 years, 2 months

Check_MK Git: check_mk: FIX fc_port: do not inventorize if brocade fibre channel mib is also supported on the device

by Goetz Golla

Module: check_mk Branch: master Commit: 96e44f6bfb036c36e5df2eb15d7741178ed7d4f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e44f6bfb036c… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jul 16 09:55:52 2014 +0200 FIX fc_port: do not inventorize if brocade fibre channel mib is also supported on the device Some devices on the market have shown to support both the brocade fibre channel mib, and the FCMGMT mib. In these cases two services were created for each fibre channel port, one for the brocade_fcport check and one for the fc_port check. With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported. --- .werks/636 | 11 +++++++++++ ChangeLog | 1 + checks/fc_port | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/636 b/.werks/636 new file mode 100644 index 0000000..a5febf6 --- /dev/null +++ b/.werks/636 @@ -0,0 +1,11 @@ +Title: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405496969 +Class: fix + +Some devices on the market have shown to support both the brocade fibre channel mib, and +the FCMGMT mib. In these cases two services were created for each fibre channel port, one for +the brocade_fcport check and one for the fc_port check. +With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported. diff --git a/ChangeLog b/ChangeLog index daaef7e..ec9e7f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' + * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index 743c74f..5986b27 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -317,7 +317,8 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch.", + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch." \ + and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0 "1.10.1.3", # connUnitPortType # 1

10 years, 2 months

Check_MK Git: check_mk: check_dns: It is now possible to use the local dns server in wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: a224010dab772e96e77146762d72d7002383f5e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a224010dab772e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 15 21:56:01 2014 +0200 check_dns: It is now possible to use the local dns server in wato configuration Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers. This is usefull if you e.g. want check web domain names. --- .werks/179 | 10 ++++++++++ ChangeLog | 1 + checks/check_dns | 3 ++- web/plugins/wato/active_checks.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.werks/179 b/.werks/179 new file mode 100644 index 0000000..1abd06a --- /dev/null +++ b/.werks/179 @@ -0,0 +1,10 @@ +Title: check_dns: It is now possible to use the local dns server in wato configuration +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405453916 +Class: feature + +Befor this change, it was only possible to define the ip of a dns server or use the the ip addres of the host as dns server. Now it's to omit this confiuration and the check is done against the dns servers configured on the monitoring servers. + +This is usefull if you e.g. want check web domain names. diff --git a/ChangeLog b/ChangeLog index daaef7e..1bfbf2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0178 mssql_tablespaces: It is now possible to define thresholds * 0999 allnet_ip_sensoric.pressure: New Check for Pressure Sensors in ALLNET IP Sensoric devices * 1082 windows agent: now also available as msi installer... + * 0179 check_dns: It is now possible to use the local dns server in wato configuration... * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checks/check_dns b/checks/check_dns index 4ac542c..049b7e4 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -29,7 +29,8 @@ def check_dns_arguments(params): args = '-H %s' % quote_shell_string(description) if "server" in settings: - args += ' -s %s' % quote_shell_string(settings["server"]) + if settings["server"] != "use local configuration": + args += ' -s %s' % quote_shell_string(settings["server"]) else: args += " -s '$HOSTADDRESS$'" diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1ad90b7..400a260 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -177,10 +177,17 @@ register_rule(group, title = _("Optional parameters"), elements = [ ( "server", - TextAscii( - title = _("DNS Server"), - allow_empty = False, - help = _("Optional DNS server you want to use for the lookup"))), + Alternative( + title = _("DNS Server"), + elements = [ + FixedValue( value="use local configuration", + title = _("Use local DNS configuration of monitoring site")), + TextAscii( + title = _("Specify DNS Server"), + allow_empty = False, + help = _("Optional DNS server you want to use for the lookup")), + ]) + ), ( "expected_address", Transform( ListOfStrings(

10 years, 2 months

Check_MK Git: check_mk: FIX fc_port: the check no longer inventorizes ports with administrative state of ' unknown' or 'offline'

by Goetz Golla

Module: check_mk Branch: master Commit: f8433892cdec1b69c744fd5e299b998e5dd7269c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8433892cdec1b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 15 15:31:32 2014 +0200 FIX fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' --- .werks/635 | 8 ++++++++ ChangeLog | 3 ++- checkman/fc_port | 8 +++++--- checks/fc_port | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/635 b/.werks/635 new file mode 100644 index 0000000..126a95c --- /dev/null +++ b/.werks/635 @@ -0,0 +1,8 @@ +Title: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405431040 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8120397..daaef7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,8 +46,9 @@ * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... * 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on - * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running + * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... + * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checkman/fc_port b/checkman/fc_port index 75ace6b..12e37ae 100644 --- a/checkman/fc_port +++ b/checkman/fc_port @@ -96,6 +96,8 @@ perfdata: inventory: The inventory creates checks for all operational ports. It can be configured (see CONFIGURATION VARIABLES) how operational ports are defined. + Ports with the admininstrative state of 1 (unkown) or 3 (offline) are not + inventorized. [parameters] parameters (dict): This check works with dictionary based parameters. The @@ -134,11 +136,11 @@ fc_port_no_inventory_types(list): List of port types not to be inventorized. fc_port_no_inventory_phystates(list): List of physical states for which ports will not be inventorized. The default is an empty list. -fc_port_inventory_opstates(list): List of operational states for which ports +fc_port_no_inventory_opstates(list): List of operational states for which ports will not be inventorized. The default is an empty list. -fc_port_inventory_admstates(list): List of administrative states for which ports - will not be inventorized. The default is an empty list. +fc_port_no_inventory_admstates(list): List of administrative states for which ports + will not be inventorized. The default is [ 1, 3 ] fc_port_inventory_use_portname(boolean): If you set this to {True}, configured names of the ports appear in the service descripion (and thus can diff --git a/checks/fc_port b/checks/fc_port index a251ee8..743c74f 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -66,7 +66,7 @@ porttype_list = ( 'unknown', 'unknown', 'other', 'not-present', 'hub-port', 'n-p # settings for inventory: which ports should not be inventorized fc_port_no_inventory_types = [ 3 ] -fc_port_no_inventory_admstates = [ ] +fc_port_no_inventory_admstates = [ 1, 3 ] fc_port_no_inventory_opstates = [ ] fc_port_no_inventory_phystates = [ ] fc_port_inventory_use_portname = False # use connUnitPortName as service description

10 years, 2 months

Check_MK Git: check_mk: FIX Max Bandwidth for PNP-Graphs of Interface checks corrected

by Goetz Golla

Module: check_mk Branch: master Commit: 0671ac4484215bf09d8e8f670d50a3e858b6cbbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0671ac4484215b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jul 15 15:17:43 2014 +0200 FIX Max Bandwidth for PNP-Graphs of Interface checks corrected The maximum bandwith of a network interfaces was falsely converted to the unit MiByte/sec, instead of MByte/sec. Example: 1 GBit/sec was converted to 119.2 (MiByte/sec), it now is 125 MByte/sec. --- .werks/634 | 10 ++++++++++ ChangeLog | 1 + pnp-templates/check_mk-if.php | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/634 b/.werks/634 new file mode 100644 index 0000000..1feaf25 --- /dev/null +++ b/.werks/634 @@ -0,0 +1,10 @@ +Title: Max Bandwidth for PNP-Graphs of Interface checks corrected +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405429992 +Class: fix + +The maximum bandwith of a network interfaces was falsely converted +to the unit MiByte/sec, instead of MByte/sec. Example: 1 GBit/sec was +converted to 119.2 (MiByte/sec), it now is 125 MByte/sec. diff --git a/ChangeLog b/ChangeLog index 37de5fc..d63f6ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... * 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on + * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 71a869d..86f197b 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -50,7 +50,7 @@ if (!strcmp($MIN[11], "0.0")) { else { $unit = "B"; $unit_multiplier = 1; - $base = 1024; // Megabyte is 1024 * 1024 + $base = 1000; // Megabyte is 1000 * 1000 } # Convert bytes to bits if neccessary @@ -58,7 +58,7 @@ $bandwidth = $MAX[1] * $unit_multiplier; $warn = $WARN[1] * $unit_multiplier; $crit = $CRIT[1] * $unit_multiplier; -# Now choose a conveniant scale, based on the known bandwith of +# Now choose a convenient scale, based on the known bandwith of # the interface, and break down bandwidth, warn and crit by that # scale. $bwuom = ' ';

10 years, 2 months

Check_MK Git: check_mk: WATO folder permissions are only exported to NagVis when configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 13c465bdef508c6b9e2ec45e54708ce0f00b96d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13c465bdef508c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 10:30:27 2014 +0200 WATO folder permissions are only exported to NagVis when configured WATO exports the configured users, roles and permissions to NagVis to make it possible to restrict access by using the permissions configured within Multisite. In most cases the folder related permissions are not needed and might take a lot of time to compute / process. So disabled the export of the folder related permissions by default and made configurable using the option {export_folder_permissions}. --- .werks/1057 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 3 +++ web/plugins/userdb/hook_auth.py | 10 ++++++++-- web/plugins/wato/check_mk_configuration.py | 15 +++++++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.werks/1057 b/.werks/1057 new file mode 100644 index 0000000..3b79771 --- /dev/null +++ b/.werks/1057 @@ -0,0 +1,13 @@ +Title: WATO folder permissions are only exported to NagVis when configured +Level: 1 +Component: wato +Version: 1.2.5i5 +Date: 1405412830 +Class: feature + +WATO exports the configured users, roles and permissions to NagVis to make +it possible to restrict access by using the permissions configured within +Multisite. In most cases the folder related permissions are not needed and +might take a lot of time to compute / process. So disabled the export +of the folder related permissions by default and made configurable using +the option {export_folder_permissions}. diff --git a/ChangeLog b/ChangeLog index 0ab6b7c..3e54b39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ WATO: * 0825 WATO: Hover menu of user online state shows the last seen date/time now + * 1057 WATO folder permissions are only exported to NagVis when configured... * 0990 FIX: Fix HTTP error handling in bulk inventory... * 1004 FIX: Fix exception when saving rules, caused by empty item * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index bc00a9e..61a8e0b 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -237,3 +237,6 @@ default_user_profile = { lock_on_logon_failures = False user_localizations = default_user_localizations + +# Write WATO folder permissions to auth.php file +export_folder_permissions = False diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 771807c..896ee6b 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -207,8 +207,14 @@ function may($username, $need_permission) { def create_auth_file(callee, users): make_nagios_directory(g_auth_base_dir) - import wato # HACK: cleanup! - create_php_file(callee, users, config.get_role_permissions(), wato.get_folder_permissions_of_users(users)) + + if config.export_folder_permissions: + import wato # HACK: cleanup! + folder_permissions = wato.get_folder_permissions_of_users(users) + else: + folder_permissions = {} + + create_php_file(callee, users, config.get_role_permissions(), folder_permissions) hooks.register('users-saved', lambda users: create_auth_file("users-saved", users)) hooks.register('roles-saved', lambda x: create_auth_file("roles-saved", load_users())) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index b7ea47e..a550b26 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -978,6 +978,21 @@ register_configvar(group, domain = "multisite" ) + +register_configvar(group, + "export_folder_permissions", + Checkbox( + title = _("Export WATO folder permissions"), + label = _("Make WATO folder permissions usable e.g. by NagVis"), + help = _("It is possible to create maps representing the WATO folder hierarchy within " + "NagVis by naming the maps like the folders are named internally. To make the " + "restriction of access to the maps as comfortable as possible, the permissions " + "configured within WATO can be exported to NagVis."), + default_value = False, + ), + domain = "multisite" +) + #. # .--Check_MK------------------------------------------------------------. # | ____ _ _ __ __ _ __ |

10 years, 2 months

Check_MK Git: check_mk: FIX Fixed selection of hosts for bulk actions

by Lars Michelsen

Module: check_mk Branch: master Commit: bc6d2f5f472b5ba7d91f06b0241222f7d325c5c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc6d2f5f472b5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 09:04:33 2014 +0200 FIX Fixed selection of hosts for bulk actions --- .werks/1056 | 8 ++++++++ ChangeLog | 1 + web/htdocs/weblib.py | 7 +++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1056 b/.werks/1056 new file mode 100644 index 0000000..b701d88 --- /dev/null +++ b/.werks/1056 @@ -0,0 +1,8 @@ +Title: Fixed selection of hosts for bulk actions +Level: 1 +Component: wato +Version: 1.2.5i5 +Date: 1405407835 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e7dc726..0ab6b7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains * 0826 FIX: Fixed problem where user access times were not updated correctly * 1044 FIX: Remove icon for service parameters in WATO service list for missing services... + * 1056 FIX: Fixed selection of hosts for bulk actions Notifications: * 1042 Rule based notifications: allow matching on host groups... diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index f00ccef..2fbee11 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -78,12 +78,15 @@ def cleanup_old_selections(): def selection_id(): if not html.has_var('selection'): sel_id = lib.gen_id() - html.add_var('selection', sel_id) + html.set_var('selection', sel_id) + return sel_id else: sel_id = html.var('selection') # Avoid illegal file access by introducing .. or / if not re.match("^[-0-9a-zA-Z]+$", sel_id): - return lib.gen_id() + new_id = lib.gen_id() + html.set_var('selection', new_id) + return new_id else: return sel_id

10 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014