Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 4c93b5710912a4373d96e6b2e10cbf71defb919e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c93b5710912a4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 26 12:37:37 2017 +0200 Do not use tuple parameter unpacking. It's on death row already and doesn't buy us anything, see https://www.python.org/dev/peps/pep-3113/ Change-Id: I5a607a6f948432a0ec7f8b4dd845c06a4f917809 --- bin/mkeventd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index bf6ef11..20ecee0 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1590,7 +1590,8 @@ class EventServer(object): # Receives an incoming SNMP trap from the socket and hands it over to PySNMP for parsing # and processing. PySNMP is calling self.handle_snmptrap back. - def process_snmptrap(self, (whole_msg, sender_address)): + def process_snmptrap(self, data): + whole_msg, sender_address = data self.logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) g_snmp_engine.setUserContext(sender_address=sender_address) g_snmp_engine.msgAndPduDsp.receiveMessage(g_snmp_engine, (), (), whole_msg) @@ -2235,7 +2236,8 @@ class EventServer(object): syslog_facilities[facility], syslog_priorities[priority], count, (100.0 * count / float(total_count)))) - def process_line(self, (line, address)): + def process_line(self, data): + line, address = data line = line.rstrip() if g_config["debug_rules"]: if address:

6 years, 11 months

Tabs => Spaces

by Sven Panne

Module: check_mk Branch: master Commit: c2505b787305b92e7ac3b3504c7955b7ceaeb4f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2505b787305b9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 26 13:03:21 2017 +0200 Tabs => Spaces Change-Id: Ie7fa84045860ba9ca79b7d63d5ddac131b571b5d --- cmk_base/automations/check_mk.py | 2 +- cmk_base/discovery.py | 10 +-- cmk_base/events.py | 2 +- doc/treasures/inventory/extract_inventory.py | 4 +- doc/treasures/wato_host_svc_groups.py | 24 +++--- lib/log.py | 6 +- lib/store.py | 2 +- livestatus/api/python/example.py | 10 +-- livestatus/api/python/example_multisite.py | 16 ++-- livestatus/api/python/livestatus.py | 2 +- livestatus/api/python/make_nagvis_map.py | 38 ++++----- tests/git/test_permissions.py | 2 +- tests/testlib/__init__.py | 4 +- tests/web/test_crawl.py | 2 +- web/htdocs/views.py | 2 +- web/htdocs/wato.py | 18 ++-- web/htdocs/watolib.py | 2 +- web/plugins/icons/inventory.py | 2 +- web/plugins/metrics/check_mk.py | 26 +++--- web/plugins/sidebar/shipped.py | 8 +- web/plugins/userdb/ldap.py | 2 +- web/plugins/views/builtin.py | 4 +- web/plugins/views/mobile.py | 56 ++++++------- web/plugins/views/painters.py | 2 +- web/plugins/visuals/filters.py | 16 ++-- web/plugins/wato/active_checks.py | 6 +- web/plugins/wato/check_parameters.py | 118 +++++++++++++-------------- 27 files changed, 193 insertions(+), 193 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c2505b7873…

6 years, 11 months

Removed dead -L/--livestatus commandline option from mkeventd

by Sven Panne

