Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: New option prefix_values for ValueSpec DropdownChoice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b82354b948fedd9a2f331a20a840001192be7743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b82354b948fedd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 18:28:55 2012 +0200 New option prefix_values for ValueSpec DropdownChoice --- web/htdocs/valuespec.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0de2dc7..4c85365 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -757,6 +757,7 @@ class DropdownChoice(ValueSpec): self._choices = kwargs["choices"] self._help_separator = kwargs.get("help_separator") self._label = kwargs.get("label") + self._prefix_values = kwargs.get("prefix_values", False) def choices(self): if type(self._choices) == list: @@ -778,6 +779,8 @@ class DropdownChoice(ValueSpec): defval = "0" options = [] for n, entry in enumerate(self.choices()): + if self._prefix_values: + entry = (entry[0], "%s - %s" % entry) options.append((str(n),) + entry[1:]) if entry[0] == value: defval = str(n)

11 years, 11 months

Check_MK Git: check_mk: Cosmetic code cleanup (added missing linefeed)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67f622f3bfe3f33eb61a918af19008673cb9f907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f622f3bfe3f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 14:40:01 2012 +0200 Cosmetic code cleanup (added missing linefeed) --- livestatus/src/logger.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index d5a1911..3872e2c 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -67,7 +67,8 @@ void logger(int priority, const char *loginfo, ...) char timestring[64]; time_t now_t = time(0); struct tm now; localtime_r(&now_t, &now); - strftime(timestring, 64, "%F %T ", &now); fputs(timestring, g_logfile); + strftime(timestring, 64, "%F %T ", &now); + fputs(timestring, g_logfile); /* write log message */ vfprintf(g_logfile, loginfo, ap);

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b387092942428cc395d1f86606e0c50bb065df8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b387092942428c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 14:40:05 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: hpux_tunables: Pretty Perf-O-Meters and PNP-Graphs for kernel tunable statistics from HP-UX systems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b24326fc2a2eca9f9c5f419558ee76a15f89578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b24326fc2a2ec… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 18:20:50 2012 +0200 hpux_tunables: Pretty Perf-O-Meters and PNP-Graphs for kernel tunable statistics from HP-UX systems --- checks/hpux_tunables | 5 +- .../check_mk-hpux_tunables.maxfiles_lim.php | 1 + pnp-templates/check_mk-hpux_tunables.nkthread.php | 1 + pnp-templates/check_mk-hpux_tunables.nproc.php | 1 + pnp-templates/check_mk-hpux_tunables.php | 50 ++++++++++++++++++++ pnp-templates/check_mk-hpux_tunables.semmni.php | 1 + pnp-templates/check_mk-hpux_tunables.semmns.php | 1 + pnp-templates/check_mk-hpux_tunables.shmseg.php | 1 + web/plugins/perfometer/check_mk.py | 42 ++++++++++++++++ 9 files changed, 101 insertions(+), 2 deletions(-) diff --git a/checks/hpux_tunables b/checks/hpux_tunables index c0acc76..8a79f12 100644 --- a/checks/hpux_tunables +++ b/checks/hpux_tunables @@ -86,9 +86,10 @@ def check_hpux_tunables(item, params, info, hpux_tunable, thingname): state = 2 elif float(warn) < pct: state = 1 - perfdata = [ (thingname, usage, threshold, warn * mimi, crit * mimi) ] +# name = current , warn , crit , min , max + perfdata = [ (thingname, usage, warn * mimi, crit * mimi, 0, threshold) ] else: - perfdata = [ (thingname, usage, threshold, '', '') ] + perfdata = [ (thingname, usage, None, None, 0, threshold) ] return (state, nagios_state_names[state] + \ " - %.2f%% used" % pct + state * "!" + " (%d/%d %s) " % (usage, threshold, thingname), perfdata) diff --git a/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php b/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.nkthread.php b/pnp-templates/check_mk-hpux_tunables.nkthread.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.nkthread.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.nproc.php b/pnp-templates/check_mk-hpux_tunables.nproc.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.nproc.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.php b/pnp-templates/check_mk-hpux_tunables.php new file mode 100644 index 0000000..3dd2c66 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.php @@ -0,0 +1,50 @@ +<?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. + +$title = str_replace("_", " ", substr($servicedesc, 10)); +$vertical = "Number"; +$format = "%4.0lf"; +$color = "8040f0"; +$line = "202060"; + +$opt[1] = " --vertical-label \"$vertical\" -X0 -L5 -l 0 -u $MAX[1] --title \"$title \" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ". + "AREA:$MAX[1]#f3f3f2:\"\" ". + "LINE:$MAX[1]#8b8989:\"Kernel threshold\" ". + "AREA:var1#$color:\"$title\" ". + "LINE1:var1#$line:\"\" ". + "GPRINT:var1:LAST:\"Current\: $format\" ". + "GPRINT:var1:MAX:\"Peak\: $format \" ". + ""; + +# Add in warning / crit if they're passed to us. +if (isset($WARN[1]) and $WARN[1] != "") { + $def[1] .= ""; + "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" ". + "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; + } + +?> diff --git a/pnp-templates/check_mk-hpux_tunables.semmni.php b/pnp-templates/check_mk-hpux_tunables.semmni.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.semmni.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.semmns.php b/pnp-templates/check_mk-hpux_tunables.semmns.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.semmns.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.shmseg.php b/pnp-templates/check_mk-hpux_tunables.shmseg.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.shmseg.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 94300db..7673ff3 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -465,3 +465,45 @@ def perfometer_mssql_counters_cache_hits(row, check_command, perf_data): return "%.1f%%" % perc, h perfometers["check_mk-mssql_counters.cache_hits"] = perfometer_mssql_counters_cache_hits + + + +def perfometer_hpux_tunables(row, check_command, perf_data): + + varname, value, unit, warn, crit, minival, threshold = perf_data[0] + value = float(value) + threshold = float(threshold) + + + if warn != "" or crit != "": + warn = saveint(warn) + crit = saveint(crit) + + # go red if we're over crit + if value > crit: + color = "#f44" + # yellow + elif value > warn: + color = "#f84" + else: + # all green lights + color = "#2d3" + else: + # use a brown-ish color if we have no levels. + # otherwise it could be "green" all the way to 100% + color = "#f4a460" + + used = value / threshold * 100 + + return "%.0f%%" % (used), perfometer_linear(used, color) + +perfometers["check_mk-hpux_tunables.nproc"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.maxfiles_lim"] = perfometer_hpux_tunables +# this one still doesn't load. I need more test data to find out why. +perfometers["check_mk-hpux_tunables.semmni"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.semmns"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.shmseg"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +

11 years, 11 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: 91a434f4b5d5863105302d5cdea10a07cfac008e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a434f4b5d586… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 18:21:04 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ac8ec7074da967bd62d563a0588017546be21f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ac8ec7074da96… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 13 16:49:58 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Fixed setting of Downtimes/ Ack when using Nagstamon or similar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a01c7a5dc3a83ec03a91dbaf00c4b2017fcbdc92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a01c7a5dc3a83e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 13 16:49:49 2012 +0200 Fixed setting of Downtimes/ Ack when using Nagstamon or similar --- web/htdocs/views.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0ba799d..64c84fd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1349,6 +1349,15 @@ def render_view(view, rows, datasource, group_painters, painters, elif 'C' in display_options: # (*not* display open, if checkboxes are currently shown) show_command_form(False, datasource) + + # Also execute commands in cases without command form (needed for Python- + # web service e.g. for NagStaMon) + elif len(rows) > 0 and config.may("general.act") \ + and html.do_actions() and html.transaction_valid(): + try: + do_actions(view, datasource["infos"][0], rows, '') + except: + pass # currently no feed back on webservice if 'O' in display_options and len(painter_options) > 0 and config.may("general.painter_options"): show_painter_options(painter_options)

11 years, 11 months

Check_MK Git: check_mk: hpux_tunables: Add check man page for monitoring of HP-UX kernel tunables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ec1b074e25cc54db60a88ef6b9d23cf2de7e430 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec1b074e25cc5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 15:23:40 2012 +0200 hpux_tunables: Add check man page for monitoring of HP-UX kernel tunables --- checkman/hpux_tunables | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/checkman/hpux_tunables b/checkman/hpux_tunables new file mode 100644 index 0000000..9617b4d --- /dev/null +++ b/checkman/hpux_tunables @@ -0,0 +1,64 @@ +title: Check kernel tunables on HP-UX +agents: hpux +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows for monitoring of admin-tunable kernel limits on HP-UX + systems that support the {"kcusage"} command. The command should be available + from HP-UX 11.20 to the current 11.31. + + Typical tunables are the number of running processes or the number of + semaphores for applications using IPC. + The check can alert you if the usage of a certain tunable element exceeds + a configurable threshold, which is set as a percentage. + + The supported tunables are: + Number of processes (npoc) + Number of threads (nkthread) + Number of open files (maxfiles_lim) + Number of IPC Semaphore IDs (semmni) + Number of IPC Semaphores (semmns) + Number of shared memory segments (semmns) + + +item: + {None} + +inventory: + {hpux_tunables} generates one check per host for each of the supported + tunables. + +examples: + # Set the alert levels for the process table to 50% WARN, 60% CRIT: + hpux_tunables_nproc_default_levels = (50.0, 60.0) + + checks = [ + # Enforce a check on all HP-UX machines for an alert at 16000 open + # processes + (["hp"], ALL_HOSTS, "hpux_tunables.maxfiles_lim", (16000, 20000)), + ] + +perfdata: + The name of the tunable along with it's usage, threshold and warning / + crit levels. + +[parameters] +warn(float): Warning percentage for the tunables allocation +crit(float): Critical percentage for the tunables allocation + + +[configuration]: + Generally the checks only track the usage and a limit has to be defined + using check_parameters. + The checks {nproc} and {nkthread} come with pre-configured default levels: + +hpux_tunables_nproc_default_levels (float, float): + The percentage of running processes compared to the kernel limit for running + processes. + +hpux_tunables_nkthread_default_levels (float, float): + The percentage of threads of running processes compared to the kernel limit + for running threads. + +

11 years, 11 months

Check_MK Git: check_mk: tsm_stagingpools: Update RRD template for better overview with multiple TSM farms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 729686cd74e039d9adbad8f4eebcf646cb29b1cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=729686cd74e039… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 14:18:37 2012 +0200 tsm_stagingpools: Update RRD template for better overview with multiple TSM farms --- pnp-templates/check_mk-tsm_stagingpools.php | 28 +++++++++++++------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pnp-templates/check_mk-tsm_stagingpools.php b/pnp-templates/check_mk-tsm_stagingpools.php index eeb77a6..d45c231 100644 --- a/pnp-templates/check_mk-tsm_stagingpools.php +++ b/pnp-templates/check_mk-tsm_stagingpools.php @@ -23,25 +23,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# bisect the pool name from service description, this didn't work -#$parts = explode(" ", $servicedesc); -#$pool = $parts[1]; -$opt[1] = "-l0 --vertical-label \"Tapes\" --title \"Occupancy of pool\" "; +# cut TSM part from service description +$item = substr($servicedesc, 16); +# if ___ is in the item, then we have info on the TSM farm and the Poolname +# split it. otherwise, keep the item name unchanged. +$parts = explode("___", $item); +$info = (isset($parts[1])) ? $parts[1] . " (".$parts[0].")" : $item; -$def[1] = "DEF:tapes=$RRDFILE[1]:$DS[1]:MAX "; -$def[1] .= "DEF:free=$RRDFILE[2]:$DS[1]:MAX "; -$def[1] .= "DEF:util=$RRDFILE[3]:$DS[1]:MAX "; - - -$def[1] .= "AREA:tapes#cd853f:\"Tapes in Pool \" "; -$def[1] .= "AREA:free#a000ff:\"Free Tapes \" "; -$def[1] .= "LINE:util#000000:\"Utilization \" "; -# FIXME: -# add warn/crit lines +$opt[1] = "-l0 --vertical-label \"Tapes\" --title \"Occupancy of $info\" "; +$def[1] = "DEF:tapes=$RRDFILE[1]:$DS[1]:MAX ". + "DEF:free=$RRDFILE[2]:$DS[1]:MAX ". + "DEF:util=$RRDFILE[3]:$DS[1]:MAX ". + "AREA:tapes#cd853f:\"Tapes in Pool \" ". + "AREA:free#a000ff:\"Free Tapes \" ". + "LINE3:util#5f1010:\"Utilization \" ". + ""; ?>

11 years, 11 months

Check_MK Git: check_mk: check_mk-tsm_stagingpools.php

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4212a3f5eeb443b3a653f25c471c2f6f157d769d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4212a3f5eeb443… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Jul 12 18:23:41 2012 +0200 check_mk-tsm_stagingpools.php tsm_stagingpools: Add PNP graph --- pnp-templates/check_mk-tsm_stagingpools.php | 47 +++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk-tsm_stagingpools.php b/pnp-templates/check_mk-tsm_stagingpools.php new file mode 100644 index 0000000..eeb77a6 --- /dev/null +++ b/pnp-templates/check_mk-tsm_stagingpools.php @@ -0,0 +1,47 @@ +<?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. + +# bisect the pool name from service description, this didn't work +#$parts = explode(" ", $servicedesc); +#$pool = $parts[1]; + +$opt[1] = "-l0 --vertical-label \"Tapes\" --title \"Occupancy of pool\" "; + + + +$def[1] = "DEF:tapes=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "DEF:free=$RRDFILE[2]:$DS[1]:MAX "; +$def[1] .= "DEF:util=$RRDFILE[3]:$DS[1]:MAX "; + + +$def[1] .= "AREA:tapes#cd853f:\"Tapes in Pool \" "; +$def[1] .= "AREA:free#a000ff:\"Free Tapes \" "; +$def[1] .= "LINE:util#000000:\"Utilization \" "; +# FIXME: +# add warn/crit lines + + + +?>

11 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012