Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

ucs_bladecenter_faultinst: No longer reports UNKNWOWN when no fault instances are found

by Andreas Boesl

Module: check_mk Branch: master Commit: c12f0b81dbfc232bb125912f924074a94a767147 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c12f0b81dbfc23… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 3 10:36:39 2017 +0100 ucs_bladecenter_faultinst: No longer reports UNKNWOWN when no fault instances are found Change-Id: Ida6b14d4a1e7238740477f8225c9ecdce2680db2 --- .werks/4453 | 10 ++++++++++ checks/ucs_bladecenter_faultinst | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4453 b/.werks/4453 new file mode 100644 index 0000000..fd068e8 --- /dev/null +++ b/.werks/4453 @@ -0,0 +1,10 @@ +Title: ucs_bladecenter_faultinst: No longer reports UNKNWOWN when no fault instances are found +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488533709 +Class: fix + + diff --git a/checks/ucs_bladecenter_faultinst b/checks/ucs_bladecenter_faultinst index ceb9b52..df614a5 100644 --- a/checks/ucs_bladecenter_faultinst +++ b/checks/ucs_bladecenter_faultinst @@ -49,10 +49,12 @@ def check_ucs_bladecenter_faultinst(item, _no_params, parsed): severities.setdefault(entry_sev, []) severities[entry_sev].append(values) - state = 0 + if not severities.items(): + yield 0, "No fault instances found" + return + for sev, instances in severities.items(): sev_state = severity_map.get(sev, 3) - state = max(state, sev_state) # Right now, OK instances are also reported in detail # If required we can increase the state level here, so that only WARN+ messages are shown

7 years, 6 months

Updated internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f7496d3959dc4370baea8ec88194c1856a06a40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f7496d3959dc4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 3 10:44:23 2017 +0100 Updated internal notes Change-Id: I664a08b2cbf4470af3a86474ed23f7b0e964aba9 --- web/htdocs/availability.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index afba61b..6b4dba0 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -730,17 +730,19 @@ def compute_availability(what, av_rawdata, avoptions): # Now compute availability table. We have the following possible states: # 1. "unmonitored" - # 2. "monitored" - # 2.1 "outof_notification_period" - # 2.2 "in_notification_period" - # 2.2.1 "in_downtime" (also in_host_downtime) - # 2.2.2 "not_in_downtime" - # 2.2.2.1 "host_down" - # 2.2.2.2 "host not down" - # 2.2.2.2.1 "ok" - # 2.2.2.2.2 "warn" - # 2.2.2.2.3 "crit" - # 2.2.2.2.4 "unknown" + # 2. monitored --> + # 2.1 "outof_service_period" + # 2.2 in service period --> + # 2.2.1 "outof_notification_period" + # 2.2.2 in notification period --> + # 2.2.2.1 "in_downtime" (also in_host_downtime) + # 2.2.2.2 not in downtime --> + # 2.2.2.2.1 "host_down" + # 2.2.2.2.2 host not down --> + # 2.2.2.2.2.1 "ok" + # 2.2.2.2.2.2 "warn" + # 2.2.2.2.2.3 "crit" + # 2.2.2.2.2.4 "unknown" availability_table = [] os_aggrs, os_states = get_outage_statistic_options(avoptions) need_statistics = os_aggrs and os_states

7 years, 6 months

8733 FIX mk_jolokia: added missing protocol configuration

by Simon Betz

Module: check_mk Branch: master Commit: 381ba613b5b11f8eaf74331dffcd32b69940fb35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=381ba613b5b11f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 3 10:39:10 2017 +0100 8733 FIX mk_jolokia: added missing protocol configuration Change-Id: I72aaa98c0ef0f03e9b3e0ff26dc4b3ecacd44f84 --- .werks/8733 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/8733 b/.werks/8733 new file mode 100644 index 0000000..cf865c5 --- /dev/null +++ b/.werks/8733 @@ -0,0 +1,11 @@ +Title: mk_jolokia: added missing protocol configuration +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1488533605 + +

7 years, 6 months

Fixed activate changes web API call after recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c73c86ddbac3471515200c68c5a5a5c439ef877 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c73c86ddbac34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 3 10:20:51 2017 +0100 Fixed activate changes web API call after recent change Change-Id: Ie052eafedff0ac351ba9f321d5d89fe90d8d0bea --- web/plugins/webapi/webapi.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 6d81b61..4a8ff22 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -492,6 +492,7 @@ def action_activate_changes(request): sites = request.get("sites") changes = ActivateChanges() + changes.load() if changes.has_foreign_changes(): if not config.user.may("wato.activateforeign"): @@ -507,6 +508,7 @@ def action_activate_changes(request): manager = ActivateChangesManager() + manager.load() if not manager.has_changes(): raise MKUserError(None, _("Currently there are no changes to activate."))

7 years, 6 months

ucd_mem: Fix wrong return type of SNMP scan function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3648c2ac130c1c79309d95999c443fbcdf138d6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3648c2ac130c1c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Mar 3 09:59:22 2017 +0100 ucd_mem: Fix wrong return type of SNMP scan function Change-Id: I779bd54b658971d6e74ec35da46fa2362f7ea75e --- checks/ucd_mem | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index 905c8b0..75bd758 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -59,8 +59,8 @@ check_info['ucd_mem'] = { "6", # memAvailable -> kB ]), 'snmp_scan_function' : lambda oid: \ - "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or - prefer_hr_scan_function, + "pfsense" in oid(".1.3.6.1.2.1.1.1.0").lower() or + prefer_hr_scan_function(oid), 'default_levels_variable' : 'ucd_mem_default_levels', 'group' : 'memory_simple', 'includes' : [ "ucd.include", "memory.include" ],

7 years, 6 months

check_sql: Fixed executable flag

by Lars Michelsen

Module: check_mk Branch: master Commit: 34530d0f1a11e1258bfd63113f00d5e291cc65fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34530d0f1a11e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 3 08:41:23 2017 +0100 check_sql: Fixed executable flag Change-Id: I7d9013bee5e2bb24e42e445b73ce0eec1fdc5a2e --- active_checks/check_sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/active_checks/check_sql b/active_checks/check_sql old mode 100644 new mode 100755

7 years, 6 months

Reworked WATO pending change persistance for better performance and cleaned up some code

by Lars Michelsen

Module: check_mk Branch: master Commit: bf6a965af163b6c5c39cd868758e4e4277e21d97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6a965af163b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 3 08:32:30 2017 +0100 Reworked WATO pending change persistance for better performance and cleaned up some code Change-Id: Ic91f2565eb81bd1123ad4522eac42288aa9b94b3 --- web/htdocs/wato.py | 9 +- web/htdocs/watolib.py | 307 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 224 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf6a965af1…

7 years, 6 months

4436 FIX check_sql: fixed thresholds and added missing options

by Marcel Arentz

Module: check_mk Branch: master Commit: 095e64321cea2378531190b6161c24c9ab23e5ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=095e64321cea23… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Feb 23 10:50:48 2017 +0100 4436 FIX check_sql: fixed thresholds and added missing options Thresholds are now actually used when the options are activated and the number is added to the output if Thresholds are set. Additionally the option "Performance Data" is now actually used. If not activated no performance data will be added, even if it is given by the result of the SQL statement. Change-Id: Ifb3780f318f3a2bc81ade56007698bbc7fd43f16 --- .werks/4436 | 13 +++++++++++++ active_checks/check_sql | 28 +++++++++++++++++++--------- checks/check_sql | 3 +++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.werks/4436 b/.werks/4436 new file mode 100644 index 0000000..c03c4c8 --- /dev/null +++ b/.werks/4436 @@ -0,0 +1,13 @@ +Title: check_sql: fixed thresholds and added missing options +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487842750 +Class: fix + +Thresholds are now actually used when the options are activated and the +number is added to the output if Thresholds are set. Additionally the option +"Performance Data" is now actually used. If not activated no performance +data will be added, even if it is given by the result of the SQL statement. diff --git a/active_checks/check_sql b/active_checks/check_sql old mode 100755 new mode 100644 index 6cac732..18a88b2 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -64,6 +64,7 @@ OPTIONS: -c RANGE, --critical RANGE lower and upper level for the critical state, separated by a colon -o, --procedure treat the main argument as a procedure instead of an SQL-Statement -i CSV, --inputvars CSV values of input variables if required by the procedure; csv-list + -m, --metrics Add performance data to the output --debug Debug mode: let Python exceptions come through -v, --verbose Verbose mode: print SQL statement and levels @@ -83,10 +84,10 @@ def bail_out(exit_code, output): sys.exit(exit_code) -short_options = 'hou:i:p:d:n:H:P:w:c:v' +short_options = 'hou:i:p:d:n:H:P:w:c:v:m' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', - 'port=', 'debug', 'verbose', 'procedure', 'inputvars='] + 'port=', 'debug', 'verbose', 'procedure', 'inputvars=', 'metrics'] try: @@ -106,10 +107,12 @@ opt_port = None opt_sql = None opt_input = [] opt_procedure = False +opt_metrics = False warn = [ None, None ] crit = [ None, None ] + try: for o,a in opts: if o in [ '--debug' ]: @@ -134,6 +137,8 @@ try: crit = map(saverfloat,a.split(":",2)) elif o in [ '-o', '--procedure' ]: opt_procedure = True + elif o in [ '-m', '--metrics' ]: + opt_metrics = True elif o in [ '-i', '--inputvars' ]: opt_input = a.split(",") elif o in [ '-h', '--help' ]: @@ -268,12 +273,13 @@ try: else: text = "%s" % result[1] - try: - perf = " | performance_data=%s" % str(result[2]) - except IndexError: - if opt_debug: - raise - perf = "" + if opt_metrics: + try: + perf = " | performance_data=%s" % str(result[2]) + except IndexError: + if opt_debug: + raise + perf = "" state = 0 if warn != [ None, None ] or crit != [ None, None ]: @@ -283,6 +289,7 @@ try: if (crit[0] != None and crit[0] > number) or \ (crit[1] != None and crit[1] < number): state = 2 + text += ": %s" % number else: if number in [ 0, 1, 2, 3 ]: state = int(number) @@ -295,4 +302,7 @@ except Exception, e: bail_out(3, "Error while processing result of SQL statement: %s" % e) -bail_out(state, "%s%s" % (text, perf)) +if opt_metrics: + bail_out(state, "%s%s" % (text, perf)) +else: + bail_out(state, "%s" % text) diff --git a/checks/check_sql b/checks/check_sql index b689050..ac48882 100644 --- a/checks/check_sql +++ b/checks/check_sql @@ -65,6 +65,9 @@ def check_sql_arguments(params): else: lower = "", "" + if "perfdata" in params: + args += [ "--metrics" ] + if "levels" in params or "levels_low" in params: args += [ "-w", "%s:%s" % (lower[0], upper[0]) ] args += [ "-c", "%s:%s" % (lower[1], upper[1]) ]

7 years, 6 months

added comment

by Simon Betz

Module: check_mk Branch: master Commit: 8b2e807b81c3c6119f28436bf36557672d934903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b2e807b81c3c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 2 17:12:14 2017 +0100 added comment Change-Id: I17220cdc4c4c08c3278cb24986b24d14c7186a2b --- checks/cisco_fru_power | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power index 7ca7e8a..366eba2 100644 --- a/checks/cisco_fru_power +++ b/checks/cisco_fru_power @@ -86,6 +86,8 @@ def parse_cisco_fru_power(info): ppre_parsed = {} for end_oid, oper_state, fru_current in info[0]: + # We discover only "real" power supplies which have current value >= 0 + # Others such as modules do not have such values if oper_state not in [ "", "0", "1", "5" ] and \ fru_current and int(fru_current) >= 0: ppre_parsed.setdefault(end_oid, map_states.get(oper_state, (3, "unexpected(%s)" % oper_state)))

7 years, 7 months

quicksearch without results defaults to allservices view

by Andreas Boesl

Module: check_mk Branch: master Commit: 26c816985ec35590208e889fdfb3a37174e0e51d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26c816985ec355… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 2 17:16:59 2017 +0100 quicksearch without results defaults to allservices view Change-Id: I1fbb471d5501b493a02def58161f03d9a7c7d018 --- web/htdocs/sidebar.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 49cc064..c574800 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -1044,7 +1044,10 @@ class LivestatusQuicksearch(object): use_search_object = search_object break else: - return + return html.makeuri([("view_name", "allservices"), + ("filled_in", "filter"), ("service_regex", self._query)], + delvars = "q", + filename = "view.py") return search_object.get_search_url() @@ -1143,5 +1146,5 @@ def generate_results(query): def generate_search_results(query): quicksearch = LivestatusQuicksearch(query) - return quicksearch.generate_search_url() + return quicksearch.generate_search_url()

7 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017