Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Fixed nagvis auth file generation

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfaa059972d5a2dc47a3dd3bf43482ca7a8f8d81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfaa059972d5a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 10:40:42 2011 +0100 Fixed nagvis auth file generation --- web/plugins/wato/nagvis_auth.py | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index 9536ba9..5375f97 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -46,6 +46,43 @@ # # This feature is available since NagVis release 1.6.1. +# +# The 3 following functions must be removed here when splitting +# up the auth file generation in "global" and map folder specific +# permissions +# +g_target_maps = {} +def get_mapname_by_stringpath(filename): + return get_mapname(api.get_folder(filename)) + +def get_mapname(thing): + """ + folder can be a file/folder dictionary as provided by wato + or a tuple path to a file/folder. e.g. the parent folder. + + In NagVis Mapnamen sind nur [0-9A-Za-z_-] erlaubt. + """ + if thing is None: + return 'main' + elif isinstance(thing, tuple): + name = '_'.join(thing) + elif thing.get('.path', ()) != '': + name = thing['.path'].replace('/', '_') + else: + name = 'main' + + if '.mk' in name: + name = name.replace('.mk', '') + + return name + +def nagvis_auth_process_tree(thing): + global g_target_maps + g_target_maps[get_mapname(thing)] = thing + + for child in thing.get('.folders', {}).itervalues(): + process_tree(child) + # Generate the permissions file for the multisite authorization module def generate_auth_file(users): import json @@ -57,7 +94,7 @@ def generate_auth_file(users): # # 0. Data gathering - populate g_target_maps list # - process_tree(api.get_folder_tree()) + nagvis_auth_process_tree(api.get_folder_tree()) # # 1. Write out the user permissions file

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ecd878949e9c7d56e14d74ab6df563f4d417bc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ecd878949e9c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 10:40:45 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Changed only_hosts filter in distributed WATO to new distributed_wato_site var

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bea23d6724c3a83c67acc90a126c810b29c8b6a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bea23d6724c3a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 10:40:31 2011 +0100 Changed only_hosts filter in distributed WATO to new distributed_wato_site var --- web/htdocs/wato.py | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4ec0338..43e7eec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6401,13 +6401,13 @@ def save_sites(sites): out = file(sites_mk, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("sites = \\\n%s\n" % pprint.pformat(sites)) - update_only_hosts_file(sites) + update_distributed_wato_file(sites) need_sidebar_reload() # Makes sure, that in distributed mode we monitor only # the hosts that are directly assigned to our (the local) # site. -def update_only_hosts_file(sites): +def update_distributed_wato_file(sites): # Note: we cannot access config.sites here, since we # are currently in the process of saving the new # site configuration. @@ -6417,9 +6417,9 @@ def update_only_hosts_file(sites): distributed = True if "socket" not in site \ or site["socket"] == "unix:" + defaults.livestatus_unix_socket: - create_only_hosts_file(siteid, site.get("replication")) + create_distributed_wato_file(siteid, site.get("replication")) if not distributed: - delete_only_hosts_file() + delete_distributed_wato_file() #. # .-Replication----------------------------------------------------------. @@ -6968,7 +6968,7 @@ def automation_push_snapshot(): log_commit_pending() # pending changes are lost # Create rule making this site only monitor our hosts - create_only_hosts_file(site_id, mode) + create_distributed_wato_file(site_id, mode) log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) if html.var("restart", "no") == "yes": check_mk_local_automation("restart") @@ -6980,20 +6980,16 @@ def automation_push_snapshot(): else: return _("Internal automation error: %s") % e -def create_only_hosts_file(siteid, mode): - out = file(defaults.check_mk_configdir + "/only_hosts.mk", "w") +def create_distributed_wato_file(siteid, mode): + out = file(defaults.check_mk_configdir + "/distributed_wato.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("# This file has been created by the master site\n" "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") - out.write("if only_hosts == None:\n only_hosts = []\n\n") - #if mode == 'master': - # out.write("only_hosts += [(NEGATE, ['!site:%s'], ALL_HOSTS )]\n" % siteid) - #else: - out.write("only_hosts += [(['site:%s'], ALL_HOSTS )]\n" % siteid) - -def delete_only_hosts_file(): - p = defaults.check_mk_configdir + "/only_hosts.mk" + out.write("distributed_wato_site = '%s'\n" % siteid) + +def delete_distributed_wato_file(): + p = defaults.check_mk_configdir + "/distributed_wato.mk" if os.path.exists(p): os.remove(p)

12 years, 9 months

Check_MK Git: check_mk: Fixed typo in docu of mem.win

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 156a7f59bea8d12afdec27ab33fb84622dc323f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=156a7f59bea8d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:37:10 2011 +0100 Fixed typo in docu of mem.win --- checkman/mem.win | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/mem.win b/checkman/mem.win index cce57aa..2109481 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -26,7 +26,7 @@ examples: # Disable memory levels for all hosts with the tag "test" check_parameters += [ ( { "memory" : ("101.0", "101.0") }, - [ "test" ], ALL_HOSTS, [ "Memory and Pagefile" ] ), + [ "test" ], ALL_HOSTS, [ "Memory and pagefile" ] ), ] perfdata:

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d21c1b3fabc4880997e0810ab77c28b3cd625384 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d21c1b3fabc488… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:36:01 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: New config variable distributed_wato_site

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10a01921e4010e1eedbdde2aa10bd24d21095249 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a01921e4010e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:35:58 2011 +0100 New config variable distributed_wato_site This variable is intended for internal use by WATO --- modules/check_mk.py | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 4d8c9d5..cd8b14e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -296,6 +296,7 @@ summary_host_notification_periods = [] summary_service_notification_periods = [] ipaddresses = {} # mapping from hostname to ipaddress only_hosts = None +distributed_wato_site = None # used by distributed WATO extra_host_conf = {} extra_summary_host_conf = {} extra_service_conf = {} @@ -1075,18 +1076,29 @@ def output_conf_header(outfile): """) def all_active_hosts(): - if only_hosts == None: - return strip_tags(all_hosts) - else: - return [ hostname for hostname in strip_tags(all_hosts) \ - if in_binary_hostlist(hostname, only_hosts) ] + return filter_active_hosts(all_hosts) def all_active_clusters(): - if only_hosts == None: - return strip_tags(clusters.keys()) - else: - return [ hostname for hostname in strip_tags(clusters.keys()) \ + return filter_active_hosts(clusters.keys()) + +def filter_active_hosts(hostlist): + if only_hosts == None and distributed_wato_site == None: + return strip_tags(hostlist) + elif only_hosts == None: + site_tag = "site:" + distributed_wato_site + return [ hostname for hostname in strip_tags(hostlist) + if site_tag in tags_of_host(hostname) ] + elif distributed_wato_site == None: + return [ hostname for hostname in strip_tags(hostlist) if in_binary_hostlist(hostname, only_hosts) ] + else: + site_tag = "site:" + distributed_wato_site + return [ hostname for hostname in strip_tags(hostlist) + if in_binary_hostlist(hostname, only_hosts) + and site_tag in tags_of_host(hostname) ] + + + def hostgroups_of(hostname): return host_extra_conf(hostname, host_groups)

12 years, 9 months

Check_MK Git: check_mk: Fix: Javascript error in Wato

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9870338eb0c56fad612d3a81f232fdf31f9109b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9870338eb0c56f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 10:02:33 2011 +0100 Fix: Javascript error in Wato --- web/htdocs/js/wato.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index de7e593..a450e74 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -135,7 +135,7 @@ function wato_fix_visibility() { delete hide_topics[index]; } } - for each (var item in volatile_topics){ + for (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); if(oTr) { if(hide_topics.indexOf(item) > -1 )

12 years, 9 months

Check_MK Git: check_mk: WATO: Fixed not displayed host-tag changes during bulk cleanup

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84f5276f349e356526a3aa975350a77a67d71df5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f5276f349e35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 10:31:22 2011 +0100 WATO: Fixed not displayed host-tag changes during bulk cleanup --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a5bda50..4ec0338 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2268,6 +2268,7 @@ def mode_bulk_cleanup(phase): num_cleaned, hostname)) mark_affected_sites_dirty(g_folder, hostname) save_hosts(g_folder) + reload_hosts() # indirect host tag changes return "folder" return

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7de9cd65e6dafb521d81a4c017e565e8bb6d0a1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7de9cd65e6dafb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 18:44:48 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: lnx_if: add missing old config variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8165b114bf4114851e8d532d9402de06ca0f889f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8165b114bf4114… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:28:32 2011 +0100 lnx_if: add missing old config variable --- checks/if.include | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/checks/if.include b/checks/if.include index 87605f2..17a6209 100644 --- a/checks/if.include +++ b/checks/if.include @@ -37,6 +37,10 @@ factory_settings["if_default_levels"] = { "errors" : (0.01, 0.1), } +# Obsolete variable, but needed as contained in autochecks of +# older checks. We need to keep this up for a few years... +if_default_error_levels = if_default_levels["errors"] + if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices def if64_disabled(hostname):

12 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011