Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 51639fad9e458cc150d1c307168d8175176bbbfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51639fad9e458c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 21 15:24:16 2017 +0100 Reserved 10 Werk IDS Change-Id: Ia524e69c033286f62dab86757b1185e651c3d3cf --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1626a73..468d6fb 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4406 +4416

7 years, 7 months

Fixed permissions for event console events/history.

by Sven Panne

Module: check_mk Branch: master Commit: d433cd8c82553927060f053dfb604e9fef43d8ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d433cd8c825539… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 21 11:35:51 2017 +0100 Fixed permissions for event console events/history. Change-Id: If3ae8365e6cdda1c302c927e8f170ff195487f9e --- livestatus/src/TableEventConsole.cc | 53 +++++++++++++++++++++++++++++-------- livestatus/src/TableEventConsole.h | 5 ++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 172ece1..82db1c0 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -112,25 +112,56 @@ void TableEventConsole::answerQuery(Query *query) { } } -// TODO(sp) Remove evil casts below. bool TableEventConsole::isAuthorizedForEvent(contact *ctc, void *data) { - if (MonitoringCore::Host *hst = static_cast<Row *>(data)->_host) { - return _core->host_has_contact( - hst, reinterpret_cast<MonitoringCore::Contact *>(ctc)); + // TODO(sp) Remove evil casts below. + auto c = reinterpret_cast<MonitoringCore::Contact *>(ctc); + auto r = static_cast<Row *>(data); + // NOTE: Further filtering in the GUI for mkeventd.seeunrelated permission + bool result = true; + auto precedence = static_pointer_cast<StringEventConsoleColumn>( + column("event_contact_groups_precedence")) + ->getValue(data); + if (precedence == "rule") { + isAuthorizedForEventViaContactGroups(c, r, result) || + isAuthorizedForEventViaHost(c, r, result); + Error(_core->loggerLivestatus()) << "RULE " << result << " " << ctc; + } else if (precedence == "host") { + isAuthorizedForEventViaHost(c, r, result) || + isAuthorizedForEventViaContactGroups(c, r, result); + Error(_core->loggerLivestatus()) << "HOST " << result << " " << ctc; + } else { + Error(_core->loggerLivestatus()) << "unknown precedence '" << precedence + << "' in table " << name(); + result = false; } + return result; +} +bool TableEventConsole::isAuthorizedForEventViaContactGroups( + MonitoringCore::Contact *ctc, Row *row, bool &result) { auto col = static_pointer_cast<ListEventConsoleColumn>( column("event_contact_groups")); - if (col->isNone(data)) { - return true; + if (col->isNone(row)) { + Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 1"; + return false; } - - for (const auto &name : col->getValue(data)) { + for (const auto &name : col->getValue(row)) { if (_core->is_contact_member_of_contactgroup( - _core->find_contactgroup(name), - reinterpret_cast<MonitoringCore::Contact *>(ctc))) { - return true; + _core->find_contactgroup(name), ctc)) { + Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 2"; + return (result = true, true); } } + Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 3"; + return (result = false, true); +} + +bool TableEventConsole::isAuthorizedForEventViaHost( + MonitoringCore::Contact *ctc, Row *row, bool &result) { + if (MonitoringCore::Host *hst = row->_host) { + Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaHost 1"; + return (result = _core->host_has_contact(hst, ctc), true); + } + Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaHost 2"; return false; } diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index c9c6dac..0948157 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -197,6 +197,11 @@ protected: private: MonitoringCore *_core; + + bool isAuthorizedForEventViaContactGroups(MonitoringCore::Contact *ctc, + Row *row, bool &result); + bool isAuthorizedForEventViaHost(MonitoringCore::Contact *ctc, Row *row, + bool &result); }; #endif // TableEventConsole_h

7 years, 7 months

Removed unused 'using' declarations.

by Sven Panne

Module: check_mk Branch: master Commit: 38a972b855311624c30fed2026e79d313111a680 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38a972b8553116… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 21 14:50:49 2017 +0100 Removed unused 'using' declarations. Change-Id: I4285227fdea648db28cb2998f225e1ab96e62197 --- livestatus/src/TableEventConsoleEvents.cc | 1 - livestatus/src/TableEventConsoleHistory.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 80098cc..b1810a3 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -31,7 +31,6 @@ #include "TableHosts.h" using std::make_unique; -using std::static_pointer_cast; using std::string; #ifdef CMC diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index 3b185b4..e3a445c 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -30,7 +30,6 @@ #include "TableEventConsoleEvents.h" using std::make_unique; -using std::static_pointer_cast; using std::string; #ifdef CMC

7 years, 7 months