Module: check_mk Branch: master Commit: 25f6d9b02010c58a1beb5db58576c02ecbe67ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25f6d9b02010c5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 26 11:05:46 2017 +0200 Removed dead -L/--livestatus commandline option from mkeventd Starting with 1.4.0, the event console *always* connects to the local cmc, so the option did nothing at all. That's confusing, let's remove it... Change-Id: Id98c2e90852be51c97b91784603ae98a91b94bd8 --- bin/mkeventd | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 7d56f12..bf6ef11 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4816,7 +4816,6 @@ def usage(): -C, --configdir Path to directory where mkevent.mk lives -S, --socket P Path to unix socket for querying status -E, --eventsocket P Path to unix socket for receiving events (optional) - -L, --livestatus P Path to livestatus socket of monitoring core (optional) -P, --pipe P Path to pipe for receiving events --syslog Enable builtin UDP syslog server --syslog-fd FD Do not open UDP port 514, but inherit it via this FD @@ -4837,7 +4836,6 @@ The following defaults are set: Config dir: %(g_config_dir)s Unix socket: %(g_socket_path)s Event socket: %(g_eventsocket_path)s - Livestatus socket %(g_livestatus_socket)s Event Pipe: %(g_pipe_path)s PID file: %(g_pid_file)s Log file: %(g_logfile_path)s @@ -4881,7 +4879,6 @@ if omd_root: g_config_dir = omd_root + "/etc/check_mk" g_socket_path = omd_root + "/tmp/run/mkeventd/status" g_eventsocket_path = omd_root + "/tmp/run/mkeventd/eventsocket" - g_livestatus_socket = omd_root + "/tmp/run/live" g_pipe_path = omd_root + "/tmp/run/mkeventd/events" g_pid_file = omd_root + "/tmp/run/mkeventd/pid" g_logfile_path = omd_root + "/var/log/mkeventd.log" @@ -4891,7 +4888,6 @@ else: g_config_dir = "/etc/check_mk" g_socket_path = None g_eventsocket_path = None - g_livestatus_socket = None g_pipe_path = None g_pid_file = "/var/run/mkeventd.pid" g_logfile_path = "/var/log/mkeventd.log" @@ -4899,10 +4895,10 @@ else: g_compiled_mibs_dir = "/var/lib/mkeventd/compiled_mibs" -short_options = "hvVgS:P:p:C:E:L:" +short_options = "hvVgS:P:p:C:E:" long_options = [ "help", "version", "verbose", "debug", "foreground", "socket=", "eventsocket=", "pipe=", "pidfile=", "statedir=", "configdir=", "logdir=", "profile-status", "profile-event", "debug-locking", - "syslog", "syslog-fd=", "syslog-tcp", "syslog-tcp-fd=", "snmptrap", "snmptrap-fd=", "livestatus=" ] + "syslog", "syslog-fd=", "syslog-tcp", "syslog-tcp-fd=", "snmptrap", "snmptrap-fd=" ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -4921,8 +4917,6 @@ try: g_socket_path = a elif o in [ '-E', '--eventsocket' ]: g_eventsocket_path = a - elif o in [ '-L', '--livestatus' ]: - g_livestatus_socket = a elif o in [ '-P', '--pipe' ]: g_pipe_path = a elif o == '--syslog':

6 years, 11 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 320754e224c4c4d66405102b3d4acebd18b393e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=320754e224c4c4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 26 10:50:43 2017 +0200 Removed dead code. Change-Id: Ibb1ba6d08c6f45ea9301b47ced0ab54c5d3367f6 --- bin/mkeventd | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 0839191..7d56f12 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -4875,10 +4875,6 @@ opt_syslog_tcp_fd = None opt_snmptrap = False opt_snmptrap_fd = None -# ASN1 MIB source directory candidates. Non existing dirs are ok -# Please sync these paths with htdocs/mkeventd.py -g_mib_dirs = [ '/usr/share/snmp/mibs' ] - # Set default values for options omd_root = os.getenv("OMD_ROOT") if omd_root: @@ -4891,12 +4887,6 @@ if omd_root: g_logfile_path = omd_root + "/var/log/mkeventd.log" g_state_dir = omd_root + "/var/mkeventd" g_compiled_mibs_dir = omd_root + "/local/share/check_mk/compiled_mibs" - - # Please sync these paths with htdocs/mkeventd.py - g_mib_dirs = [ - omd_root + "/local/share/snmp/mibs", - omd_root + "/share/snmp/mibs", - ] + g_mib_dirs else: g_config_dir = "/etc/check_mk" g_socket_path = None

6 years, 11 months

5069 FIX Choose correct owner for report schedule entry when creating a new one

by Mathias Kettner

Module: check_mk Branch: master Commit: 97162e51832c2cd04f0757723fca0bb1d2afc574 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97162e51832c2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 26 10:57:25 2017 +0200 5069 FIX Choose correct owner for report schedule entry when creating a new one When you create a new entry for the report scheduler and you are in the <tt>admin</tt> role then you can select the owner of this entry. But the dialog would default to the user name being the first in the alphabet rather then to your own name. This led to confusion and has now been fixed. The problem showed up after adding an <tt>automation</tt> user per default, which starts with the character <tt>a</tt> and this is most times the first in the list. Change-Id: I0b450e457a0389030043e2659bfeaf9d911af6d9 --- .werks/5069 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/5069 b/.werks/5069 new file mode 100644 index 0000000..50ace58 --- /dev/null +++ b/.werks/5069 @@ -0,0 +1,17 @@ +Title: Choose correct owner for report schedule entry when creating a new one +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1501059306 +Class: fix + +When you create a new entry for the report scheduler and you are in the +<tt>admin</tt> role then you can select the owner of this entry. But the +dialog would default to the user name being the first in the alphabet rather +then to your own name. This led to confusion and has now been fixed. + +The problem showed up after adding an <tt>automation</tt> user per default, +which starts with the character <tt>a</tt> and this is most times the +first in the list.

