Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 6db58c5f3e929f52709107674d676373cb127764 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db58c5f3e929f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 5 13:09:33 2013 +0100 deleted werk 85 --- .werks/85 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.werks/85 b/.werks/85 deleted file mode 100644 index 1aafa58..0000000 --- a/.werks/85 +++ /dev/null @@ -1,10 +0,0 @@ -Title: brocade_mlx: now handles more different module states -Level: 1 -Component: checks -Version: 1.2.3i7 -Date: 1386233089 -Class: feature - -If a module in a Brocade MLX device reports status configured/stacking or -blocked for full height card the check now returns WARN and a meaningful -message (instead of UNKNOWN before)

10 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog, moved werk 18 to correct version

by Mathias Kettner

Module: check_mk Branch: master Commit: 19544764f5ab8c812ccc2240cec9e97924717dec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19544764f5ab8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 5 12:05:54 2013 +0100 Fixed ChangeLog, moved werk 18 to correct version --- .werks/18 | 2 +- ChangeLog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/18 b/.werks/18 index 9a478fe..3b8805c 100644 --- a/.werks/18 +++ b/.werks/18 @@ -1,7 +1,7 @@ Title: New option for displaying a legend for the colors used in the timeline Level: 1 Component: reporting -Version: 1.2.3i7 +Version: 1.2.3i8 Date: 1386241423 Class: feature diff --git a/ChangeLog b/ChangeLog index f6fcc42..1e40047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i8: + Reporting & Availability: + * 0018 New option for displaying a legend for the colors used in the timeline... + 1.2.3i7: Core & Setup: @@ -113,7 +116,6 @@ * 0055 Allow grouping by host, host group or service group... * 0056 New concept of service periods in availability reporting... * 0002 You can now annotate events in the availability reporting... - * 0018 New option for displaying a legend for the colors used in the timeline... * 0014 FIX: Fix styling of tables: always use complete width... * 0015 FIX: Fixed summary computation in availability when grouping is used...

10 years, 9 months

Check_MK Git: check_mk: New option for displaying a legend for the colors used in the timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: ec43ac35281a5e3df326d90e8596ba63c368dc71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec43ac35281a5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 5 12:04:56 2013 +0100 New option for displaying a legend for the colors used in the timeline The availability has now a new labelling option <i>Display legend for timeline</i>. If this is enabled and a timeline is being displayed, then at the end of the page a small legend is shown, which explains all of the possible colors in the timeline. --- .werks/18 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.css | 31 +++++++++++++++++----------- web/plugins/views/availability.py | 40 ++++++++++++++++++++++++++++++------- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/.werks/18 b/.werks/18 new file mode 100644 index 0000000..9a478fe --- /dev/null +++ b/.werks/18 @@ -0,0 +1,10 @@ +Title: New option for displaying a legend for the colors used in the timeline +Level: 1 +Component: reporting +Version: 1.2.3i7 +Date: 1386241423 +Class: feature + +The availability has now a new labelling option <i>Display legend for timeline</i>. If this is +enabled and a timeline is being displayed, then at the end of the page a small legend is shown, +which explains all of the possible colors in the timeline. diff --git a/ChangeLog b/ChangeLog index 3cd8047..d116059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 0055 Allow grouping by host, host group or service group... * 0056 New concept of service periods in availability reporting... * 0002 You can now annotate events in the availability reporting... + * 0018 New option for displaying a legend for the colors used in the timeline... * 0014 FIX: Fix styling of tables: always use complete width... * 0015 FIX: Fixed summary computation in availability when grouping is used... diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 473e2a5..1b2e0a0 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -505,24 +505,24 @@ table.data.availability tr.summary td { padding-top: 1px; } -table.data td.flapping, table.timeline td.flapping { +table.data td.flapping, table.timeline td.flapping, div.avlegend.timeline div.state.flapping { /* background-image: url("images/bg_flapping.png"); background-repeat: repeat; */ background-color: #f0f; } -table.data td.downtime, table.timeline td.downtime { +table.data td.downtime, table.timeline td.downtime, div.avlegend.timeline div.state.downtime { background-color: #0af; } -table.data td.hostdown, table.timeline td.hostdown { +table.data td.hostdown, table.timeline td.hostdown, div.avlegend.timeline div.state.hostdown { background-color: #048; color: white; } -table.data td.unmonitored, table.timeline td.unmonitored { +table.data td.unmonitored, table.timeline td.unmonitored, div.avlegend.timeline div.state.unmonitored { background-color: #cacaca; color: #888; } -table.timeline td.ooservice { +table.timeline td.ooservice, div.avlegend.timeline div.state.ooservice { background-color: #cacaca; background-image: url("images/ooservice.png"); background-repeat: repeat; @@ -635,7 +635,7 @@ table.data.timewarp { margin-bottom: 20px; } -div.av_levels_legend { +div.avlegend { background-image: url("images/white_20percent.png"); background-repeat: repeat; padding: 5px 15px; @@ -643,26 +643,33 @@ div.av_levels_legend { margin-top: 10px; text-align: right; } -div.av_levels_legend h3 { +div.avlegend h3 { margin-top: 0px; font-size: 13px; color: black; } -div.av_levels_legend div { +div.avlegend div { display: inline-block; width: 50px; white-space: nowrap; margin-right: 5px; } -div.av_levels_legend div.state { +div.avlegend div.state { text-align: center; padding: 2px 0px; font-size: 12px; } -div.av_levels_legend div.level { +div.avlegend div:last-child { + margin-right: 0px; +} +div.avlegend.levels div.level { margin-right: 15px; color: black; } -div.av_levels_legend div:last-child { - margin-right: 0px; + +div.avlegend.timeline div.state { + width: 75px; +} +div.avlegend.timeline div.state.ooservice { + color: black; } diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 1c0fb97..ba300b7 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -134,9 +134,10 @@ avoption_entries = [ ListChoice( title = _("Labelling Options"), choices = [ - ( "omit_host", _("Do not display the host name")), - ( "use_display_name", _("Use alternative display name for services")), - ( "omit_buttons", _("Do not display icons for history and timeline")), + ( "omit_host", _("Do not display the host name")), + ( "use_display_name", _("Use alternative display name for services")), + ( "omit_buttons", _("Do not display icons for history and timeline")), + ( "display_timeline_legend", _("Display legend for timeline")), ] ) ), @@ -789,7 +790,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): if timeline: render_timeline(timeline_rows, from_time, until_time, total_duration, - timeline, range_title, render_number, what, timewarpcode, style="standalone") + timeline, range_title, render_number, what, timewarpcode, avoptions, style="standalone") else: render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number) @@ -798,7 +799,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): # style is either inline (just the timeline bar) or "standalone" (the complete page) def render_timeline(timeline_rows, from_time, until_time, considered_duration, - timeline, range_title, render_number, what, timewarpcode, style): + timeline, range_title, render_number, what, timewarpcode, avoptions, style): if not timeline_rows: html.write('<div class=info>%s</div>' % _("No information available")) return @@ -879,6 +880,11 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, table.end() + # Legend for timeline + if "display_timeline_legend" in avoptions["labelling"]: + render_timeline_legend(what) + + def render_timeline_choords(from_time, until_time, width): duration = until_time - from_time def render_choord(t, title): @@ -1071,13 +1077,33 @@ def render_availability_table(availability, from_time, until_time, range_title, av_levels = avoptions["av_levels"] if av_levels: warn, crit = av_levels - html.write('<div class="av_levels_legend">') + html.write('<div class="avlegend levels">') html.write('<h3>%s</h3>' % _("Availability levels")) html.write('<div class="state state0">%s</div><div class=level>≥ %.3f%%</div>' % (_("OK"), warn)) html.write('<div class="state state1">%s</div><div class=level>≥ %.3f%%</div>' % (_("WARN"), crit)) html.write('<div class="state state2">%s</div><div class=level>< %.3f%%</div>' % (_("CRIT"), crit)) html.write('</div>') + # Legend for timeline + if "display_timeline_legend" in avoptions["labelling"] and avoptions["show_timeline"]: + render_timeline_legend(what) + + +def render_timeline_legend(what): + html.write('<div class="avlegend timeline">') + html.write('<h3>%s</h3>' % _('Timeline colors')) + html.write('<div class="state state0">%s</div>' % (what == "host" and _("UP") or _("OK"))) + if what != "host": + html.write('<div class="state state1">%s</div>' % _("WARN")) + html.write('<div class="state state2">%s</div>' % (what == "host" and _("DOWN") or _("CRIT"))) + html.write('<div class="state state3">%s</div>' % (what == "host" and _("UNREACH") or _("UNKNOWN"))) + html.write('<div class="state flapping">%s</div>' % _("Flapping")) + if what != "host": + html.write('<div class="state hostdown">%s</div>' % _("H.Down")) + html.write('<div class="state downtime">%s</div>' % _("Downtime")) + html.write('<div class="state ooservice">%s</div>' % _("OO/Service")) + html.write('<div class="state unmonitored">%s</div>' % _("unmonitored")) + html.write('</div>') def get_av_groups(availability, grouping): @@ -1176,7 +1202,7 @@ def render_availability_group(group_title, range_title, group_id, availability, if show_timeline: table.cell(_("Timeline"), css="timeline") html.write('<a href="%s">' % timeline_url) - render_timeline(timeline_rows, from_time, until_time, total_duration, (site, host, service), range_title, render_number, what, "", style="inline") + render_timeline(timeline_rows, from_time, until_time, total_duration, (site, host, service), range_title, render_number, what, "", avoptions, style="inline") html.write('</a>') for sid, css, sname, help in availability_columns:

10 years, 9 months

Check_MK Git: check_mk: Added new version section to changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 23d3ccb7da90f2c77838cdec7f1ab1fe3b1ec356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d3ccb7da90f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 5 11:29:01 2013 +0100 Added new version section to changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index aff3e74..67ce4dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i8: + 1.2.3i7: Core & Setup: * 0011 Introduce optional lower limit for predicted levels...

10 years, 9 months

Check_MK Git: check_mk: werk: remove GIT conflict markers from ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ddaa4d28a4342bd9364c2eaab805e0cc20583bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddaa4d28a4342… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 5 11:09:07 2013 +0100 werk: remove GIT conflict markers from ChangeLog --- werk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/werk b/werk index edac4d5..0a2dfe0 100755 --- a/werk +++ b/werk @@ -124,7 +124,8 @@ def rewrite_changelog(*args): ch.readline() # skip current version while True: line = ch.readline() - if not line[0].isspace(): + # Konfliktmarker einfach ignorieren + if line[0] not in [ '\n', ' ', '\t', '<', '>', '=' ]: break oldlines = [line] + ch.readlines()

10 years, 9 months

Check_MK Git: check_mk: Prepare for release 1.2.3i7

by Lars Michelsen

Module: check_mk Branch: master Commit: 08773de4f1eee203db04feb09c288f3423af6cd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08773de4f1eee2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 5 10:36:39 2013 +0100 Prepare for release 1.2.3i7 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 153088 -> 153088 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 147591 -> 147595 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 588a9af..7667506 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i6 +VERSION = 1.2.3i7 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index fb0f3ca..be51a38 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index a588707..7537c37 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index c5a75a0..ed754fe 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 229e42a..fd7499d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -93,7 +93,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 2015d66..263b757 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 92bbec5..d7a472f 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 53cfc07..737f578 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i6 +echo Version: 1.2.3i7 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index c7e8a59..9d40b62 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i6" +$say "Version: 1.2.3i7" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 37494af..cabab17 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -92,7 +92,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 2013.12.02 +echo Version: 1.2.3i7 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 87c8fda..bd7d858 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i6" +#define CHECK_MK_VERSION "1.2.3i7" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 0978bc9..fe3ce5b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 00a9d41..df4eb2b 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index eb0f06f..cebbc7d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index a60fa29..1205fbb 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i6" +!define CHECK_MK_VERSION "1.2.3i7" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 0b87628..03480aa 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index ce39270..a95fdf6 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i6-1_all.deb net optional +check-mk_1.2.3i7-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 014e10c..b517817 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i6" +VERSION="1.2.3i7" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 1f2adb3..10dfd6e 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.3i6], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i7], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 15b424b..6e90fe2 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i6" +VERSION="1.2.3i7" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 023393b..0736329 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i6 +VERSION=1.2.3i7 NAME=check_mk LANG= LC_ALL=

10 years, 9 months

Check_MK Git: check_mk: brocade_mlx: now handles more different module states

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 60e7897cc4d27885f3839e772d5a709570ffdf81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60e7897cc4d278… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 5 09:48:33 2013 +0100 brocade_mlx: now handles more different module states If a module in a Brocade MLX device reports status configured/stacking or blocked for full height card the check now returns WARN and a meaningful message (instead of UNKNOWN before) --- .werks/85 | 10 ++++++++++ ChangeLog | 1 + checks/brocade_mlx | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/85 b/.werks/85 new file mode 100644 index 0000000..1aafa58 --- /dev/null +++ b/.werks/85 @@ -0,0 +1,10 @@ +Title: brocade_mlx: now handles more different module states +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1386233089 +Class: feature + +If a module in a Brocade MLX device reports status configured/stacking or +blocked for full height card the check now returns WARN and a meaningful +message (instead of UNKNOWN before) diff --git a/ChangeLog b/ChangeLog index ade6e7d..aff3e74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0238 vsphere monitoring: new option to skip placeholder vms in agent output... * 0016 Linux+Windows agent: allow spooling plugin outputs via files... * 0017 local: New state type P for state computation based on perfdata... + * 0085 brocade_mlx: now handles more different module states... * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree... diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 8d7ccf4..ed76795 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -64,10 +64,14 @@ def check_brocade_mlx_module(item, _no_params, info): return 2, "Module reports status 3 (rejected)" elif module_state == "4": return 2, "Module reports status 4 (bad)" + elif module_state == "8": + return 1, "Module reports status 8 (configured / stacking)" elif module_state == "9": return 1, "Module reports status 9 (coming up)" elif module_state == "10": return 0, "Module reports status 10 (running)" + elif module_state == "11": + return 1, "Module reports status 11 (blocked for full height card)" else: return 3, "Module reports unidentified status %s" % module_state return 3, "Module %s not found" % item

10 years, 9 months

Check_MK Git: check_mk: Display HTTP links in plugin output as icon now

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d79a600a38ee5c3bdf87e63fbb2f59fffbe5840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d79a600a38ee5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 15:38:50 2013 +0100 Display HTTP links in plugin output as icon now --- .werks/35 | 7 ++++--- ChangeLog | 2 +- web/htdocs/images/pluginurl.png | Bin 0 -> 5597 bytes web/htdocs/lib.py | 4 ++-- web/htdocs/status.css | 7 +++++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.werks/35 b/.werks/35 index 5d7598e..b09f784 100644 --- a/.werks/35 +++ b/.werks/35 @@ -1,11 +1,12 @@ -Title: http[s] links are display again in the plugin output +Title: Convert HTTP(S) links in plugin output into clickable icon Level: 1 Component: multisite Version: 1.2.3i7 Date: 1384432725 Class: fix -The multisite GUI now translates html links into <tt><a href= ..></tt> -This feature has been introduced to allow at least basic html support in plugin outputs. +The Multisite GUI now translates HTTP links that are contained in the output +of plugins into an icon that contains a clickable <tt>href</tt> to that link. +This feature has been introduced to allow at least basic HTML support in plugin outputs. If you want to have full html support in plugin output (including the security risks it brings) you can disable the option "Escape HTML codes in plugin output" in the global settings. diff --git a/ChangeLog b/ChangeLog index 69704a0..ade6e7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,7 +68,7 @@ * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... * 0206 FIX: Fixed logwatch permission check when using liveproxy for normal users... * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN - * 0035 FIX: http[s] links are display again in the plugin output... + * 0035 FIX: Convert HTTP(S) links in plugin output into clickable icon... * 0006 FIX: Checkboxes for hosts/services were missing on modified views... * 0284 FIX: Context help toggled on/off randomly... * 0285 FIX: Fixed bookmarking of absolute URLs or PNP/NagVis URLs in sidebar snapin... diff --git a/web/htdocs/images/pluginurl.png b/web/htdocs/images/pluginurl.png new file mode 100644 index 0000000..b5f28c4 Binary files /dev/null and b/web/htdocs/images/pluginurl.png differ diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index b96bdf5..3994f6d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -264,8 +264,8 @@ def format_plugin_output(output, row = None): if config.escape_plugin_output: output = re.sub("http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*,]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", - lambda p: '<a href="%s">%s</a>' % - (p.group(0), len(p.group(0)) > 40 and p.group(0)[:40] + "..." or p.group(0)), output) + lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % + (p.group(0), p.group(0)), output) return output diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 7fc12af..fa5c0bb 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -98,6 +98,13 @@ b.stmark { border: 1px solid #666; } +/* inline icon in plugin output for URLs */ +img.pluginurl { + width: 16px; + height: 16px; + vertical-align: middle; +} + /* *some* problem */ .states, .hstates { background-image: url("images/someproblem.png");

10 years, 9 months

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 031a23441c1d86d04b6bda9228a8b91cffcec122 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=031a23441c1d86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 15:12:09 2013 +0100 Updated werk description --- .werks/17 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/17 b/.werks/17 index 9be5396..4f37286 100644 --- a/.werks/17 +++ b/.werks/17 @@ -47,5 +47,5 @@ F-: The output will be: C+: -Environment CRIT - temp 30.0 > 28.0(!), humidity 33.0 < 35.0(!!) +CRIT - temp 30.0 > 28.0(!), humidity 33.0 < 35.0(!!) C-:

10 years, 9 months

Check_MK Git: check_mk: local: New state type P for state computation based on perfdata

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f4156e7f53949665b2db530e848b6d82b0a3c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f4156e7f53949… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 15:10:45 2013 +0100 local: New state type P for state computation based on perfdata The section <tt><<<local>>></tt> now allows a new state marker <tt>P</tt> (next to <tt>0</tt>, <tt>1</tt>, <tt>2</tt> and <tt>3</tt>). When setting this marker, the check plugin computes the state according to the levels contained in the performance data. Take the following example: F+: <<<local>>> P Environment temp=30;28;35|humidity=33;40:60;35:70;0;100 This is a text F-: The check will first check the variable <tt>temp</tt>. It's current value is <tt>30</tt>. The levels are at <tt>28</tt> and <tt>35</tt> for warning and critical, resp. Because 30 is greater then 28 this will trigger a warning. The second performance value <tt>humidity</tt> has both lower and upper levels for warning and critical - separated by a colon. The current value is 33, which is lower than the lower critical level of <tt>35</tt>. This will make this variable und thus the total check critical. H2:Notes <ul> <li>It is allowed to use fractional values like <tt>35.12</tt>.</li> <li>If the current value exactly matches a level, the <i>better</i> state is being used. This is not consistent with the usual levels in Check_MK checks, but is neccessary if you want to have just one single value to be OK.</li> <li>When using <tt>P</tt> then the current values of all variables are appended to the plugin output. If you want you can omit the your additional text at all in that case.</li> <li>When you use <tt>P</tt> and do not supply performance data or do not supply levels, the status will always be <b>OK</b>.</li> </ul> Example for a <tt>local</tt> line without a text: F+: <<<local>>> P Environment temp=30;28;35|humidity=33;40:60;35:70;0;100 F-: The output will be: C+: Environment CRIT - temp 30.0 > 28.0(!), humidity 33.0 < 35.0(!!) C-: --- .werks/17 | 51 +++++++++++++++++++++++++++++++++++++ ChangeLog | 1 + checkman/local | 2 +- checks/local | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 124 insertions(+), 6 deletions(-) diff --git a/.werks/17 b/.werks/17 new file mode 100644 index 0000000..9be5396 --- /dev/null +++ b/.werks/17 @@ -0,0 +1,51 @@ +Title: local: New state type P for state computation based on perfdata +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1386165155 +Class: feature + +The section <tt><<<local>>></tt> now allows a new state +marker <tt>P</tt> (next to <tt>0</tt>, <tt>1</tt>, <tt>2</tt> and <tt>3</tt>). +When setting this marker, the check plugin computes the state according to the +levels contained in the performance data. Take the following example: + +F+: +<<<local>>> +P Environment temp=30;28;35|humidity=33;40:60;35:70;0;100 This is a text +F-: + +The check will first check the variable <tt>temp</tt>. It's current value +is <tt>30</tt>. The levels are at <tt>28</tt> and <tt>35</tt> for warning and +critical, resp. Because 30 is greater then 28 this will trigger a warning. + +The second performance value <tt>humidity</tt> has both lower and upper +levels for warning and critical - separated by a colon. The +current value is 33, which is lower than the lower critical level +of <tt>35</tt>. This will make this variable und thus the total check critical. + +H2:Notes + +<ul> +<li>It is allowed to use fractional values like <tt>35.12</tt>.</li> +<li>If the current value exactly matches a level, the <i>better</i> state is being used. This +is not consistent with the usual levels in Check_MK checks, but is neccessary if you want +to have just one single value to be OK.</li> +<li>When using <tt>P</tt> then the current values of all variables are appended to the plugin output. +If you want you can omit the your additional text at all in that case.</li> +<li>When you use <tt>P</tt> and do not supply performance data or do not supply levels, the +status will always be <b>OK</b>.</li> +</ul> + +Example for a <tt>local</tt> line without a text: + +F+: +<<<local>>> +P Environment temp=30;28;35|humidity=33;40:60;35:70;0;100 +F-: + +The output will be: + +C+: +Environment CRIT - temp 30.0 > 28.0(!), humidity 33.0 < 35.0(!!) +C-: diff --git a/ChangeLog b/ChangeLog index bc9aa4b..69704a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 0013 Solaris Agent: implement cached async plugins and local checks... * 0238 vsphere monitoring: new option to skip placeholder vms in agent output... * 0016 Linux+Windows agent: allow spooling plugin outputs via files... + * 0017 local: New state type P for state computation based on perfdata... * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree... diff --git a/checkman/local b/checkman/local index 2a57a7b..4c0c64d 100644 --- a/checkman/local +++ b/checkman/local @@ -1,4 +1,4 @@ -title: Integrate custom checks +title: Integrate custom checks via arbitrary scripts on the agent agents: linux, windows, aix, solaris, freebsd, netbsd, openbsd catalog: generic license: GPL diff --git a/checks/local b/checks/local index 2007fe2..605bd9a 100644 --- a/checks/local +++ b/checks/local @@ -24,22 +24,82 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example output from agent: +# 0 Service_FOO V=1 This Check is OK +# 1 Bar_Service - This is WARNING and has no performance data +# 2 NotGood V=120;50;100;0;1000 A critical check +# P Some_other_Service value1=10;30;50|value2=20;10:20;0:50;0;100 Result is computed from two values +# P This_is_OK foo=18;20;50 +# P Some_yet_other_Service temp=40;30;50|humidity=28;50:100;0:50;0;100 +# P Has-no-var - This has no variable +# P No-Text hirn=-8;-20 + + +# Compute state according to warn/crit levels contained in the +# performance data. +def local_compute_state(perfdata): + texts = [] + + def outof_levels(value, levels): + if levels == None: + return + + if ':' in levels: + lower, upper = map(float, levels.split(':')) + else: + lower = None + upper = float(levels) + if value > upper: + return " %s > %s" % (value, upper) + elif lower != None and value < lower: + return " %s < %s" % (value, lower) + + worst = 0 + for entry in perfdata: + if len(entry) < 3: + continue # No levels attached + varname = entry[0] + value = float(entry[1]) + warn = entry[2] + if len(entry) >= 4: + crit = entry[3] + else: + crit = None + + text = outof_levels(value, crit) + if text: + worst = 2 + text = "%s%s(!!)" % (varname, text) + texts.append(text) + + else: + text = outof_levels(value, warn) + if text: + worst = max(worst, 1) + text = "%s%s(!)" % (varname, text) + texts.append(text) + + else: + texts.append("%s is %s(.)" % (varname, value)) + + return worst, texts def inventory_local(info): inventory = [] # Ignore invalid lines, tolerate bugs in local checks - # of unexperianced users + # of unexperianced users. Lines with P do not need to + # supply a text for line in info: - if len(line) >= 4: + if len(line) >= 4 or len(line) == 3 and line[0] == 'P': inventory.append( (line[1], None) ) return inventory def check_local(item, params, info): for line in info: # Ignore invalid lines, tolerate bugs in local checks - # of unexperianced users + # of unexperienced users if len(line) >= 2 and line[1] == item: - state = int(line[0]) + statechar = line[0] perftxt = line[2] output = " ".join(line[3:]) perfdata = [] @@ -49,11 +109,17 @@ def check_local(item, params, info): varname, valuetxt = entry.split('=') values = valuetxt.split(';') perfdata.append(tuple( [varname] + values )) + if statechar == 'P': + state, texts = local_compute_state(perfdata) + if output: + texts = [output] + texts + output = ", ".join(texts) + else: + state = int(statechar) return (state, output, perfdata) return (3, "Check output not found in local checks") - check_info["local"] = { 'check_function': check_local, 'inventory_function': inventory_local,

10 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013