Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: Updated bug entries #0647

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82ceece24a70b9d255b2fd77385f9d81335da89b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82ceece24a70b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 12:47:27 2012 +0100 Updated bug entries #0647 --- .bugs/647 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/647 b/.bugs/647 new file mode 100644 index 0000000..681efb7 --- /dev/null +++ b/.bugs/647 @@ -0,0 +1,11 @@ +Title: Sidebar Reload macht während Nagios Restart Probleme +Component: multisite +State: open +Date: 2012-02-06 12:46:07 +Targetversion: future +Class: nastiness + +Man könnte so lange versuchen die Livestatus Verbindung aufzubauen +bis das Connect Timeout erreicht ist. + +Momentan wird es nur einmal versucht. Dann wird mit "Connection reset by peer" abgebrochen.

12 years, 8 months

Check_MK Git: check_mk: prevent sidebar reload after logfile commit

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88b3871649fcd692c64d3f3031288a38097221cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88b3871649fcd6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 12:43:29 2012 +0100 prevent sidebar reload after logfile commit --- web/htdocs/wato.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0d446e1..af72f16 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3056,7 +3056,6 @@ def log_commit_pending(): pending = log_dir + "pending.log" if os.path.exists(pending): os.remove(pending) - need_sidebar_reload() def clear_audit_log(): path = log_dir + "audit.log"

12 years, 8 months

Check_MK Git: check_mk: Distributed WATO: Made all url calls using curl now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4bdc8f77df947ea374b32c547a571fa3d514d5bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bdc8f77df947e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 11:09:57 2012 +0100 Distributed WATO: Made all url calls using curl now --- ChangeLog | 7 +++++ web/htdocs/wato.py | 65 ++++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec5c357..5c85974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1.1.13i4: + Multisite: + * Added several missing localization stringsw + + WATO: + * Distributed WATO: Made all url calls using curl now + 1.1.13i3: Core, Setup, etc.: * *_contactgroups lists: Single group rules are all appended. When a list diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4469323..0d446e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -108,7 +108,6 @@ import sys, pprint, socket, re, subprocess, time, datetime, \ shutil, tarfile, StringIO, math, fcntl -import urllib, urllib2 import config, htmllib, multitar from lib import * from valuespec import * @@ -5897,32 +5896,41 @@ def do_site_login(site_id, name, password): _("Please specify your password.")) # Trying basic auth AND form based auth to ensure the site login works - o = open_url(site["multisiteurl"] + 'automation_login.py?_login=1' - '&_username=%s&_password=%s&_origtarget=automation_login.py' % - (name, password), name, password) - response = o.read() + response = get_url(site["multisiteurl"] + 'automation_login.py?_login=1' + '&_username=%s&_password=%s&_origtarget=automation_login.py' % + (name, password), site.get('insecure', False), name, password) try: return eval(response) except: raise MKAutomationException(response) +def upload_file(url, file_path, insecure): + return get_url(url, insecure, params = ' -F snapshot=@%s' % file_path) -def open_url(url, user=None, password=None): +def get_url(url, insecure, user=None, password=None, params = ''): + cred = '' if user: - try: - passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm() - passwdmngr.add_password(None, url, user, password) - authhandler = urllib2.HTTPBasicAuthHandler(passwdmngr) - opener = urllib2.build_opener(authhandler) - urllib2.install_opener(opener) - return urllib2.urlopen(url) - except urllib2.HTTPError, e: - if e.code == 401: - raise MKUserError("_passwd", _("Authentication failed. Invalid login/password.")) - else: - raise MKUserError("_passwd", _("HTTP Error: %s" % e)) - else: - return urllib.FancyURLopener().open(url) + cred = ' -u "%s:%s"' % (user, password) + + insecure = insecure and ' --insecure' or '' + + # -s: silent + # -S: show errors + # -w '%{http_code}': add the http status code to the end of the output + response = os.popen('curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % (insecure, cred, params, url)).read().strip() + try: + status_code = int(response[-3:]) + response_body = response[:-3] + except: + status_code = None + response_body = response + + if status_code == 401: + raise MKUserError("_passwd", _("Authentication failed. Invalid login/password.")) + elif status_code != 200: + raise MKUserError("_passwd", _("HTTP Error - %s: %s") % (status_code, response_body)) + + return response_body def check_mk_remote_automation(siteid, command, args, indata): # If the site is not up-to-date, synchronize it first. @@ -5952,16 +5960,15 @@ def do_remote_automation(site, command, vars): ("secret", secret), ("debug", config.debug and '1' or '') ] + vars) - connection = open_url(url) - response_code = connection.read().strip() - if not response_code: + response = get_url(url, site.get('insecure', False)) + if not response: raise MKAutomationException("Empty output from remote site.") try: - response = eval(response_code) + response = eval(response) except: # The remote site will send non-Python data in case of an # error. - raise MKAutomationException("<pre>%s</pre>" % response_code) + raise MKAutomationException("<pre>%s</pre>" % response) return response @@ -6200,13 +6207,7 @@ def push_snapshot_to_site(site, do_restart): ("debug", config.debug and "1" or ""), ]) url = url_base + var_string - # urllib2 does not seem to support file uploads. Please tell me, if - # you know a better method for uploading, without the use of external - # programs... - # -s -S: Disable progress meter but enable error messages - insecure = site.get('insecure', False) and ' --insecure' or '' - response_text = os.popen("curl -s -S%s -F snapshot=@%s '%s' 2>&1" % - (insecure, sync_snapshot_file, url)).read() + response_text = upload_file(url, sync_snapshot_file, site.get('insecure', False)) try: response = eval(response_text) return response

12 years, 8 months

Check_MK Git: check_mk: Fixed foldertree creation

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9254280bfdac201edefb8b13c4eb26f67c0d9ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9254280bfdac2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 11:41:46 2012 +0100 Fixed foldertree creation --- web/plugins/sidebar/wato.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 08b1256..9ed84c9 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -106,6 +106,15 @@ def render_wato_foldertree(): html.live.set_prepend_site(False) hosts.sort() + def get_folder(path, num = 0): + wato_folder = wato.load_folder(wato.root_dir + path, childs = False) + return { + 'title': wato_folder['title'], + '.path': path, + '.num_hosts': num, + '.folders': {}, + } + # After the query we have a list of lists where each # row is a folder with the number of hosts on this level. # @@ -123,24 +132,19 @@ def render_wato_foldertree(): this_folder = '/'.join(folder_parts[:num_parts]) if this_folder not in user_folders: - wato_folder = wato.load_folder(wato.root_dir + this_folder, childs = False) - user_folders[this_folder] = { - 'title': wato_folder['title'], - '.path': this_folder, - '.num_hosts': num, - '.folders': {}, - } + user_folders[this_folder] = get_folder(this_folder, num) else: user_folders[this_folder]['.num_hosts'] += num # # Now build the folder tree # - for folder_path, folder in user_folders.items(): + for folder_path, folder in sorted(user_folders.items(), reverse = True): if not folder_path: continue folder_parts = folder_path.split('/') parent_folder = '/'.join(folder_parts[:-1]) + user_folders[parent_folder]['.folders'][folder_path] = folder del user_folders[folder_path]

12 years, 8 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: fb08269d81bb1d9d0a43d0f449ff6860f95d8d5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb08269d81bb1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 11:42:43 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 8 months

Check_MK Git: check_mk: hpux_if: fix outputting MAC address

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08b01d4d77e749a6acbff8ac7cc108b33cc13190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b01d4d77e749… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 11:29:53 2012 +0100 hpux_if: fix outputting MAC address --- checks/hpux_if | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/checks/hpux_if b/checks/hpux_if index 42adb8e..43bdeca 100644 --- a/checks/hpux_if +++ b/checks/hpux_if @@ -104,6 +104,9 @@ def hpux_convert_to_if64(info): elif left == "Interface Name": nic[1] = right nic[18] = right + elif left == "Station Address": + h = right[2:] + nic[19] = "".join([ chr(int(x+y, 16)) for (x,y) in zip(h[::2],h[1::2]) ]) return nics

12 years, 8 months

Check_MK Git: check_mk: FIX: if.include: fix handling of NIC with index 0

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91552907b4db9e0531d6176e685c340cee89a1bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91552907b4db9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 11:16:49 2012 +0100 FIX: if.include: fix handling of NIC with index 0 --- ChangeLog | 1 + checks/if.include | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1d4b64..5a7671b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * hpux_if: fix missing default parameter errors * hpux_if: make configurable via WATO + * if.include: fix handling of NIC with index 0 1.1.13i3: Core, Setup, etc.: diff --git a/checks/if.include b/checks/if.include index f8ec10b..58203ce 100644 --- a/checks/if.include +++ b/checks/if.include @@ -163,6 +163,7 @@ def check_if_common(item, params, info): ifAlias = cleanup_if_strings(ifAlias) if item.lstrip("0") == ifIndex \ + or (item == "0" * len(item) and saveint(ifIndex) == 0) \ or item == ifAlias \ or item == ifDescr \ or item == "%s %s" % (ifAlias, ifIndex) \

12 years, 8 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: a0076e74c442eef4fae03082ecedbcc93b5a39e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0076e74c442ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 11:08:24 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: hpux_if: fix default parameter, add checkgroup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11c05ab97ddd1feb998c154f07ea5cb88e1505a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11c05ab97ddd1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 10:57:27 2012 +0100 hpux_if: fix default parameter, add checkgroup --- ChangeLog | 5 +++++ checks/hpux_if | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec5c357..f1d4b64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.13i4: + Checks & Agents: + * hpux_if: fix missing default parameter errors + * hpux_if: make configurable via WATO + 1.1.13i3: Core, Setup, etc.: * *_contactgroups lists: Single group rules are all appended. When a list diff --git a/checks/hpux_if b/checks/hpux_if index 00429ee..42adb8e 100644 --- a/checks/hpux_if +++ b/checks/hpux_if @@ -129,3 +129,5 @@ def check_hpux_if(item, params, info): check_includes['hpux_if'] = [ "if.include" ] check_info['hpux_if'] = (check_hpux_if, "NIC %s", 1, inventory_hpux_if ) +checkgroup_of['hpux_if'] = "if" +check_default_levels['hpux_if'] = "if_default_levels"

12 years, 8 months

Check_MK Git: check_mk: Fixed unlocalizable strings of filter titles

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a47341e77f8bb5957c4467d48f633802d60abcfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a47341e77f8bb5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 10:03:21 2012 +0100 Fixed unlocalizable strings of filter titles --- web/plugins/views/filters.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index e8e59b4..d55820e 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -83,14 +83,14 @@ def all_groups(what): return [ (name, groups[name]) for name in names ] class FilterGroupCombo(Filter): - def __init__(self, what, enforce): + def __init__(self, what, title, enforce): self.enforce = enforce self.prefix = not self.enforce and "opt" or "" htmlvars = [ self.prefix + what + "group" ] if not enforce: htmlvars.append("neg_" + htmlvars[0]) Filter.__init__(self, self.prefix + what + "group", # name, e.g. "hostgroup" - what[0].upper() + what[1:].replace("_"," ") + " group", # title, e.g. "Hostgroup" + title, # title, e.g. "Hostgroup" what.split("_")[0], # info, e.g. "host" htmlvars, # htmlvars, e.g. "hostgroup" [ what + "group_name" ]) # rows needed to fetch for link information @@ -149,12 +149,12 @@ class FilterGroupCombo(Filter): return alias -declare_filter(104, FilterGroupCombo("host", True), _("Dropdown list, selection of host group is enforced")) -declare_filter(204, FilterGroupCombo("service", True), _("Dropdown list, selection of service group is enforced")) -declare_filter(105, FilterGroupCombo("host", False), _("Optional selection of host group")) -declare_filter(205, FilterGroupCombo("service", False), _("Optional selection of service group")) -declare_filter(106, FilterGroupCombo("host_contact", False), _("Optional selection of host contact group group")) -declare_filter(206, FilterGroupCombo("service_contact", False), _("Optional selection of service contact group group")) +declare_filter(104, FilterGroupCombo("host", _("Hostgroup"), True), _("Dropdown list, selection of host group is enforced")) +declare_filter(204, FilterGroupCombo("service", _("Servicegroup"), True), _("Dropdown list, selection of service group is enforced")) +declare_filter(105, FilterGroupCombo("host", _("Hostgroup"), False), _("Optional selection of host group")) +declare_filter(205, FilterGroupCombo("service", _("Servicegroup"), False), _("Optional selection of service group")) +declare_filter(106, FilterGroupCombo("host_contact", _("Host Contactgroup"), False), _("Optional selection of host contact group group")) +declare_filter(206, FilterGroupCombo("service_contact", _("Service Contactgroup"), False), _("Optional selection of service contact group group")) # Livestatus still misses "contact_groups" column. # declare_filter(FilterGroupCombo("contact"))

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012