Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: checkpoint_connections: Code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 91a009428cb84873ca6f5e31ff3bb2bc771f958e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a009428cb848… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 16 11:16:56 2015 +0100 checkpoint_connections: Code cleanup --- checks/checkpoint_connections | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/checkpoint_connections b/checks/checkpoint_connections index dba029e..e90ceb0 100644 --- a/checks/checkpoint_connections +++ b/checks/checkpoint_connections @@ -29,6 +29,9 @@ checkpoint_connections_default_levels = (40000, 50000) +def inventory_checkpoint_connections(info): + return [(None, "checkpoint_connections_default_levels")] + def check_checkpoint_connections(item, params, info): warn, crit = params current = saveint(info[0][0]) @@ -45,7 +48,7 @@ def check_checkpoint_connections(item, params, info): check_info["checkpoint_connections"] = { "check_function" : check_checkpoint_connections, - "inventory_function" : lambda info: [(None, "checkpoint_connections_default_levels")], + "inventory_function" : inventory_checkpoint_connections, "service_description" : "Connections", "has_perfdata" : True, "group" : "checkpoint_connections",

9 years, 4 months

Check_MK Git: check_mk: checkpoint_connections: More code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 690832f484c81b7ab85d610d82f58541de8fe5c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=690832f484c81b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 16 11:24:08 2015 +0100 checkpoint_connections: More code cleanup --- checks/checkpoint_connections | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/checks/checkpoint_connections b/checks/checkpoint_connections index e90ceb0..1292385 100644 --- a/checks/checkpoint_connections +++ b/checks/checkpoint_connections @@ -34,17 +34,19 @@ def inventory_checkpoint_connections(info): def check_checkpoint_connections(item, params, info): warn, crit = params - current = saveint(info[0][0]) + current = int(info[0][0]) state = 0 - icon = '' + levels = " (levels at %d/%d)" % (warn, crit) + infotext = "%d Current Connections" % (current) if current >= warn: state = 1 + infotext += levels if current >= crit: state = 2 + infotext += levels perfdata = [("connections", current, warn, crit)] - infotext = "%d Current Connections (levels at %d/%d)" % (current, warn, crit) - yield state, infotext, perfdata + return state, infotext, perfdata check_info["checkpoint_connections"] = { "check_function" : check_checkpoint_connections,

9 years, 4 months

Check_MK Git: check_mk: Make painters for check intervals right justified

by Mathias Kettner

Module: check_mk Branch: master Commit: 72204914d0523df80f12637c5b811a9b8b71ad0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72204914d0523d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 15 15:45:00 2015 +0100 Make painters for check intervals right justified --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d1c3581..d27ddee 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -693,13 +693,13 @@ multisite_painters["svc_normal_interval"] = { "title" : _("Service normal check interval"), "short" : _("Check int."), "columns" : [ "service_check_interval" ], - "paint" : lambda row: (None, "%.0fs" % (row["service_check_interval"] * 60.0)), + "paint" : lambda row: ("number", "%.0fs" % (row["service_check_interval"] * 60.0)), } multisite_painters["svc_retry_interval"] = { "title" : _("Service retry check interval"), "short" : _("Retry"), "columns" : [ "service_retry_interval" ], - "paint" : lambda row: (None, "%.0fs" % (row["service_retry_interval"] * 60.0)), + "paint" : lambda row: ("number", "%.0fs" % (row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_interval"] = { "title" : _("Service normal/retry check interval"),

9 years, 4 months

Check_MK Git: check_mk: A few internal improvements to the new metrics module

by Mathias Kettner

Module: check_mk Branch: master Commit: 555282e95cffb1c1040e980889045d09c8c7e1e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555282e95cffb1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 15 15:45:37 2015 +0100 A few internal improvements to the new metrics module e.g. replace "white" by "#ffffff" --- web/htdocs/metrics.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 43cf36d..2af29a1 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -28,7 +28,8 @@ # perf_data_string: Raw performance data as sent by the core, e.g "foor=17M;1;2;4;5" # perf_data: Split performance data, e.g. [("foo", "17", "M", "1", "2", "4", "5")] # translated_metrics: Completely parsed and translated into metrics, e.g. { "foo" : { "value" : 17.0, "unit" : { "render" : ... }, ... } } - +# color: RGB color representation ala HTML, e.g. "#ffbbc3" or "#FFBBC3", len() is always 7! +# color_rgb: RGB color split into triple (r, g, b), where r,b,g in (0.0 .. 1.0) import math import config, defaults @@ -410,7 +411,7 @@ def metricometer_logarithmic(value, half_value, base, color): if pos > 98: pos = 98 - return [ (pos, color), (100 - pos, "white") ] + return [ (pos, color), (100 - pos, "#ffffff") ] def build_perfometer(perfometer, translated_metrics): @@ -446,7 +447,7 @@ def build_perfometer(perfometer, translated_metrics): # Paint rest only, if it is positive and larger than one promille if total - summed > 0.001: - entry.append((100.0 * (total - summed) / total, "white")) + entry.append((100.0 * (total - summed) / total, "#ffffff")) # Use unit of first metrics for output of sum. We assume that all # stackes metrics have the same unit anyway @@ -584,17 +585,23 @@ def rrd_path(host_name, service_desc, varname): # "#ff0080" -> (1.0, 0.0, 0.5) -def parse_color(color_string): - return tuple([ int(color_string[a:a+2], 16) / 255.0 for a in (1,3,5) ]) +def parse_color(color): + return tuple([ int(color[a:a+2], 16) / 255.0 for a in (1,3,5) ]) -def render_color(rgb): +def render_color(color_rgb): return "#%02x%02x%02x" % ( - int(rgb[0] * 255), - int(rgb[1] * 255), - int(rgb[2] * 255),) + int(color_rgb[0] * 255), + int(color_rgb[1] * 255), + int(color_rgb[2] * 255),) # Make a color darker. v ranges from 0 (not darker) to 1 (black) def darken_color(rgb, v): def darken(x, v): return x * (1.0 - v) return tuple([ darken(x, v) for x in rgb ]) + +# Make a color lighter. v ranges from 0 (not lighter) to 1 (white) +def lighten_color(rgb, v): + def lighten(x, v): + return 1.0 - ((1.0 - x) * (1.0 - v)) + return tuple([ lighten(x, v) for x in rgb ])

9 years, 4 months

Check_MK Git: check_mk: Remove bogus Perf-O-Meter-Test of CPU load

by Mathias Kettner

Module: check_mk Branch: master Commit: d47297b14547daf0d14ea48a4d2c6a5735fba791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d47297b14547da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 15 15:44:40 2015 +0100 Remove bogus Perf-O-Meter-Test of CPU load --- web/plugins/metrics/check_mk.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index eb6842b..1e1b033 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -439,9 +439,6 @@ check_metrics["check_mk-bluecoat_sensors"] = {} # The label of dual and stacked is taken from the definition of the contained Perf-O-Meters perfometer_info.append(("linear", ( ["execution_time"], 90.0, None))) -perfometer_info.append(("stacked", [ - ( "logarithmic", ( "load1", 4.0, 2.0)), - ( "linear", ( [ "load1:max", ], 16, None)) ])) perfometer_info.append(("logarithmic", ( "load1", 4.0, 2.0))) perfometer_info.append(("logarithmic", ( "temp", 40.0, 1.2))) perfometer_info.append(("logarithmic", ( "ctxt", 1000.0, 2.0)))

9 years, 4 months

Check_MK Git: check_mk: fileinfo: fixed exception when outof_range_txt was none

by Andreas Boesl

Module: check_mk Branch: master Commit: 88d01546740bde7aeed765f5ac45c5a307318a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88d01546740bde… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 13 14:10:39 2015 +0100 fileinfo: fixed exception when outof_range_txt was none --- checks/fileinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 281f6b9..b625db3 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -114,7 +114,7 @@ def check_fileinfo(item, params, info): for line in info[1:]: if item == line[0]: if line[1] == "missing": - return in_timerange and 3 or 0, "File not found" + outof_range_txt + return in_timerange and 3 or 0, "File not found" + (outof_range_txt or "") state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -124,7 +124,7 @@ def check_fileinfo(item, params, info): ("age", age, get_age_human_readable) ] if check_definition == False: - return in_timerange and 3 or 0, "File not found" + outof_range_txt + return in_timerange and 3 or 0, "File not found" + (outof_range_txt or "") return fileinfo_check_function(check_definition, params, outof_range_txt) # Extracts patterns that are relevant for the current host and item.

9 years, 4 months

Check_MK Git: check_mk: fixed some unlocalizable strings

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f80506040d4e6e2190c4e4779d8e7be6cfd6516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f80506040d4e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 12 16:19:34 2015 +0100 fixed some unlocalizable strings --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 84b7337..1350a49 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3171,7 +3171,7 @@ def show_service_table(host, firsttime): except Exception, e: if config.debug: raise - html.show_error("Inventory failed for this host: %s" % e) + html.show_error(_("Inventory failed for this host: %s") % e) return checktable.sort() @@ -5381,7 +5381,7 @@ def check_mk_local_automation(command, args=[], indata=""): except Exception, e: if config.debug: raise - html.show_error("<h1>Cannot activate changes</h1>%s" % e) + html.show_error(_("<h1>Cannot activate changes</h1>%s") % e) return try:

9 years, 4 months

Check_MK Git: check_mk: #1861 FIX exception in mkeventd when archiving certain event log lines

by Goetz Golla

Module: check_mk Branch: master Commit: eca3720635e06d94d27f57ca903a07a99756448b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca3720635e06d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 12 15:41:09 2015 +0100 #1861 FIX exception in mkeventd when archiving certain event log lines --- .werks/1861 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1861 b/.werks/1861 new file mode 100644 index 0000000..9268e4e --- /dev/null +++ b/.werks/1861 @@ -0,0 +1,9 @@ +Title: exception in mkeventd when archiving certain event log lines +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423751976 + diff --git a/ChangeLog b/ChangeLog index 81d6f85..d9a9c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -242,6 +242,7 @@ * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... + * 1861 FIX: exception in mkeventd when archiving certain event log lines HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 4fb1755..f9257e7 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -681,7 +681,7 @@ def quote_tab(col): if type(col) in [ float, int ]: return str(col) elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(col) + col = "\1" + "\1".join(map(str, col)) elif col == None: col = "\2"

9 years, 4 months

Check_MK Git: check_mk: fixed exception when imported_folder attribute was set to None

by Andreas Boesl

Module: check_mk Branch: master Commit: abb94ee8fdf850f7de2826e15d96f59f6654bdc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abb94ee8fdf850… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 12 14:33:37 2015 +0100 fixed exception when imported_folder attribute was set to None --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 41556b7..84b7337 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5658,7 +5658,7 @@ class TextAttribute(Attribute): if self._mandatory and not value: raise MKUserError("attr_" + self.name(), _("Please specify a value for %s") % self.title()) - if value.strip() == "" and not self._allow_empty: + if not self._allow_empty and value.strip() == "": raise MKUserError("attr_" + self.name(), _("%s may be missing, if must not be empty if it is set.") % self.title())

9 years, 4 months

Check_MK Git: check_mk: #1943 FIX inventory plugin win_os: no longer detects incorrect i386 architecture

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f9915c7ed65154d0c7c5e31bda171dbc1b15396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f9915c7ed6515… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 12 13:20:06 2015 +0100 #1943 FIX inventory plugin win_os: no longer detects incorrect i386 architecture The inventory plugin set the architecture to i386 whenever the field was empty or the 64-Bit info was written in lowercase. --- .werks/1943 | 11 +++++++++++ ChangeLog | 1 + inventory/win_os | 9 +++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/1943 b/.werks/1943 new file mode 100644 index 0000000..6b2a3db --- /dev/null +++ b/.werks/1943 @@ -0,0 +1,11 @@ +Title: inventory plugin win_os: no longer detects incorrect i386 architecture +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423743481 + +The inventory plugin set the architecture to i386 whenever the field was empty +or the 64-Bit info was written in lowercase. diff --git a/ChangeLog b/ChangeLog index d5e837f..011d8fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ * 1846 Keep track of changes of software and hardware... * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale + * 1943 FIX: inventory plugin win_os: no longer detects incorrect i386 architecture... 1.2.6b1: diff --git a/inventory/win_os b/inventory/win_os index e653609..9fc5f2c 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -34,10 +34,11 @@ def inv_win_os(info): if len(line) == 7: node["name"] = line[1] node["kernel_version"] = line[2] - if line[3] == "64-Bit": - node["arch"] = "x86_64" - else: - node["arch"] = "i386" + if line[3]: + if line[3].lower() == "64-bit": + node["arch"] = "x86_64" + else: + node["arch"] = "i386" node["service_pack"] = line[4]+"."+line[5] dat = re.sub("\+\d+","",line[6]) tz = int(re.sub("\d{14}.\d{6}","",line[6]))

9 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015