Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Fixed merge problem during style cleanup

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: be51eaf742dbbf45f8f863fe701ff6867f84cc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be51eaf742dbbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 15:34:04 2011 +0200 Fixed merge problem during style cleanup --- web/htdocs/check_mk.css | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e5d6c3..a04d71d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -743,16 +743,6 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; -======= -td.perfometer div.title { - height: 0px; - position: relative; - top: 3px; - left: 0px; - width: 120px; - text-align: center; - white-space: nowrap; ->>>>>>> A lot of additional styling cleanups }

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97b729bd651e56072baa212420682c830c47f88f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97b729bd651e56… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:11:58 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: FIX: avoid floating points with e in performance data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc9e591e458208cd309e41b7badb124a963072fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc9e591e458208… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:11:09 2011 +0200 FIX: avoid floating points with e in performance data --- ChangeLog | 1 + modules/check_mk_base.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b765fdd..3e7aed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: avoid floating points with 'e' in performance data * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 31c0aba..9c1e601 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -888,11 +888,15 @@ def open_command_pipe(): -def none_to_empty(x): +def convert_perf_value(x): if x == None: return "" - else: + elif type(x) in [ str, unicode ]: return x + elif type(x) == float: + return ("%.6f" % x).rstrip("0").rstrip(".") + else: + return str(x) def submit_check_result(host, servicedesc, result, sa): @@ -921,7 +925,7 @@ def submit_check_result(host, servicedesc, result, sa): for p in perfdata: # replace None with "" and fill up to 6 values - p = (map(none_to_empty, p) + ['','','',''])[0:6] + p = (map(convert_perf_value, p) + ['','','',''])[0:6] perftexts.append("%s=%s;%s;%s;%s;%s" % tuple(p) ) if perftexts != [] and not direct_rrd_update(host, servicedesc, perfdata): if check_command and perfdata_format == "pnp":

13 years, 4 months

Check_MK Git: check_mk: Fixed replacement issue

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10f406fb9eb08fcbb411e166d7dafb5554981436 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10f406fb9eb08f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 11:43:00 2011 +0200 Fixed replacement issue --- web/htdocs/check_mk.css | 4 ++-- web/htdocs/sidebar.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1d83ee5..6e5d6c3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -534,13 +534,13 @@ table.navi tr.form td.form { padding: 0; } -table.navi tr.form td.#fffborder { +table.navi tr.form td.whiteborder { border-left: 1px solid #fff; border-right: 1px solid #fff; border-bottom: 1px solid #fff; } -table.navi tr.form div.#fffborder, table.navi tr.form table.#fffborder { +table.navi tr.form div.whiteborder, table.navi tr.form table.whiteborder { border-left: 1px solid #fff; border-right: 1px solid #fff; margin: 0; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 0d11e18..465ee5c 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -118,8 +118,7 @@ def sidebar_foot(): html.write('<div id="side_footer">') if config.may("configure_sidebar"): html.write('<div class=button>\n') - html.write('<a target="main" href="sidebar_add_snapin.py"') - html.write('>Add snapin</a></div>') + html.write('<a target="main" href="sidebar_add_snapin.py">Add snapin</a></div>') html.write("<div class=copyright>© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>\n") html.write('</div>')

13 years, 4 months

Check_MK Git: check_mk: Removed unused images; Cleaned up css definitions; Added fold image to view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 552d1a64f8c3ff028104c4e78d5e3f975e2c1d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=552d1a64f8c3ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:03:22 2011 +0200 Removed unused images; Cleaned up css definitions; Added fold image to view editor --- web/htdocs/check_mk.css | 107 +++++++------------- web/htdocs/htmllib.py | 2 +- web/htdocs/images/MK-mini-black.gif | Bin 1299 -> 0 bytes web/htdocs/images/MK-mini.gif | Bin 1185 -> 0 bytes .../{assumption_background.png => assume_bg.png} | Bin 222 -> 222 bytes web/htdocs/images/background-blue.jpg | Bin 13875 -> 0 bytes web/htdocs/images/background-brown.jpg | Bin 13643 -> 0 bytes web/htdocs/images/background-gold.jpg | Bin 17084 -> 0 bytes web/htdocs/images/background-gray.jpg | Bin 9539 -> 0 bytes web/htdocs/images/background-green.jpg | Bin 13467 -> 0 bytes web/htdocs/images/background-side.jpg | Bin 10549 -> 0 bytes web/htdocs/images/background-top.jpg | Bin 41727 -> 0 bytes web/htdocs/images/background.jpg | Bin 15493 -> 0 bytes web/htdocs/images/button_close14hi.png | Bin 745 -> 0 bytes web/htdocs/images/button_close14lo.png | Bin 734 -> 0 bytes web/htdocs/images/check_mk.trans.120.png | Bin 7103 -> 0 bytes web/htdocs/images/check_mk.trans.54.png | Bin 3003 -> 0 bytes web/htdocs/images/check_mk.trans.60.png | Bin 3117 -> 0 bytes web/htdocs/images/check_mk_background.jpg | Bin 63216 -> 0 bytes web/htdocs/images/closed.gif | Bin 78 -> 0 bytes web/htdocs/images/metanav_50.png | Bin 236 -> 0 bytes web/htdocs/images/metanav_50_hi.png | Bin 264 -> 0 bytes web/htdocs/images/metanav_button_20.png | Bin 300 -> 0 bytes web/htdocs/images/metanav_button_20_hi.png | Bin 287 -> 0 bytes web/htdocs/images/metanav_button_30.png | Bin 297 -> 0 bytes web/htdocs/images/metanav_button_30_hi.png | Bin 288 -> 0 bytes web/htdocs/images/metanav_button_40.png | Bin 320 -> 0 bytes web/htdocs/images/mk_logo_klein.png | Bin 1276 -> 0 bytes web/htdocs/images/mk_logo_small.gif | Bin 0 -> 453 bytes web/htdocs/images/open.gif | Bin 77 -> 0 bytes ...frame_background.jpg => sidebar_background.jpg} | Bin 49576 -> 49576 bytes .../{sidebar_unten.png => sidebar_bottom.png} | Bin 483 -> 483 bytes .../images/{sidebar_oben.png => sidebar_top.png} | Bin 5897 -> 5897 bytes web/htdocs/images/tree_closed.png | Bin 2428 -> 0 bytes web/htdocs/images/whiteglass.png | Bin 193 -> 0 bytes web/htdocs/images/whiteline_dot.gif | Bin 43 -> 0 bytes web/htdocs/js/check_mk.js | 36 ++++--- web/htdocs/permissions.py | 2 +- web/htdocs/views.py | 26 ++--- web/htdocs/wato.py | 2 +- web/plugins/views/bi.py | 2 +- 41 files changed, 75 insertions(+), 102 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=552d1a64f8…

13 years, 4 months

Check_MK Git: check_mk: A lot of additional styling cleanups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1da3865e6e8a01eaa86162a96bf756b402c0bd40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1da3865e6e8a01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 11:29:59 2011 +0200 A lot of additional styling cleanups --- web/htdocs/check_mk.css | 1114 +++++++++++++++++----------------------- web/htdocs/main.py | 1 - web/htdocs/page_logwatch.py | 2 +- web/htdocs/wato.py | 8 +- web/plugins/sidebar/search.py | 12 +- web/plugins/sidebar/shipped.py | 43 +- web/plugins/views/layouts.py | 6 +- 7 files changed, 517 insertions(+), 669 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1da3865e6e…

13 years, 4 months

Check_MK Git: check_mk: smart check: Renamed *default_values to *default_levels vars

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08be083517b59514898b72c0a0f682b96fe7ff02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08be083517b595… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 13:19:27 2011 +0200 smart check: Renamed *default_values to *default_levels vars --- checkman/smart.stats | 4 ++-- checkman/smart.temp | 2 +- checks/smart | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/smart.stats b/checkman/smart.stats index dd76728..8fe1c7f 100644 --- a/checkman/smart.stats +++ b/checkman/smart.stats @@ -20,7 +20,7 @@ inventory: examples: # These are the default thresholds of the check. - smart_stats_default_values = { + smart_stats_default_levels = { 'realloc_events': (1, 1), 'realloc_sectors': (1, 1), 'spin_retries': (1, 1), @@ -38,5 +38,5 @@ params(dict from string to (int, int)): A python dictionary which contains threshold threshold for each supported value. [configuration] -smart_stats_default_values (dict from string to (int, int)): default levels +smart_stats_default_levels (dict from string to (int, int)): default levels used for all inventorized checks. diff --git a/checkman/smart.temp b/checkman/smart.temp index a2b8fcd..e21819b 100644 --- a/checkman/smart.temp +++ b/checkman/smart.temp @@ -26,7 +26,7 @@ perfdata: examples: # Set the warning threshold to 40 and critical to 50 degrees celsius. - smart_temp_default_values = (35, 40) + smart_temp_default_levels = (35, 40) [parameters] warning (int): The degrees celsius to trigger a WARNING state diff --git a/checks/smart b/checks/smart index 087e624..a3ddae9 100644 --- a/checks/smart +++ b/checks/smart @@ -45,8 +45,8 @@ #/dev/sda ATA WDC_SSC-D0128SC- 173 Unknown_Attribute 0x0012 100 100 000 Old_age Always - 4217788040605 -smart_temp_default_values = (35, 40) -smart_stats_default_values = { +smart_temp_default_levels = (35, 40) +smart_stats_default_levels = { 'realloc_events': (1, 1), 'realloc_sectors': (1, 1), 'spin_retries': (1, 1), @@ -72,9 +72,9 @@ def inventory_smart(checktype, info): 'Command_Timeout', 'End-to-End_Error', 'Reported_Uncorrect', 'UDMA_CRC_Error_Count', ] \ and not (line[0], None) in inventory: - inventory.append((line[0], None, 'smart_stats_default_values')) + inventory.append((line[0], None, 'smart_stats_default_levels')) elif checktype == 'smart.temp' and line[4] == 'Temperature_Celsius': - inventory.append((line[0], None, 'smart_temp_default_values')) + inventory.append((line[0], None, 'smart_temp_default_levels')) return inventory

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fecf1ca8d85e88c6c6a07b61ceb68c785ddd0d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fecf1ca8d85e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 13:51:58 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: BI: better example for BI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5dad946919f116ee52cf238f319dbf4896e3ebf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dad946919f116… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 25 13:06:50 2011 +0200 BI: better example for BI --- doc/bi-example.mk | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/doc/bi-example.mk b/doc/bi-example.mk index 82bed60..129aa10 100644 --- a/doc/bi-example.mk +++ b/doc/bi-example.mk @@ -6,11 +6,10 @@ aggregation_rules["host"] = ( [ "HOST" ], "worst", [ - ( "$HOST$", HOST_STATE ), + ( "general", [ "$HOST$" ] ), + ( "performance", [ "$HOST$" ] ), ( "filesystems", [ "$HOST$" ] ), - ( "cpuandmem", [ "$HOST$" ] ), ( "networking", [ "$HOST$" ] ), - ( "checkmk", [ "$HOST$" ] ), ( "applications", [ "$HOST$" ] ), ( "logfiles", [ "$HOST$" ] ), ( "hardware", [ "$HOST$" ] ), @@ -18,14 +17,35 @@ aggregation_rules["host"] = ( ] ) +aggregation_rules["general"] = ( + "General State", + [ "HOST" ], + "worst", + [ + ( "$HOST$", HOST_STATE ), + ( "$HOST$", "Uptime" ), + ( "checkmk", [ "$HOST$" ] ), + ] +) + aggregation_rules["filesystems"] = ( - "Filesystems", + "Disk & Filesystems", [ "HOST" ], "worst", [ - ( HIDDEN, "$HOST$", "fs_" ), - ( "$HOST$", "Mount|Disk" ), + ( "$HOST$", "Disk|MD" ), ( "multipathing", [ "$HOST$" ]), + ( FOREACH_SERVICE, "$HOST$", "fs_(.*)", "filesystem", [ "$HOST$", "$1$" ] ), + ] +) + +aggregation_rules["filesystem"] = ( + "$FS$", + [ "HOST", "FS" ], + "worst", + [ + ( "$HOST$", "fs_$FS$$" ), + ( "$HOST$", "Mount options of $FS$$" ), ] ) @@ -38,12 +58,12 @@ aggregation_rules["multipathing"] = ( ] ) -aggregation_rules["cpuandmem"] = ( - "CPU, Kernel, Memory", +aggregation_rules["performance"] = ( + "Performance", [ "HOST" ], "worst", [ - ( "$HOST$", "CPU|Memory|Kernel|Number of threads" ), + ( "$HOST$", "CPU|Memory|Vmalloc|Kernel|Number of threads" ), ] ) @@ -61,8 +81,7 @@ aggregation_rules["networking"] = ( [ "HOST" ], "worst", [ - ( "$HOST$", "NFS" ), - ( FOREACH_SERVICE, "$HOST$", "NIC ([a-z]*).* counters", "nic", [ "$HOST$", "$1$" ] ), + ( "$HOST$", "NFS|Interface|TCP" ), ] )

13 years, 4 months

Check_MK Git: check_mk: BI: fixed bug in REMAINING

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e62590ba65483635ad8451e600399fc8cc39b5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e62590ba65483… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 25 13:06:00 2011 +0200 BI: fixed bug in REMAINING --- web/htdocs/bi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index ceb010c..33b4c89 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -490,7 +490,7 @@ def find_remaining_services(hostspec, aggregation): "host" : hostspec, "reqhosts" : [hostspec], "service" : service, - "title" : "%s - %s" % (host, service)} + "title" : "%s - %s" % (hostspec[1], service)} for service in remaining ]

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits