Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: FIXInventory problem with inventory_processes parameter

by Andreas Boesl

Module: check_mk Branch: master Commit: 542d6c6630e45faab111b0eedd0f18cb953601e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=542d6c6630e45f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 31 09:47:50 2013 +0100 FIXInventory problem with inventory_processes parameter --- .werks/20 | 8 ++++++++ ChangeLog | 3 +++ checks/ps | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/20 b/.werks/20 new file mode 100644 index 0000000..0373117 --- /dev/null +++ b/.werks/20 @@ -0,0 +1,8 @@ +Title: Inventory problem with inventory_processes parameter +Level: 2 +Component: checks +Version: 1.2.3i6 +Date: 1383209203 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2110f6e..13ff688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i6: + Checks & Agents: + * FIX 0020: Inventory problem with inventory_processes parameter... + Multisite: * 0000: Improved performance of LDAP sync by refactoring the group sync code diff --git a/checks/ps b/checks/ps index f310d8a..cac2e52 100644 --- a/checks/ps +++ b/checks/ps @@ -149,6 +149,9 @@ def inventory_ps_common(invdata, info, handle_perfdata = False): not in_extraconf_hostlist(hostlist, g_hostname)): continue + if len(inventry) == 7: # extend old inventory_processes + inventry += ([],) + entries.append(inventry) # Handle new wato style inventory_processes_rules

10 years, 11 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 97edd9c548c00099abf6d35509e797f26c7cf097 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97edd9c548c000… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 31 09:46:36 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 209e3ef..425151f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -20 +40

10 years, 11 months

Check_MK Git: check_mk: cleaned up merge conflicts on checks/brocade_mlx

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 78512c347a85bc7185f9f0ffd422ed5e744fbfc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78512c347a85bc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Oct 30 19:36:51 2013 +0100 cleaned up merge conflicts on checks/brocade_mlx --- checks/brocade_mlx | 68 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 5d0f8b1..1a3caf6 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -24,24 +24,37 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -brocade_mlx_info = ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ 1, 2, 3 ]) +brocade_mlx_info = [ ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ 1, 2, 3 ]), # power supplies + ('.1.3.6.1.4.1.1991.1.1.1.3.1.1', [ 1, 2, 3 ]), # fans + ] + +def brocade_mlx_scan(oid): + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1.") + +############################################################################# +# Power Supplies +############################################################################# def inventory_brocade_mlx_power(info): + print "inventory power" + import pprint; pprint.pprint(info[0]) inventory = [] - for power_id, power_descr, power_state in info: + for power_id, power_descr, power_state in info[0]: if power_descr == "": power_item = power_id else: - power_item = "%s %s" % (power_id, power_descr) + power_item = "%s: %s" % (power_id, power_descr) inventory.append( (power_item, None) ) return inventory def check_brocade_mlx_power(item, _no_params, info): - for power_id, power_descr, power_state in info: + print "check power" + import pprint; pprint.pprint(info[0]) + for power_id, power_descr, power_state in info[0]: if power_descr == "": power_item = power_id else: - power_item = "%s %s" % (power_id, power_descr) + power_item = "%s: %s" % (power_id, power_descr) if power_item == item: if power_state == "2": return 0, "Power supply reports status 2 (normal)" @@ -56,6 +69,49 @@ check_info["brocade_mlx.power"] = { "inventory_function" : inventory_brocade_mlx_power, "service_description" : "Power supply %s", "snmp_info" : brocade_mlx_info, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), + "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : False, } + +############################################################################# +# Fans +############################################################################# + +def inventory_brocade_mlx_fan(info): + print "inventory fan" + import pprint; pprint.pprint(info[1]) + inventory = [] + for fan_id, fan_descr, fan_state in info[1]: + if fan_descr == "": + fan_item = fan_id + else: + fan_item = "%s: %s" % (fan_id, fan_descr) + inventory.append( (fan_item, None) ) + return inventory + +def check_brocade_mlx_fan(item, _no_params, info): + print "check fan" + import pprint; pprint.pprint(info[1]) + for fan_id, fan_descr, fan_state in info[1]: + if fan_descr == "": + fan_item = fan_id + else: + fan_item = "%s: %s" % (fan_id, fan_descr) + if fan_item == item: + if fan_state == "2": + return 0, "Fan reports status 2 (normal)" + elif fan_state == "3": + return 2, "Fan reports status 3 (failure)" + else: + return 3, "Fan reports unidentified status %s" % fan_state + return 3, "Fan %s not found" % item + +check_info["brocade_mlx.fan"] = { + "check_function" : check_brocade_mlx_fan, + "inventory_function" : inventory_brocade_mlx_fan, + "service_description" : "Fan %s", + "snmp_info" : brocade_mlx_info, + "snmp_scan_function" : brocade_mlx_scan, + "has_perfdata" : False, +} +

10 years, 11 months

Check_MK Git: check_mk: Das ist was neues

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d4e12442028ac62cc1378157ef021d1e5efa5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d4e12442028ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:17:32 2013 +0100 Das ist was neues --- .werks/0 | 8 ++++++++ ChangeLog | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/0 b/.werks/0 new file mode 100644 index 0000000..30d44c1 --- /dev/null +++ b/.werks/0 @@ -0,0 +1,8 @@ +Title: Das ist was neues +Level: 2 +Component: core +Version: 1.2.3i6 +Date: 1383149313 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 618ffdd..1afb821 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i6: - Multisite: - * Improved performance of LDAP sync by refactoring the group sync code + Core & Setup: + * 0000: Das ist was neues... + 1.2.3i5: Core:

10 years, 11 months

Check_MK Git: check_mk: Das ist was neues

by Mathias Kettner

Module: check_mk Branch: master Commit: c937dbbc5c0d8be35132c9a2f3854a4746a22a75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c937dbbc5c0d8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:21:41 2013 +0100 Das ist was neues Und hier ist noch ein Text --- .werks/0 | 2 +- werk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/0 b/.werks/0 index 30d44c1..8960c46 100644 --- a/.werks/0 +++ b/.werks/0 @@ -5,4 +5,4 @@ Version: 1.2.3i6 Date: 1383149313 Class: feature - +Und hier ist noch ein Text diff --git a/werk b/werk index e6c62ef..2a41b7a 100755 --- a/werk +++ b/werk @@ -595,7 +595,7 @@ def main_grep(args): def main_edit(args): if len(args) == 0: - werkid = str(g_last_werk) + werkid = int(g_last_werk) if werkid == None: bail_out("No last werk. Please specify id.")

10 years, 11 months

Check_MK Git: check_mk: Improved performance of LDAP sync by refactoring the group sync code

by Mathias Kettner

Module: check_mk Branch: master Commit: e463dc319c45b446aa38c424d8f087b7d2be5d89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e463dc319c45b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:22:29 2013 +0100 Improved performance of LDAP sync by refactoring the group sync code --- .werks/0 | 5 ++--- ChangeLog | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.werks/0 b/.werks/0 index 8960c46..773e0d0 100644 --- a/.werks/0 +++ b/.werks/0 @@ -1,8 +1,7 @@ -Title: Das ist was neues +Title: Improved performance of LDAP sync by refactoring the group sync code Level: 2 -Component: core +Component: multisite Version: 1.2.3i6 Date: 1383149313 Class: feature -Und hier ist noch ein Text diff --git a/ChangeLog b/ChangeLog index 1afb821..2110f6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 1.2.3i6: - Core & Setup: - * 0000: Das ist was neues... + Multisite: + * 0000: Improved performance of LDAP sync by refactoring the group sync code 1.2.3i5:

10 years, 11 months

Check_MK Git: check_mk: werk: fixed id handling

by Mathias Kettner

Module: check_mk Branch: master Commit: 69c7bb5b9ce2247d320926134c1b225f68f7d739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c7bb5b9ce224… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:08:21 2013 +0100 werk: fixed id handling --- .gitignore | 2 ++ .werks/first_free | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index f78274b..11e4a97 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ check-mk-*.exe var/ .bugs/.my_ids .bugs/.last +.werks/.my_ids +.werks/.last check-mk-agent-*.exe .metadata RemoteSystemsTempFiles diff --git a/.werks/first_free b/.werks/first_free new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/.werks/first_free @@ -0,0 +1 @@ +20

10 years, 11 months

Check_MK Git: check_mk: Fixed type in werk tool

by Mathias Kettner

Module: check_mk Branch: master Commit: eca81b02b4791aeef994fa9737fc79b20133acde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca81b02b4791a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:07:32 2013 +0100 Fixed type in werk tool --- werk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/werk b/werk index ce003af..e6c62ef 100755 --- a/werk +++ b/werk @@ -241,7 +241,7 @@ def quote_shell_string(s): def next_werk_id(): my_werk_ids = get_werk_ids() if not my_werk_ids: - bail_out('You have no werk IDS left. You can reserve 10 additional werk IDS with "gb ids 10".') + bail_out('You have no werk IDS left. You can reserve 10 additional Werk IDS with "./werk ids 10".') return my_werk_ids[0] def add_comment(werk, title, comment):

10 years, 11 months

Check_MK Git: check_mk: Added new tool "werk" for managing changes

by Mathias Kettner

Module: check_mk Branch: master Commit: 414d25d5ce53bf568f1212f5cea23272318379d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=414d25d5ce53bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 17:02:15 2013 +0100 Added new tool "werk" for managing changes --- .werks/config | 23 ++ werk | 738 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 761 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=414d25d5ce…

10 years, 11 months

Check_MK Git: check_mk: Fixed button text in mkeventd. Removed <b>

by Bastian Kuhn

Module: check_mk Branch: master Commit: a469c7658874db20600cfd8beffbe482a7b48600 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a469c7658874db… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 30 15:38:21 2013 +0100 Fixed button text in mkeventd. Removed <b> --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index d546b46..26430a7 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1133,7 +1133,7 @@ def log_mkeventd(what, message): def mkeventd_changes_button(): pending = parse_audit_log("mkeventd") if len(pending) > 0: - buttontext = "<b>%d " % len(pending) + _("Changes") + "</b>" + buttontext = "%d " % len(pending) + _("Changes") hot = True icon = "mkeventd" else:

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013