Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: edit_dictionary can now be used without transid handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 59eacc25f2a9efdd709d0c0a773d4502cb91d5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59eacc25f2a9ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 25 15:02:31 2014 +0200 edit_dictionary can now be used without transid handling --- web/htdocs/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 675cc7d..225ba3c 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -46,10 +46,10 @@ def get_input(valuespec, varprefix): def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, buttontext=None, title=None, buttons = None, method="GET", preview=False, - varprefix="", formname="form"): + varprefix="", formname="form", consume_transid = True): new_value = value.copy() if html.var("filled_in") == formname and html.transaction_valid(): - if not preview: + if not preview and consume_transid: html.check_transaction() messages = []

9 years, 10 months

Check_MK Git: check_mk: jar_signature: make paths in plugin configurable

by Mathias Kettner

Module: check_mk Branch: master Commit: 11ccbc7410c60cbe042f1d4b7b3c95bbfc8b6823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11ccbc7410c60c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 25 13:46:07 2014 +0200 jar_signature: make paths in plugin configurable --- agents/plugins/jar_signature | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agents/plugins/jar_signature b/agents/plugins/jar_signature index 257cac3..42a06b8 100755 --- a/agents/plugins/jar_signature +++ b/agents/plugins/jar_signature @@ -32,6 +32,11 @@ JAVA_HOME=/home/oracle/bin/jdk_latest_version JAR_PATH=/home/oracle/fmw/11gR2/as_1/forms/java/*.jar +# Let user override these defaults in a configuration file +if [ -e $MK_CONFDIR/jar_signature.cfg ] ; then + . $MK_CONFDIR/jar_signature.cfg +fi + PATH=$JAVA_HOME/bin:$PATH echo "<<<jar_signature>>>"

9 years, 10 months

Check_MK Git: check_mk: #1146 nfsmounts: supported by AIX agent now

by Mathias Kettner

Module: check_mk Branch: master Commit: 704c1b8077f54729116fda4089167cd10d82c433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704c1b8077f547… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 25 13:28:25 2014 +0200 #1146 nfsmounts: supported by AIX agent now In order to make this work you need the GNU version of <tt>stat</tt> installed on AIX and make have it precedence over the AIX version of <tt>stat</tt>. GNU <tt>stat</tt> is contained in the GNU <tt>coreutils</tt> package. --- .werks/1146 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/1146 b/.werks/1146 new file mode 100644 index 0000000..87618c1 --- /dev/null +++ b/.werks/1146 @@ -0,0 +1,11 @@ +Title: nfsmounts: supported by AIX agent now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408966023 +Class: feature + +In order to make this work you need the GNU version of <tt>stat</tt> installed +on AIX and make have it precedence over the AIX version of <tt>stat</tt>. GNU +<tt>stat</tt> is contained in the GNU <tt>coreutils</tt> package. diff --git a/ChangeLog b/ChangeLog index ca9b26b..d1b6b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1375 vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm... * 1376 dmraid: moved plugin code into normal Linux agent... * 1377 Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices... + * 1146 nfsmounts: supported by AIX agent now... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries

9 years, 10 months

Check_MK Git: check_mk: nfsmounts: works now also in AIX ( needs GNU stat installed)

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e278bc41824216053ec67cef2a5e503be80c8d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e278bc4182421… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 25 13:26:51 2014 +0200 nfsmounts: works now also in AIX (needs GNU stat installed) --- agents/check_mk_agent.aix | 41 +++++++++++++++++++++++++++++++++++++++++ checkman/nfsmounts | 2 +- checks/nfsmounts | 9 +++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index bed8bad..d5d3e11 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -51,6 +51,36 @@ else exec <&- 2>/dev/null fi +# Shell version of the waitmax utility, that limits the runtime of +# commands. This version does not conserve the original exit code +# of the command. It is successfull if the command terminated +# in time. +function waitmax +{ + TIMEOUT=${1}0 + SIGNAL=9 + shift + + # Run command in background + ksh -c "$*" & + PID=$! + + # Wait for termination within TIMOUT seconds + while [ $TIMEOUT -gt 0 ] + do + TIMEOUT=$((TIMEOUT - 1)) + if [ ! -e /proc/$PID ] ; then + return 0 + fi + perl -e "select(undef, undef, undef, 0.1);" + done + + # Process did not terminate in time. Kill and + # return with an error + kill -9 $PID + return 255 +} + echo '<<<check_mk>>>' echo Version: 1.2.5i6 echo AgentOS: aix @@ -58,6 +88,17 @@ echo AgentOS: aix echo '<<<df>>>' df -kP | sed 's/ / - /' | grep -v ^/proc | grep -v ^Filesystem | grep -v : +# Check for hanging NFS mounts. This needs a GNU stat installed in the PATH +if type stat >/dev/null 2>&1 ; then + echo '<<<nfsmounts>>>' + mount | grep ' nfs' | awk '{print $3;}' | \ + while read MP + do + waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ + echo "$MP hanging 0 0 0 0" + done +fi + echo '<<<ps>>>' ps -ef -F user,vszsize,rssize,pcpu,args | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' diff --git a/checkman/nfsmounts b/checkman/nfsmounts index 3adcc16..c067b57 100644 --- a/checkman/nfsmounts +++ b/checkman/nfsmounts @@ -1,5 +1,5 @@ title: Health of NFS mounts -agents: linux +agents: linux, aix catalog: os/services license: GPL distribution: check_mk diff --git a/checks/nfsmounts b/checks/nfsmounts index 6d5a1a0..a705cab 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -36,6 +36,15 @@ def check_nfsmounts(item, _no_params, info): for line in info: mountpoint = " ".join(line[:-5]) if mountpoint == item: + # On some operating systems there is no information about + # used and free space, but just dahshes (e.g. AIX) + if line[-4] == '-': + if line[-5] == 'ok': + return 0, "NFS mount seems OK" + else: + return 2, "Server not responding" + + size_blocks = int(line[-4]) free_blocks = int(line[-2]) # for non-root user blocksize = int(line[-1])

9 years, 10 months

Check_MK Git: check_mk: oracle_dataguard_stats: removed empty unit in check parameter. (caused problem during translation)

by Andreas Boesl

Module: check_mk Branch: master Commit: 81d76d6fd5a1da0eb4ac2c84297b7d5db28e1cee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81d76d6fd5a1da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 25 13:17:01 2014 +0200 oracle_dataguard_stats: removed empty unit in check parameter. (caused problem during translation) --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 724100f..5e9a3fd 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3152,15 +3152,15 @@ register_check_parameters( title = _("Apply Lag"), help = _( "The limit for the apply lag in v$dataguard_stats."), elements = [ - Age(title = _("Warning if above"), unit = _(""), default_value = 10800), - Age(title = _("Critical if above"), unit = _(""), default_value = 21600)])), + Age(title = _("Warning if above"), default_value = 10800), + Age(title = _("Critical if above"), default_value = 21600)])), ( "transport_lag", Tuple( title = _("Transport Lag"), help = _( "The limit for the transport lag in v$dataguard_stats."), elements = [ - Age(title = _("Warning if above"), unit = _(""), default_value = 10800), - Age(title = _("Critical if above"), unit = _(""), default_value = 21600)])), + Age(title = _("Warning if above"), default_value = 10800), + Age(title = _("Critical if above"), default_value = 21600)])), ]), TextAscii( title = _("Database SID"),

9 years, 10 months

Check_MK Git: check_mk: URL dashlets: Added option to enable /

by Lars Michelsen

disable displaying URLs in iframe Message-ID: <53fafc3a./Arj54FZBVgPKTft%lm(a)mathias-kettner.de> 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: d9e723b6df34de6c475886f6986db5f6d87d67e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9e723b6df34de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 25 11:04:50 2014 +0200 URL dashlets: Added option to enable / disable displaying URLs in iframe --- web/htdocs/dashboard.py | 4 +++- web/plugins/dashboard/dashlets.py | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 3da590b..deb2311 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -482,7 +482,9 @@ def render_dashlet(name, board, nr, dashlet, wato_folder, add_url_vars): # Optional way to render a dynamic iframe URL if "iframe_urlfunc" in dashlet_type: - dashlet["iframe"] = dashlet_type["iframe_urlfunc"](dashlet) + url = dashlet_type["iframe_urlfunc"](dashlet) + if url != None: + dashlet["iframe"] = url elif "iframe_render" in dashlet_type: dashlet["iframe"] = html.makeuri_contextless([ diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 8e19a94..5038bb1 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -567,7 +567,8 @@ dashlet_types["view"] = { # '----------------------------------------------------------------------' def dashlet_url(params): - return params['url'] + if params.get('show_in_iframe', True): + return params['url'] dashlet_types["url"] = { "title" : _("Custom URL"), @@ -585,6 +586,11 @@ dashlet_types["url"] = { title = _('Dynamic URL rendering function'), size = 50, )), + ("show_in_iframe", Checkbox( + title = _('Render in iframe'), + label = _('Render URL contents in own frame'), + default_value = True, + )), ], "opt_params": ['url', 'urlfunc'], }

9 years, 10 months

Check_MK Git: check_mk: Fixed exception when editing "Hostgroups (Summary) view

by Lars Michelsen

Module: check_mk Branch: master Commit: 44117e1ed9fd54cbe07aba8def55491e3d70166b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44117e1ed9fd54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 25 08:43:47 2014 +0200 Fixed exception when editing "Hostgroups (Summary) view --- web/plugins/visuals/context_types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/context_types.py b/web/plugins/visuals/context_types.py index 063a569..05b287e 100644 --- a/web/plugins/visuals/context_types.py +++ b/web/plugins/visuals/context_types.py @@ -88,7 +88,7 @@ context_types['hostgroup'] = { context_types['hostgroups'] = { 'title' : _('Multiple Hostgroups'), 'single' : False, - 'parameters' : VisualFilterList(['hostgroup']), + 'parameters' : VisualFilterList(['hostgroup', 'hostgroups']), } context_types['servicegroup'] = {

9 years, 10 months

Check_MK Git: check_mk: #1378 FIX mk_logwatch: remove exceeding \n when rewriting message and using \0

by Mathias Kettner

Module: check_mk Branch: master Commit: ebc7a7193a9bbd0f1802df520fbed1ac8a142190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebc7a7193a9bbd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 22:05:24 2014 +0200 #1378 FIX mk_logwatch: remove exceeding \n when rewriting message and using \0 When using <tt>R</tt> for rewriting message and then using <tt>\0</tt> for inserting the complete original message there was only exceeding linefeed. This has been removed and thus the format being fixed. --- .werks/1378 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_logwatch | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1378 b/.werks/1378 new file mode 100644 index 0000000..b4c2bd6 --- /dev/null +++ b/.werks/1378 @@ -0,0 +1,11 @@ +Title: mk_logwatch: remove exceeding \n when rewriting message and using \0 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408910658 +Class: fix + +When using <tt>R</tt> for rewriting message and then using <tt>\0</tt> for +inserting the complete original message there was only exceeding linefeed. +This has been removed and thus the format being fixed. diff --git a/ChangeLog b/ChangeLog index ef7e7f4..ca9b26b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 1144 FIX: blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description... NOTE: Please refer to the migration notes! * 1145 FIX: windows_tasks: handle case correctly where task is currently running... + * 1378 FIX: mk_logwatch: remove exceeding \n when rewriting message and using \0... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 65ab679..d5326ef 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -282,7 +282,7 @@ def process_logfile(logfile, patterns): # Replacement for replace in replacements: - line = replace.replace('\\0', line) + "\n" + line = replace.replace('\\0', line.rstrip()) + "\n" for nr, group in enumerate(matches.groups()): line = line.replace('\\%d' % (nr+1), group)

9 years, 10 months

Check_MK Git: check_mk: Moved config examples to subdirectory,

by Mathias Kettner

add example for ngnix Message-ID: <53fa171b.9hb3ajAVXXG4myTB%mk(a)mathias-kettner.de> 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: f617a1cc2967dd90fc8b3ada481de4d9cae780e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f617a1cc2967dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 18:47:15 2014 +0200 Moved config examples to subdirectory, add example for ngnix --- agents/{ => cfg_examples}/apache_status.cfg | 0 agents/{ => cfg_examples}/jolokia.cfg | 0 agents/{ => cfg_examples}/logwatch.cfg | 0 agents/cfg_examples/nginx_status.cfg | 16 ++++++++++++++++ agents/{ => cfg_examples}/sqlplus.sh | 0 checkman/nginx_status | 17 +---------------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/agents/apache_status.cfg b/agents/cfg_examples/apache_status.cfg similarity index 100% rename from agents/apache_status.cfg rename to agents/cfg_examples/apache_status.cfg diff --git a/agents/jolokia.cfg b/agents/cfg_examples/jolokia.cfg similarity index 100% rename from agents/jolokia.cfg rename to agents/cfg_examples/jolokia.cfg diff --git a/agents/logwatch.cfg b/agents/cfg_examples/logwatch.cfg similarity index 100% rename from agents/logwatch.cfg rename to agents/cfg_examples/logwatch.cfg diff --git a/agents/cfg_examples/nginx_status.cfg b/agents/cfg_examples/nginx_status.cfg new file mode 100644 index 0000000..68805dd --- /dev/null +++ b/agents/cfg_examples/nginx_status.cfg @@ -0,0 +1,16 @@ +# Example configuration file. If you do not supply +# a configuration file then autodetection is being tried. + +servers = [ + { + "protocol" : "http", + "address" : "localhost", + "port" : 80, + }, + { + "protocol" : "https", + "address" : "localhost", + "port" : 443, + "page" : "nginx_status", + }, +] diff --git a/agents/sqlplus.sh b/agents/cfg_examples/sqlplus.sh similarity index 100% rename from agents/sqlplus.sh rename to agents/cfg_examples/sqlplus.sh diff --git a/checkman/nginx_status b/checkman/nginx_status index 02ffc02..e3bc1ae 100644 --- a/checkman/nginx_status +++ b/checkman/nginx_status @@ -43,22 +43,7 @@ description: The plugin tries to autodetect all running nginx servers. If that fails for some reason you need to create the configuration file {/etc/check_mk/nginx_status.cfg} and configure your servers in that file. - Take a look at the example section for the content of that file. - -examples: - servers = [ - { - 'protocol' : 'http', - 'address' : 'localhost', - 'port' : 80 , - }, - { - 'protocol' : 'https', - 'address' : 'localhost', - 'port' : 443 , - 'page' : 'my-server-status', - }, - ] + You find an example of that file in your agent directory ({share/check_mk/agents}). inventory: One service per web server will be created.

9 years, 10 months

Check_MK Git: check_mk: Fix bold font in ngnix_status manpage

by Mathias Kettner

Module: check_mk Branch: master Commit: 3b80897136801030a8267cf12b86b524bf368ba8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b808971368010… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 24 18:43:09 2014 +0200 Fix bold font in ngnix_status manpage --- checkman/nginx_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/nginx_status b/checkman/nginx_status index 0384549..02ffc02 100644 --- a/checkman/nginx_status +++ b/checkman/nginx_status @@ -21,7 +21,7 @@ description: {nginx -V 2>&1 | grep -o with-http_stub_status_module} to check this. You should see a single line of output when you have this module available. - Now you need to add the following configuration to a nginx site, inside the {server {..}} block. + Now you need to add the following configuration to a nginx site, inside the {server} block. On a debian system, this is located in the file {/etc/nginx/sites-enabled/default}. Now add the following block:

9 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014