Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: sap.cfg: minor fix in example cfg

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9896b92e4fd35097160b8650035b8499080463ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9896b92e4fd350… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 11:05:27 2014 +0200 sap.cfg: minor fix in example cfg --- agents/sap/sap.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/sap/sap.cfg b/agents/sap/sap.cfg index 5ccae15..d19713e 100644 --- a/agents/sap/sap.cfg +++ b/agents/sap/sap.cfg @@ -46,7 +46,7 @@ cfg = [ # 'trace': '3', # 'loglevel': 'warn', # 'lang': 'EN', -} +#} ]

10 years, 2 months

Check_MK Git: check_mk: #0187 FIX hp_proliant_power: Fixed Wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0b017d2dba8ed9a3e51ad0435aa18a9b16e220a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b017d2dba8ed9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 10:00:25 2014 +0200 #0187 FIX hp_proliant_power: Fixed Wato configuration --- .werks/187 | 9 +++++++++ ChangeLog | 1 + checks/hp_proliant_power | 6 +++--- web/plugins/wato/check_parameters.py | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/187 b/.werks/187 new file mode 100644 index 0000000..3615f81 --- /dev/null +++ b/.werks/187 @@ -0,0 +1,9 @@ +Title: hp_proliant_power: Fixed Wato configuration +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406707206 + + diff --git a/ChangeLog b/ChangeLog index c64bf6f..b94b4b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 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 + * 0187 FIX: hp_proliant_power: Fixed Wato configuration Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power index 52d335d..c078823 100644 --- a/checks/hp_proliant_power +++ b/checks/hp_proliant_power @@ -41,10 +41,10 @@ def check_hp_proliant_power(item, params, info): warn, crit = params state = 0 levels = '' - if reading > crit: + if reading => crit: state = 2 levels = '( Warning/Critical %s/%s )' % ( warn, crit ) - elif reading > warn: + elif reading => warn: state = 1 levels = '( Warning/Critical %s/%s )' % ( warn, crit ) @@ -52,7 +52,7 @@ def check_hp_proliant_power(item, params, info): return state, "Current reading: %d Watt" % reading + levels, perf check_info["hp_proliant_power"] = { - 'group' : 'epower', + 'group' : 'epower_single', 'check_function' : check_hp_proliant_power, 'inventory_function' : inventory_hp_proliant_power, 'service_description' : 'HW Power Meter', diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d7b684f..932fee4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4147,6 +4147,20 @@ register_check_parameters( register_check_parameters( subgroup_environment, + "epower_single", + _("Electrical Power for Devices with only one phase"), + Tuple( + help = _("Levels for the electrical power consumption of a device "), + elements = [ + Integer(title = _("warning if at"), unit = "Watt", default_value = 300), + Integer(title = _("critical if at"), unit = "Watt", default_value = 400), + ]), + None, + "first" +) + +register_check_parameters( + subgroup_environment, "hw_temperature", _("Hardware temperature (e.g. switches)"), Tuple(

10 years, 2 months

Check_MK Git: check_mk: Fixed context type of log dashlet in builtin main dashboard

by Lars Michelsen

Module: check_mk Branch: master Commit: 525ef823009d2312a94150990f35b3db6b179a2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=525ef823009d23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 30 09:59:12 2014 +0200 Fixed context type of log dashlet in builtin main dashboard --- web/plugins/dashboard/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 2762c0e..03dcaa4 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -153,7 +153,7 @@ builtin_dashboards["main"] = { 'browser_reload': 90, 'column_headers': 'pergroup', 'datasource': 'log_events', - 'context_type': 'mkeventd_events', + 'context_type': 'logs', 'group_painters': [], 'context': { 'logtime': {

10 years, 2 months

Check_MK Git: check_mk: #1068 livedump: Added optional check interval ( detect staleness) / option to encrypt mails

by Lars Michelsen

Module: check_mk Branch: master Commit: d738e9f339af59b6939e92f0305eef4886c523b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d738e9f339af59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 30 09:53:48 2014 +0200 #1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails Added a new option "-i" to livedump to make the check_interval of the hosts / services configurable. When this is set the staleness detection on the destination system works. Added option to use AES encrypted messages with livedump-mail-fetch. Added a short documentation to the livedump README for details. --- .werks/1068 | 12 +++++++ ChangeLog | 1 + doc/treasures/livedump/README | 29 +++++++++++++++++ doc/treasures/livedump/livedump | 24 +++++++++++--- doc/treasures/livedump/livedump-mail-fetch | 48 ++++++++++++++++++++++++---- 5 files changed, 103 insertions(+), 11 deletions(-) diff --git a/.werks/1068 b/.werks/1068 new file mode 100644 index 0000000..8487e94 --- /dev/null +++ b/.werks/1068 @@ -0,0 +1,12 @@ +Title: livedump: Added optional check interval (detect staleness) / option to encrypt mails +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406706675 +Class: feature + +Added a new option "-i" to livedump to make the check_interval of the hosts / services +configurable. When this is set the staleness detection on the destination system works. + +Added option to use AES encrypted messages with livedump-mail-fetch. Added a short +documentation to the livedump README for details. diff --git a/ChangeLog b/ChangeLog index 9316b4d..45698d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... + * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked diff --git a/doc/treasures/livedump/README b/doc/treasures/livedump/README index 3f478ab..eac5c43 100644 --- a/doc/treasures/livedump/README +++ b/doc/treasures/livedump/README @@ -67,3 +67,32 @@ Make sure that all columns are prefixed with host_ in these. If you are using this is in conjunction with NSCA transport and do not wish to transfer the templated configuration, you can use the filter to only export services that have "obsess_over_service = 1" set. + +Encrypted Transport (E-Mail) +---------------------------- +When you use mail to transport the output of livedump. For example with this +command: + +livedump | mail -s "status" lm(a)mathias-kettner.de + +You can extend this mechanism to make the contents (not the whole message) +be encrypted. This can be reached by different ways, we use an AES encryption +with a preshared key here. + +First you need openssl on the sending site. Then you need a file which first line +contains the preshared key which will be used to encrypt the data. Then you need +to first send the livedump data to openssl to let it encrypt it and forward it to +the mail command afterwards. + +livedump | openssl aes-256-cbc -a -kfile /path/to/my/preshared-key-file | mail -s "status" lm(a)mathias-kettner.de + +Please ensure that the permissions to the preshared key file are as limited as +possible. Everyone who has access to an email and the key can decrypt it. + +This command should turn the mail contents in a block of cryptic characters when +you take a look at the generated mail in your mail client. + +Now you need to configure the receiving side. We use the script "livedump-mail-fetch" +here. To make it able to handle the encrypted message, you need to set the variable +encrypt to hold your preshared key as string. All incoming mails will then be decrypted +beforce being processed. diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index 8feb977..443b9a6 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -30,6 +30,10 @@ import os, sys, getopt, livestatus, tempfile, time check_mk_version = '(inofficial)' def dump_templates(): + check_interval = "" + if opt_check_interval != None: + check_interval = "check_interval %d" % opt_check_interval + sys.stdout.write(""" define host { name livedump-host @@ -37,7 +41,7 @@ define host { register 0 active_checks_enabled 0 passive_checks_enabled 1 - + %s } define service { @@ -46,6 +50,7 @@ define service { active_checks_enabled 0 passive_checks_enabled 1 check_period 0x0 + %s } define command { @@ -57,7 +62,7 @@ define timeperiod { timeperiod_name 0x0 alias Never ever } -""") +""" % (check_interval, check_interval)) def encode_row(row): for key, val in row.items(): @@ -257,6 +262,12 @@ def usage(): This header is also used in service queries. -S, --service-header H add header H to service queries (usually Filter: ...) + -i, --interval assume this check interval for hosts/services. This is + used in nagios config definition "check_interval". + Will be used for staleness checks on the server. This + option is only used when dumping the config together + with templates (-C -T). + -v, --verbose output debug information an stderr --debug do not catch Python exceptions @@ -277,11 +288,11 @@ def print_version(): # | Main entry point, getopt, etc. | # '----------------------------------------------------------------------' -short_options = 'hVvc:H:S:O:TCMG' -long_options = [ "help", "version", "verbose", "debug", "socket=", +short_options = 'hVvc:H:S:O:TCMGi:s:' +long_options = [ "help", "version", "verbose", "debug", "socket=", "host-header=", "host-only-header=", "service-header=", "dump-templates", "config", "state", "mark-mode", - "include-groups" ] + "include-groups", "interval" ] opt_verbose = False opt_debug = False @@ -292,6 +303,7 @@ opt_host_only_headers = "" opt_service_headers = "" opt_dump_templates = False opt_groups = False +opt_check_interval = None try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -328,6 +340,8 @@ for o,a in opts: opt_mark_mode = True elif o in [ '-G', '--include-groups' ]: opt_groups = True + elif o in [ '-i', '--interval' ]: + opt_check_interval = int(a) # Main modes try: diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch index d3b8f7f..e88b89f 100755 --- a/doc/treasures/livedump/livedump-mail-fetch +++ b/doc/treasures/livedump/livedump-mail-fetch @@ -27,6 +27,15 @@ pop_pass = "secretpassword" # By default the mail body is treated to be encoded as "quoted-printable". # In the other case no decoding is not performed. encoding = "quoted-printable" +# By default the mails are not decrypted. If you configure a string here +# it is assumed to be the preshared key to decrypt the AES encrypted mails. +encrypt = None + +if encrypt: + from base64 import b64decode + from Crypto import Random + from Crypto.Hash import MD5 + from Crypto.Cipher import AES M = poplib.POP3_SSL(pop_server) M.user(pop_user) @@ -39,6 +48,27 @@ numMessages = len(M.list()[1]) status_mails = [] config_mails = [] +# This decrypts mail bodies generated with openssl. e.g. with this command: +# openssl aes-256-cbc -a -kfile /path/to/my/preshared-key-file +def decrypt(body): + encrypted = b64decode(body) + salt = encrypted[8:16] + data = encrypted[16:] + + # Need 32 bytes for the key and 16 bytes for the IV + def openssl_kdf(req): + prev = '' + while req>0: + prev = MD5.new(prev+encrypt+salt).digest() + req -= 16 + yield prev + mat = ''.join([ x for x in openssl_kdf(32+16) ]) + key = mat[0:32] + iv = mat[32:48] + + dec = AES.new(key, AES.MODE_CBC, iv) + return dec.decrypt(data) + pattern = re.compile(r"^Subject: (.*)") for i in range(numMessages): for header_lines in M.top(i + 1, 0)[1]: @@ -59,10 +89,13 @@ if config_mails: mail_index, ident = config_mails[-1] code, mail, num = M.retr(mail_index) body_start_index = mail.index('') + body = '\n'.join(mail[body_start_index:]) + + if encrypt: + body = decrypt(body) + if encoding == 'quoted-printable': - body = quopri.decodestring('\n'.join(mail[body_start_index:])) - else: - body = '\n'.join(mail[body_start_index:]) + body = quopri.decodestring(body) file("%s/etc/nagios/conf.d/remote-%s.cfg" % (omd_root, ident), "w").write(body) @@ -71,10 +104,13 @@ if status_mails: for index in status_mails: code, mail, code = M.retr(index) body_start_index = mail.index('') + body = '\n'.join(mail[body_start_index:]) + + if encrypt: + body = decrypt(body) + if encoding == 'quoted-printable': - body = quopri.decodestring('\n'.join(mail[body_start_index:])) - else: - body = '\n'.join(mail[body_start_index:]) + body = quopri.decodestring(body) fd, path = tempfile.mkstemp('', 'c', "%s/tmp/nagios/checkresults" % omd_root) os.write(fd, body)

10 years, 2 months

Check_MK Git: check_mk: #1091 FIX logwatch patterns: allow unicode text in pattern comment

by Andreas Boesl

Module: check_mk Branch: master Commit: bd640263af67ea055e75126abbb39af35c9e7cb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd640263af67ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 29 17:33:12 2014 +0200 #1091 FIX logwatch patterns: allow unicode text in pattern comment --- .werks/1091 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1091 b/.werks/1091 new file mode 100644 index 0000000..675925e --- /dev/null +++ b/.werks/1091 @@ -0,0 +1,9 @@ +Title: logwatch patterns: allow unicode text in pattern comment +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406647953 + + diff --git a/ChangeLog b/ChangeLog index 6cf5446..c64bf6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... + * 1091 FIX: logwatch patterns: allow unicode text in pattern comment 1.2.5i5: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 101e891..d7b684f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -76,7 +76,7 @@ register_rule(group + '/' + subgroup_applications, title = _("Pattern (Regex)"), size = 40, ), - TextAscii( + TextUnicode( title = _("Comment"), size = 40, ),

10 years, 2 months

Check_MK Git: check_mk: #0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems

by Bastian Kuhn

Module: check_mk Branch: master Commit: b04df555675a934e037e32e9ef7be2d9ae797153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b04df555675a93… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 29 16:25:44 2014 +0200 #0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems --- .werks/186 | 8 +++++ ChangeLog | 1 + checkman/touchstone_cable_modem_fec | 15 +++++++++ checks/touchstone_cable_modem_fec | 57 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 33 ++++++++++++++++++++ 5 files changed, 114 insertions(+) diff --git a/.werks/186 b/.werks/186 new file mode 100644 index 0000000..e9785af --- /dev/null +++ b/.werks/186 @@ -0,0 +1,8 @@ +Title: touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406643907 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b9e0046..6cf5446 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... + * 0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems * 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 diff --git a/checkman/touchstone_cable_modem_fec b/checkman/touchstone_cable_modem_fec new file mode 100644 index 0000000..4a62c65 --- /dev/null +++ b/checkman/touchstone_cable_modem_fec @@ -0,0 +1,15 @@ +title: Touchstone Cable Modem: Forward error correction +agents: snmp +catalog: hw/network/arris +license: GPL +distribution: +description: + This check monitors the Forward Error correction rate on Touchestone Cable Modems. + It is possible to set levels for good, uncorrected and corrected packages. + +item: + None + +inventory: + One service will be created + diff --git a/checks/touchstone_cable_modem_fec b/checks/touchstone_cable_modem_fec new file mode 100644 index 0000000..daca175 --- /dev/null +++ b/checks/touchstone_cable_modem_fec @@ -0,0 +1,57 @@ +#!/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. + +factory_settings["touchstone_cable_modem_fec_default_levels"] = { + "good" : ( 250000000000, 260000000000 ), + "corrected" : ( 250000000000, 260000000000 ), + "uncorrected" : ( 250000000000, 260000000000 ), +} + +def inventory_touchstone_cable_modem_fec(info): + return [ (None, {}) ] + +def check_touchstone_cable_modem_fec(_no_item, params, info): + fec = {} + fec['good'], fec['corrected'], fec['uncorrected'] = map(int, info[0]) + for what in ['good', 'corrected', 'uncorrected']: + warn, crit = params[what] + state = 0 + if fec[what] >= crit: + state = 2 + elif fec[what] >= warn: + state = 1 + yield state, "FEC %s at %s" % ( what, fec[what] ), [ ( what, fec[what], warn, crit ) ] + +check_info["touchstone_cable_modem_fec"] = { + "check_function" : check_touchstone_cable_modem_fec, + "inventory_function" : inventory_touchstone_cable_modem_fec, + "service_description" : "FEC", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", + "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.4.1", [ 2, 3, 4 ]), + "default_levels_variable" : "touchstone_cable_modem_fec_default_levels", + "group" : "fec", +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2dc57fc..101e891 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1317,6 +1317,39 @@ register_check_parameters( register_check_parameters( subgroup_networking, + 'fec', + _("Forward error correction"), + Dictionary( + elements = [ + ( 'good', Tuple( + title = _("Levels for good Packages"), + elements = [ + Integer( title = _("Warning at"), default_value="250000000000"), + Integer( title = _("Critical at"), default_value="260000000000"), + ] + )), + ( 'corrected', Tuple( + title = _("Levels for corrected Packages"), + elements = [ + Integer( title = _("Warning at"), default_value="250000000000"), + Integer( title = _("Critical at"), default_value="260000000000"), + ] + )), + ( 'uncorrected', Tuple( + title = _("Levels for uncorrected Packages"), + elements = [ + Integer( title = _("Warning at"), default_value="250000000000"), + Integer( title = _("Critical at"), default_value="260000000000"), + ] + )), + ] + ), + None, + "dict" +) + +register_check_parameters( + subgroup_networking, "vpn_tunnel", _("VPN Tunnel"), Dictionary(

10 years, 2 months

Check_MK Git: check_mk: fixed syntax error

by Andreas Boesl

Module: check_mk Branch: master Commit: fc83a01bbcd52b4e0aa6cf10b8316860553a986b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc83a01bbcd52b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 29 16:11:29 2014 +0200 fixed syntax error --- checks/zfsget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/zfsget b/checks/zfsget index a03564b..ca34418 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -99,7 +99,7 @@ def parse_zfsget(info): if zfs_agent_data: new_entry = parse_zfs_entry(zfs_agent_data) if new_entry: - zfs_converted.append() + zfs_converted.append(new_entry) zfs_agent_data = [] zfs_agent_data.append(line[:3])

10 years, 2 months

Check_MK Git: check_mk: #1090 FIX zfsget: fixed exception which happened on incomplete zfs entries

by Andreas Boesl

Module: check_mk Branch: master Commit: d502ea1a1f9058cc604c1814947c39f8dcdbf8a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d502ea1a1f9058… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 29 15:38:57 2014 +0200 #1090 FIX zfsget: fixed exception which happened on incomplete zfs entries --- .werks/1090 | 9 +++++++++ ChangeLog | 1 + checks/zfsget | 10 ++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/1090 b/.werks/1090 new file mode 100644 index 0000000..1204ab5 --- /dev/null +++ b/.werks/1090 @@ -0,0 +1,9 @@ +Title: zfsget: fixed exception which happened on incomplete zfs entries +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406641044 + + diff --git a/ChangeLog b/ChangeLog index 9316b4d..b9e0046 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... * 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 Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/zfsget b/checks/zfsget index f4b0ec5..a03564b 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -59,7 +59,7 @@ # tsrdb10exp 5128704 21 4982717 1% /tsrdb10exp # tsrdb10dat 30707712 19914358 10789464 65% /u01 -def parse_zfs_entrie(info): +def parse_zfs_entry(info): def mb(x): return saveint(x) / (1024.0 * 1024) entry = {} @@ -71,8 +71,8 @@ def parse_zfs_entrie(info): entry[what] = mb(value) elif what in [ 'mountpoint', 'type', 'name' ]: entry[what] = value - if entry: - return entry + + return entry def parse_zfsget(info): run_zfs = True @@ -97,7 +97,9 @@ def parse_zfsget(info): if last_name != name: last_name = name if zfs_agent_data: - zfs_converted.append(parse_zfs_entrie(zfs_agent_data)) + new_entry = parse_zfs_entry(zfs_agent_data) + if new_entry: + zfs_converted.append() zfs_agent_data = [] zfs_agent_data.append(line[:3])

10 years, 2 months

Check_MK Git: check_mk: #1067 FIX Fixed login problem in LDAP connector when no user filter specified

by Lars Michelsen

Module: check_mk Branch: master Commit: 967caa6012f6194a317b0ca4c4095ac4b2cb957a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=967caa6012f619… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 29 15:21:44 2014 +0200 #1067 FIX Fixed login problem in LDAP connector when no user filter specified The 1.2.5i5 released introduced a bug which prevents user logins when the LDAP configured does not has a LDAP user filter set. If you encounter this problem either update to this release or set a user filter to prevent the exception. --- .werks/1067 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1067 b/.werks/1067 new file mode 100644 index 0000000..0eb0eaf --- /dev/null +++ b/.werks/1067 @@ -0,0 +1,12 @@ +Title: Fixed login problem in LDAP connector when no user filter specified +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406640020 + +The 1.2.5i5 released introduced a bug which prevents user logins when the +LDAP configured does not has a LDAP user filter set. If you encounter this +problem either update to this release or set a user filter to prevent the +exception. diff --git a/ChangeLog b/ChangeLog index 3e7cdc6..9316b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Multisite: * 1066 Implemented Dashboard Designer... + * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3cf8883..e4ec3e7 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -475,7 +475,7 @@ def ldap_get_user(username, no_escape = False): result = ldap_search( ldap_replace_macros(config.ldap_userspec['dn']), '(&(%s=%s)%s)' % (ldap_user_id_attr(), ldap.filter.escape_filter_chars(username), - config.ldap_userspec['filter']), + config.ldap_userspec.get('filter', '')), [ldap_user_id_attr()], )

10 years, 2 months

Check_MK Git: check_mk: #1066 Implemented Dashboard Designer

by Lars Michelsen

Module: check_mk Branch: master Commit: e605b7f8fc92cd99d5e314ccd9d7d62115bab9e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e605b7f8fc92cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 29 13:04:42 2014 +0200 #1066 Implemented Dashboard Designer This change implements the long awaited Dashboard Designer. With this feature users can edit existing dashboards, create new ones and provide their dashboards to other users just like it can be done with the views. Another nice feature is the formalized context we introduced for views and dashboards. With this concept it is possible to create a host specific dashboard once and open it for several different hosts. You can create a "Oracle Database dashboard" once which can show you the state of a single database server. The name of the database server (context: hostname) of your choice can be provided when accessing the dashboard to "instanciate" such a dashboard. Dashboards edited by users are saved in <tt>var/check_mk/web/USER/user_dashboards.mk</tt> just like edited views are now saved in <tt>var/check_mk/web/USER/user_views.mk</tt>. The views saved by a user before this release which are stored in <tt>var/check_mk/web/USER/views.mk</tt> will be migrated automatically once the user edits it's first view. From this time the new edited views will be read/written from/to the new file. For details take a look at the <a href="/checkmk_multisite_dashboards.html">dashboard documentation</a>. --- .werks/1066 | 25 +++++++++++++++++++++++++ ChangeLog | 3 +++ 2 files changed, 28 insertions(+) diff --git a/.werks/1066 b/.werks/1066 new file mode 100644 index 0000000..0682ef7 --- /dev/null +++ b/.werks/1066 @@ -0,0 +1,25 @@ +Title: Implemented Dashboard Designer +Level: 3 +Component: multisite +Version: 1.2.5i6 +Date: 1406631300 +Class: feature + +This change implements the long awaited Dashboard Designer. With this feature users +can edit existing dashboards, create new ones and provide their dashboards to other +users just like it can be done with the views. + +Another nice feature is the formalized context we introduced for views and dashboards. +With this concept it is possible to create a host specific dashboard once and open +it for several different hosts. You can create a "Oracle Database dashboard" once +which can show you the state of a single database server. The name of the database +server (context: hostname) of your choice can be provided when accessing the dashboard +to "instanciate" such a dashboard. + +Dashboards edited by users are saved in <tt>var/check_mk/web/USER/user_dashboards.mk</tt> +just like edited views are now saved in <tt>var/check_mk/web/USER/user_views.mk</tt>. The +views saved by a user before this release which are stored in <tt>var/check_mk/web/USER/views.mk</tt> +will be migrated automatically once the user edits it's first view. From this time the +new edited views will be read/written from/to the new file. + +For details take a look at the <a href="/checkmk_multisite_dashboards.html">dashboard documentation</a>. diff --git a/ChangeLog b/ChangeLog index bd20700..3e7cdc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked + Multisite: + * 1066 Implemented Dashboard Designer... + WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling......

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits