Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 5626e2b8134bf57b7b372d53bf9c1167cfb01162 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5626e2b8134bf5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 17:21:30 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Fix localization of flapping icon

by Mathias Kettner

Module: check_mk Branch: master Commit: 42066e905012a49261d5abc4fddecae246c79c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42066e905012a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 17:21:28 2012 +0100 Fix localization of flapping icon --- web/plugins/icons/builtin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index f7580c7..7e34c24 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -364,7 +364,7 @@ multisite_icons.append({ def paint_flapping(what, row, tags, custom_vars): if row[what + "_is_flapping"]: return '<img class=icon title="%s" src="images/icon_flapping.gif">' % \ - _('This %s is flapping') % what + _('This %s is flapping') % _(what) multisite_icons.append({ 'columns': [ 'is_flapping' ],

11 years, 9 months

Check_MK Git: check_mk: Add three new HP hardware related checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f7b7dffa00003bf512ececfee2f5e434cdcb85d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f7b7dffa00003… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 16:56:58 2012 +0100 Add three new HP hardware related checks * Added check for disk controllers in HP Proliant servers: hp_proliant_da_cntlr * Added check to monitor Storage System Drive Box Groups attached to HP servers * Added check to monitor the summary status of HP EML tape libraries --- ChangeLog | 5 ++ checkman/hp_eml_sum | 12 ++++ checkman/hp_proliant_da_cntlr | 21 +++++++ checkman/hp_sts_drvbox | 24 ++++++++ checks/hp_eml_sum | 62 +++++++++++++++++++ checks/hp_proliant_da_cntlr | 97 ++++++++++++++++++++++++++++++ checks/hp_sts_drvbox | 132 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 353 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8f7b7dffa0…

11 years, 9 months

Check_MK Git: check_mk: ldap: Fixed encoding of all fetched ldap values

by Lars Michelsen

Module: check_mk Branch: master Commit: 5dfa534c3a390f64aacce8c52b76a88a9ca60fe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dfa534c3a390f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 16:52:58 2012 +0100 ldap: Fixed encoding of all fetched ldap values --- web/plugins/userdb/ldap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3a492a0..8538efd 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -181,7 +181,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): for dn, obj in ldap_connection.search_s(base, scope, filt, columns): new_obj = {} for key, val in obj.iteritems(): - new_obj[key.lower()] = val + new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] result.append((dn, new_obj)) return result #return ldap_connection.search_s(base, scope, filter, columns)

11 years, 9 months

Check_MK Git: check_mk: ldap: Returned DNs need double escape of backslashes

by Lars Michelsen

Module: check_mk Branch: master Commit: abe1849a6042c8ff61021ec2047ca27932d0321a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abe1849a6042c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 5 16:47:39 2012 +0100 ldap: Returned DNs need double escape of backslashes --- web/plugins/userdb/ldap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index fce0856..3a492a0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -229,7 +229,7 @@ def ldap_get_user_dn(username): ) if result: - return result[0][0] + return result[0][0].replace('\\', '\\\\') def ldap_get_users(add_filter = None): columns = [

11 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0882

by Mathias Kettner

Module: check_mk Branch: master Commit: 644e4a2406ae776ffda9fd9d688b330f11a10512 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=644e4a2406ae77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 16:05:26 2012 +0100 Updated bug entries #0882 --- .bugs/882 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/882 b/.bugs/882 new file mode 100644 index 0000000..347f0ae --- /dev/null +++ b/.bugs/882 @@ -0,0 +1,16 @@ +Title: WATO rule for CPU load does not allow float +Component: checks +State: open +Date: 2012-12-05 16:03:54 +Targetversion: 1.2.0 +Class: nastiness + +The WATO rule for the CPU load does not allow to specify float +values. But since the level is multiplied by the number +of cores this would be neccessary. So convert from int gto +float. Does the ValueSpec float() accept ints? If not, make +it configurable such that it does or make an automatic +conversion, so WATO is happy with existing int-based rules. + +Also fix the labelling: The level is multiplied by the +number of Cores!

11 years, 9 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a3c160bd79e3af3719649a7edf61907935f64b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a3c160bd79e3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 16:06:06 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: New option when setting host downtimes for also including child hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 17a7d43cafbfc6f8fe8513d483803a1974e6e90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17a7d43cafbfc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 16:06:04 2012 +0100 New option when setting host downtimes for also including child hosts --- ChangeLog | 1 + web/plugins/views/commands.py | 96 ++++++++++++++++++++++++++++------------ 2 files changed, 68 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe97010..92f3499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * FIX: warn / crit levels in if-check when using "bit" as unit * Use pprint when writing global settings (makes files more readable) * New script for settings/removing downtimes: doc/treasures/downtime + * New option when setting host downtimes for also including child hosts WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 5fa9df4..a9b4998 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -383,41 +383,79 @@ def command_downtime(cmdtag, spec, row): else: fixed = 1 duration = 0 - command = (("SCHEDULE_" + cmdtag + "_DOWNTIME;%s;" % spec) \ + + if html.var("_include_childs"): # only for hosts + specs = [ spec ] + get_child_hosts(row["site"], [spec], recurse = not not html.var("_include_childs_recurse")) + else: + specs = [ spec ] + + commands = [(("SCHEDULE_" + cmdtag + "_DOWNTIME;%s;" % spec ) \ + ("%d;%d;%d;0;%d;%s;" % (down_from, down_to, fixed, duration, config.user_id)) \ - + comment) - return command, title + + comment) for spec in specs] + return commands, title + +def get_child_hosts(site, hosts, recurse): + hosts = set(hosts) + html.live.set_only_sites([site]) + query = "GET hosts\nColumns: name\n" + for h in hosts: + query += "Filter: parents >= %s\n" % h + query += "Or: %d\n" % len(hosts) + childs = html.live.query_column(query) + html.live.set_only_sites(None) + # Recursion, but try to avoid duplicate work + childs = set(childs) + new_childs = childs.difference(hosts) + if new_childs and recurse: + rec_childs = get_child_hosts(site, new_childs, True) + new_childs.update(rec_childs) + return list(new_childs) + +def paint_downtime_buttons(what): + html.write(_('Downtime Comment')+": ") + html.text_input("_down_comment", size=40) + html.write("<hr>") + html.button("_down_2h", _("2 hours")) + html.button("_down_today", _("Today")) + html.button("_down_week", _("This week")) + html.button("_down_month", _("This month")) + html.button("_down_year", _("This year")) + html.write("   -  ") + html.button("_down_remove", _("Remove all")) + html.write("<hr>") + html.button("_down_custom", _("Custom time range")) + html.datetime_input("_down_from", time.time()) + html.write("  "+_('to')+"  ") + html.datetime_input("_down_to", time.time() + 7200) + html.write("<hr>") + html.button("_down_from_now", _("From now for")) + html.write(" ") + html.number_input("_down_minutes", 60, size=4, style="text-align: right") + html.write("  " + _("minutes")) + html.write("<hr>") + html.checkbox("_down_flexible", False, label=_('flexible with max. duration')+" ") + html.time_input("_down_duration", 2, 0) + html.write(" "+_('(HH:MM)')) + if what == "host": + html.write("<hr>") + html.checkbox("_include_childs", False, label=_('Also set downtime on child hosts')) + html.write(" ") + html.checkbox("_include_childs_recurse", False, label=_('Do this recursively')) multisite_commands.append({ - "tables" : [ "host", "service" ], + "tables" : [ "host" ], "permission" : "action.downtimes", "title" : _("Schedule downtimes"), - "render" : lambda: \ - html.button("_down_2h", _("2 hours")) == \ - html.button("_down_today", _("Today")) == \ - html.button("_down_week", _("This week")) == \ - html.button("_down_month", _("This month")) == \ - html.button("_down_year", _("This year")) == \ - html.write("   -  ") == \ - html.button("_down_remove", _("Remove all")) == \ - html.write("<hr>") == \ - html.button("_down_custom", _("Custom time range")) == \ - html.datetime_input("_down_from", time.time()) == \ - html.write("  "+_('to')+"  ") == \ - html.datetime_input("_down_to", time.time() + 7200) == \ - html.write("<hr>") == \ - html.button("_down_from_now", _("From now for")) == \ - html.write(" ") == \ - html.number_input("_down_minutes", 60, size=4, style="text-align: right") == \ - html.write("  " + _("minutes")) == \ - html.write("<hr>") == \ - html.checkbox("_down_flexible", False, label=_('flexible with max. duration')+" ") == \ - html.time_input("_down_duration", 2, 0) == \ - html.write(" "+_('(HH:MM)')) == \ - html.write("<hr>") == \ - html.write(_('Comment')+": ") == \ - html.text_input("_down_comment", size=48), + "render" : lambda: paint_downtime_buttons("host"), + "action" : command_downtime, +}) + +multisite_commands.append({ + "tables" : [ "service" ], + "permission" : "action.downtimes", + "title" : _("Schedule downtimes"), + "render" : lambda: paint_downtime_buttons("service"), "action" : command_downtime, })

11 years, 9 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 96bd81b84ff62b959afaf428030e565231b18257 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96bd81b84ff62b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 09:36:46 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: WATO: new helper for data tables,

by Mathias Kettner

converted users and groups Message-ID: <50bf07a0.dbSBmcU7XnB6+MEP%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: efcd63169cb27f4fd8cca64835146e2f78ae0b96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efcd63169cb27f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 5 09:36:42 2012 +0100 WATO: new helper for data tables, converted users and groups --- web/htdocs/htmllib.py | 31 ++++++++++++++- web/htdocs/index.py | 1 + web/htdocs/table.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 94 +++++++++++++++++------------------------------ 4 files changed, 161 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=efcd63169c…

11 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012