[checkmk-commits] Check_MK Git: check_mk: #1257 FIX oracle_jobs: Fix: Discovery now supports the old oracle plugin again

Module: check_mk Branch: master Commit: 8472c685e5a47af30952f95d4c357b43158e0cc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8472c685e5a47a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jun 10 16:01:37 2015 +0200 #1257 FIX oracle_jobs: Fix: Discovery now supports the old oracle plugin again --- .werks/1257 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_jobs | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1257 b/.werks/1257 new file mode 100644 index 0000000..81b0ea8 --- /dev/null +++ b/.werks/1257 @@ -0,0 +1,10 @@ +Title: oracle_jobs: Fix: Discovery now supports the old oracle plugin again +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433944845 + + diff --git a/ChangeLog b/ChangeLog index b4d1599..013c790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices * 2217 FIX: md: Fix handling of found and expected disks * 2309 FIX: cpu_util checks: removed superfluous space in check output + * 1257 FIX: oracle_jobs: Fix: Discovery now supports the old oracle plugin again Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/checks/oracle_jobs b/checks/oracle_jobs index 3781710..d1dca28 100644 --- a/checks/oracle_jobs +++ b/checks/oracle_jobs @@ -42,7 +42,9 @@ factory_settings["oracle_jobs_defaults"] = { } def inventory_oracle_jobs(info): - return [ ( ("%s.%s.%s" % (line[0], line[1], line[2])), {} ) for line in info ] + for line in info: + if len(line) >= 3: + yield "%s.%s.%s" % ( line[0], line[1], line[2] ), {} def check_oracle_jobs(item, params, info): if item.count('.') == 2: