Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64619 discussions

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: bd4b42b81f50442056710bec6ac113c00ab61570 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd4b42b81f5044… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 4 17:18:32 2014 +0200 Updated Werk description ---

10 years, 6 months

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 04b4b2f95547d6af5c67a40d89c88c6e4cda2633 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04b4b2f95547d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 4 17:16:27 2014 +0200 Updated Werk description --- .werks/786 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/786 b/.werks/786 new file mode 100644 index 0000000..a099da4 --- /dev/null +++ b/.werks/786 @@ -0,0 +1,15 @@ +Title: zfsget: fixed compatibility with older Solaris agents +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i2 +Date: 1396620030 + +The check zfsget expected more fields in the section zfsget than +that the check_mk_agent.solaris delivered - the fstype was missing +This caused an exception in the zfsget check. + +The problem has been fixed in the check itself, so it can handle +both agent output versions. Now its also fixed in the agent output. +

10 years, 6 months

Check_MK Git: check_mk: FIX check_mk_agent.solaris: fixed problem with section <<<zfsget>>>

by Andreas Boesl

Module: check_mk Branch: master Commit: e92db8e1bb5629cd55268a70b734e09a0f1f6f62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e92db8e1bb5629… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 16:03:21 2014 +0200 FIX check_mk_agent.solaris: fixed problem with section <<<zfsget>>> The check zfsget expected more fields in the section zfsget than that the check_mk_agent.solaris delivered - the fstype was missing This caused an exception in the zfsget check. The problem has been fixed in the check itself, so it can handle both agent output versions. Now its also fixed in the agent output. --- .werks/786 | 15 +++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/786 b/.werks/786 new file mode 100644 index 0000000..f8a89d8 --- /dev/null +++ b/.werks/786 @@ -0,0 +1,15 @@ +Title: check_mk_agent.solaris: fixed problem with section <<<zfsget>>> +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396620030 + +The check zfsget expected more fields in the section zfsget than +that the check_mk_agent.solaris delivered - the fstype was missing +This caused an exception in the zfsget check. + +The problem has been fixed in the check itself, so it can handle +both agent output versions. Now its also fixed in the agent output. + diff --git a/ChangeLog b/ChangeLog index 26181a9..81e4b5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0150 printer_suply: New option to upturn toner levels... * 0801 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... + * 0786 FIX: check_mk_agent.solaris: fixed problem with section <<<zfsget>>>... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index e2d7b80..435ded5 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -126,7 +126,7 @@ then echo '<<<zfsget>>>' zfs get -Hp name,quota,used,avail,mountpoint,type echo '[df]' - df -l -k -F zfs 2>/dev/null | sed 1d + df -l -k -T -F zfs 2>/dev/null | sed 1d fi

10 years, 6 months

Check_MK Git: check_mk: Allow users to disable their notifications completely

by Mathias Kettner

Module: check_mk Branch: master Commit: 50afb0aeab1a86045c4827a8c507009d33a92bdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50afb0aeab1a86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 4 15:59:27 2014 +0200 Allow users to disable their notifications completely --- .werks/754 | 16 ++++++++++++++++ ChangeLog | 1 + modules/notify.py | 34 ++++++++++++++++++++++++--------- web/htdocs/default_permissions.py | 7 +++++++ web/htdocs/userdb.py | 18 +++++++++++------ web/htdocs/wato.py | 17 +++++++++++------ web/plugins/userdb/user_attributes.py | 15 +++++++++++++++ 7 files changed, 87 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=50afb0aeab…

10 years, 6 months

Check_MK Git: check_mk: enterasys_lsnat: now also provides perfdata

by Andreas Boesl

Module: check_mk Branch: master Commit: 3400c4b80b54674570de5e6ff4ba3128029b45cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3400c4b80b5467… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 14:44:08 2014 +0200 enterasys_lsnat: now also provides perfdata --- checks/enterasys_lsnat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/enterasys_lsnat b/checks/enterasys_lsnat index e38169d..fb719b6 100644 --- a/checks/enterasys_lsnat +++ b/checks/enterasys_lsnat @@ -44,7 +44,9 @@ def check_enterasys_lsnat(no_item, params, info): state = 1 state_info = state_markers[state] - return state, "Current bindings %d%s" % (lsnat_bindings, state_info) + perfdata = [ ("current_bindings", util, warn, crit) ] + + return state, "Current bindings %d%s" % (lsnat_bindings, state_info), perfdata check_info["enterasys_lsnat"] = { @@ -52,6 +54,7 @@ check_info["enterasys_lsnat"] = { "inventory_function" : inventory_enterasys_lsnat, "service_description" : "LSNAT Bindings", "group" : "lsnat", + "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.74.1.1.5", [ "0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") and oid(".1.3.6.1.4.1.5624.1.2.74.1.1.5.0"),

10 years, 6 months

Check_MK Git: check_mk: FIX Availability: fixed memory leak in table statehist

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b16865cf7b8396acc9d9fa8395f53d6a788f86e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b16865cf7b839… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 15:09:54 2014 +0200 FIX Availability: fixed memory leak in table statehist The cleanup procedure of the livestatus table statehist missed some items.. This has been fixed. --- .werks/785 | 10 ++++++++++ ChangeLog | 3 +++ livestatus/src/TableStateHistory.cc | 2 ++ 3 files changed, 15 insertions(+) diff --git a/.werks/785 b/.werks/785 new file mode 100644 index 0000000..e96262e --- /dev/null +++ b/.werks/785 @@ -0,0 +1,10 @@ +Title: Availability: fixed memory leak in table statehist +Level: 2 +Component: core +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396616927 + +The cleanup procedure of the livestatus table statehist missed some items.. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index e90c32c..c152fb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i3: + Core & Setup: + * 0785 FIX: Availability: fixed memory leak in table statehist... + Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes * 0751 New localcheck for Linux that makes sure that filesystems in /etc/fstab are mounted... diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 9705336..39d1ab7 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -678,6 +678,8 @@ void TableStateHistory::answerQuery(Query *query) delete it_hst->second; it_hst++; } + state_info.clear(); + object_blacklist.clear(); g_store->logCache()->unlockLogCache(); }

10 years, 6 months

