Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Fix make headers, again

by Mathias Kettner

Module: check_mk Branch: master Commit: 43e1d91cb9fa6fe45e00121efa0cde671f39419c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43e1d91cb9fa6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 15:31:45 2013 +0200 Fix make headers, again --- doc/helpers/headrify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index d56a74b..95e8d34 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -48,7 +48,7 @@ headrify () if [ "${headline:0:9}" = "#!/bin/sh" ] ; then comment="# " bangpath="#!/bin/sh" - if [ "${headline:0:9}" = "#!/usr/bin/ksh93" ] ; then + elif [ "${headline:0:16}" = "#!/usr/bin/ksh93" ] ; then comment="# " bangpath="#!/usr/bin/ksh93" elif [ "${headline:0:11}" = "#!/bin/bash" ] ; then

11 years, 2 months

Check_MK Git: check_mk: FIX: check_mk_agent.aix: fix shebang: was python, must be ksh

by Mathias Kettner

Module: check_mk Branch: master Commit: c5b2135d8f53270e4e6e9214eacde5a8bdd1f8da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b2135d8f5327… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 15:27:03 2013 +0200 FIX: check_mk_agent.aix: fix shebang: was python, must be ksh --- ChangeLog | 1 + agents/check_mk_agent.aix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da0864d..8d9f29b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ Checks & Agents: * FIX: vsphere_agent: fix problems whith ! and \ in username or password + * FIX: check_mk_agent.aix: fix shebang: was python, must be ksh 1.2.2: diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 26615e0..769328e 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -1,5 +1,4 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- +#!/usr/bin/ksh93 # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

11 years, 2 months

Check_MK Git: check_mk: FIX: vsphere_agent: fix problems whith ! and \ in username or password

by Mathias Kettner

Module: check_mk Branch: master Commit: 81c5fbc77f487eca434dc18037074dae42ebad56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81c5fbc77f487e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 14:24:57 2013 +0200 FIX: vsphere_agent: fix problems whith ! and \ in username or password --- ChangeLog | 4 ++++ modules/check_mk.py | 13 +++++++++---- modules/check_mk_base.py | 6 ++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 664c7e4..da0864d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,10 @@ 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios + + Checks & Agents: + * FIX: vsphere_agent: fix problems whith ! and \ in username or password + 1.2.2: Core: diff --git a/modules/check_mk.py b/modules/check_mk.py index 9fa4c64..6cad5ed 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1584,8 +1584,6 @@ def create_nagios_config(outfile = sys.stdout, hostnames = None): outfile.write("\n# extra_nagios_conf\n\n") outfile.write(extra_nagios_conf) - - def create_nagios_config_host(outfile, hostname): outfile.write("\n# ----------------------------------------------------\n") outfile.write("# %s\n" % hostname) @@ -1927,7 +1925,8 @@ define service { for acttype, act_info, params in actchecks: has_perfdata = act_info.get('has_perfdata', False) description = act_info["service_description"](params) - args = act_info["argument_function"](params) + # compute argument, and quote ! and \ for Nagios + args = act_info["argument_function"](params).replace("\\", "\\\\").replace("!", "\\!") if description in used_descriptions: cn, it = used_descriptions[description] @@ -1987,7 +1986,7 @@ define service { freshness = " check_freshness\t\t1\n" + \ " freshness_threshold\t\t%d\n" % (60 * entry["freshness"]["interval"]) command_line = "echo %s && exit %d" % ( - quote_shell_string(entry["freshness"]["output"]), entry["freshness"]["state"]) + quote_nagios_string(entry["freshness"]["output"]), entry["freshness"]["state"]) else: freshness = "" @@ -2213,6 +2212,12 @@ def create_nagios_config_contacts(outfile): outfile.write("}\n\n") +# Quote string for use in a nagios command execution. +# Please note that also quoting for ! and \ vor Nagios +# itself takes place here. +def quote_nagios_string(s): + return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'" + diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fc3d770..1585a8c 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1462,11 +1462,9 @@ def get_age_human_readable(secs): return "%d days, %d hours" % (days, hours) return "%d days" % days -# Quote string for use as arguments on the shell (for usage -# in command definitions as $ARG1$). Please note that also -# quoting for ! and \ vor Nagios itself takes place here. +# Quote string for use as arguments on the shell def quote_shell_string(s): - return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'" + return "'" + s.replace("'", "'\"'\"'") + "'" # Check if a timeperiod is currently active. We have no other way than

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: c023d5d27fd3e6f6c78b10c5dc7a5eb16f54c327 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c023d5d27fd3e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 14:05:10 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Disable tag folding if only one tag topic is used

by Lars Michelsen

Module: check_mk Branch: master Commit: 164f9b1ff55532f141214b90c1924a0433a2d2d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164f9b1ff55532… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 11 14:05:06 2013 +0200 Disable tag folding if only one tag topic is used --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c2cb14d..1c2ea9b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10814,7 +10814,7 @@ def render_condition_editor(tag_specs, varprefix=""): auxtags = dict(group_hosttags_by_topic(config.wato_aux_tags)) hosttags = group_hosttags_by_topic(config.wato_host_tags) - make_foldable = bool(hosttags) + make_foldable = len(hosttags) > 1 for topic, grouped_tags in hosttags: if make_foldable: html.begin_foldable_container("topic", topic, True, "<b>%s</b>" % (topic or _('Host tags')))

11 years, 2 months

Check_MK Git: check_mk: Fix: honor host check command also for clusters with an IP address

by Mathias Kettner

Module: check_mk Branch: master Commit: 674378991bdff7cb025fff6b8d294bb3b5602ac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=674378991bdff7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 13:49:18 2013 +0200 Fix: honor host check command also for clusters with an IP address --- modules/check_mk.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 11cedc2..9fa4c64 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1669,10 +1669,6 @@ def create_nagios_hostdefs(outfile, hostname): if not extra_conf_parents: outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) - # Host check uses (service-) IP address if available - if ip: - outfile.write(" check_command\t\t\tcheck-mk-host-ping\n") - # Output alias, but only if it's not define in extra_host_conf aliases = host_extra_conf(hostname, extra_host_conf.get("alias", [])) if len(aliases) == 0:

11 years, 2 months

Check_MK Git: check_mk: Move rule datasource_programs to topic Datasource Programs

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b907661364c0998cb33eeb8de69f1cbe70b11ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b907661364c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 13:44:28 2013 +0200 Move rule datasource_programs to topic Datasource Programs --- web/plugins/wato/check_mk_configuration.py | 14 -------------- web/plugins/wato/datasource_programs.py | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 30c0f9c..59826fa 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1666,20 +1666,6 @@ register_rule(group, register_rule(group, - "datasource_programs", - TextAscii( - title = _("Individual program call instead of agent access"), - help = _("For agent based checks Check_MK allows you to specify an alternative " - "program that should be called by Check_MK instead of connecting the agent " - "via TCP. That program must output the agent's data on standard output in " - "the same format the agent would do. This is for example useful for monitoring " - "via SSH. The command line may contain the placeholders <tt><IP></tt> and " - "<tt><HOST></tt>."), - label = _("Command line to execute"), - size = 80, - attrencode = True)) - -register_rule(group, "piggyback_translation", Dictionary( title = _("Hostname translation for piggybacked hosts"), diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index ef8d568..43716b3 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -30,6 +30,20 @@ register_rulegroup("datasource_programs", group = "datasource_programs" register_rule(group, + "datasource_programs", + TextAscii( + title = _("Individual program call instead of agent access"), + help = _("For agent based checks Check_MK allows you to specify an alternative " + "program that should be called by Check_MK instead of connecting the agent " + "via TCP. That program must output the agent's data on standard output in " + "the same format the agent would do. This is for example useful for monitoring " + "via SSH. The command line may contain the placeholders <tt><IP></tt> and " + "<tt><HOST></tt>."), + label = _("Command line to execute"), + size = 80, + attrencode = True)) + +register_rule(group, "special_agents:vsphere", Dictionary( title = _("Check state of VMWare ESX via vSphere"),

11 years, 2 months

Check_MK Git: check_mk: Fix problems in template with various PING checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a599ae200eca3868e9b3537914c941f42b327d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a599ae200eca3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 13:38:59 2013 +0200 Fix problems in template with various PING checks --- check_mk_templates.cfg | 23 ++++++++++++++--------- modules/check_mk.py | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 40b9ed6..e764510 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -95,7 +95,7 @@ define host { retain_status_information 1 retain_nonstatus_information 1 process_perf_data 0 - check_command check-mk-ping + check_command check-mk-host-ping check_interval 1 check_period 24X7 max_check_attempts 1 @@ -133,7 +133,7 @@ define host { define host { name check_mk_cluster use check_mk_default - check_command check-mk-ping-cluster + check_command check-mk-host-ping-cluster register 0 } @@ -315,18 +315,28 @@ define command { command_line echo "DUMMY - Always OK" } +# Commands for services of PING-only hosts define command { command_name check-mk-ping command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ } -# Check for clusters: it is UP if at least one node is up define command { command_name check-mk-ping-cluster command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ } -# Dummy host check that always assumes that the host is up +# Host check commands +define command { + command_name check-mk-host-ping + command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ +} + +define command { + command_name check-mk-host-ping-cluster + command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ +} + define command { command_name check-mk-host-ok command_line echo "OK - Host is always assumed to be up" @@ -337,11 +347,6 @@ define command { command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ } -define command { - command_name check-mk-host-ping - command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ -} - # General notification script. Details can be configured # in main.mk via notification_... options diff --git a/modules/check_mk.py b/modules/check_mk.py index f9fe105..11cedc2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1671,7 +1671,7 @@ def create_nagios_hostdefs(outfile, hostname): # Host check uses (service-) IP address if available if ip: - outfile.write(" check_command\t\t\tcheck-mk-ping\n") + outfile.write(" check_command\t\t\tcheck-mk-host-ping\n") # Output alias, but only if it's not define in extra_host_conf aliases = host_extra_conf(hostname, extra_host_conf.get("alias", []))

11 years, 2 months

Check_MK Git: check_mk: Fix styling of buttons in ineffective rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 35726a036d039f068050c621fb080352b53c47cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35726a036d039f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 11:47:55 2013 +0200 Fix styling of buttons in ineffective rules --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c2cb14d..7056e83 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9702,7 +9702,7 @@ def mode_ineffective_rules(phase): table.row() # Actions - table.cell("Actions", css="ruleset") + table.cell("Actions", css="buttons") edit_url = make_link([ ("mode", "edit_rule"), ("varname", varname),

11 years, 2 months

Check_MK Git: check_mk: Fix ineffective rules in case of multiple folders

by Mathias Kettner

Module: check_mk Branch: master Commit: 67dbe82ee4222ff27ecbb3890546a785befa90af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67dbe82ee4222f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 11 11:48:40 2013 +0200 Fix ineffective rules in case of multiple folders --- web/htdocs/wato.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 93a5f32..53dde39 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10203,8 +10203,7 @@ def mode_edit_ruleset(phase): html.write(" ") html.write(htmllib.attrencode(rule_options.get("comment", ""))) - table.end() - + table.end() create_new_rule_form(rulespec, hostname, item)

11 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013