4348 FIX agent_jolokia: Fix nonfunctional special agent

by Konstantin Büttner

Module: check_mk Branch: master Commit: bc34058cbc7ba2cf619d455f168619c612b918cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc34058cbc7ba2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 21 14:46:41 2017 +0100 4348 FIX agent_jolokia: Fix nonfunctional special agent Change-Id: I829b24fc64b5348133ac5f8b2768f34c4a63802e --- .werks/4348 | 10 ++++++++++ agents/special/agent_jolokia | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4348 b/.werks/4348 new file mode 100644 index 0000000..256c1e7 --- /dev/null +++ b/.werks/4348 @@ -0,0 +1,10 @@ +Title: agent_jolokia: Fix nonfunctional special agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487684650 + + diff --git a/agents/special/agent_jolokia b/agents/special/agent_jolokia index 09864c8..4f6ca9f 100755 --- a/agents/special/agent_jolokia +++ b/agents/special/agent_jolokia @@ -147,7 +147,7 @@ def fetch_var(protocol, server, port, path, suburi, cert_path, itemspec): sys.stderr.write("Fetching: %s\n" % url) try: conn = urllib2.urlopen(url) - data = conn.read() + json_data = conn.read() if opt_verbose: sys.stderr.write("Result: %s\n\n" % data)

7 years, 7 months

Edited Werk title again

by Konstantin Büttner

Module: check_mk Branch: master Commit: c35188e2f54ae9324f23f75196b7723d65033e53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c35188e2f54ae9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 21 14:06:51 2017 +0100 Edited Werk title again Change-Id: I5a6f59d6ac6b8b4ad3ba60deda332ea6cc979bf7 --- .werks/4347 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4347 b/.werks/4347 index e073a51..58ceec3 100644 --- a/.werks/4347 +++ b/.werks/4347 @@ -1,4 +1,4 @@ -Title: packeteer_fan_status, packeteer_ps_status: Two checks for Blue Coat Packet Shaper devices +Title: packeteer_fan_status packeteer_ps_status: Two checks for Blue Coat Packet Shaper devices Level: 1 Component: checks Class: feature

7 years, 7 months

4028 Windows Agent: now also sets the environment variable REMOTE for compatibility reasons

by Andreas Boesl

Module: check_mk Branch: master Commit: 8e2ab46197ca72764975b7652283664a679f0d0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e2ab46197ca72… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 21 12:54:43 2017 +0100 4028 Windows Agent: now also sets the environment variable REMOTE for compatibility reasons Change-Id: I9c398d16fdd105c128f72fb47f197349f41d3c9e --- .werks/4028 | 9 +++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1329152 -> 1329664 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15658018 -> 15658530 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1329152 -> 1329664 bytes agents/windows/check_mk_agent.cc | 2 ++ agents/windows/check_mk_agent.exe | Bin 1305600 -> 1305600 bytes agents/windows/check_mk_agent.msi | Bin 2904576 -> 2905088 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13549114 -> 13549114 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305600 -> 1305600 bytes agents/windows/install_agent-64.exe | Bin 586828 -> 586870 bytes agents/windows/install_agent.exe | Bin 583891 -> 583912 bytes 12 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4028 b/.werks/4028 new file mode 100644 index 0000000..02149e0 --- /dev/null +++ b/.werks/4028 @@ -0,0 +1,9 @@ +Title: Windows Agent: now also sets the environment variable REMOTE for compatibility reasons +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487678028 +Class: feature + + diff --git a/agents/windows/build_version b/agents/windows/build_version index bcf6e41..fe534ad 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2541 +2543 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b2ea483..79ab757 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index e84b793..cd2401d 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 3955a4d..8ad627c 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c745e59..b56b7be 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -622,6 +622,7 @@ DWORD WINAPI realtime_check_func(void *data_in) { if (current_socket != INVALID_SOCKET) { // send data SetEnvironmentVariable("REMOTE_HOST", current_ip.c_str()); + SetEnvironmentVariable("REMOTE", current_ip.c_str()); char timestamp[11]; snprintf(timestamp, 11, "%" PRIdtime, time(NULL)); @@ -713,6 +714,7 @@ void do_adhoc(const Environment &env) { } SetEnvironmentVariable("REMOTE_HOST", ip_hr.c_str()); + SetEnvironmentVariable("REMOTE", ip_hr.c_str()); try { output_data(*out, env, false, *g_config->section_flush); } catch (const std::exception &e) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ef93271..9723e87 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 95b7b00..0b254b8 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index c35ce70..824db74 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 11c52f4..6896b17 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b5289a8..4fdd569 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ffb4e49..962a2c6 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 7 months

Edited Werk Title

by Konstantin Büttner

Module: check_mk Branch: master Commit: 668c2325c454b64f43d4ebca3936dc7c1c82707b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=668c2325c454b6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 21 12:50:00 2017 +0100 Edited Werk Title Change-Id: If9d03ff960c69f711cf8bde97c5397c103d51fb9 --- .werks/4347 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4347 b/.werks/4347 index 304559c..e073a51 100644 --- a/.werks/4347 +++ b/.werks/4347 @@ -1,4 +1,4 @@ -Title: packeteer_{fan,ps}_status: Two checks for Blue Coat Packet Shaper devices +Title: packeteer_fan_status, packeteer_ps_status: Two checks for Blue Coat Packet Shaper devices Level: 1 Component: checks Class: feature

7 years, 7 months

4027 FIX BI Aggregations: fixed compilation problem with BI aggregations when using sites without hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: 4cbcfec31915b53eecc5434cba847a97086cc5a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cbcfec31915b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 21 12:46:02 2017 +0100 4027 FIX BI Aggregations: fixed compilation problem with BI aggregations when using sites without hosts BI aggregations did not compile correctly for sites without hosts. Happens when there was an empty viewer site with several connected real sites. Change-Id: Id84214e23443b02fe1173038ce848c771cc0b0fd --- .werks/4027 | 11 +++++++++++ web/htdocs/bi.py | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/.werks/4027 b/.werks/4027 new file mode 100644 index 0000000..cfb420f --- /dev/null +++ b/.werks/4027 @@ -0,0 +1,11 @@ +Title: BI Aggregations: fixed compilation problem with BI aggregations when using sites without hosts +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487677398 + +BI aggregations did not compile correctly for sites without hosts. +Happens when there was an empty viewer site with several connected real sites. diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index e1bc75c..f2d247b 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -700,6 +700,11 @@ class BISitedataManager(object): cleanup_orphaned_files = True only_sites = [x[0] for x in missing_sites] new_data = self._query_data(only_sites) + + sites_with_no_data = set(map(lambda x: x[0], missing_sites)) - set(new_data.keys()) + for site in sites_with_no_data: + new_data[site] = {} + for site, sitedata in new_data.items(): # Write data to disk siteinfo = (site, dict(missing_sites).get(site))

7 years, 7 months

4050 FIX Fixed snapin-refresh error handling.

by Roland Halbig

Module: check_mk Branch: master Commit: ecc366bb467e17cdd15dfb8d4071442b5a5bf008 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc366bb467e17… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 15 16:12:10 2017 +0100 4050 FIX Fixed snapin-refresh error handling. Change-Id: I9e7164875d058e5580c9b26c5273e11540f8e6e2 --- .werks/4050 | 9 ++++++++ web/htdocs/sidebar.py | 63 ++++++++++++++++++++++++--------------------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/.werks/4050 b/.werks/4050 new file mode 100644 index 0000000..f2c4d90 --- /dev/null +++ b/.werks/4050 @@ -0,0 +1,9 @@ +Title: Fixed snapin-refresh error handling. +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0b2 +Date: 1487171383 +Class: fix + + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a81e33a..b42f078 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -433,44 +433,41 @@ def ajax_snapin(): else: snapnames = html.var('names', '').split(',') - html.plug() snapin_code = [] - try: - for snapname in snapnames: - if not config.user.may("sidesnap." + snapname): + for snapname in snapnames: + if not config.user.may("sidesnap." + snapname): + continue + snapin = sidebar_snapins.get(snapname) + + # When restart snapins are about to be refreshed, only render + # them, when the core has been restarted after their initial + # rendering + if not snapin.get('refresh') and snapin.get('restart'): + since = float(html.var('since', 0)) + newest = since + for site in sites.states().values(): + prog_start = site.get("program_start", 0) + if prog_start > newest: + newest = prog_start + if newest <= since: + # no restart + snapin_code.append('') continue - snapin = sidebar_snapins.get(snapname) - - # When restart snapins are about to be refreshed, only render - # them, when the core has been restarted after their initial - # rendering - if not snapin.get('refresh') and snapin.get('restart'): - since = float(html.var('since', 0)) - newest = since - for site in sites.states().values(): - prog_start = site.get("program_start", 0) - if prog_start > newest: - newest = prog_start - if newest <= since: - # no restart - snapin_code.append('') - continue - try: - snapin["render"]() - except Exception, e: - if config.debug: - raise - snapin_exception(e) + html.plug() + try: + # For testing purposes only: raise Exception("Test") + snapin["render"]() + except Exception, e: + snapin_exception(e) + e_message = _("Exception during snapin refresh (snapin \'%s\')") % snapname + logger.error("%s %s: %s" % (html.request_uri(), e_message, traceback.format_exc())) + finally: snapin_code.append(html.drain()) - html.unplug() - html.write('[%s]' % ','.join([ '"%s"' % s.replace('"', '\\"').replace('\n', '') for s in snapin_code])) - except Exception, e: - html.flush() - html.unplug() - logger.error('Exception during snapin refresh: %s' % e) - raise + + html.write('[%s]' % ','.join([ '"%s"' % s.replace('"', '\\"').replace('\n', '') for s in snapin_code])) + def move_snapin(): if not config.user.may("general.configure_sidebar"):

7 years, 7 months

4347 packeteer_{fan, ps}_status: Two checks for Blue Coat Packet Shaper devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: 861fc2f64ea1d4839ce80714cc50f9fbfcd81d80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=861fc2f64ea1d4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 21 12:01:08 2017 +0100 4347 packeteer_{fan,ps}_status: Two checks for Blue Coat Packet Shaper devices Change-Id: I95d13e2a5dbb94d0eab3cff81b809f996480f5ba --- .werks/4347 | 10 +++++++++ checkman/packeteer_fan_status | 10 +++++++++ checkman/packeteer_ps_status | 10 +++++++++ checks/packeteer_fan_status | 50 +++++++++++++++++++++++++++++++++++++++++++ checks/packeteer_ps_status | 47 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+) diff --git a/.werks/4347 b/.werks/4347 new file mode 100644 index 0000000..304559c --- /dev/null +++ b/.werks/4347 @@ -0,0 +1,10 @@ +Title: packeteer_{fan,ps}_status: Two checks for Blue Coat Packet Shaper devices +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487674799 + + diff --git a/checkman/packeteer_fan_status b/checkman/packeteer_fan_status new file mode 100644 index 0000000..3bdbfbd --- /dev/null +++ b/checkman/packeteer_fan_status @@ -0,0 +1,10 @@ +title: Blue Coat Packet Shaper: Fan Status +agents: snmp +catalog: hw/network/bluecoat +license: GPL +distribution: check_mk +description: + Checks the status of fans as described in the Packeteer MIB. + +inventory: + One check for each fan will be created. diff --git a/checkman/packeteer_ps_status b/checkman/packeteer_ps_status new file mode 100644 index 0000000..034a362 --- /dev/null +++ b/checkman/packeteer_ps_status @@ -0,0 +1,10 @@ +title: Blue Coat Packet Shaper: Power Supply Status +agents: snmp +catalog: hw/network/bluecoat +license: GPL +distribution: check_mk +description: + Checks the status of power supplies as described in the Packeteer MIB. + +inventory: + One check for each device will be created. diff --git a/checks/packeteer_fan_status b/checks/packeteer_fan_status new file mode 100644 index 0000000..51099dc --- /dev/null +++ b/checks/packeteer_fan_status @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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. + + +def inventory_packeteer_fan_status(info): + for nr, fan_status in enumerate(info[0]): + if fan_status in [ u"1", u"2" ]: + yield ("%d" % nr, None) + + +def check_packeteer_fan_status(item, _no_params, info): + fan_status = info[0][int(item)] + if fan_status == u"1": + return 0, "OK" + elif fan_status == u"2": + return 2, "Not OK" + elif fan_status == u"3": + return 2, "Not present" + + +check_info["packeteer_fan_status"] = { + "inventory_function" : inventory_packeteer_fan_status, + "check_function" : check_packeteer_fan_status, + "service_description" : "Fan Status", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2334"), + "snmp_info" : ( ".1.3.6.1.4.1.2334.2.1.5", [ "12", "14", "22", "24" ]), +} diff --git a/checks/packeteer_ps_status b/checks/packeteer_ps_status new file mode 100644 index 0000000..1ea140f --- /dev/null +++ b/checks/packeteer_ps_status @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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. + + +def inventory_packeteer_ps_status(info): + if info: + return [ (None, None) ] + + +def check_packeteer_ps_status(_no_item, _no_params, info): + for nr, ps_status in enumerate(info[0]): + if ps_status == u"1": + yield 0, "Power Supply %d okay" % nr + else: + yield 2, "Power Supply %d not okay" % nr + + +check_info["packeteer_ps_status"] = { + "inventory_function" : inventory_packeteer_ps_status, + "check_function" : check_packeteer_ps_status, + "service_description" : "Power Supply Status", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2334"), + "snmp_info" : ( ".1.3.6.1.4.1.2334.2.1.5", [ "8", "10" ]), +}

7 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017