Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

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: 6076974782efbfeb09aeb2f5b2fdab13c16b3808 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6076974782efbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 15:35:31 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: WATO: new api function clean_host_attributes(). Cleanup of redundant api initializations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84e544258db1b90f93da36533cfd78a57ff59a42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e544258db1b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 19 13:15:54 2011 +0100 WATO: new api function clean_host_attributes(). Cleanup of redundant api initializations --- web/htdocs/wato.py | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d86b6ac..59af32a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9724,13 +9724,15 @@ class API: # of the given folder. If folder is None, returns all hosts from the root folder # Folder must be returned by get_folder() def get_all_hosts(self, folder=None): - load_all_folders() + if not folder: + self.prepare_folder_info() return collect_hosts(folder or g_root_folder) # Find a folder by its path. Raise an exception if it does # not exist. def get_folder(self, path): - load_all_folders() + self.prepare_folder_info() + folder = g_folders.get(path) if folder: load_hosts(folder) @@ -9738,35 +9740,42 @@ class API: else: raise MKGeneralException("No WATO folder %s." % path) - # Get the number of hosts recursive from the given folder + # Get the number of hosts recursive from the given folder. Folder must be returned by get_folder() def num_hosts_in_folder(self, folder): return num_hosts_in(folder, True) # Get all effective data of a host. Folder must be returned by get_folder() def get_host(self, folder, hostname): - declare_host_tag_attributes() host = folder[".hosts"][hostname] eff = effective_attributes(host, folder) eff["name"] = hostname return eff + # Clean the attributes of the given host and returns the resulting host attributes + # host must be returned by get_host() / get_all_hosts() + def clean_host_attributes(self, host, attr): + folder = g_folders.get(host["path"]) + load_hosts(folder) + for entry in attr: + try: + del folder[".hosts"][host["name"]][entry] + except: + continue + + save_folder_and_hosts(folder) + return folder[".hosts"][host["name"]] + # Update the attributes of the given host and returns the resulting host attributes - # which have been persisted + # host must be returned by get_host() / get_all_hosts() def update_host_attributes(self, host, attr): - # Initialize attributes and load all folders - declare_host_tag_attributes() - declare_site_attribute() - load_all_folders() - folder = g_folders.get(host["path"]) load_hosts(folder) folder[".hosts"][host["name"]].update(attr) save_folder_and_hosts(folder) return folder[".hosts"][host["name"]] - # Return displayable information about host (call with with result vom get_host()) + # Return displayable information about host (call with result of get_host()) def get_host_painted(self, host): - declare_host_tag_attributes() result = [] for attr, topic in host_attributes: attrname = attr.name() @@ -9833,6 +9842,12 @@ class API: return len(parse_audit_log("pending")) # BELOW ARE PRIVATE HELPER FUNCTIONS + def prepare_folder_info(self): + # Initialize attributes and load all folders + declare_host_tag_attributes() + declare_site_attribute() + load_all_folders() + def _cleanup_directory(self, thing): # drop 'parent' entry, recursively

12 years, 6 months

Check_MK Git: check_mk: FIX: volatile hidden topics finally hidden

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9300b49e255bf2ba45fdd06e3cd97212e70f61c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9300b49e255bf2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 19 13:12:54 2011 +0100 FIX: volatile hidden topics finally hidden --- web/htdocs/js/wato.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index d7de239..95d367d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -136,9 +136,10 @@ function wato_fix_visibility() { } } for (var item in volatile_topics){ - var oTr = document.getElementById("topic_" + item); + var name = volatile_topics[item] + var oTr = document.getElementById("topic_" + name); if(oTr) { - if(hide_topics.indexOf(item) > -1 ) + if(hide_topics.indexOf(name) > -1 ) oTr.style.display = "none"; else oTr.style.display = "";

12 years, 6 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: f5339caa9e6ca7f280c840171aa50b7bd350d93c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5339caa9e6ca7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 10:30:19 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Fix timeperiod definitions created by Check_MK

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb2d14e65882bef3158c89411975901dcd6f09f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb2d14e65882be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 10:30:10 2011 +0100 Fix timeperiod definitions created by Check_MK --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2e3a451..1b8e426 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1840,7 +1840,7 @@ def create_nagios_config_timeperiods(outfile): outfile.write(" alias\t\t\t\t%s\n" % tp["alias"].encode("utf-8")) for key, value in tp.items(): if key != "alias": - times = ", ".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) + times = ",".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) if times: outfile.write(" %-20s\t\t%s\n" % (key, times)) outfile.write("}\n\n")

12 years, 6 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: c89079ba130bf3bb7dd5342fdcba04b1311cc59b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c89079ba130bf3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 17:42:26 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: ADD Wato: New varspec for age

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8cda2c3695b92a3d4fd4a7aa01f9fe73c0ccece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8cda2c3695b92… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 17:41:16 2011 +0100 ADD Wato: New varspec for age --- web/htdocs/wato.py | 37 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 31 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c50e3b..d86b6ac 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4263,8 +4263,45 @@ class FixedValue(ValueSpec): def validate_value(self, value, varprefix): self.validate_datatype(value, varprefix) + +# Time in seconds +class Age(ValueSpec): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._label = kwargs.get("label") + + def canonical_value(self): + return 0 + + def render_input(self, varprefix, value): + days, rest = divmod(value, 60*60*24) + hours, rest = divmod(rest, 60*60) + minutes, seconds = divmod(rest, 60) + html.write("<div>") + html.number_input(varprefix+'_days', days, 2) + html.write(_("days")) + html.number_input(varprefix+'_hour', hours, 2) + html.write(_("hours")) + html.number_input(varprefix+'_minutes', minutes, 2) + html.write(_("min")) + html.number_input(varprefix+'_seconds', seconds, 2) + html.write(_("sec")) + html.write("</div>") + def from_html_vars(self, varprefix): + return (saveint(html.var(varprefix+'_hour'))*3600) + (saveint(html.var(varprefix+'_minutes'))*60) + saveint(html.var(varprefix+'_seconds')) + + def value_to_text(self, value): + days, rest = divmod(value, 60*60*24) + hours, rest = divmod(rest, 60*60) + minutes, seconds = divmod(rest, 60) + return "%sd %sh %sm %ss" % (days, hours, minutes, seconds) + + def validate_datatype(self, value, varprefix): + if type(value) != int: + raise MKUserError(varprefix, _("The value has type %s, but must be of type int") % (type(value))) + # Editor for a single integer class Integer(ValueSpec): def __init__(self, **kwargs): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 69fe98d..4f6b6bb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -253,6 +253,37 @@ checkgroups.append(( "first" )) +checkgroups.append(( + "fileinfo", + _("Fileinfo"), + Dictionary( + elements = [ + ( "minage", + Tuple( + title = _("Minimal age"), + elements = [ + Age(title = _("Warning younger then")), + Age(title = _("Critical younger then")), + ] + ) + ), + ( "maxage", + Tuple( + title = _("Maximal age"), + elements = [ + Age(title = _("Warning older then")), + Age(title = _("Critical older then")), + ] + ) + ), + + + ] + ), + None, + "first" +)) + checkgroups.append(( "tcp_conn_stats", ("TCP connection stats"),

12 years, 6 months

Check_MK Git: check_mk: FIX: dell_poweredge_cpu: handle sporadic invalid output from agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19a5a0d9ea52754af21b765c9784c98f9c942148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19a5a0d9ea5275… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:30:57 2011 +0100 FIX: dell_poweredge_cpu: handle sporadic invalid output from agent --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f37c9..8dadd28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,8 @@ * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) * FIX: smart: make levels work (thanks to Bernhard Schmidt) * FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error + * FIX: dell_powerconnect_cpu: handle sporadic incomplete output + from SNMP agent 1.1.12p4: Multisite: diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index a0209cf..b7787dc 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -48,7 +48,10 @@ def inventory_dell_powerconnect_cpu(checkname, info): # Check of dell power connect CPU details. def check_dell_powerconnect_cpu(item, params, info): - enabled, onesecondperc, oneminuteperc, fiveminutesperc = info[0] + try: + enabled, onesecondperc, oneminuteperc, fiveminutesperc = map(int, info[0]) + except ValueError: + raise MKCounterWrapped("", "Ignoring empty data from SNMP agent") if int(enabled) == 1: cpu_load = int(onesecondperc) if cpu_load >= 0 <= 100:

12 years, 6 months

Check_MK Git: check_mk: dell_powerconnect_cpu: renamed service from CPU to "CPU utilization"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fad7c5d4136c09623106a86534fe961a3ea26bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad7c5d4136c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:31:29 2011 +0100 dell_powerconnect_cpu: renamed service from CPU to "CPU utilization" --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dadd28..4957e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.13i2 Checks & Agents: * linux agent - ipmi: Creating directory of cache file if not exists + * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in + order to be consistent with other checks 1.1.13i1: Multisite: diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index b7787dc..124c138 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -64,17 +64,17 @@ def check_dell_powerconnect_cpu(item, params, info): status = 1 output = ' (Above %d%%)' % params[0] - return (status, '%s - CPU load is %d%% %s' % + return (status, '%s - CPU utilization is %d%% %s' % (nagios_state_names[status], cpu_load, output), [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), ]) - return (3, "UNKNOWN - Invalid information in snmp data") + return (3, "UNKNOWN - Invalid information in SNMP data") # Auto-detection of CPU elements. -check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU", 1, inventory_dell_powerconnect_cpu) +check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU utilization", 1, inventory_dell_powerconnect_cpu) snmp_info['dell_powerconnect_cpu'] = ( ".1.3.6.1.4.1.89.1", [ "6", "7", "8", "9" ] ) snmp_scan_functions['dell_powerconnect_cpu'] = \ lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0")

12 years, 6 months

Check_MK Git: check_mk: Helper function saveint() into lib.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30f50e1aaacb173088bb963f559cdbed84aa1295 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30f50e1aaacb17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:29:28 2011 +0100 Helper function saveint() into lib.py --- web/htdocs/lib.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index be1be76..e2cffda 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -149,4 +149,8 @@ def format_exception(): traceback.print_exception(t, v, tb, None, txt) return txt.getvalue() - +def saveint(x): + try: + return int(x) + except: + return 0

12 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
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