Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: FIX: fixed bug showing only sidebar after re-login in multisite

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 406d78571cdcad3191efd5894f01bdc1f0228fe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=406d78571cdcad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:44:58 2012 +0200 FIX: fixed bug showing only sidebar after re-login in multisite --- ChangeLog | 1 + web/htdocs/login.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0df5de..0bac8de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored + * FIX: fixed bug showing only sidebar after re-login in multisite Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/login.py b/web/htdocs/login.py index b75bf55..aff6fa1 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -223,6 +223,13 @@ def normal_login_page(called_directly = True): if not origtarget and not html.req.myfile == 'login': origtarget = html.makeuri([]) + # When e.g. the password of a user is changed and the first frame that recognizes the + # non matching cookies is the sidebar it redirects the user to side.py while removing + # the frameset. This is not good. Instead of this redirect the user to the index page. + if html.req.myfile == 'side': + html.immediate_browser_redirect(0.1, 'index.py') + return apache.OK + # Never allow the login page to be opened in a frameset. Redirect top page to login page. # This will result in a full screen login page. html.javascript('''if(top != self) { @@ -232,7 +239,7 @@ def normal_login_page(called_directly = True): # When someone calls the login page directly and is already authed redirect to main page if html.req.myfile == 'login' and check_auth() != '': html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') - return + return apache.OK html.write("<div id=login>") html.write("<img id=login_window src=\"images/login_window.png\">")

12 years, 2 months

Check_MK Git: check_mk: mssql agent: Added WMI code to be able to monitor MSSQL version 9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c1943b7846816dfe8c7f7c31226795b59daec1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1943b7846816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:23:43 2012 +0200 mssql agent: Added WMI code to be able to monitor MSSQL version 9 --- agents/windows/plugins/mssql.vbs | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index faceb6f..7e12135 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -27,7 +27,23 @@ Dim WMI, prop, instId, instVersion, instIds, instName Set instIds = CreateObject("Scripting.Dictionary") ' Loop all found local MSSQL server instances +' Try different trees to handle different versions of MSSQL +On Error Resume Next +' MSSQL >= 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") +If Err.Number <> 0 Then + Err.Clear() + + ' MSSQL < 10 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + If Err.Number <> 0 Then + wscript.echo "Error: " & Err.Number & " " & Err.Description + Err.Clear() + wscript.quit() + End If +End If +On Error Goto 0 + For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ "SQLServiceType = 1 AND PropertyName = 'VERSION'")

12 years, 2 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60cb274bfca04752c76a121eac1e41d8bc4f2441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60cb274bfca047… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:24:56 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2cb0e6..bb96457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * mysql_capacity: cleaned up check, levels are in MB now * jolokia_info, jolokia_metrics: new rewritten checks for jolokia (formerly jmx4perl). You need the new plugin mk_jokokia for using them + * FIX: mssql agent: Added compatibility code for MSSQL 9 WATO: * Added permission to control the "clone host" feature in WATO

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7b33be067c8393ca8461d689bdf8437edb9aef6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7b33be067c839… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:25:36 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 2 months

Check_MK Git: check_mk: Version version to 1.2.0p3

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60a7e2c3ea7ca59c2c67eb641f0666775a1d3056 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60a7e2c3ea7ca5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 18:01:33 2012 +0200 Version version to 1.2.0p3 --- Makefile | 4 ++-- 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.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 126275 -> 126273 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 84c1e07..edaf85a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0p2 +VERSION = 1.2.0p3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -116,7 +116,7 @@ setversion: sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ done ; \ - sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agent/check_mk_agent.openvms + sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index beaa35c..6833431 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0p2 +echo Version: 1.2.0p3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 747f761..14a3e61 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.0p2 +echo Version: 1.2.0p3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 0579338..2a3ca9b 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0p2 +echo Version: 1.2.0p3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4074fd5..f7b77b6 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0p2 +echo Version: 1.2.0p3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index fb81d57..a943469 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.0p2 +echo Version: 1.2.0p3 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index f1e5dae..8c64b7b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -41,7 +41,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0p2 +echo Version: 1.2.0p3 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e414f0d..0b2a3ea 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.0p2" +#define CHECK_MK_VERSION "1.2.0p3" #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 158751b..8d3f956 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 64c211e..02c2f2a 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 126d6a2..3286f34 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 151f440..16d3021 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.0p2" +!define CHECK_MK_VERSION "1.2.0p3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 8d156a4..96a7de8 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0p2-1_all.deb net optional +check-mk_1.2.0p3-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 17ed5e7..f560801 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.0p2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0p3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index cc94c4f..58c1aca 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0p2 +VERSION=1.2.0p3 NAME=check_mk LANG= LC_ALL=

12 years, 2 months

