Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: FIX: ps.perf: sum up memory usage over all processes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a5856fa7e1d666a60da1a4b594675d5ed8a3713f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5856fa7e1d666… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 8 13:09:31 2011 +0100 FIX: ps.perf: sum up memory usage over all processes --- ChangeLog | 4 ++++ pnp-templates/check_mk-ps.perf.php | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05ffec5..3b20a03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,10 @@ one pie dashlet for host/service stats * FIX: drbd: fixed inventory functions * FIX: printer_supply: handle output of Brother printers + * FIX: ps.perf PNP template: show memory usage per process and not + summed up. This is needed in situations where one process forks itself + in irregular intervals and rates but you are interested just in the + memory usage of the main process. Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index 3b468f8..a1b841e 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -40,11 +40,12 @@ $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" "; $def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; if (isset($DS[2])) { - $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage\" "; - $def[2] = "DEF:vsz=$RRDFILE[2]:$DS[2]:MAX "; + $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage per process\" "; + $def[2] = "DEF:count=$RRDFILE[1]:$DS[1]:MAX "; + $def[2] .= "DEF:vsz=$RRDFILE[2]:$DS[2]:MAX "; $def[2] .= "DEF:rss=$RRDFILE[3]:$DS[3]:MAX "; - $def[2] .= "CDEF:vszmb=vsz,1024,/ "; - $def[2] .= "CDEF:rssmb=rss,1024,/ "; + $def[2] .= "CDEF:vszmb=vsz,1024,/,count,/ "; + $def[2] .= "CDEF:rssmb=rss,1024,/,count,/ "; $def[2] .= "AREA:vszmb#90a0f0:\"Virtual size \" "; $def[2] .= "GPRINT:vszmb:LAST:\"Current\: %5.1lf MB\" "; $def[2] .= "GPRINT:vszmb:MIN:\"Min\: %5.1lf MB\" ";

12 years, 10 months

Check_MK Git: check_mk: Cleaned up ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 933610c4a8430e55efd73a594f7a591d1b85cd47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=933610c4a8430e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 16:50:08 2011 +0100 Cleaned up ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae23dfd..05ffec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,6 @@ * New nifty sidebar snapin "Speed-O-Meter" * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers - * FIX: Loading dashboard plugins in dashboard module Livestatus: * New columns num_hosts and num_services in status table @@ -56,6 +55,7 @@ problems view * FIX: dashboard problem views now ignore notification period, just as tactical overview and normal problem views do + * FIX: Loading dashboard plugins in dashboard module 1.1.12:

12 years, 10 months

Check_MK Git: check_mk: WATO: fix bulk inventory in sub-subfolders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70294e0911883c8da16b3ceaca9d06b196cf0f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70294e0911883c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 16:47:26 2011 +0100 WATO: fix bulk inventory in sub-subfolders --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a526184..0741b3b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2119,7 +2119,7 @@ def mode_bulk_inventory(phase): # interactive progress is *not* done in action phase. It # renders the page content itself. hostnames = get_hostnames_from_checkboxes() - items = [ "%s|%s" % (g_folder[".name"], hostname) + items = [ "%s|%s" % (g_folder[".path"], hostname) for hostname in hostnames ] if html.var("_start"):

12 years, 10 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: 5e8a83ca0fe14f641012219e8bb644a49618bae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e8a83ca0fe14f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 16:47:29 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 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: 8b4ca49735d29f7271b0e55c899d420ef164eb85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4ca49735d29f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 16:45:34 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: FIX: Loading dashboard plugins in dashboard module

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1070fce30cd742ad21b169495073db27ee93c205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1070fce30cd742… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 16:43:23 2011 +0100 FIX: Loading dashboard plugins in dashboard module --- .bugs/413 | 10 ++++++++++ web/htdocs/dashboard.py | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/413 b/.bugs/413 new file mode 100644 index 0000000..243637a --- /dev/null +++ b/.bugs/413 @@ -0,0 +1,10 @@ +Title: filesystem_levels aus Dokus entfernen +Component: docu +Benefit: 2 +State: open +Cost: 1 +Date: 2011-11-07 10:27:18 +Targetversion: 1.1.12 +Class: bug + +Die Option ist deprecated. Deswegen aus der Doku entfernen. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 95646c6..2739242 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -589,3 +589,4 @@ def render_pnpgraph(site, host, service=None, source=0): img_url = base_url + "image" + var_part html.write('<a href="%s"><img border=0 src="%s"></a>' % (pnp_url, img_url)) +load_plugins()

12 years, 10 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 79734677175ba9bd362db27eeab7391c61bcd7fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79734677175ba9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 7 16:44:05 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe65bd2..ae23dfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * New nifty sidebar snapin "Speed-O-Meter" * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers + * FIX: Loading dashboard plugins in dashboard module Livestatus: * New columns num_hosts and num_services in status table

12 years, 10 months

Check_MK Git: check_mk: WATO: added home button in rule screens

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71546e6c3b549ce4c3275a8b8827fa15ad07214f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71546e6c3b549c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 16:37:50 2011 +0100 WATO: added home button in rule screens --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5ba7809..a526184 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8325,6 +8325,7 @@ def mode_rulesets(phase): elif phase == "buttons": if only_host: + home_button() html.context_button(only_host, make_link([("mode", "edithost"), ("host", only_host)]), "back") else: @@ -8462,6 +8463,7 @@ def mode_edit_ruleset(phase): return title elif phase == "buttons": + home_button() html.context_button(_("All rulesets"), make_link([("mode", "rulesets"), ("host", hostname)]), "back") if hostname: @@ -9011,6 +9013,7 @@ def mode_edit_rule(phase): return _("Edit rule %s") % rulespec["title"] elif phase == "buttons": + home_button() html.context_button(_("All rules"), make_link([("mode", "edit_ruleset"), ("varname", varname),

12 years, 10 months

Check_MK Git: check_mk: WATO: fix handling of explicit values in rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6af263d0ed3443b67903c25be2db3af6c651973 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6af263d0ed344… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 16:07:48 2011 +0100 WATO: fix handling of explicit values in rule editor --- web/htdocs/wato.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fddf823..5ba7809 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8987,12 +8987,15 @@ def get_rule_conditions(ruleset): item_list = [] while True: var = "item_%d" % nr - item = html.var(var) + item = html.var(var, "").strip() if nr > config.wato_num_itemspecs and not item: break if item: item_list.append(item) nr += 1 + if len(item_list) == 0: + raise MKUserError("item_0", _("Please specify at least one %s or " + "this rule will never match.") % ruleset["itemname"]) else: item_list = None @@ -9211,7 +9214,9 @@ def mode_edit_rule(phase): html.write("</td><td class=content>") if itemtype: - checked = len(item_list) > 0 and item_list[0] != "" + checked = html.get_checkbox("explicit_services") + if checked == None: # read from rule itself + checked = len(item_list) == 0 or item_list[0] != "" div_id = "itemlist" html.checkbox("explicit_services", checked, onclick="wato_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit values"))

12 years, 10 months

Check_MK Git: check_mk: WATO: icon instead of button for edit rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b80ebfc3895fcbaa09c0a11cd475abd857ca08ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b80ebfc3895fcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 7 15:44:10 2011 +0100 WATO: icon instead of button for edit rule --- web/htdocs/images/button_edit_hi.png | Bin 544 -> 2795 bytes web/htdocs/images/button_edit_lo.png | Bin 549 -> 3408 bytes web/htdocs/wato.py | 21 ++++++++------------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/web/htdocs/images/button_edit_hi.png b/web/htdocs/images/button_edit_hi.png index 2fdca44..fb33ba5 100644 Binary files a/web/htdocs/images/button_edit_hi.png and b/web/htdocs/images/button_edit_hi.png differ diff --git a/web/htdocs/images/button_edit_lo.png b/web/htdocs/images/button_edit_lo.png index 973bbff..bddd87b 100644 Binary files a/web/htdocs/images/button_edit_lo.png and b/web/htdocs/images/button_edit_lo.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02cb90e..fddf823 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8563,7 +8563,6 @@ def mode_edit_ruleset(phase): "<th>" + _("Folder") + "</th>" "<th>" + _("Value") + "</th>" "<th>" + _("Conditions") + "</th>" - "<th></th>" # Edit "<th></th>" # Several icons "</tr>\n") @@ -8603,6 +8602,14 @@ def mode_edit_ruleset(phase): rule_button("down", _("Move this rule one position down"), folder, rel_rulenr) else: rule_button(None) + edit_url = make_link([ + ("mode", "edit_rule"), + ("varname", varname), + ("rulenr", rel_rulenr), + ("host", hostname), + ("item", repr(item)), + ("rule_folder", folder[".path"])]) + icon_button(edit_url, _("Edit this rule"), "edit") rule_button("insert", _("Insert a copy of this rule into the folder '%s'") % g_folder["title"], folder, rel_rulenr) rule_button("delete", _("Delete this rule"), folder, rel_rulenr) @@ -8667,18 +8674,6 @@ def mode_edit_ruleset(phase): render_conditions(rulespec, tag_specs, host_list, item_list, varname, folder) html.write("</td>") - # Edit - html.write("<td class=buttons>") - url = make_link([ - ("mode", "edit_rule"), - ("varname", varname), - ("rulenr", rel_rulenr), - ("host", hostname), - ("item", repr(item)), - ("rule_folder", folder[".path"])]) - html.buttonlink(url, _("Edit")) - html.write("</td>") - # Icons html.write("<td>") # "this folder"

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits