Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1ed028c22ab082e17fe3e9d657d1262c46baad8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ed028c22ab082… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 21 14:14:15 2016 +0100 Intermediate state Change-Id: Ide7b4a34bc157770a339c46a1717cbfe6fe4b901 --- checks/jolokia_generic | 91 +++++++++++++++++++++++++++++------- web/plugins/wato/check_parameters.py | 48 ++++++++++++++++--- 2 files changed, 115 insertions(+), 24 deletions(-) diff --git a/checks/jolokia_generic b/checks/jolokia_generic index 90120ba..55224ed 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -30,7 +30,7 @@ def parse_jolokia_generic(info): for line in info: instance, mbean, value, value_type = line - if value_type == "number": + if value_type in ["number", "rate"]: value = float(value) item = instance + " " + mbean @@ -55,19 +55,19 @@ def parse_jolokia_generic(info): def inventory_jolokia_generic_string(parsed): for item in parsed: if parsed[item]["type"] == "string": - yield item, None + yield item, {} def check_jolokia_generic_string(item, params, parsed): value = parsed[item]["value"] + default_status = params.get("default_status", 0) - yield 0, value - - if not params: - params = [] - for search_string, status in params: + search_strings = params.get("search_strings", []) + for search_string, status in search_strings: if search_string in value: - yield status, "%s matches" % search_string + return status, "%s: %s matches" % (value, search_string) + + return default_status, value check_info["jolokia_generic.string"] = { @@ -88,6 +88,58 @@ check_info["jolokia_generic.string"] = { # | | # '----------------------------------------------------------------------' +def inventory_jolokia_generic_rate(parsed): + for item in parsed: + if parsed[item]["type"] == "rate": + yield item, {} + + +def check_jolokia_generic_rate(item, params, parsed): + now = time.time() + rate = get_rate(item, now, parsed[item]["value"]) + infotext = "%.1f" % rate + perfdata = None + + if params: + if params.get("levels"): + status = 0 + warn, crit = params["levels"] + perfdata = [ ("generic_rate", rate, warn, crit) ] + levelstext = "(warn/crit at %.1f/%.1f)" % (warn, crit) + + if rate >= crit: + status = 2 + elif rate >= warn: + status = 1 + + if not status: + levelstext = "" + yield status, levelstext + + if params.get("levels_lower"): + status = 0 + warn_lower, crit_lower = params["levels_lower"] + levelstext_lower = "(warn/crit below %.1f/%.1f)" % (warn_lower, crit_lower) + if rate < crit_lower: + status = 2 + elif rate < warn_lower: + status = 1 + if not status: + levelstext_lower = "" + yield status, levelstext_lower + + if not perfdata: + perfdata = [ ("generic_rate", rate) ] + + yield 0, infotext, perfdata + + +check_info["jolokia_generic.rate"] = { + "inventory_function" : inventory_jolokia_generic_rate, + "check_function" : check_jolokia_generic_rate, + "service_description" : "MBean %s", + "group" : "generic_rate", +} #. @@ -109,35 +161,40 @@ def inventory_jolokia_generic(parsed): def check_jolokia_generic(item, params, parsed): value = parsed[item]["value"] infotext = "%.1f" % value + perfdata = None + if params: if params.get("levels"): status = 0 warn, crit = params["levels"] - levelstext = " (warn/crit at %.1f/%.1f)" % (warn, crit) + perfdata = [ ("generic_number", value, warn, crit) ] + levelstext = "(warn/crit at %.1f/%.1f)" % (warn, crit) if value >= crit: status = 2 elif value >= warn: status = 1 - if status: - infotext += levelstext - yield status, infotext + if not status: + levelstext = "" + yield status, levelstext if params.get("levels_lower"): status = 0 warn_lower, crit_lower = params["levels_lower"] + levelstext_lower = "(warn/crit below %.1f/%.1f)" % (warn_lower, crit_lower) if value < crit_lower: status = 2 elif value < warn_lower: status = 1 - if status: - levelstext_lower = " (warn/crit below %.1f/%.1f)" % (warn_lower, crit_lower) - else: + if not status: levelstext_lower = "" yield status, levelstext_lower - else: - yield 0, "%.1f" % value + + if not perfdata: + perfdata = [ ("generic_number", value) ] + + yield 0, infotext, perfdata check_info["jolokia_generic"] = { diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e8e4f5c..a64b9ba 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3276,19 +3276,53 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "generic_rate", + _("Generic rate"), + Dictionary( + elements = [ + ( "levels", + Tuple( + title = _("Upper levels"), + elements = [ + Float(title = "Warning at", unit = "/s"), + Float(title = "Critical at", unit = "/s"), + ])), + ( "levels_lower", + Tuple( + title = _("Lower levels"), + elements = [ + Float(title = "Warning below", unit = "/s"), + Float(title = "Critical below", unit = "/s"), + ])), + ]), + TextAscii( + title = _("Item"), + ), + "dict" +) + + +register_check_parameters( + subgroup_applications, "generic_string", _("Generic string"), - ListOf( - Tuple( - elements = [ - TextAscii(title=_("Search string")), - MonitoringState(), - ]) + Dictionary( + elements = [ + ( "default_status", MonitoringState(title = _("Default Status"))), + ( "match_strings", + ListOf( + Tuple( + elements = [ + TextAscii(title=_("Search string")), + MonitoringState(), + ]) + )), + ] ), TextAscii( title = _("Item"), ), - "list" + "dict" )

7 years, 9 months

4210 jolokia_generic, jolokia_generic.rate, jolokia_generic.string: New checks to monitor custom MBeans

by Konstantin Büttner

Module: check_mk Branch: master Commit: 41e62a9d68a379e02f6251dd20a654504b85115b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41e62a9d68a379… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 17:11:42 2016 +0100 4210 jolokia_generic, jolokia_generic.rate, jolokia_generic.string: New checks to monitor custom MBeans Change-Id: I59dfa5d5ccbcd0913db62d8e54a19a3662bbaca0 --- .werks/4210 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/4210 b/.werks/4210 new file mode 100644 index 0000000..74314ba --- /dev/null +++ b/.werks/4210 @@ -0,0 +1,9 @@ +Title: jolokia_generic, jolokia_generic.rate, jolokia_generic.string: New checks to monitor custom MBeans +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482941428 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8534eff..3e02495 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ NOTE: Please refer to the migration notes! * 4201 mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution... * 4007 Windows Agent: Reduced number of needless WMI Queries when Skype performance counters are missing... + * 4210 jolokia_generic, jolokia_generic.rate, jolokia_generic.string: New checks to monitor custom MBeans * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping

7 years, 9 months

jolokia_generic, jolokia_generic.string: Generic checks for custom MBeans

by Konstantin Büttner

Module: check_mk Branch: master Commit: a9c7f6657585e8fb65fc020435c6b8a0c4676043 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9c7f6657585e8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 12:17:17 2016 +0100 jolokia_generic, jolokia_generic.string: Generic checks for custom MBeans Change-Id: I33e6a7c4bfc7c5a3b980440bde7845a0b5f26d4f --- checks/jolokia_generic | 149 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 47 +++++++++++ 2 files changed, 196 insertions(+) diff --git a/checks/jolokia_generic b/checks/jolokia_generic new file mode 100644 index 0000000..90120ba --- /dev/null +++ b/checks/jolokia_generic @@ -0,0 +1,149 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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- +# tails. 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 parse_jolokia_generic(info): + parsed = {} + for line in info: + instance, mbean, value, value_type = line + + if value_type == "number": + value = float(value) + + item = instance + " " + mbean + + parsed[item] = { + "type" : value_type, + "value" : value + } + + return parsed + +#. +# .--String--------------------------------------------------------------. +# | ____ _ _ | +# | / ___|| |_ _ __(_)_ __ __ _ | +# | \___ \| __| '__| | '_ \ / _` | | +# | ___) | |_| | | | | | | (_| | | +# | |____/ \__|_| |_|_| |_|\__, | | +# | |___/ | +# '----------------------------------------------------------------------' + +def inventory_jolokia_generic_string(parsed): + for item in parsed: + if parsed[item]["type"] == "string": + yield item, None + + +def check_jolokia_generic_string(item, params, parsed): + value = parsed[item]["value"] + + yield 0, value + + if not params: + params = [] + for search_string, status in params: + if search_string in value: + yield status, "%s matches" % search_string + + +check_info["jolokia_generic.string"] = { + "inventory_function" : inventory_jolokia_generic_string, + "check_function" : check_jolokia_generic_string, + "service_description" : "MBean %s", + "group" : "generic_string", +} + + +#. +# .--Rate----------------------------------------------------------------. +# | ____ _ | +# | | _ \ __ _| |_ ___ | +# | | |_) / _` | __/ _ \ | +# | | _ < (_| | || __/ | +# | |_| \_\__,_|\__\___| | +# | | +# '----------------------------------------------------------------------' + + + +#. +# .--Number--------------------------------------------------------------. +# | _ _ _ | +# | | \ | |_ _ _ __ ___ | |__ ___ _ __ | +# | | \| | | | | '_ ` _ \| '_ \ / _ \ '__| | +# | | |\ | |_| | | | | | | |_) | __/ | | +# | |_| \_|\__,_|_| |_| |_|_.__/ \___|_| | +# | | +# '----------------------------------------------------------------------' + +def inventory_jolokia_generic(parsed): + for item in parsed: + if parsed[item]["type"] == "number": + yield item, {} + + +def check_jolokia_generic(item, params, parsed): + value = parsed[item]["value"] + infotext = "%.1f" % value + if params: + if params.get("levels"): + status = 0 + warn, crit = params["levels"] + levelstext = " (warn/crit at %.1f/%.1f)" % (warn, crit) + + if value >= crit: + status = 2 + elif value >= warn: + status = 1 + + if status: + infotext += levelstext + yield status, infotext + + if params.get("levels_lower"): + status = 0 + warn_lower, crit_lower = params["levels_lower"] + if value < crit_lower: + status = 2 + elif value < warn_lower: + status = 1 + if status: + levelstext_lower = " (warn/crit below %.1f/%.1f)" % (warn_lower, crit_lower) + else: + levelstext_lower = "" + yield status, levelstext_lower + else: + yield 0, "%.1f" % value + + +check_info["jolokia_generic"] = { + "parse_function" : parse_jolokia_generic, + "inventory_function" : inventory_jolokia_generic, + "check_function" : check_jolokia_generic, + "service_description" : "MBean %s", + "group" : "generic_number", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2f30d2b..e8e4f5c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3246,6 +3246,53 @@ register_check_parameters( ) +register_check_parameters( + subgroup_applications, + "generic_number", + _("Generic numeric value"), + Dictionary( + elements = [ + ( "levels", + Tuple( + title = _("Upper levels"), + elements = [ + Float(title = "Warning at"), + Float(title = "Critical at"), + ])), + ( "levels_lower", + Tuple( + title = _("Lower levels"), + elements = [ + Float(title = "Warning below"), + Float(title = "Critical below"), + ])), + ]), + TextAscii( + title = _("Item"), + ), + "dict" +) + + +register_check_parameters( + subgroup_applications, + "generic_string", + _("Generic string"), + ListOf( + Tuple( + elements = [ + TextAscii(title=_("Search string")), + MonitoringState(), + ]) + ), + TextAscii( + title = _("Item"), + ), + "list" +) + + + #. # .--Environment---------------------------------------------------------. # | _____ _ _ |

7 years, 9 months

veeam_tapejobs: Updated manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0dcdfa1857c2bbdd30ac00b5b049acd0e1aa21b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dcdfa1857c2bb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 15:07:26 2016 +0100 veeam_tapejobs: Updated manpage Change-Id: I8bfd8f9869206a00adc1bba35b7baec7ccff4543 --- checkman/veeam_tapejobs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/checkman/veeam_tapejobs b/checkman/veeam_tapejobs index 9fafec6..4fb36a1 100644 --- a/checkman/veeam_tapejobs +++ b/checkman/veeam_tapejobs @@ -10,7 +10,11 @@ description: comment section of the Veeam agent plugin powershell scripts on how to install the scripts. - This check is {OK} if the last tape job ran successfully and {CRIT} otherwise. + This check is {OK} if the last tape job ran successfully and {CRIT} otherwise, + provided the backup is not currently in progress. + + While the tapejob is running, the status is determined by the levels set on + maximum acceptable time the job is supposed to take. inventory: One check will be created for each tape job run by the Veeam tool.

7 years, 9 months

veeam_tapejobs: Now allows checking for maximum backup job runtime

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6944cc99bc3b34c76c91a1270ef30d6236238f1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6944cc99bc3b34… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 15:05:35 2016 +0100 veeam_tapejobs: Now allows checking for maximum backup job runtime Change-Id: I8d0dcbf25bc44ec60f18367fcea512e92d1db23b --- checks/veeam_tapejobs | 39 ++++++++++++++++++++++++++++++------ web/plugins/wato/check_parameters.py | 17 ++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/checks/veeam_tapejobs b/checks/veeam_tapejobs index 0e45e71..51a2dec 100644 --- a/checks/veeam_tapejobs +++ b/checks/veeam_tapejobs @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +veeam_tapejobs_default_levels = (1*3600*24, 2*3600*24) + def parse_veeam_tapejobs(info): parsed = {} columns = map(lambda s: s.lower(), info[0]) @@ -42,19 +44,43 @@ def parse_veeam_tapejobs(info): def inventory_veeam_tapejobs(parsed): for job in parsed: - yield job, None + yield job, "veeam_tapejobs_default_levels" -def check_veeam_tapejobs(item, _no_params, parsed): +def check_veeam_tapejobs(item, params, parsed): last_result = parsed[item]["last_result"] last_state = parsed[item]["last_state"] + statetext = ", last state: " + last_state + + warn, crit = params + + now = time.time() + + running_since = get_item_state("running_since") - if last_result == "Success": - yield 0, "Last backup successful" + if last_result == "None" and last_state == "Working": + if not running_since: + running_since = now + set_item_state("running_since", now) + running_time = now - running_since + status = 0 + levelstext = " (warn/crit at %s/%s)" % tuple(map(get_age_human_readable, params)) + if running_time >= crit: + status = 2 + elif running_time >= warn: + status = 1 + else: + levelstext = "" + infotext = "Backup in progress since " + get_timestamp_human_readable(running_since)\ + + " (" + get_age_human_readable(running_time) + ")" + levelstext + return status, infotext else: - yield 2, "Last backup result: " + last_result + clear_item_state("running_since") + if last_result == "Success": + return 0, "Last backup successful" + statetext + else: + return 2, "Last backup result: " + last_result + statetext - yield 0, "Last state: " + last_state check_info["veeam_tapejobs"] = { @@ -62,4 +88,5 @@ check_info["veeam_tapejobs"] = { 'inventory_function' : inventory_veeam_tapejobs, 'check_function' : check_veeam_tapejobs, 'service_description' : 'VEEAM Tape Job %s', + 'group' : 'veeam_tapejobs', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0df53e0..2f30d2b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4073,6 +4073,23 @@ register_check_parameters( "dict" ) +register_check_parameters( + subgroup_storage, + "veeam_tapejobs", + _("VEEAM tape backup jobs"), + Tuple( + title = _("Levels for duration of backup job"), + elements = [ + Age(title = "Warning at"), + Age(title = "Critical at"), + ], + ), + TextAscii( + title = _("Name of the tape job"), + ), + "first", +) + #. # .--Printing------------------------------------------------------------. # | ____ _ _ _ |

7 years, 9 months

4121 FIX mk_mysql: fixed handling of multiple instances

by Marcel Schulte

Module: check_mk Branch: master Commit: fe08e8400c9f2932f32dbfce54be1bdb7d5f28bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe08e8400c9f29… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Dec 28 13:11:56 2016 +0100 4121 FIX mk_mysql: fixed handling of multiple instances Change-Id: I9e0d34a5c7d14d3891087a5c9acf7b67884d3e51 --- .werks/4121 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_mysql | 26 +++++++++++++------------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.werks/4121 b/.werks/4121 new file mode 100644 index 0000000..848eee1 --- /dev/null +++ b/.werks/4121 @@ -0,0 +1,11 @@ +Title: mk_mysql: fixed handling of multiple instances +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482927046 + + + diff --git a/ChangeLog b/ChangeLog index 6aade15..8534eff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent... * 4209 FIX: mk_jolokia: Setting a default product now works... * 4120 FIX: fixed checks mysql and mysql.sessions for multiple MySQL instances... + * 4121 FIX: mk_mysql: fixed handling of multiple instances Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index 5b29ac1..7e2a04e 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -26,13 +26,13 @@ # gets optional socket as argument function do_query() { INSTANCE=$(echo $1|awk -v FS="=" '{print $2}') - COUNT=$(ps -ef | grep [/]usr/sbin/mysqld | grep socket | wc -l) + COUNT=$(ps -efww | grep [/]usr/sbin/mysqld | grep socket | wc -l) if [ $COUNT -gt 1 ] then - INSTANCE_NAME=$(ps -ef|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*socket=$[^.]*$.*/\1/p') + INSTANCE_NAME=$(ps -efww|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*socket=$[^.]*$.*/\1/p') INSTANCE_NAME="[[${INSTANCE_NAME##*/}]]" else - INSTANCE_NAME="[[$(ps -ef|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" + INSTANCE_NAME="[[$(ps -efww|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" fi @@ -66,22 +66,22 @@ function do_query() { if which mysqladmin >/dev/null then - mysql_sockets="--"$(fgrep socket $MK_CONFDIR/mysql.cfg) - if [ $mysql_sockets = "--" ] ; then - mysql_sockets=$(ps -ef | grep mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') - if [ -z $mysql_sockets ] ; then - do_query "" - else - for socket in $mysql_sockets ; do do_query "--socket="$socket ; done - fi - else + mysql_sockets=$(fgrep socket $MK_CONFDIR/mysql.cfg|sed -ne 's/.*socket=$[^ ]*$.*/\1/p') + if [ -z "$mysql_sockets" ] ; then + mysql_sockets=$(ps -efww | grep mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') + fi + if [ -z "$mysql_sockets" ] ; then do_query "" + else + for socket in $mysql_sockets ; do + do_query "--socket="$socket + done fi #echo "<<<mysql_version>>>" #mysql -V echo "<<<mysql_port>>>" - ps -ef|grep mysqld|while read LINE; do echo $LINE|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|grep mysqld | grep "[p]ort"|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 + ps -efww|grep mysqld|while read LINE; do echo $LINE|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|grep mysqld | grep "[p]ort"|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 #echo "<<<mysql_instances>>>" #mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -s \

7 years, 9 months

4120 FIX fixed checks mysql and mysql.sessions for multiple MySQL instances

by Marcel Schulte

Module: check_mk Branch: master Commit: e8951ed06a41b184015aa8c195eacdda56cfa2f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8951ed06a41b1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Dec 28 12:33:03 2016 +0100 4120 FIX fixed checks mysql and mysql.sessions for multiple MySQL instances Previously only one mysql (version) and mysql.sessions check was created. This has been fixed now. Change-Id: I2d19502b7a79fa62ba08f1f5b1df0b8d9e1b6c86 --- .werks/4120 | 10 ++++++++++ ChangeLog | 1 + checks/mysql | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4120 b/.werks/4120 new file mode 100644 index 0000000..f5fa4fe --- /dev/null +++ b/.werks/4120 @@ -0,0 +1,10 @@ +Title: fixed checks mysql and mysql.sessions for multiple MySQL instances +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482924646 + +Previously only one mysql (version) and mysql.sessions check was created. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index cd258ec..6aade15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent... * 4209 FIX: mk_jolokia: Setting a default product now works... + * 4120 FIX: fixed checks mysql and mysql.sessions for multiple MySQL instances... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/mysql b/checks/mysql index 581bfeb..42d68c6 100644 --- a/checks/mysql +++ b/checks/mysql @@ -51,7 +51,7 @@ def inventory_mysql(parsed): for instance, values in parsed.items(): if len(values.keys()) > 200: # should be at least 321 line - return [(instance, {})] + yield instance, {} # FIXME: Crapy copy n paste! Consolidate with other mysql_* parse functions def parse_mysql(info): @@ -91,7 +91,7 @@ def parse_mysql(info): def inventory_mysql_version(parsed): for instance, values in parsed.items(): if 'version' in values: - return [(instance, {})] + yield instance, {} def check_mysql_version(item, _no_params, parsed): if item in parsed:

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: fde4a38d234bd20e482d1816444b5d67011eb243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fde4a38d234bd2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 28 10:15:03 2016 +0100 Fetched livestatus from downstream. Change-Id: Ib4be8e05724ee9ca4c906836649dc8bdb786afa7 --- livestatus/src/DoublePointerColumn.h | 7 +++--- livestatus/src/InputBuffer.cc | 4 +-- livestatus/src/InputBuffer.h | 4 +-- livestatus/src/OutputBuffer.cc | 8 +++--- livestatus/src/OutputBuffer.h | 4 +-- livestatus/src/TableStatus.cc | 32 +++++++++++------------ livestatus/src/TableStatus.h | 3 ++- livestatus/src/global_counters.cc | 49 +++++++++++++++++++++++------------- livestatus/src/global_counters.h | 33 +++++++++++++----------- livestatus/src/module.cc | 44 ++++++++++++++++---------------- 10 files changed, 102 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fde4a38d23…

7 years, 9 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: c003b1e98f51078b61f2fc7ce09897085986a00c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c003b1e98f5107… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 10:05:41 2016 +0100 Minor code cleanup Change-Id: I5faf6328593188d37e38b2dbba775269cc6c7dcb --- checks/fileinfo | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/fileinfo b/checks/fileinfo index bbe0940..5c1752e 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -60,6 +60,7 @@ def inventory_fileinfo(info, case): inventory.append((group, {})) return inventory + def fileinfo_process_date(pattern, reftime): for what, the_time in [ ("DATE", reftime), ("YESTERDAY", reftime - 86400) ]: the_regex = '((?:/|[A-Za-z]).*)\$%s:((?:%%\w.?){1,})\$(.*)' % what @@ -73,6 +74,7 @@ def fileinfo_process_date(pattern, reftime): return pattern + def fileinfo_groups_of_file(check_filename, reftime): groups = [] for line in host_extra_conf(g_hostname, fileinfo_groups): @@ -112,6 +114,7 @@ def fileinfo_groups_of_file(check_filename, reftime): return groups + def fileinfo_check_timeranges(params): ranges = params.get("timeofday") if ranges == None: @@ -123,6 +126,7 @@ def fileinfo_check_timeranges(params): return None return " (out of relevant time of day)" + def fileinfo_in_timerange(now, range_from, range_to): minutes_from = range_from[0] * 60 + range_from[1] minutes_to = range_to[0] * 60 + range_to[1] @@ -160,6 +164,7 @@ def check_fileinfo(item, params, info): return fileinfo_check_function(check_definition, params, outof_range_txt) + # Extracts patterns that are relevant for the current host and item. # Constructs simple list of patterns and makes them available for the check def fileinfo_groups_precompile(hostname, item, params): @@ -270,6 +275,7 @@ def check_fileinfo_groups(item, params, info): return fileinfo_check_function(check_definition, params, outof_range_txt) + def fileinfo_check_function(check_definition, params, outof_range_txt): state = 0 infos = []

7 years, 9 months

Removed ancient useless #defines.

by Sven Panne

Module: check_mk Branch: master Commit: 186e986414a22e2b7914c4c508a871690d08164b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=186e986414a22e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 28 08:34:01 2016 +0100 Removed ancient useless #defines. Change-Id: Ia0e3a97e566b20521dd778c2e6f0e643b73cdd82 --- livestatus/src/module.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index ae7d661..1d3e0b0 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -95,9 +95,6 @@ int g_num_active_connections = size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ extern int g_disable_statehist_filtering; -#define false 0 -#define true 1 - void *g_nagios_handle; int g_unix_socket = -1; int g_max_fd_ever = 0;

7 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016