Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: d29c45b48043ca38f60ec4917d0c2838d3091bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29c45b48043ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 16:28:09 2015 +0100 GUI-Tests: Fix option -W --- doc/helpers/guitest | 1 - web/htdocs/guitester.py | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/helpers/guitest b/doc/helpers/guitest index 1009f23..bbe9825 100755 --- a/doc/helpers/guitest +++ b/doc/helpers/guitest @@ -320,7 +320,6 @@ def add_wait_step(args): wait_seconds = int(args[1]) / 1000.0 guitest[step_number+1:step_number+1] = [ { "wait" : wait_seconds } ] save_guitest(test_name, guitest) - add_special_step("wait", args) def add_reschedule_step(args): diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index 5a31050..a20eb1b 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -337,20 +337,21 @@ def page_reschedule_all(): raise MKAuthException(_("GUI Tests are disabled.")) html.header(_("Rescheduling and waiting for check results"), stylesheets=["status", "pages"]) - wait_for_pending("host", pending_hosts, 10) - wait_for_pending("service", pending_active_services, 50) + wait_for_pending("host", pending_hosts, 20) + wait_for_pending("service", pending_active_services, 100) html.footer() def wait_for_pending(what, generator_function, tries): + entries = generator_function() for try_number in range(tries): + for site, entry in entries: + html.live.command("[1231231233] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (what.upper(), entry, time.time()), sitename = site) + time.sleep(0.3) entries = generator_function() if not entries: html.message("All %ss are checked.\n" % what) break - for site, entry in entries: - html.live.command("[1231231233] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (what.upper(), entry, time.time()), sitename = site) - time.sleep(0.5) else: html.message("Reschedule failed after %d tries. Still pending %ss: %s\n" % (tries, what, ", ".join([e[1] for e in entries])))

8 years, 7 months

GUI-Tests: new option -E for adding artificial reschedule step

by Mathias Kettner

Module: check_mk Branch: master Commit: b3a7ca48b7892ea677e9d2cc563b7ca7a50ec4bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3a7ca48b7892e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 16:05:54 2015 +0100 GUI-Tests: new option -E for adding artificial reschedule step --- doc/helpers/guitest | 52 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/doc/helpers/guitest b/doc/helpers/guitest index 706efcf..1009f23 100755 --- a/doc/helpers/guitest +++ b/doc/helpers/guitest @@ -320,8 +320,26 @@ def add_wait_step(args): wait_seconds = int(args[1]) / 1000.0 guitest[step_number+1:step_number+1] = [ { "wait" : wait_seconds } ] save_guitest(test_name, guitest) + add_special_step("wait", args) +def add_reschedule_step(args): + if len(args) != 2: + bail_out("Please specify the test and the step number to add the reschdule after") + test_name = args[1] + guitest = load_guitest(test_name) + step_number = int(args[0]) + guitest[step_number+1:step_number+1] = [{ + 'elapsed_time': 0.01, + 'filename': 'guitest_reschedule_all', + 'output': {'message': [('message', 'All hosts are checked.\n'), + ('message', 'All services are checked.\n')], + 'page_title': ['Rescheduling and waiting for check results']}, + 'user': u'omdadmin', + 'variables': {}, + }] + save_guitest(test_name, guitest) + #. # .-Helpers--------------------------------------------------------------. # | _ _ _ | @@ -390,23 +408,24 @@ Usage: cmk-guitest [OPTIONS] MODE [ARGS...] OPERATION MODES - (no option) [TESTS...] Run some or all tests - -R, --repair Run a test and at the same time rerecord it - -r, --record Start/stop recording test TEST - -l, --list-tests [TEST] List one or all tests - -x, --extract RANGE TEST [OUTPUT] Extract a range of steps from a test to stdout - -D, --delete RANGE TEST Remove a range of steps from a test - -W, --add-wait-step STEP MS TEST Insert and artificial wait phase into the test - -h, --help Show this crufty help + (no option) [TESTS...] Run some or all tests + -R, --repair Run a test and at the same time rerecord it + -r, --record Start/stop recording test TEST + -l, --list-tests [TEST] List one or all tests + -x, --extract RANGE TEST [OUTPUT] Extract a range of steps from a test to stdout + -D, --delete RANGE TEST Remove a range of steps from a test + -W, --add-wait-step STEP MS TEST Insert and artificial wait phase into the test + -E, --add-reschedule-step STEP TEST Insert and artificial "reschedule all checks" + -h, --help Show this crufty help OPTIONS - -v, --verbose Output debug information on stderr - --debug Do not catch Python exceptions - -S, --steps RANGE Just run steps START...END (1st step is 0) - -i, --interactive When tests fail ask for automatic repair - -c, --continue Continue after errors + -v, --verbose Output debug information on stderr + --debug Do not catch Python exceptions + -S, --steps RANGE Just run steps START...END (1st step is 0) + -i, --interactive When tests fail ask for automatic repair + -c, --continue Continue after errors RANGES @@ -430,9 +449,10 @@ Usage: cmk-guitest [OPTIONS] MODE [ARGS...] # | Main entry point, getopt, etc. | # '----------------------------------------------------------------------' -short_options = 'hvrslRS:x:D:icW' +short_options = 'hvrslRS:x:D:icWE' long_options = [ "help", "debug", "verbose", "list-tests=", "record", "repair", - "steps=", "extract=", "delete=", "interactive", "continue", "add-wait-step" ] + "steps=", "extract=", "delete=", "interactive", "continue", + "add-wait-step", "add-reschedule-step" ] opt_verbose = False opt_debug = False @@ -467,6 +487,8 @@ for o,a in opts: mode_function = delete_steps_from_test elif o in [ '-W', '--add-wait-step' ]: mode_function = add_wait_step + elif o in [ '-E', '--add-reschedule-step' ]: + mode_function = add_reschedule_step # Modifiers elif o in [ '-S', '--steps' ]:

8 years, 7 months

GUI-Tests: new page for scheduling all checks and waiting for the results

by Mathias Kettner

Module: check_mk Branch: master Commit: a6829d50417692b6934fd15a2ae61005eab0e0a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6829d50417692… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 15:49:25 2015 +0100 GUI-Tests: new page for scheduling all checks and waiting for the results --- web/htdocs/guitester.py | 44 ++++++++++++++++++++++++++++++++++++++++ web/htdocs/html_mod_python.py | 1 + web/htdocs/wato.py | 3 +++ web/plugins/pages/guitester.py | 31 ++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index 1d93788..5a31050 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -25,6 +25,9 @@ # Boston, MA 02110-1301 USA. import re +import time + +import config import defaults from lib import * @@ -311,3 +314,44 @@ def guitest_drop_dynamic_ids_in_text(text): text = re.sub(year_regex, "YEAR", text) text = re.sub(english_date_regex, "DATE", text) return text + + +def pending_hosts(): + html.live.set_prepend_site(True) + hosts = html.live.query("GET hosts\nFilter: has_been_checked = 0\nColumns: name") + html.live.set_prepend_site(False) + return hosts + + +def pending_active_services(): + html.live.set_prepend_site(True) + services = html.live.query("GET services\nFilter: has_been_checked = 0\nFilter: check_type = 0\nColumns: host_name description") + html.live.set_prepend_site(False) + entries = [ (site, "%s;%s" % (host_name, service_description)) + for (site, host_name, service_description) in services ] + return entries + + +def page_reschedule_all(): + if not config.guitests_enabled: + raise MKAuthException(_("GUI Tests are disabled.")) + + html.header(_("Rescheduling and waiting for check results"), stylesheets=["status", "pages"]) + wait_for_pending("host", pending_hosts, 10) + wait_for_pending("service", pending_active_services, 50) + html.footer() + + +def wait_for_pending(what, generator_function, tries): + for try_number in range(tries): + entries = generator_function() + if not entries: + html.message("All %ss are checked.\n" % what) + break + for site, entry in entries: + html.live.command("[1231231233] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (what.upper(), entry, time.time()), sitename = site) + time.sleep(0.5) + + else: + html.message("Reschedule failed after %d tries. Still pending %ss: %s\n" % (tries, what, ", ".join([e[1] for e in entries]))) + diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 6b14d19..a646b36 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -350,6 +350,7 @@ def connect_to_livestatus(): enabled_sites = {} disabled_sites = {} + for sitename, site in config.allsites().items(): siteconf = config.user_siteconf.get(sitename, {}) # Convert livestatus-proxy links into UNIX socket diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14202cc..d70f8a1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3955,6 +3955,9 @@ def mode_changelog(phase): if config.may("wato.auditlog"): html.context_button(_("Audit Log"), folder_preserving_link([("mode", "auditlog")]), "auditlog") + if config.guitests_enabled: + html.context_button(_("Reschedule All"), "guitest_reschedule_all.py", "guitest") + elif phase == "action": action = html.var("_action", html.var("_siteaction")) if action == "activate": diff --git a/web/plugins/pages/guitester.py b/web/plugins/pages/guitester.py new file mode 100644 index 0000000..a7693ed --- /dev/null +++ b/web/plugins/pages/guitester.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +import guitester + +pagehandlers.update({ + "guitest_reschedule_all" : guitester.page_reschedule_all, +})

8 years, 7 months

Fix newly introduced error with mkp release

by Mathias Kettner

Module: check_mk Branch: master Commit: 25cafc772ca86ef57739f27a9d3d858832edb424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25cafc772ca86e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 13:46:28 2015 +0100 Fix newly introduced error with mkp release --- modules/packaging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/packaging.py b/modules/packaging.py index 6f6f962..1f0e39a 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -245,7 +245,7 @@ def package_release(args): pacname = args[0] pacpath = pac_dir + pacname - if package_exists(pacname): + if not package_exists(pacname): raise PackageException("No such package %s." % pacname) package = read_package_info(pacname) verbose("Releasing files of package %s into freedom...\n" % pacname)

8 years, 7 months

Internal code change for styling in availability tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 28b9cb0358f9215975db7447765139a0ee650928 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b9cb0358f921… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 11:17:02 2015 +0100 Internal code change for styling in availability tables --- web/htdocs/availability.py | 2 ++ web/plugins/views/availability.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ee184d4..5ec7802 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -976,6 +976,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): if number and av_levels and sid in [ "ok", "up" ]: css = "state%d" % check_av_levels(number, av_levels, entry["considered_duration"]) + css = css + " narrow number" row["cells"].append((render_number(number, entry["considered_duration"]), css)) # Statistics? @@ -1017,6 +1018,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): if number and av_levels and sid in [ "ok", "up" ]: css = "state%d" % check_av_levels(number, av_levels, entry["considered_duration"]) + css = css + " narrow number" summary_cells.append((render_number(number, entry["considered_duration"]), css)) if sid in os_states: for aggr in os_aggrs: diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b643119..43f0225 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -388,7 +388,7 @@ def render_availability_table(group_title, availability_table, what, avoptions): # Columns with the actual availability data for (title, help), (text, css) in zip(av_table["cell_titles"], row["cells"]): - table.cell(title, text, css="narrow number " + css, help=help) + table.cell(title, text, css=css, help=help) if "summary" in av_table: table.row(css="summary") @@ -401,7 +401,7 @@ def render_availability_table(group_title, availability_table, what, avoptions): table.cell("", "") for (title, help), (text, css) in zip(av_table["cell_titles"], av_table["summary"]): - table.cell(title, text, css="heading number " + css, help=help) + table.cell(title, text, css="heading " + css, help=help) return table.end() # returns Table data if fetch == True

8 years, 7 months

Fix exception with site_is_local when using LDAP connector

by Mathias Kettner

Module: check_mk Branch: master Commit: ad5bc4948c41d3e27853ee8d99a70322db1b0c3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad5bc4948c41d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 22 10:07:34 2015 +0100 Fix exception with site_is_local when using LDAP connector --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index f596c27..f2ce5a0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1758,7 +1758,7 @@ def synchronize_profile_to_sites(connection, user_id, profile): import wato # FIXME: Cleanup! sites = [(site_id, config.site(site_id)) for site_id in config.sitenames() - if not wato.site_is_local(site_id) ] + if not config.site_is_local(site_id) ] connection.log('Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(sites)))

8 years, 7 months

guitest: fix permissions of binary

by Mathias Kettner

Module: check_mk Branch: master Commit: d8ed192aa0218d96c112551988ffced6147bb730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8ed192aa0218d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 21 15:02:47 2015 +0100 guitest: fix permissions of binary --- 0 files changed diff --git a/doc/helpers/guitest b/doc/helpers/guitest old mode 100644 new mode 100755

8 years, 7 months

Code refactoring: prepare for recurring downtimes with non-uniform periods

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c84835ea5614b9ea23b58d796cc3b187fc8cbea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c84835ea5614b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 21 14:58:40 2015 +0100 Code refactoring: prepare for recurring downtimes with non-uniform periods --- web/htdocs/views.py | 1 + web/plugins/views/commands.py | 41 ++++++++++++++++++++--------------------- web/plugins/views/painters.py | 19 +++++++++---------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 017f76d..7398f1b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1103,6 +1103,7 @@ def show_view(view, show_heading = False, show_buttons = True, else: rows = [] + # Apply non-Livestatus filters for filter in all_active_filters: rows = filter.filter_table(rows) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index db8de3b..bce0edc 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -495,26 +495,24 @@ multisite_commands.append({ # | | # '----------------------------------------------------------------------' -recurring_types = { - 1: _("hour"), - 2: _("day"), - 3: _("week"), - 4: _("second week"), - 5: _("fourth week"), -} - config.declare_permission("action.downtimes", _("Set/Remove Downtimes"), _("Schedule and remove downtimes on hosts and services"), [ "user", "admin" ]) def command_downtime(cmdtag, spec, row): + try: + wato.recurring_downtimes_types + have_recurring_downtimes = True + except: + have_recurring_downtimes = False + down_from = int(time.time()) down_to = None - if html.get_checkbox("_down_do_recur"): + if have_recurring_downtimes and html.get_checkbox("_down_do_recur"): recurring_type = int(html.var("_down_recurring")) - title_start = _("schedule a periodic downtime every %s") % recurring_types[recurring_type] + title_start = _("schedule a periodic downtime every %s") % wato.recurring_downtimes_types[recurring_type] else: title_start = _("schedule an immediate downtime") @@ -711,17 +709,18 @@ def paint_downtime_buttons(what): html.write("<hr>") html.checkbox("_on_hosts", False, label=_('Schedule downtimes on the affected hosts instead of on the individual services')) - html.write("<hr>") - html.checkbox("_down_do_recur", False, label=_("Repeat this downtime on a regular base every")) - html.write(" ") - html.select("_down_recurring", [ - ( "1", _("hour") ), - ( "2", _("day") ), - ( "3", _("week") ), - ( "4", _("second week") ), - ( "5", _("fourth week") ), - ], "3") - html.write(_("(This only works when using CMC)")) + try: + wato.recurring_downtimes_types # Check if this exists + have_recurring_downtimes = True + except: + have_recurring_downtimes = False + + if have_recurring_downtimes: + html.write("<hr>") + html.checkbox("_down_do_recur", False, label=_("Repeat this downtime on a regular base every")) + html.write(" ") + html.select("_down_recurring", [ (str(k), v) for (k,v) in sorted(wato.recurring_downtimes_types.items())], "3") + html.write(_("(This only works when using CMC)")) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e845043..af76f73 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1927,17 +1927,16 @@ multisite_painters["downtime_origin"] = { } def paint_downtime_recurring(row): + try: + wato.recurring_downtimes_types + except: + return "", _("(not supported)") + r = row["downtime_recurring"] - return "", { - 0: _("no"), - None: _("no"), - 1: _("hourly"), - 2: _("daily"), - 3: _("weekly"), - 4: _("two-weekly"), - 5: _("four-weekly"), - 999: _("every 5 minutes"), - }.get(r, _("(unknown)")) + if not r: + return "", _("no") + else: + return "", wato.recurring_downtimes_types.get(r, _("(unknown: %d)") % r) multisite_painters["downtime_recurring"] = { "title" : _("Downtime recurring interval"),

8 years, 7 months

#2886 solaris_fmadm: new check monitors the severity and name of the fault class on Solaris systems using the 'fmadm faulty' command

by Simon Betz

Module: check_mk Branch: master Commit: 5188e8cf8ce06b4ff3dba61f9f751e0b4b260259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5188e8cf8ce06b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 21 11:25:05 2015 +0100 #2886 solaris_fmadm: new check monitors the severity and name of the fault class on Solaris systems using the 'fmadm faulty' command --- .werks/2886 | 8 +++ ChangeLog | 1 + agents/check_mk_agent.solaris | 7 +++ checkman/solaris_fmadm | 18 ++++++ checks/solaris_fmadm | 126 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+) diff --git a/.werks/2886 b/.werks/2886 new file mode 100644 index 0000000..d46d040 --- /dev/null +++ b/.werks/2886 @@ -0,0 +1,8 @@ +Title: solaris_fmadm: new check monitors the severity and name of the fault class on Solaris systems using the 'fmadm faulty' command +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450693400 +Class: feature + diff --git a/ChangeLog b/ChangeLog index dcf7160..624b45b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB * 1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM Mainframes) * 1318 cisco_asa_svcsessions: New Check to monitor VPN Connections on Cisco ASA devices + * 2886 solaris_fmadm: new check monitors the severity and name of the fault class on Solaris systems using the 'fmadm faulty' command * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 579c41c..499ead4 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -293,6 +293,13 @@ then trd -s fi +# Displaying Information About Faults or Defects +# If there are no faults the output of this command will be empty. +if type fmadm faulty > /dev/null 2>&1 +then + echo '<<<solaris_fmadm:sep(58)>>>' + fmadm faulty +fi # MK's Remote Plugin Executor if test -f "$MK_CONFDIR/mrpe.cfg" diff --git a/checkman/solaris_fmadm b/checkman/solaris_fmadm new file mode 100644 index 0000000..74615f2 --- /dev/null +++ b/checkman/solaris_fmadm @@ -0,0 +1,18 @@ +title: Fault Class on Solaris +agents: solaris +catalog: os/solaris +license: GPL +distribution: check_mk +description: + This check monitors the name and severity of the fault class on Solaris systems using + the 'fmadm faulty' command. + For more information see https://docs.oracle.com/cd/E23824_01/html/821-1451/glisy.html + + The check is OK if there are no faults. Otherwise there are three types of + faults: minor will be WARN, major and critical will be CRIT. + +item: + No item. + +inventory: + One service is created. diff --git a/checks/solaris_fmadm b/checks/solaris_fmadm new file mode 100644 index 0000000..5693e01 --- /dev/null +++ b/checks/solaris_fmadm @@ -0,0 +1,126 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + + +# No faults: +# Agent section is empty + +# From https://docs.oracle.com/cd/E23824_01/html/821-1451/glisy.html +# One fault: +# --------------- ------------------------------------ -------------- --------- +# TIME EVENT-ID MSG-ID SEVERITY +# --------------- ------------------------------------ -------------- --------- +# Aug 24 17:56:03 7b83c87c-78f6-6a8e-fa2b-d0cf16834049 SUN4V-8001-8H Minor +# +# Host : bur419-61 +# Platform : SUNW,T5440 Chassis_id : BEL07524BN +# Product_sn : BEL07524BN +# +# Fault class : fault.cpu.ultraSPARC-T2plus.ireg +# Affects : cpu:///cpuid=0/serial=1F95806CD1421929 +# faulted and taken out of service +# FRU : "MB/CPU0" (hc://:product-id=SUNW,T5440:server-id=bur419-61:\ +# serial=3529:part=541255304/motherboard=0/cpuboard=0) +# faulty +# Serial ID. : 3529 +# 1F95806CD1421929 +# +# Description : The number of integer register errors associated with this thread +# has exceeded acceptable levels. +# +# Response : The fault manager will attempt to remove the affected thread from +# service. +# +# Impact : System performance may be affected. +# +# Action : Use 'fmadm faulty' to provide a more detailed view of this event. +# Please refer to the associated reference document at +# http://sun.com/msg/SUN4V-8001-8H for the latest service +# procedures and policies regarding this diagnosis. + +# Multiple faults: +# --------------- ------------------------------------ -------------- ------- +# TIME EVENT-ID MSG-ID SEVERITY +# --------------- ------------------------------------ -------------- ------- +# Sep 21 10:01:36 d482f935-5c8f-e9ab-9f25-d0aaafec1e6c PCIEX-8000-5Y Major +# +# Fault class : fault.io.pci.device-invreq +# Affects : dev:///pci@0,0/pci1022,7458@11/pci1000,3060@0 +# dev:///pci@0,0/pci1022,7458@11/pci1000,3060@1 +# ok and in service +# dev:///pci@0,0/pci1022,7458@11/pci1000,3060@2 +# dev:///pci@0,0/pci1022,7458@11/pci1000,3060@3 +# faulty and taken out of service +# FRU : "SLOT 2" (hc://.../pciexrc=3/pciexbus=4/pciexdev=0) +# repair attempted +# "SLOT 3" (hc://.../pciexrc=3/pciexbus=4/pciexdev=1) +# acquitted +# "SLOT 4" (hc://.../pciexrc=3/pciexbus=4/pciexdev=2) +# not present +# "SLOT 5" (hc://.../pciexrc=3/pciexbus=4/pciexdev=3) +# faulty +# +# Description : The transmitting device sent an invalid request. +# +# Response : One or more device instances may be disabled +# +# Impact : Possible loss of services provided by the device instances +# associated with this fault +# +# Action : Use 'fmadm faulty' to provide a more detailed view of this event. +# Please refer to the associated reference document at +# http://sun.com/msg/PCIEX-8000-5Y for the latest service +# procedures and policies regarding this diagnosis. + + +def inventory_solaris_fmadm(info): + return [ (None, None) ] + + +def check_solaris_fmadm(item, params, info): + if not info: + return 0, "No faults detected" + + map_state = { + "minor" : (1, "minor"), + "major" : (2, "major"), + "critical" : (2, "critical"), + } + + infotext = "" + state, state_readable = map_state.get(info[3][-1].split(" ")[-1].lower(), (3, "unknown")) + for line in info[4:]: + if line[0].strip().lower() == "fault class": + infotext += "Status: %s, Name: %s" % (state_readable, line[1].strip()) + + return state, infotext + + +check_info['solaris_fmadm'] = { + 'inventory_function' : inventory_solaris_fmadm, + 'check_function' : check_solaris_fmadm, + 'service_description' : 'Fault class', +}

8 years, 7 months

Reworked commands for scheduled downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 0290a2458c9a38e1967cc6e16df52dce55ff67c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0290a2458c9a38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 21 10:13:27 2015 +0100 Reworked commands for scheduled downtimes --- web/plugins/views/commands.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index a4dd6fb..db8de3b 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -495,6 +495,14 @@ multisite_commands.append({ # | | # '----------------------------------------------------------------------' +recurring_types = { + 1: _("hour"), + 2: _("day"), + 3: _("week"), + 4: _("second week"), + 5: _("fourth week"), +} + config.declare_permission("action.downtimes", _("Set/Remove Downtimes"), _("Schedule and remove downtimes on hosts and services"), @@ -505,28 +513,19 @@ def command_downtime(cmdtag, spec, row): down_to = None if html.get_checkbox("_down_do_recur"): - recurring_type = html.var("_down_recurring") - if recurring_type == "1": - title_start = _("schedule a hourly recurring") - elif recurring_type == "2": - title_start = _("schedule a daily recurring") - elif recurring_type == "3": - title_start = _("schedule a weekly recurring") - elif recurring_type == "4": - title_start = _("schedule a two-weekly recurring") - elif recurring_type == "5": - title_start = _("schedule a four-weekly recurring") + recurring_type = int(html.var("_down_recurring")) + title_start = _("schedule a periodic downtime every %s") % recurring_types[recurring_type] else: - title_start = _("schedule an immediate") + title_start = _("schedule an immediate downtime") if html.var("_down_2h"): down_to = down_from + 7200 - title = _("%s 2-hour downtime on") % title_start + title = _("%s of 2 hours length on") % title_start elif html.var("_down_today"): br = time.localtime(down_from) down_to = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 - title = _("%s downtime until 24:00:00 on") % title_start + title = _("%s until 24:00:00 on") % title_start elif html.var("_down_week"): br = time.localtime(down_from) @@ -534,7 +533,7 @@ def command_downtime(cmdtag, spec, row): days_plus = 6 - wday down_to = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 down_to += days_plus * 24 * 3600 - title = _("%s downtime until sunday night on") % title_start + title = _("%s until sunday night on") % title_start elif html.var("_down_month"): br = time.localtime(down_from) @@ -545,12 +544,12 @@ def command_downtime(cmdtag, spec, row): else: new_year = br.tm_year down_to = time.mktime((new_year, new_month, 1, 0, 0, 0, 0, 0, br.tm_isdst)) - title = _("%s downtime until end of month on") % title_start + title = _("%s until end of month on") % title_start elif html.var("_down_year"): br = time.localtime(down_from) down_to = time.mktime((br.tm_year, 12, 31, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 - title = _("%s downtime until end of %d on") % (title_start, br.tm_year) + title = _("%s until end of %d on") % (title_start, br.tm_year) elif html.var("_down_from_now"): try: @@ -562,12 +561,12 @@ def command_downtime(cmdtag, spec, row): raise MKUserError("_down_minutes", _("Please enter a positive number of minutes.")) down_to = time.time() + minutes * 60 - title = _("%s downtime for the next %d minutes on" % (title_start, minutes)) + title = _("%s for the next %d minutes on" % (title_start, minutes)) elif html.var("_down_adhoc"): minutes = config.adhoc_downtime.get("duration",0) down_to = time.time() + minutes * 60 - title = _("%s downtime for the next %d minutes on" % (title_start, minutes)) + title = _("%s for the next %d minutes on" % (title_start, minutes)) elif html.var("_down_custom"): down_from = html.get_datetime_input("_down_from")

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015