Check_MK Git: check_mk: IBM SVC checks: added hint for special agents in check manpages

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ec46f6a01ed1b6f68e2cdaeb1aaf28e1cb68ae3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec46f6a01ed1b6… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Apr 4 13:59:42 2014 +0200 IBM SVC checks: added hint for special agents in check manpages --- checkman/ibm_svc_eventlog | 5 +++++ checkman/ibm_svc_host | 5 +++++ checkman/ibm_svc_license | 5 +++++ checkman/ibm_svc_mdisk | 5 +++++ checkman/ibm_svc_mdiskgrp | 5 +++++ checkman/ibm_svc_node | 5 +++++ checkman/ibm_svc_nodestats.cache | 5 +++++ checkman/ibm_svc_nodestats.cpu_util | 5 +++++ checkman/ibm_svc_nodestats.diskio | 5 +++++ checkman/ibm_svc_system | 5 +++++ checkman/ibm_svc_systemstats.cache | 5 +++++ checkman/ibm_svc_systemstats.cpu_util | 5 +++++ checkman/ibm_svc_systemstats.diskio | 5 +++++ 13 files changed, 65 insertions(+) diff --git a/checkman/ibm_svc_eventlog b/checkman/ibm_svc_eventlog index 5b6fc24..006b209 100644 --- a/checkman/ibm_svc_eventlog +++ b/checkman/ibm_svc_eventlog @@ -8,6 +8,11 @@ description: and not yet fixed. Returns {WARN} if there is at least one and {OK} if there is none. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + inventory: Creates exactly one check on every IBM SVC / V7000 device named IBM SVC Eventlog. diff --git a/checkman/ibm_svc_host b/checkman/ibm_svc_host index 9a43898..5e78d0c 100644 --- a/checkman/ibm_svc_host +++ b/checkman/ibm_svc_host @@ -11,6 +11,11 @@ description: any unidentified status the check returns {WARN}. If some hosts report {offline} status the check returns {CRIT}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + perfdata: Five values are reported: The number of hosts reporting active, inactive, degraded, offline and unidentified status. diff --git a/checkman/ibm_svc_license b/checkman/ibm_svc_license index 9147643..bf40d7a 100644 --- a/checkman/ibm_svc_license +++ b/checkman/ibm_svc_license @@ -8,6 +8,11 @@ description: of licenses is compared to the usage of licenses. The check returns {CRIT} if the usage is higher than the licensing and {OK} otherwise. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the licensable feature. This is everything after used_ or license_ in the output of the lslicense command. diff --git a/checkman/ibm_svc_mdisk b/checkman/ibm_svc_mdisk index 39cc756..d8f4703 100644 --- a/checkman/ibm_svc_mdisk +++ b/checkman/ibm_svc_mdisk @@ -13,6 +13,11 @@ description: The worst of both is returned as check result. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the MDisk. diff --git a/checkman/ibm_svc_mdiskgrp b/checkman/ibm_svc_mdiskgrp index 7f5846d..c89bf11 100644 --- a/checkman/ibm_svc_mdiskgrp +++ b/checkman/ibm_svc_mdiskgrp @@ -12,6 +12,11 @@ description: Additionally the status of the MDisksGrp is checked. On every other status than {online} the check results in {CRIT} status. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the MDisksGrp diff --git a/checkman/ibm_svc_node b/checkman/ibm_svc_node index a77c841..95d4a43 100644 --- a/checkman/ibm_svc_node +++ b/checkman/ibm_svc_node @@ -11,6 +11,11 @@ description: {offline}) the check returns {CRIT}. And in all other cases - that means if at least one node is {online} - the check returns {WARN}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the IO Group. diff --git a/checkman/ibm_svc_nodestats.cache b/checkman/ibm_svc_nodestats.cache index cabb6b0..29c70a1 100644 --- a/checkman/ibm_svc_nodestats.cache +++ b/checkman/ibm_svc_nodestats.cache @@ -9,6 +9,11 @@ description: The check does report only and returns always {OK}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the node. diff --git a/checkman/ibm_svc_nodestats.cpu_util b/checkman/ibm_svc_nodestats.cpu_util index 8f87447..1ce05b7 100644 --- a/checkman/ibm_svc_nodestats.cpu_util +++ b/checkman/ibm_svc_nodestats.cpu_util @@ -9,6 +9,11 @@ description: The check returns {WARN} or {CRIT} if the utilization in percent is higher then given levels and {OK} otherwise. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: The name of the node. diff --git a/checkman/ibm_svc_nodestats.diskio b/checkman/ibm_svc_nodestats.diskio index 523c197..aa018fd 100644 --- a/checkman/ibm_svc_nodestats.diskio +++ b/checkman/ibm_svc_nodestats.diskio @@ -9,6 +9,11 @@ description: The check is only for reporting and returns always {OK}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: "Drives", "MDisks" or "VDisks" plus the name of the node. diff --git a/checkman/ibm_svc_system b/checkman/ibm_svc_system index 7b6d62b..f5a626a 100644 --- a/checkman/ibm_svc_system +++ b/checkman/ibm_svc_system @@ -7,6 +7,11 @@ description: Reports name, location, code_level and email_contact_location of an IBM SVC / V7000 device. The check always returns {OK}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + inventory: Creates exactly one check for every IBM SVC / V7000 named IBM SVC Info. diff --git a/checkman/ibm_svc_systemstats.cache b/checkman/ibm_svc_systemstats.cache index a5357d6..256377f 100644 --- a/checkman/ibm_svc_systemstats.cache +++ b/checkman/ibm_svc_systemstats.cache @@ -9,6 +9,11 @@ description: The check does report only and returns always {OK}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + inventory: Creates one check per IBM SVC / V7000 device. diff --git a/checkman/ibm_svc_systemstats.cpu_util b/checkman/ibm_svc_systemstats.cpu_util index 3a572fd..14ef781 100644 --- a/checkman/ibm_svc_systemstats.cpu_util +++ b/checkman/ibm_svc_systemstats.cpu_util @@ -9,6 +9,11 @@ description: The check returns {WARN} or {CRIT} if the utilization in percent is higher then given levels and {OK} otherwise. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + inventory: Creates one check IBM SVC / V7000 device. diff --git a/checkman/ibm_svc_systemstats.diskio b/checkman/ibm_svc_systemstats.diskio index 4f7c9c6..1722294 100644 --- a/checkman/ibm_svc_systemstats.diskio +++ b/checkman/ibm_svc_systemstats.diskio @@ -9,6 +9,11 @@ description: The check is only for reporting and returns always {OK}. + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + item: "Drives", "MDisks" or "VDisks"

10 years, 6 months

Check_MK Git: check_mk: Improved security of WATO bulk inventory by using transaction ids

by Andreas Boesl

Module: check_mk Branch: master Commit: 367e01890c767d48d286cfbb858631ca7ec79c18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=367e01890c767d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 4 13:56:24 2014 +0200 Improved security of WATO bulk inventory by using transaction ids --- .werks/784 | 8 ++++++++ ChangeLog | 3 ++- web/htdocs/js/wato.js | 7 +++++-- web/htdocs/wato.py | 18 ++++++++++++++++-- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.werks/784 b/.werks/784 new file mode 100644 index 0000000..3e38fb9 --- /dev/null +++ b/.werks/784 @@ -0,0 +1,8 @@ +Title: Improved security of WATO bulk inventory by using transaction ids +Level: 2 +Component: wato +Class: feature +State: unknown +Version: 1.2.5i3 +Date: 1396612529 + diff --git a/ChangeLog b/ChangeLog index cb9b6ba..e90c32c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,14 +7,15 @@ NOTE: Please refer to the migration notes! * 0799 ibm_svc_systemstats.cpu_util: New check for CPU Utilization of an IBM SVC / V7000 device in total * 0800 ibm_svc_nodestats.cache, ibm_svc_systemstats.cache: New checks for Cache Usage of IBM SVC / V7000 devices - * 0801 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices * 0150 printer_suply: New option to upturn toner levels... + * 0801 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) WATO: + * 0784 Improved security of WATO bulk inventory by using transaction ids * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... Notifications: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 7cbafc6..2d5843d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -342,6 +342,7 @@ function progress_retry() { document.getElementById('progress_abort').style.display = ''; progress_clean_log(); clear_progress_stats(); + // Note: no bulksize limit is applied here progress_items = failed_items; failed_items = Array(); progress_scheduler(progress_mode, progress_url, progress_timeout, [], "", ""); @@ -432,12 +433,13 @@ function progress_clean_log() { log = null; } -function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_stats, fail_stats, term_url, finished_txt) { +function progress_scheduler(mode, url_prefix, timeout, items, transids, end_url, success_stats, fail_stats, term_url, finished_txt) { // Initialize if (progress_items === null) { total_num_items = items.length; progress_items = items; failed_items = Array(); + progress_transids = transids; progress_total_num = items.length; progress_end_url = end_url; progress_term_url = term_url; @@ -465,7 +467,8 @@ function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_s // Remove leading pipe signs (when having no folder set) // update_progress_title(percentage + "%"); update_progress_title(title); - get_url(url_prefix + '&_transid=-1&_item=' + escape(progress_items[0]), + use_transid = progress_transids.shift(); + get_url(url_prefix + '&_transid=' + use_transid + '&_item=' + escape(progress_items[0]), progress_handle_response, // regular handler (http code 200) [ mode, progress_items[0] ], // data to hand over to handlers progress_handle_error // error handler diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f15f138..37ddb04 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3373,6 +3373,12 @@ def mode_bulk_inventory(phase): elif phase == "action": if html.var("_item"): + if not html.check_transaction(): + html.write(repr([ 'failed', 0, 0, 0, 0, 0, 0, ]) + "\n") + html.write(_("Error during inventory: Maximum number of retries reached. " + "You need to restart the bulk inventory")) + return "" + how = html.var("how") try: site_id, folderpath, hostnamesstring = html.var("_item").split("|") @@ -5102,8 +5108,16 @@ def interactive_progress(items, title, stats, finishvars, timewait, success_stat finish_url = make_link([("mode", "folder")] + finishvars) term_url = make_link([("mode", "folder")] + termvars) - html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json_items, finish_url, + # Reserve a certain amount of transids for the progress scheduler + # Each json item requires one transid. Additionally, each "Retry failed hosts" eats + # up another one. We reserve 20 additional transids for the retry function + # Note: The "retry option" ignores the bulk size + transids = [] + for i in range(len(items) + 20): + transids.append(html.fresh_transid()) + json_transids = '[ %s ]' % ',\n'.join([ "'" + h + "'" for h in transids]) + html.javascript(('progress_scheduler("%s", "%s", 50, %s, %s, "%s", %s, %s, "%s", "' + _("FINISHED.") + '");') % + (html.var('mode'), base_url, json_items, json_transids, finish_url, success_stats, fail_stats, term_url))

10 years, 6 months

Check_MK Git: check_mk: manually resolved merge conflict in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f50a9fcf13c24cf462c68655e186e492b448dbaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50a9fcf13c24c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Apr 4 13:49:45 2014 +0200 manually resolved merge conflict in ChangeLog ---

10 years, 6 months

Check_MK Git: check_mk: ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 0227914547c5b138c714f41cd797a1b586472487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0227914547c5b1… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Apr 4 13:48:48 2014 +0200 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices --- .werks/801 | 8 ++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 15 +++++--- checkman/ibm_svc_eventlog | 13 +++++++ checks/ibm_svc_eventlog | 61 +++++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 1 + 6 files changed, 94 insertions(+), 5 deletions(-) diff --git a/.werks/801 b/.werks/801 new file mode 100644 index 0000000..9c7742b --- /dev/null +++ b/.werks/801 @@ -0,0 +1,8 @@ +Title: ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396612089 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a7cb5fd..8f71b33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ NOTE: Please refer to the migration notes! * 0799 ibm_svc_systemstats.cpu_util: New check for CPU Utilization of an IBM SVC / V7000 device in total * 0800 ibm_svc_nodestats.cache, ibm_svc_systemstats.cache: New checks for Cache Usage of IBM SVC / V7000 devices + * 0801 ibm_svc_eventlog: New Check for Messages in Event log of IBM SVC / V7000 devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... Multisite: diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 3598a1e..4a61a04 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -61,10 +61,10 @@ OPTIONS: -i MODULES, --modules MODULES Modules to query. This is a comma separated list of which may contain the keywords "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", - "lssystem", "lssystemstats" or "all" to define which - information should be queried from the device. You can - define to use only view of them to optimize performance. - The default is "all". + "lssystem", "lssystemstats", "lseventlog" or "all" to + define which information should be queried from the + device. You can define to use only view of them to + optimize performance. The default is "all". """) @@ -100,6 +100,7 @@ command_options = { "lsnodestats" : {"section_header" : "ibm_svc_nodestats", "active" : False}, "lssystem" : {"section_header" : "ibm_svc_system", "active" : False}, "lssystemstats" : {"section_header" : "ibm_svc_systemstats", "active" : False}, + "lseventlog" : {"section_header" : "ibm_svc_eventlog", "active" : False}, } for o,a in opts: @@ -156,7 +157,11 @@ cmd = "ssh -o ConnectTimeout=%s %s %s@%s '" % (opt_timeout, opt_any_hostkey, use for module in command_options.keys(): if command_options[module]["active"] == True: - cmd += "echo \<\<\<%s:sep\(58\)\>\>\>; %s -nohdr -delim :;" % (command_options[module]["section_header"], module) + cmd += "echo \<\<\<%s:sep\(58\)\>\>\>;" % command_options[module]["section_header"] + if module == "lseventlog": + cmd += "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr;" + else: + cmd += "%s -nohdr -delim :;" % module cmd += "'" diff --git a/checkman/ibm_svc_eventlog b/checkman/ibm_svc_eventlog new file mode 100644 index 0000000..5b6fc24 --- /dev/null +++ b/checkman/ibm_svc_eventlog @@ -0,0 +1,13 @@ +title: IBM SVC / V7000: Messages in Event log +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Checks the event log of IBM SVC / V7000 devices for messsages not expired + and not yet fixed. Returns {WARN} if there is at least one and {OK} if + there is none. + +inventory: + Creates exactly one check on every IBM SVC / V7000 device named + IBM SVC Eventlog. diff --git a/checks/ibm_svc_eventlog b/checks/ibm_svc_eventlog new file mode 100644 index 0000000..7d6f893 --- /dev/null +++ b/checks/ibm_svc_eventlog @@ -0,0 +1,61 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example output from agent: +# <<<ibm_svc_eventlog:sep(58)>>> +# 588:120404112526:mdiskgrp:6:md07_sas10k::alert:no:989001::Managed Disk Group space warning +# 589:120404112851:mdiskgrp:7:md08_nlsas7k_1t::alert:no:989001::Managed Disk Group space warning +# 590:120404112931:mdiskgrp:8:md09_nlsas7k_1t::alert:no:989001::Managed Disk Group space warning +# 591:120404113001:mdiskgrp:9:md10_nlsas7k_1t::alert:no:989001::Managed Disk Group space warning +# 592:120404113026:mdiskgrp:10:md11_nlsas7k_1t::alert:no:989001::Managed Disk Group space warning +# 593:120404113111:mdiskgrp:11:md12_nlsas7k_1t::alert:no:989001::Managed Disk Group space warning +# 1690:130801070656:drive:59:::alert:no:981020::Managed Disk error count warning threshold met +# 2058:131030112416:drive:42:::alert:no:981020::Managed Disk error count warning threshold met + +def inventory_ibm_svc_eventlog(info): + return [ (None, None) ] + +def check_ibm_svc_eventlog(item, _no_params, info): + messagecount = 0 + last_err = "" + + for sequence_number, last_timestamp, object_type, object_id, object_name, copy_id, status, fixed, event_id, error_code, description in info: + messagecount += 1 + last_err = description + + if messagecount > 0: + return 1, "%d messages not expired and not yet fixed found in event log, last was: %s" % \ + (messagecount, last_err) + + return 0, "No messages not expired and not yet fixed found in event log" + +check_info["ibm_svc_eventlog"] = { + "check_function" : check_ibm_svc_eventlog, + "inventory_function" : inventory_ibm_svc_eventlog, + "service_description" : "IBM SVC Eventlog", + "has_perfdata" : False, +} + diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 90f9077..990095a 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -273,6 +273,7 @@ register_rule(group, ( "lsnodestats", _("Node Stats") ), ( "lssystem", _("System Info") ), ( "lssystemstats", _("System Stats") ), + ( "lseventlog", _("Event Log") ), ], default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", ],

10 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits