Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored

by Götz Golla

Module: check_mk Branch: master Commit: 6a8d9ec2ba1cbf338e035a9828d9ded26e6c42a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a8d9ec2ba1cbf… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Jan 23 20:44:29 2014 +0100 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored --- .werks/572 | 9 +++++++++ ChangeLog | 1 + checkman/cmciii_lcp_waterflow | 3 +++ checks/cmciii_lcp_waterflow | 25 ++++++++++++++++++------- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.werks/572 b/.werks/572 new file mode 100644 index 0000000..8a8834b --- /dev/null +++ b/.werks/572 @@ -0,0 +1,9 @@ +Title: cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1390506211 + + diff --git a/ChangeLog b/ChangeLog index a25baca..91c128b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm + * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/cmciii_lcp_waterflow b/checkman/cmciii_lcp_waterflow index 8345297..e9ef7d1 100644 --- a/checkman/cmciii_lcp_waterflow +++ b/checkman/cmciii_lcp_waterflow @@ -10,6 +10,9 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Furthermore, the minimum and maximum flow limits of the device are + extracted and a state of {WARN} is assumed if the actual flow is + outside these limits. item: None diff --git a/checks/cmciii_lcp_waterflow b/checks/cmciii_lcp_waterflow index 910253a..9192c47 100644 --- a/checks/cmciii_lcp_waterflow +++ b/checks/cmciii_lcp_waterflow @@ -30,15 +30,26 @@ def inventory_cmciii_lcp_waterflow(info): def check_cmciii_lcp_waterflow(item, params, info): if info[0]: - info_text = "%s Status: %s Flow: %s, MinFlow: %s, MaxFLow: %s" % \ - (info[0][0], info[0][4], info[0][1], info[0][3], info[0][2]) + name = info[0][0] + status = info[0][4] + flow = float(info[0][1].split(" ")[0]) + unit = info[0][1].split(" ")[1] + minflow= float(info[0][3].split(" ")[0]) + maxflow = float(info[0][2].split(" ")[0]) - perfdata = [ ("flow", re.sub(" ", "", info[0][1]) , 0, re.sub(' .*$', '', info[0][3])+":"+re.sub(' .*$', '', info[0][2]), 0 ) ] - - if info[0][4].lower() == "ok": - state = 0 - else: + sym = "" + if status.lower() != "ok": state = 2 + elif flow < minflow or flow > maxflow: + state = 1 + sym = "(!)" + else: + state = 0 + + info_text = "%s Status: %s Flow: %.1f%s, MinFlow: %.1f, MaxFLow: %.1f" \ + % (name, status, flow, sym, minflow, maxflow) + + perfdata = [ ("flow", str(flow)+unit , str(minflow)+":"+str(maxflow), 0, 0 ) ] return (state, info_text, perfdata)

10 years, 5 months

Check_MK Git: check_mk: Again added missing files

by Bastian Kuhn

Module: check_mk Branch: master Commit: d95f1c667c93038de25f1677c693ad80fd9b937c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d95f1c667c9303… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 23 17:46:26 2014 +0100 Again added missing files --- checkman/hp_proliant_raid | 16 ++++++++++ checks/hp_proliant_raid | 78 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/checkman/hp_proliant_raid b/checkman/hp_proliant_raid new file mode 100644 index 0000000..2fa59bf --- /dev/null +++ b/checkman/hp_proliant_raid @@ -0,0 +1,16 @@ +title: HP Proliant Servers: Raid status` +agents: snmp +catalog: hw/server/hp +license: GPL +distribution: check_mk +description: + This check connects to the SNMP agent installed on an operating system + on a HP Proliant server and reads the information from the {CPQHLTH-MIB} + MIB. + The systems SNMP agent is extended by the HP Management Agents which need + to be installed on the monitored systems. + + The check monitors the state of all logical and physical devices + +inventory: + One check is automatically created for each logical device. diff --git a/checks/hp_proliant_raid b/checks/hp_proliant_raid new file mode 100644 index 0000000..7901451 --- /dev/null +++ b/checks/hp_proliant_raid @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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 inventory_hp_proliant_raid(info): + if len(info) > 0: + inventory = [] + for line in info: + inventory.append((line[0], None)) + return inventory + +def check_hp_proliant_raid(item, _no_params, info): + hp_proliant_raid_statusmap = { + 3 : "More physical drives have failed than the fault tolerance mode can handle.", + 4 : "Logical drive is not configured.", + 5 : "Recovery for at least one physical drive hasfailed. No data loss currently.", + 6 : "Logical drive is ready for recovery but is still operating in Interim Recovery Mode.", + 8 : "The wrong physical drive was replaced after failure.", + 9 : "A physical drive is not responding.", + 10 : "Enclosue is overheated but drives still functioning and should be shutdown.", + 11 : "Enclosure is overheated and drives are shutdown.", + 12 : "Logical drive is currently doing Automatic Data Expansion.", + 13 : "Logical drive is currently unavailable.", + 14 : "Logical drive is in the queue for expansion.", + + } + for line in info: + if line[0] == item: + state, size_mb, percent_rebuild = map(saveint, line[1:]) + drive_size = "Logical Volume Size: %s" % get_bytes_human_readable(size_mb * 1024 * 1024 ) + if state == 7: + return 1, "Rebuild: %d%% finished. %s" % ( percent_rebuild, drive_size ) + if state == 2: + return 0, "In normal operation mode. " + drive_size + if state in [ 4, 5, 6, 12, 14 ]: + return 1, hp_proliant_raid_statusmap[state] + drive_size + if state in [ 3, 8, 9, 10, 12, 13 ]: + return 2, hp_proliant_raid_statusmap[state] + drive_size + return (3, "Drive not found or Uknown state") + +check_info["hp_proliant_raid"] = { + 'check_function': check_hp_proliant_raid, + 'inventory_function': inventory_hp_proliant_raid, + 'service_description': 'Logical Device %s', + 'snmp_info': ( + ".1.3.6.1.4.1.232.3.2.3.1.1", [ + 14, # Drive Name + 4, # Logical Drive status + 9, # Drive Size + 12, # Percent rebuild + ] + ), + 'snmp_scan_function': \ + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), +}

10 years, 5 months

Check_MK Git: check_mk: hp_proliant_raid: Check for proliant RAID status.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1f64a5753bb0ac1192b868d69dfa2c2d08fe4d3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f64a5753bb0ac… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 23 17:45:56 2014 +0100 hp_proliant_raid: Check for proliant RAID status. --- .werks/127 | 8 ++++++++ ChangeLog | 1 + 2 files changed, 9 insertions(+) diff --git a/.werks/127 b/.werks/127 new file mode 100644 index 0000000..4039e70 --- /dev/null +++ b/.werks/127 @@ -0,0 +1,8 @@ +Title: hp_proliant_raid: Check for proliant RAID status. +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1390495529 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0a38083..fce8dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 0464 stulz_pump: new check for the status of pumps of Stulz clima units * 0125 unitrends_backup:Unitrends Backup... * 0126 mikrotik_signal: Check for mikrotik wifi bridges + * 0127 hp_proliant_raid: Check for proliant RAID status. * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...

10 years, 5 months

Check_MK Git: check_mk: Picked Werk 696

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c5add92f9b22017e6127be65070966bbbe65345 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c5add92f9b220… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 16:58:22 2014 +0100 Picked Werk 696 --- .werks/696 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/696 b/.werks/696 new file mode 100644 index 0000000..73df176 --- /dev/null +++ b/.werks/696 @@ -0,0 +1,9 @@ +Title: Remove garbled output of cmk -v in state of CMC +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390492533 + + diff --git a/ChangeLog b/ChangeLog index 0d49002..15e8a07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 0451 FIX: Ignore missing check types when creating configuration for Nagios * 0259 FIX: Fixed htpasswd permission problem in check_mk standalone installation... * 0453 FIX: Fix ugly Python exception in host diagnosis page in case of SNMP error... + * 0696 FIX: Remove garbled output of cmk -v in state of CMC Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets

10 years, 5 months

Check_MK Git: check_mk: Picked werk from 1.2.4

by Mathias Kettner

Module: check_mk Branch: master Commit: c0b7b2f1983cc318a3d4e5493550cd522c28e7d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0b7b2f1983cc3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 16:58:50 2014 +0100 Picked werk from 1.2.4 --- modules/check_mk_base.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7e18d66..2e8390e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1285,18 +1285,14 @@ def submit_check_result(host, servicedesc, result, sa): def submit_to_core(host, service, state, output): # Save data for sending it to the Check_MK Micro Core # Replace \n to enable multiline ouput - if monitoring_core == "cmc": + if opt_keepalive: output = output.replace("\n", "\x01", 1).replace("\n","\\n") result = "\t%d\t%s\t%s\n" % (state, service, output.replace("\0", "")) # remove binary 0, CMC does not like it - if opt_keepalive: - global total_check_output - total_check_output += result - else: - if not opt_verbose: - sys.stdout.write(result) + global total_check_output + total_check_output += result # Send to Nagios/Icinga command pipe - elif check_submission == "pipe": + elif check_submission == "pipe" or monitoring_core == "cmc": # CMC does not support file output = output.replace("\n", "\\n") open_command_pipe() if nagios_command_pipe:

10 years, 5 months

Check_MK Git: check_mk: Remove obsolete option -u, --cleanup-autochecks

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ae86839324bebdd03b4c73cb11e6f021b8b62cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ae86839324beb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 16:34:41 2014 +0100 Remove obsolete option -u, --cleanup-autochecks The option <tt>-u</tt> / <tt>--cleanup-autochecks</tt> has been removed. Autocheck files in <tt>var/check_mk/autochecks</tt> are now always cleaned up (i.e. one file per host). --- .bugs/2100 | 6 ++++-- .werks/695 | 10 ++++++++++ ChangeLog | 2 ++ modules/check_mk.py | 24 +++++------------------- web/plugins/wato/check_mk_configuration.py | 8 -------- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/.bugs/2100 b/.bugs/2100 index 6d1602b..a0a76ae 100644 --- a/.bugs/2100 +++ b/.bugs/2100 @@ -1,8 +1,10 @@ Title: OpenLDAP: Group sync seems broken Component: multisite -State: open +Class: bug +State: done Date: 2013-12-17 13:38:38 Targetversion: 1.2.4 -Class: bug Groups are not synced anymore. The search-filter on the distinguishedName does not work in Openldap, nor can "dn" be used in a searchfilter. + +2014-01-23 16:13:08: changed state open -> done diff --git a/.werks/695 b/.werks/695 new file mode 100644 index 0000000..dbb0529 --- /dev/null +++ b/.werks/695 @@ -0,0 +1,10 @@ +Title: Remove obsolete option -u, --cleanup-autochecks +Level: 1 +Component: core +Version: 1.2.5i1 +Date: 1390491224 +Class: incomp + +The option <tt>-u</tt> / <tt>--cleanup-autochecks</tt> has been removed. +Autocheck files in <tt>var/check_mk/autochecks</tt> are now always +cleaned up (i.e. one file per host). diff --git a/ChangeLog b/ChangeLog index f8cb1d0..0d49002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ * 0452 Speedup generation of configuration... * 0124 Support multiline plugin output for Check_MK Checks... * 0675 Activate inline SNMP per default (if available)... + * 0695 Remove obsolete option -u, --cleanup-autochecks... + NOTE: Please refer to the migration notes! * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory diff --git a/modules/check_mk.py b/modules/check_mk.py index 28a2513..2d64184 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -252,7 +252,7 @@ inventory_check_severity = 1 # warning inventory_check_do_scan = True # include SNMP scan for SNMP devices inventory_max_cachefile_age = 120 # secs. inventory_check_autotrigger = True # Automatically trigger inv-check after automation-inventory -always_cleanup_autochecks = True +always_cleanup_autochecks = None # For compatiblity with old configuration # Nagios templates and other settings concerning generation # of Nagios configuration files. No need to change these values. @@ -4508,9 +4508,8 @@ Copyright (C) 2009 Mathias Kettner def usage(): print """WAYS TO CALL: cmk [-n] [-v] [-p] HOST [IPADDRESS] check all services on HOST - cmk [-u] -I [HOST ..] inventory - find new services - cmk [-u] -II ... renew inventory, drop old services - cmk -u, --cleanup-autochecks reorder autochecks files + cmk -I [HOST ..] inventory - find new services + cmk -II ... renew inventory, drop old services cmk -N [HOSTS...] output Nagios configuration cmk -B create configuration for core cmk -C, --compile precompile host checks @@ -4572,10 +4571,6 @@ NOTES: -II does the same as -I but deletes all existing checks of the specified types and hosts. - -u, --cleanup-autochecks resorts all checks found by inventory - into per-host files. It can be used as an options to -I or as - a standalone operation. - -N outputs the Nagios configuration. You may optionally add a list of hosts. In that case the configuration is generated only for that hosts (useful for debugging). @@ -5665,7 +5660,7 @@ def output_profile(): # Do option parsing and execute main function - # if check_mk is not called as module if __name__ == "__main__": - short_options = 'SHVLCURODMmd:Ic:nhvpXPuNB' + short_options = 'SHVLCURODMmd:Ic:nhvpXPNB' long_options = [ "help", "version", "verbose", "compile", "debug", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "snmptranslate", @@ -5673,7 +5668,7 @@ if __name__ == "__main__": "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", - "check-inventory=", "paths", "cleanup-autochecks", "checks=", + "check-inventory=", "paths", "checks=", "cmc-file=", "browse-man", "list-man", "update-dns-cache" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', @@ -5713,8 +5708,6 @@ if __name__ == "__main__": opt_showperfdata = True elif o == '-n': opt_dont_submit = True - elif o in [ '-u', '--cleanup-autochecks' ]: - opt_cleanup_autochecks = True elif o == '--fake-dns': fake_dns = a elif o == '--keepalive': @@ -5928,14 +5921,7 @@ if __name__ == "__main__": for checkname in checknames: make_inventory(checkname, hostnames, False) - # -u, --cleanup-autochecks called in stand alone mode - if opt_cleanup_autochecks or always_cleanup_autochecks: - do_cleanup_autochecks() - done = True - - if not done and opt_cleanup_autochecks: # -u as standalone option do_cleanup_autochecks() - done = True if done: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index c71c642..162fd60 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1256,14 +1256,6 @@ register_configvar(group, need_restart = True ) -register_configvar(group, - "always_cleanup_autochecks", - Checkbox(title = _("Always cleanup autochecks"), - help = _("When switched on, Check_MK will always cleanup the autochecks files " - "after each inventory, i.e. create one file per host. This is the same " - "as adding the option <tt>-u</tt> to each call of <tt>-I</tt> on the " - "command line."))) - group = _("Check configuration")

10 years, 5 months

Check_MK Git: check_mk: Reserved 3 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 362019ffd21ae134fb7d4748b828ce68a9c6a0a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=362019ffd21ae1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 16:32:44 2014 +0100 Reserved 3 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e0f6509..679fa6b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -695 +698

10 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0839

by Mathias Kettner

Module: check_mk Branch: master Commit: c6d92d548f92adaed8f5cd3c353d1cfa64600200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6d92d548f92ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 16:12:41 2014 +0100 Updated bug entries #0839 --- .bugs/839 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/839 b/.bugs/839 index a926bd0..dd5e3ef 100644 --- a/.bugs/839 +++ b/.bugs/839 @@ -1,9 +1,9 @@ Title: printer suply levels for ricoh Component: checks -State: open +Class: bug +State: done Date: 2014-01-07 11:08:41 Targetversion: future -Class: bug Prinzipiell funktioniert der Check check_mk-printer_supply_ricoh gut allerdings haben wir festgestellt, dass er die Patronen verkehrt auswertet. @@ -12,3 +12,5 @@ Sprich wo 80% die Patrone voll ist erreicht die Auswertung 20% im Monitoring Sy Sprich nach Tausch ist der Drucker sofort auf kritisch und beim leer werden auf 100% voll. + +2014-01-23 16:12:39: changed state open -> done

10 years, 5 months

Check_MK Git: check_mk: Fixed inline comment headers

by Mathias Kettner

Module: check_mk Branch: master Commit: f93b3f5f88e171c4a5a748beb2e1f5929465f882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f93b3f5f88e171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 23 13:44:37 2014 +0100 Fixed inline comment headers --- web/plugins/wato/check_mk_configuration.py | 69 +++++++++++++++------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6ce159c..c71c642 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -24,16 +24,18 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# .--Global Settings-----------------------------------------------------. +# | ____ _ _ _ ____ _ _ _ | +# | / ___| | ___ | |__ __ _| | / ___| ___| |_| |_(_)_ __ __ _ ___ | +# || | _| |/ _ \| '_ \ / _` | | \___ \ / _ \ __| __| | '_ \ / _` / __| | +# || |_| | | (_) | |_) | (_| | | ___) | __/ |_| |_| | | | | (_| \__ \ | +# | \____|_|\___/|_.__/ \__,_|_| |____/ \___|\__|\__|_|_| |_|\__, |___/ | +# | |___/ | # +----------------------------------------------------------------------+ -# | ____ __ _ | -# | / ___|___ _ __ / _(_) __ ___ ____ _ _ __ ___ | -# | | | / _ \| '_ \| |_| |/ _` \ \ / / _` | '__/ __| | -# | | |__| (_) | | | | _| | (_| |\ V / (_| | | \__ \ | -# | \____\___/|_| |_|_| |_|\__, | \_/ \__,_|_| |___/ | -# | |___/ | -# +----------------------------------------------------------------------+ -# | Configuration variables for main.mk | -# +----------------------------------------------------------------------+ +# | Global configuration settings for main.mk and multisite.mk | +# '----------------------------------------------------------------------' + group = _("Status GUI (Multisite)") @@ -380,7 +382,7 @@ register_configvar(group, domain = "multisite", ) - +#. # .--WATO----------------------------------------------------------------. # | __ ___ _____ ___ | # | \ \ / / \|_ _/ _ \ | @@ -388,6 +390,8 @@ register_configvar(group, # | \ V V / ___ \| || |_| | | # | \_/\_/_/ \_\_| \___/ | # | | +# +----------------------------------------------------------------------+ +# | Global Configuration for WATO | # '----------------------------------------------------------------------' group = _("Configuration GUI (WATO)") @@ -466,7 +470,8 @@ register_configvar(group, default_value = False), domain = "multisite") -#GUI----------------------------------------------------------------------. +#. +# .--User Mgmt-----------------------------------------------------------. # | _ _ __ __ _ | # | | | | |___ ___ _ __ | \/ | __ _ _ __ ___ | |_ | # | | | | / __|/ _ \ '__| | |\/| |/ _` | '_ ` _ \| __| | @@ -474,6 +479,8 @@ register_configvar(group, # | \___/|___/\___|_| |_| |_|\__, |_| |_| |_|\__| | # | |___/ | # +----------------------------------------------------------------------+ +# | Global settings for users and LDAP connector. | +# '----------------------------------------------------------------------' group = _("User Management") @@ -879,14 +886,17 @@ register_configvar(group, domain = "multisite" ) -# .----------------------------------------------------------------------. -# | _ _ | -# | ___ _ __ ___ | | __ ___ _ __ _ __ ___ ___ __| | ___ | -# | / __| '_ ` _ \| |/ / / _ \| '_ \| '_ ` _ \ / _ \ / _` |/ _ \ | -# | | (__| | | | | | < | (_) | |_) | | | | | | (_) | (_| | __/ | -# | \___|_| |_| |_|_|\_\ \___/| .__/|_| |_| |_|\___/ \__,_|\___| | -# | |_| | +#. +# .--Check_MK------------------------------------------------------------. +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | |_____| | # +----------------------------------------------------------------------+ +# | Operation mode of Check_MK | +# '----------------------------------------------------------------------' group = _("Operation mode of Check_MK") @@ -1329,22 +1339,17 @@ register_configvar(group, ], )) -# +----------------------------------------------------------------------+ -# | ____ _ | -# | | _ \ _ _| | ___ | -# | | |_) | | | | |/ _ \ | -# | | _ <| |_| | | __/ | -# | |_| \_\\__,_|_|\___| | +#. +# .--Rulesets------------------------------------------------------------. +# | ____ _ _ | +# | | _ \ _ _| | ___ ___ ___| |_ ___ | +# | | |_) | | | | |/ _ \/ __|/ _ \ __/ __| | +# | | _ <| |_| | | __/\__ \ __/ |_\__ \ | +# | |_| \_\\__,_|_|\___||___/\___|\__|___/ | # | | -# | ____ _ _ _ | -# | | _ \ ___ ___| | __ _ _ __ __ _| |_(_) ___ _ __ ___ | -# | | | | |/ _ \/ __| |/ _` | '__/ _` | __| |/ _ \| '_ \/ __| | -# | | |_| | __/ (__| | (_| | | | (_| | |_| | (_) | | | \__ \ | -# | |____/ \___|\___|_|\__,_|_| \__,_|\__|_|\___/|_| |_|___/ | -# | | -# +----------------------------------------------------------------------+ -# | Declaration of rules to be defined in main.mk or in folders | # +----------------------------------------------------------------------+ +# | Rulesets for hosts and services except check parameter rules. | +# '----------------------------------------------------------------------' register_rulegroup("grouping", _("Grouping"), _("Assignment of host & services to host, service and contacts groups. "))

10 years, 5 months

Check_MK Git: check_mk: fixed double escaping of newlines...

by Andreas Boesl

Module: check_mk Branch: master Commit: 881af42dfa328d660542173b825af1fe64009ba9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=881af42dfa328d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 23 14:58:21 2014 +0100 fixed double escaping of newlines... --- modules/check_mk_base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index c4c50a5..7e18d66 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1285,7 +1285,6 @@ def submit_check_result(host, servicedesc, result, sa): def submit_to_core(host, service, state, output): # Save data for sending it to the Check_MK Micro Core # Replace \n to enable multiline ouput - output = output.replace('\n', '\\n') if monitoring_core == "cmc": output = output.replace("\n", "\x01", 1).replace("\n","\\n") result = "\t%d\t%s\t%s\n" % (state, service, output.replace("\0", "")) # remove binary 0, CMC does not like it

10 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014