6 years, 11 months

4984 FIX aix_service_packs: Cleaned up mixture of the latest and all past service packs

by Simon Betz

Module: check_mk Branch: master Commit: db2d70e34a8f575949412674d21bc3420b04ee7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2d70e34a8f57… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 26 10:57:56 2017 +0200 4984 FIX aix_service_packs: Cleaned up mixture of the latest and all past service packs Change-Id: I20eb7c46796dcb72b75f02177de21a5c12a9bcac --- .werks/4984 | 13 +++++++++++++ agents/plugins/mk_inventory.aix | 2 +- inventory/aix_service_packs | 21 ++++++++++++++++++--- web/plugins/views/inventory.py | 2 +- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.werks/4984 b/.werks/4984 new file mode 100644 index 0000000..ecd25a5 --- /dev/null +++ b/.werks/4984 @@ -0,0 +1,13 @@ +Title: aix_service_packs: Cleaned up mixture of the latest and all past service packs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1501058641 + +Previously the latest service pack was displayed as a single row +below {{Service Packs}}. Separated the latest service pack from +all past ones. diff --git a/agents/plugins/mk_inventory.aix b/agents/plugins/mk_inventory.aix index fb79884..602d2ba 100755 --- a/agents/plugins/mk_inventory.aix +++ b/agents/plugins/mk_inventory.aix @@ -55,7 +55,7 @@ then # list the known service packs on a system echo "<<<aix_service_packs:persist($UNTIL)>>>" - oslevel -s + oslevel -sq fi # If you run the prtconf command without any flags, it displays the system model, machine serial, diff --git a/inventory/aix_service_packs b/inventory/aix_service_packs index ee97af7..b0ab5bf 100644 --- a/inventory/aix_service_packs +++ b/inventory/aix_service_packs @@ -24,11 +24,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inv_aix_service_packs(info): - node = inv_tree_list("software.os.service_packs:") + latest_service_pack = None + service_packs = [] for line in info: - node.append({ "name" : line[0]}) + if line[0].startswith("----") or line[0].startswith("Known"): + continue + if latest_service_pack is None: + latest_service_pack = line[0] + else: + service_packs.append(line[0]) + + node = inv_tree("software.os.") + node["service_pack"] = latest_service_pack + + node = inv_tree_list("software.os.service_packs:") + for service_pack in service_packs: + node.append({"name" : service_pack}) + inv_info['aix_service_packs'] = { - "inv_function" : inv_aix_service_packs, + "inv_function": inv_aix_service_packs, } diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index dca55b4..8ecd1d4 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -770,7 +770,7 @@ inventory_displayhints.update({ ".software.os.install_date" : { "title" : _("Install Date"), "paint" : "date" }, ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, - ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, + ".software.os.service_pack" : { "title" : _("Latest Service Pack"), "short" : _("Service Pack") }, ".software.os.service_packs:" : { "title" : _("Service Packs"), "render" : render_inv_dicttable, "keyorder" : [ "name" ] }, ".software.configuration." : { "title" : _("Configuration"), },

6 years, 11 months

Move report error message from the end to the start

by Mathias Kettner

Module: check_mk Branch: master Commit: fab63352cd1a742ae5d772f8fbde980a923992fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab63352cd1a74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 26 10:39:10 2017 +0200 Move report error message from the end to the start Change-Id: Ib58d03318a61ac57be4c29f0dae774bd7fc8195d --- .werks/5068 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.werks/5068 b/.werks/5068 index 4330145..127723a 100644 --- a/.werks/5068 +++ b/.werks/5068 @@ -11,7 +11,6 @@ When you create a report in a distributed environment with multiple sites and not all of the sites are reachable when the report is being created then there was simply missing data without any further notice. -No at the end of the report there is added an error message if there -was a problem with at least one site. That way the reader knows that -the data might be incomplete. - +Now if there was a problem with at least one site during the report creation +at the start of the report there will be inserted an extra page with an +error message. That way the reader knows that the data might be incomplete.

6 years, 11 months

5043 RBN: Improved displaying of notitification context in analyse notification mode

by Lars Michelsen

Module: check_mk Branch: master Commit: dc801547783c18147fd769771f60a36c0f58175a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc801547783c18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 26 09:15:06 2017 +0200 5043 RBN: Improved displaying of notitification context in analyse notification mode There is a new icon for toggling the notification context. Once you click on this icon the notification context will be displayed below the notification you clicked the icon for. Change-Id: Ie6c20fc14c4458b7828f3eb770019e81171affe6 --- .bugs/2939 | 7 +++++-- .werks/5043 | 12 ++++++++++++ web/htdocs/images/button_toggle_context.png | Bin 0 -> 2598 bytes web/htdocs/js/checkmk.js | 9 +++++++++ web/htdocs/pages.css | 17 ++++++++++++----- web/htdocs/wato.css | 12 ++++++++++++ web/htdocs/wato.py | 28 ++++++++++++++++++++++++++-- 7 files changed, 76 insertions(+), 9 deletions(-) diff --git a/.bugs/2939 b/.bugs/2939 index 9c20201..f9230ff 100644 --- a/.bugs/2939 +++ b/.bugs/2939 @@ -1,9 +1,9 @@ Title: Export WATO folder permissions breaks activate changes in distributed setups Component: wato -State: open +Class: bug +State: done Date: 2017-07-18 18:46:33 Targetversion: 1.2.8 -Class: bug If the option Export WATO permissions is activated and around 1400 users are used in user management, it will break activation of changes. It will end in a apache process @@ -12,3 +12,6 @@ which is running on full power to calculate all the settings for all users. This option should be blocked if too much users exists or should be better optimized for higer user amounts. Workaround: Deactivte the option Export WATO permissions + +2017-07-25 17:59:14: changed state open -> done +Feature has been removed. diff --git a/.werks/5043 b/.werks/5043 new file mode 100644 index 0000000..aaeb4eb --- /dev/null +++ b/.werks/5043 @@ -0,0 +1,12 @@ +Title: RBN: Improved displaying of notitification context in analyse notification mode +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501052799 +Class: feature + +There is a new icon for toggling the notification context. Once you click on this icon +the notification context will be displayed below the notification you clicked the icon +for. diff --git a/web/htdocs/images/button_toggle_context.png b/web/htdocs/images/button_toggle_context.png new file mode 100644 index 0000000..e09387c Binary files /dev/null and b/web/htdocs/images/button_toggle_context.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index cdbc417..6de3b29 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -231,6 +231,15 @@ function mouse_offset_to_middle(obj, event){ } } +function toggle_notification_context(id) +{ + var obj = document.getElementById(id); + if (has_class(obj, "hidden")) + remove_class(obj, "hidden"); + else + add_class(obj, "hidden"); +} + //#. //# .-Events-------------------------------------------------------------. //# | _____ _ | diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 51f003a..0c8b5fe 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1345,7 +1345,8 @@ a.element_dragger:hover { } td.invtree table, -td.agent_config table.rulesets table { +td.agent_config table.rulesets table, +table.data tr.notification_context table { border-collapse: collapse; border: 0.5px solid black; box-shadow: 0.5px 0.5px 1px #ccc; @@ -1357,7 +1358,9 @@ td.agent_config table.rulesets table td, td.invtree table th, td.agent_config table.rulesets table td.title, table.data.single tr.data td.invtree table td, -table.data.single tr.data td.invtree table th +table.data.single tr.data td.invtree table th, +table.data tr.notification_context table td, +table.data tr.notification_context table th { border: 1px solid #888; padding: 1px 5px; @@ -1365,15 +1368,19 @@ table.data.single tr.data td.invtree table th } td.invtree table th, -td.agent_config table.rulesets table td.title { +td.agent_config table.rulesets table td.title, +table.data tr.notification_context table th { text-align: left; } + td.invtree table td, -td.agent_config table.rulesets table td { +td.agent_config table.rulesets table td, +table.data tr.notification_context table td { background-color: #fff; } -td.agent_config table.rulesets table td.title { +td.agent_config table.rulesets table td.title, +table.data tr.notification_context table th { background-color: #999; color: #fff; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index c9d2274..c8be8d7 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -1004,6 +1004,18 @@ div.varname { width: 280px; } +.wato table.data tr.notification_context.hidden { + display: none; +} + +table.data tr.notification_context table { + margin: 5px; +} + +table.data tr.notification_context table th, +table.data tr.notification_context table td { + font-family: monospace; +} /*-------------------------------------------------------------------------. | ____ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4f16c2a..2fb53c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8470,10 +8470,15 @@ def mode_notifications(phase): table.cell(" ", css="buttons") analyse_url = html.makeuri([("analyse", str(nr))]) - tooltip = "".join(("%s: %s\n" % e) for e in sorted(context.items())) - html.icon_button(analyse_url, _("Analyze ruleset with this notification:\n%s") % tooltip, "analyze") + html.icon_button(analyse_url, _("Analyze ruleset with this notification"), "analyze") + + html.icon_button(None, _("Show / hide notification context"), + "toggle_context", + onclick="toggle_notification_context('notification_context_%d')" % nr) + replay_url = html.makeactionuri([("_replay", str(nr))]) html.icon_button(replay_url, _("Replay this notification, send it again!"), "replay") + if html.var("analyse") and nr == int(html.var("analyse")): html.icon(_("You are analysing this notification"), "rulematch") @@ -8516,6 +8521,25 @@ def mode_notifications(phase): table.cell(_("Service"), context.get("SERVICEDESC", "")) output = context.get("SERVICEOUTPUT", context.get("HOSTOUTPUT")) table.cell(_("Plugin output"), format_plugin_output(output)) + + # Add toggleable notitication context + table.row(class_="notification_context hidden", + id_="notification_context_%d" % nr) + table.cell(colspan=8) + + html.open_table() + for nr, (key, val) in enumerate(sorted(context.items())): + if nr % 2 == 0: + if nr != 0: + html.close_tr() + html.open_tr() + html.th(key) + html.td(val) + html.close_table() + + # This dummy row is needed for not destroying the odd/even row highlighting + table.row(class_="notification_context hidden") + table.end() # Do analysis

6 years, 11 months

5042 FIX Removed export of WATO folder permissions to NagVis

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a1845bcba346111c391f28dfc3214b0e5dd8876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a1845bcba3461… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 17:59:00 2017 +0200 5042 FIX Removed export of WATO folder permissions to NagVis In previous versions it was possible to export the WATO folder permissions of each user to NagVis. This was only used for maps that are named exactly like the WATO folder name. If you don't have such NagVis maps you are not affected by this change. This feature has never been documented officially, It was disabled by default and could be enabled with the global setting "Export WATO folder permissions". When having a large amount of users (1000+) and/or a bigger folder hierarchy while having the global setting enabled this lead to a huge performance impact when editing several things in WATO (users, roles, groups, ...) and during activation of changes. In case you really used this feature, you now need to configure the permissions manually e.g. by defining contact groups and giving them permissions on the NagVis maps (via WATO). Change-Id: If3485261e4a7b6957f3d29d70aab07c186a96a91 --- .werks/5042 | 27 ++++++++++++++++++++++ web/plugins/config/builtin.py | 3 --- web/plugins/userdb/hook_auth.py | 36 ++++-------------------------- web/plugins/wato/check_mk_configuration.py | 15 ------------- 4 files changed, 31 insertions(+), 50 deletions(-) diff --git a/.werks/5042 b/.werks/5042 new file mode 100644 index 0000000..264356c --- /dev/null +++ b/.werks/5042 @@ -0,0 +1,27 @@ +Title: Removed export of WATO folder permissions to NagVis +Level: 1 +Component: wato +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1500997952 +Class: fix + +In previous versions it was possible to export the WATO folder +permissions of each user to NagVis. This was only used for maps +that are named exactly like the WATO folder name. If you don't +have such NagVis maps you are not affected by this change. + +This feature has never been documented officially, + +It was disabled by default and could be enabled with the global +setting "Export WATO folder permissions". + +When having a large amount of users (1000+) and/or a bigger folder +hierarchy while having the global setting enabled this lead to +a huge performance impact when editing several things in WATO +(users, roles, groups, ...) and during activation of changes. + +In case you really used this feature, you now need to configure +the permissions manually e.g. by defining contact groups and +giving them permissions on the NagVis maps (via WATO). diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 2e02099..5a61f03 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -332,9 +332,6 @@ user_downtime_timeranges = [ # Override toplevel and sort_index settings of builtin icons builtin_icon_visibility = {} -# Write WATO folder permissions to auth.php file -export_folder_permissions = False - # Name of the hostgroup to filter the network topology view by default topology_default_filter_group = None diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index d671cfe..c89c470 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -52,11 +52,6 @@ # users_with_permission(<PERMISSION>) # Returns an array of usernames with the given permission # -# get_folder_permissions(<USERNAME>) -# Returns an array of all wato folder related permissions of the -# given user. The keys are the folder paths and the values are an -# array of "read" and "write" elements with boolean values. -# # may(<USER_NAME>, <PERMISSION>) # Returns true/false whether or not the user is permitted @@ -90,7 +85,7 @@ def format_php(data, lvl = 1): return s -def create_php_file(callee, users, role_permissions, groups, folder_permissions): +def create_php_file(callee, users, role_permissions, groups): # Do not change WATO internal objects nagvis_users = copy.deepcopy(users) @@ -110,27 +105,10 @@ def create_php_file(callee, users, role_permissions, groups, folder_permissions) # when reading half written files during creating that new file file(tempfile, 'w').write('''<?php // Created by Multisite UserDB Hook (%s) -global $mk_users, $mk_roles, $mk_groups, $mk_folders; +global $mk_users, $mk_roles, $mk_groups; $mk_users = %s; $mk_roles = %s; $mk_groups = %s; -$mk_folders = %s; - -function get_folder_permissions($username) { - global $mk_folders; - if(!isset($mk_folders[$username])) { - return array(); - } else { - $permissions = $mk_folders[$username]; - foreach ($permissions as $folder => $perms) { - if (!isset($perms['read'])) - $perms['read'] = false; - elseif (!isset($perms['write'])) - $perms['write'] = false; - } - return $permissions; - } -} function all_users() { global $mk_users; @@ -230,7 +208,7 @@ function permitted_maps($username) { ?> ''' % (callee, format_php(nagvis_users), format_php(role_permissions), - format_php(groups), format_php(folder_permissions))) + format_php(groups))) # Now really replace the file os.rename(tempfile, g_auth_base_dir + '/auth.php') @@ -241,19 +219,13 @@ function permitted_maps($username) { def create_auth_file(callee, users): make_nagios_directory(g_auth_base_dir) - if config.export_folder_permissions: - import wato # HACK: cleanup! - folder_permissions = get_folder_permissions_of_users(users) - else: - folder_permissions = {} - contactgroups = load_group_information().get('contact', {}) groups = {} for gid, group in contactgroups.items(): if 'nagvis_maps' in group and group['nagvis_maps']: groups[gid] = group['nagvis_maps'] - create_php_file(callee, users, config.get_role_permissions(), groups, folder_permissions) + create_php_file(callee, users, config.get_role_permissions(), groups) def get_folder_permissions_of_users(users): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0a2c80f..5341bc7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1205,21 +1205,6 @@ 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------------------------------------------------------------. # | ____ _ _ __ __ _ __ |

6 years, 11 months

Added a (hacky) wmitest.exe Makefile target.

by Sven Panne

Module: check_mk Branch: master Commit: 8f40b33a0b2f4c0b976dd19915311cc6de271045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f40b33a0b2f4c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 16:53:23 2017 +0200 Added a (hacky) wmitest.exe Makefile target. Change-Id: Id9e61305b5bac0903f4101b2ff76d472ad29afaf --- agents/windows/.gitignore | 3 +++ agents/windows/Makefile | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 8b1ab35..3686414 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -14,3 +14,6 @@ log check_mk_agent*.unstripped.exe depend testtools +*.d +*.o +wmitest.exe diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 7991bc2..4bcbe94 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -67,6 +67,18 @@ fix_linebreaks: fi ; \ done + +# The rules below to build wmitest.exe are a total hack, this Makefile needs a +# *serious* overhaul... :-P +%.o: %.cc + $(CXX) -c $(COMMON_OPTS) -MMD -MP $< + +-include wmitest.d +-include stringutil.d +-include wmiHelper.d +wmitest.exe: wmitest.o stringutil.o wmiHelper.o + $(CXX) $(COMMON_OPTS) $^ -o $@ -lwsock32 -lole32 -loleaut32 -lwbemuuid + # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file # contains a dummy version number, which is later being replaced with the @@ -198,7 +210,7 @@ nowin.exe: nowin.cc $(CXX) -o $@ $< clean: - rm -f *.o *.exe *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o obj/sections/*.o obj64/sections/*.o + rm -f *.o *.d *.exe *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o obj/sections/*.o obj64/sections/*.o make -C msibuild clean mrproper: clean

6 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017