Check_MK Git: check_mk: added preliminary agent for OpenVMS (

by git＠mathias-kettner.de

refer to agents/README.OpenVMS) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: ec2c530c7aa16b077e9177aad19a296377da265b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec2c530c7aa16b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 18:00:28 2012 +0200 added preliminary agent for OpenVMS (refer to agents/README.OpenVMS) --- ChangeLog | 4 +- Makefile | 1 + agents/README.OpenVMS | 87 +++++++++++++++ agents/check_mk_agent.openvms | 236 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 326 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec2c530c7a…

12 years, 2 months

Check_MK Git: check_mk: vms_system.procs: new check for number of processes on OpenVMS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 638efe913a14e63d4f3f19fa00b4df474b14d288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638efe913a14e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 17:26:14 2012 +0200 vms_system.procs: new check for number of processes on OpenVMS --- ChangeLog | 1 + checkman/vms_system.procs | 19 +++++++++++++++++++ checks/cpu | 2 +- checks/vms_system | 22 ++++++++++++++++++++++ pnp-templates/check_mk-vms_system.procs.php | 1 + web/plugins/perfometer/check_mk.py | 5 +++++ web/plugins/wato/check_parameters.py | 17 +++++++++++++++-- 7 files changed, 64 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32178ed..0bf8111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * vms_cpu: new check for CPU utilization on OpenVMS * vms_if: new check for network interfaces on OpenVMS * vms_system.ios: new check for total direct/buffered IOs on OpenVMS + * vms_system.procs: new check for number of processes on OpenVMS WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/vms_system.procs b/checkman/vms_system.procs new file mode 100644 index 0000000..56e6966 --- /dev/null +++ b/checkman/vms_system.procs @@ -0,0 +1,19 @@ +title: Check number of processes on OpenVMS +agents: openvms +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check measures the number of existing (not neccessarily + running) processes on OpenVMS. You can set levels on the number. + +perfdata: + One value: the number of processes. + +inventory: + One check per OpenVMS system will be created. + +[parameters] +warn(int): warning level for the number of processes +crit(int): critical level for the number of processes + diff --git a/checks/cpu b/checks/cpu index ea3198e..480a86c 100644 --- a/checks/cpu +++ b/checks/cpu @@ -70,7 +70,7 @@ def check_cpu_threads(item, params, info): if nthreads >= crit: return (2, "CRIT - %d threads (critical at %d)" % (nthreads, crit), perfdata) elif nthreads >= warn: - return (1, "WARN - %d threads (warning %d)" % (nthreads, warn), perfdata) + return (1, "WARN - %d threads (warning at %d)" % (nthreads, warn), perfdata) else: return (0, "OK - %d threads" % (nthreads,), perfdata) diff --git a/checks/vms_system b/checks/vms_system index cbf18bb..3f77288 100644 --- a/checks/vms_system +++ b/checks/vms_system @@ -48,3 +48,25 @@ check_info["vms_system.ios"] = { "service_description" : "IOs", "has_perfdata" : True, } + +def check_vms_system_procs(_no_item, params, info): + procs = int(float(info[0][2])) + if params: + warn, crit = params + perfdata = [('procs', procs, warn, crit, 0 )] + if procs >= crit: + return (2, "CRIT - %d processes (critical at %d)" % (procs, crit), perfdata) + elif procs >= warn: + return (1, "WARN - %d processes (warning at %d)" % (procs, warn), perfdata) + else: + return (0, "OK - %d processes" % (procs,), perfdata) + + +check_info["vms_system.procs"] = { + "check_function" : check_vms_system_procs, + "inventory_function" : inventory_vms_system, + "service_description" : "Number of processes", + "has_perfdata" : True, + "group" : "vms_procs", +} + diff --git a/pnp-templates/check_mk-vms_system.procs.php b/pnp-templates/check_mk-vms_system.procs.php new file mode 120000 index 0000000..559cd5e --- /dev/null +++ b/pnp-templates/check_mk-vms_system.procs.php @@ -0,0 +1 @@ +check_mk-cpu.threads.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 818a397..0ff9d66 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -537,3 +537,8 @@ def perfometer_vms_system_ios(row, check_command, perf_data): perfometers["check_mk-vms_system.ios"] = perfometer_vms_system_ios +def perfometer_check_mk_vms_system_procs(row, check_command, perf_data): + color = { 0: "#a4f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[row["service_state"]] + return "%d" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 100, 2, color) + +perfometers["check_mk-vms_system.procs"] = perfometer_check_mk_vms_system_procs diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e319296..68ee915 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1215,8 +1215,21 @@ checkgroups.append(( help = _("These levels check the number of currently existing threads on the system. Each process has at " "least one thread."), elements = [ - Integer(title = _("Warning at"), label = _("threads")), - Integer(title = _("Critical at"), label = _("threads"))]), + Integer(title = _("Warning at"), unit = _("threads"), default_value = 1000), + Integer(title = _("Critical at"), unit = _("threads"), default_value = 2000)]), + None, None)) + +checkgroups.append(( + subgroup_applications, + "vms_procs", + _("Number of processes on OpenVMS"), + Optional( + Tuple( + elements = [ + Integer(title = _("Warning at"), unit = _("processes"), default_value = 100), + Integer(title = _("Critical at"), unit = _("processes"), default_value = 200)]), + title = _("Impose levels on number of processes"), + ), None, None)) checkgroups.append((

12 years, 2 months

Check_MK Git: check_mk: vms_system.ios: new check for total direct/ buffered IOs on OpenVMS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e24f036c853d617bcea1306ef35e168d928a7e28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e24f036c853d61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 17:02:08 2012 +0200 vms_system.ios: new check for total direct/buffered IOs on OpenVMS --- ChangeLog | 1 + checkman/vms_system.ios | 15 +++++++++ checks/vms_system | 50 +++++++++++++++++++++++++++++ pnp-templates/check_mk-vms_system.ios.php | 40 +++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 13 +++++++ 5 files changed, 119 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c6cf05..32178ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * vms_users: new check for number of interactive sessions on OpenVMS * vms_cpu: new check for CPU utilization on OpenVMS * vms_if: new check for network interfaces on OpenVMS + * vms_system.ios: new check for total direct/buffered IOs on OpenVMS WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/vms_system.ios b/checkman/vms_system.ios new file mode 100644 index 0000000..865e464 --- /dev/null +++ b/checkman/vms_system.ios @@ -0,0 +1,15 @@ +title: Monitor number total IOs of a node on OpenVMS +agents: openvms +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This checks measures the number of total direct and buffered IOs + on an OpenVMS host. The check is always OK. + +perfdata: + Two values: the number of direct and bufferd IOs per second. + +inventory: + One check per OpenVMS host will be created. + diff --git a/checks/vms_system b/checks/vms_system new file mode 100644 index 0000000..cbf18bb --- /dev/null +++ b/checks/vms_system @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example output from agent +# Columns: +# 1. Direct IOs / sec (on hardware) +# 2. Buffered IOs / sec (queued) +# 3. Number of currently existing processes (averaged) + +# <<<vms_system>>> +# 0.00 0.00 15.00 + +def inventory_vms_system(info): + if len(info) > 0: + return [(None, None)] + +def check_vms_system_ios(_no_item, _no_params, info): + direct_ios, buffered_ios = map(float, info[0][:2]) + return (0, "OK - Direct IOs: %.2f/sec, Buffered IOs: %.2f/sec" % ( + direct_ios, buffered_ios), [ ("direct", direct_ios), ("buffered", buffered_ios)]) + +check_info["vms_system.ios"] = { + "check_function" : check_vms_system_ios, + "inventory_function" : inventory_vms_system, + "service_description" : "IOs", + "has_perfdata" : True, +} diff --git a/pnp-templates/check_mk-vms_system.ios.php b/pnp-templates/check_mk-vms_system.ios.php new file mode 100644 index 0000000..c9a300f --- /dev/null +++ b/pnp-templates/check_mk-vms_system.ios.php @@ -0,0 +1,40 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +$opt[1] = "--vertical-label 'IOs per second' -l0 --title \"IOs on $hostname\" "; +$def[1] = "" + . "DEF:direct=$RRDFILE[1]:$DS[1]:MAX " + . "AREA:direct#38808f:\"Direct IOs/sec \" " + . "GPRINT:direct:LAST:\"last\: %8.0lf/s\" " + . "GPRINT:direct:AVERAGE:\"avg\: %8.0lf/s\" " + . "GPRINT:direct:MAX:\"max\: %8.0lf/s\\n\" " + + . "DEF:buffered=$RRDFILE[2]:$DS[2]:MAX " + . "AREA:buffered#38b0cf:\"Buffered IOs/sec\":STACK " + . "GPRINT:buffered:LAST:\"last\: %8.0lf/s\" " + . "GPRINT:buffered:AVERAGE:\"avg\: %8.0lf/s\" " + . "GPRINT:buffered:MAX:\"max\: %8.0lf/s\\n\" " + ; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 8bdd0f1..818a397 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -524,3 +524,16 @@ def perfometer_mysql_capacity(row, check_command, perf_data): return "%s" % number_human_readable(size), perfometer_logarithmic(size, median, 10, color) perfometers['check_mk-mysql_capacity'] = perfometer_mysql_capacity + +def perfometer_vms_system_ios(row, check_command, perf_data): + h = '<div class="stacked">' + direct = float(perf_data[0][1]) + buffered = float(perf_data[1][1]) + h += perfometer_logarithmic(buffered, 10000, 3, "#38b0cf") + h += perfometer_logarithmic(direct, 10000, 3, "#38808f") + h += '</div>' + return "%.0f / %.0f" % (direct, buffered), h # perfometer_logarithmic(100, 200, 2, "#883875") + +perfometers["check_mk-vms_system.ios"] = perfometer_vms_system_ios + +

12 years, 2 months

Check_MK Git: check_mk: vms_if: new check for network interfaces on OpenVMS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c92e4fd7b267c552db39eef0cc8b68b5e625d67e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c92e4fd7b267c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 16:18:22 2012 +0200 vms_if: new check for network interfaces on OpenVMS --- ChangeLog | 1 + checkman/vms_if | 12 ++++++ checks/vms_if | 74 ++++++++++++++++++++++++++++++++++++ pnp-templates/check_mk-vms_if.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 89 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 896a24e..0c6cf05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ come shortly after) * vms_users: new check for number of interactive sessions on OpenVMS * vms_cpu: new check for CPU utilization on OpenVMS + * vms_if: new check for network interfaces on OpenVMS WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/vms_if b/checkman/vms_if new file mode 100644 index 0000000..8fbe109 --- /dev/null +++ b/checkman/vms_if @@ -0,0 +1,12 @@ +title: Monitor traffic of network interfaces on OpenVMS +agents: openvms +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the ingoing and outgoing traffic of networking + interfaces on OpenVMS. Levels can be set on the used bandwidth and + on the error rate. + + This check is compatible to {if}. Please refer to that man page for + further details about check configuration. diff --git a/checks/vms_if b/checks/vms_if new file mode 100644 index 0000000..e18e236 --- /dev/null +++ b/checks/vms_if @@ -0,0 +1,74 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +def convert_vms_if(info): + new_info = [] + ifIndex = 0 + for line in info: + ifDescr, ifInOctets, ifInErrors, ifOutOctets, ifOutErrors, ifInDiscards = line[:6] + ifIndex += 1 + new_info.append(( + str(ifIndex), + ifDescr, + '6', # ifType = Ethernet + '1000000000',# ifHighSpeed + '1', # ifOperStatus + ifInOctets, + '0', # ifHCInUcastPkts + '0', # ifHCInMulticastPkts + '0', # ifHCInBroadcastPkts + ifInDiscards, + ifInErrors, + ifOutOctets, + '0', # ifHCOutUcastPkts + '0', # ifHCOutMulticastPkts + '0', # ifHCOutBroadcastPkts + '0', # ifOutDiscards + ifOutErrors, + '0', # ifOutQLen + ifDescr, + '', # ifPhysAddress + )) + return new_info + + +def inventory_vms_if(info): + return inventory_if_common(convert_vms_if(info)) + +def check_vms_if(item, params, info): + return check_if_common(item, params, convert_vms_if(info)) + + +check_info['vms_if'] = { + "check_function" : check_vms_if, + "inventory_function" : inventory_vms_if, + "service_description" : "Interface %s", + "has_perfdata" : True, + "includes" : [ "if.include" ], + "group" : "if", + "default_levels_variable" : "if_default_levels", +} + diff --git a/pnp-templates/check_mk-vms_if.php b/pnp-templates/check_mk-vms_if.php new file mode 120000 index 0000000..9a34dce --- /dev/null +++ b/pnp-templates/check_mk-vms_if.php @@ -0,0 +1 @@ +check_mk-if.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 1faf690..8bdd0f1 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -266,6 +266,7 @@ def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): perfometers["check_mk-if"] = perfometer_check_mk_if perfometers["check_mk-if64"] = perfometer_check_mk_if +perfometers["check_mk-vms_if"] = perfometer_check_mk_if perfometers["check_mk-if_lancom"] = perfometer_check_mk_if perfometers["check_mk-lnx_if"] = perfometer_check_mk_if perfometers["check_mk-hpux_if"] = perfometer_check_mk_if

12 years, 2 months

Check_MK Git: check_mk: Cosmetic improvement for OpenVMS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a1c20d76ab14b2ed14d331481c9c8a4b8dac669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a1c20d76ab14b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 15:52:31 2012 +0200 Cosmetic improvement for OpenVMS --- modules/check_mk.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 57c5c80..0d7f84e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3062,7 +3062,8 @@ def show_check_manual(checkname): for agent in header['agents'].split(","): agent = agent.strip() ags.append({ "vms" : "VMS", "linux":"Linux", "aix": "AIX", - "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP"} + "solaris":"Solaris", "windows":"Windows", "snmp":"SNMP", + "openvms" : "OpenVMS" } .get(agent, agent.upper())) print_splitline(header_color_left, "Supported Agents: ", header_color_right, ", ".join(ags))

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits