lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
October 2011
----- 2024 -----
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
2 participants
109 discussions
Start a n
N
ew thread
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: 755e4e6f6dec69c97b48d711f6700b78d5e6a7e1 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=755e4e6f6dec69…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 16:05:42 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: FIX: fixed sorting of service perfdata columns
by lm@mathias-kettner.de
Module: check_mk Branch: master Commit: 090d6fc612146fc0df6afd0a141d99ab9b5cbbe9 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=090d6fc612146f…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 11:50:33 2011 +0200 FIX: fixed sorting of service perfdata columns --- ChangeLog | 1 + web/plugins/views/sorters.py | 67 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8f12a3..01db004 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * FIX: Fixed not updating pnp graphs on dashboard in some browsers (like chrome) * FIX: fix URL-too-long in permissions page * FIX: fix permission computation + * FIX: fixed sorting of service perfdata columns * Cleanup permissions page optically, add comments for views and snapins * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index b8cfae5..0ad3848 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -157,14 +157,65 @@ declare_1to1_sorter("svc_group_memberlist", cmp_string_list) declare_1to1_sorter("svc_acknowledged", cmp_simple_number) def cmp_perfdata_nth_value(r1, r2, n): - return cmp(get_perfdata_nth_value(r1, n), get_perfdata_nth_value(r2, n)) - -for n in range(1, 10): - multisite_sorters['svc_perf_val%02d' % n] = { - "title" : _("Service performance data - value number %02d" % n), - "columns" : [ 'service_perf_data' ], - "cmp" : lambda r1, r2: cmp(get_perfdata_nth_value(r1, n - 1), get_perfdata_nth_value(r2, n - 1)) - } + def saveint(s): + # Change None or empty strings to -1 to make these lines + # appear below the lines with a value of 0 + if s is None or s == '': + return -1 + return int(s) + return cmp(saveint(get_perfdata_nth_value(r1, n)), saveint(get_perfdata_nth_value(r2, n))) + +multisite_sorters['svc_perf_val01'] = { + "title" : _("Service performance data - value number 01"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 0), +} +multisite_sorters['svc_perf_val02'] = { + "title" : _("Service performance data - value number 02"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 1), +} +multisite_sorters['svc_perf_val03'] = { + "title" : _("Service performance data - value number 03"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 2), +} +multisite_sorters['svc_perf_val04'] = { + "title" : _("Service performance data - value number 04"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 3), +} +multisite_sorters['svc_perf_val05'] = { + "title" : _("Service performance data - value number 05"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 4), +} +multisite_sorters['svc_perf_val06'] = { + "title" : _("Service performance data - value number 06"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 5), +} +multisite_sorters['svc_perf_val07'] = { + "title" : _("Service performance data - value number 07"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 6), +} +multisite_sorters['svc_perf_val08'] = { + "title" : _("Service performance data - value number 08"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 7), +} +multisite_sorters['svc_perf_val09'] = { + "title" : _("Service performance data - value number 09"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 8), +} +multisite_sorters['svc_perf_val10'] = { + "title" : _("Service performance data - value number 10"), + "columns" : [ 'service_perf_data' ], + "cmp" : lambda r1, r2: cmp_perfdata_nth_value(r1, r2, 9), +} + # Host declare_1to1_sorter("alias", cmp_simple_string)
12 years, 8 months
1
0
0
0
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: 27abcd12f480c5ea3822bdc9574c58be927887be URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27abcd12f480c5…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 14:29:49 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: FIX: "move to" dropdown in IE9 works again
by lm@mathias-kettner.de
Module: check_mk Branch: master Commit: 56486f5a6da0ca89cab965aba7ac03aab4b77183 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56486f5a6da0ca…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 14:29:39 2011 +0200 FIX: "move to" dropdown in IE9 works again --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 3 ++- web/htdocs/wato.py | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeec1c6..7af2c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ WATO: * FIX: "bulk move to" at the top of wato hostlists works again * FIX: IE<9: Fixed problem with checkbox events when editing a host + * FIX: "move to" dropdown in IE9 works again 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 0439168..f1e8e16 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1025,6 +1025,7 @@ function highlight_row(elem, on) { }); checkbox = null; } + return false; } function highlight_elem(elem, on) { @@ -1040,7 +1041,7 @@ function highlight_elem(elem, on) { var childs = elem.childNodes; for(var i = 0; i < childs.length; i++) - if(childs[i].nodeName !== '#text') + if(childs[i].nodeName !== '#text' && childs[i].nodeName !== 'OPTION') highlight_elem(childs[i], on); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c1ee266..e30e7c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2547,10 +2547,9 @@ def host_move_combo(host = None, top = False): onchange = "update_bulk_moveto(this.value)", attrs = {'class': 'bulk_moveto'}) else: - html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) - html.sorted_select(None, selections, "", - "location.href='%s&_move_host_to=' + this.value;" % uri); + html.sorted_select("_move_%s" % host, selections, "", + "location.href='%s&_move_host_to=' + this.value;return true;" % uri); def move_hosts_to(hostnames, target_filename):
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: wato: minor code formating
by lm@mathias-kettner.de
Module: check_mk Branch: master Commit: 42f8ce6e9f8e7d62d798750b3fad2dc5f7130419 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f8ce6e9f8e7d…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 6 13:08:20 2011 +0200 wato: minor code formating --- 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 93536bc..c1ee266 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2550,7 +2550,7 @@ def host_move_combo(host = None, top = False): html.hidden_field("host", host) uri = html.makeuri([("host", host), ("_transid", html.current_transid() )]) html.sorted_select(None, selections, "", - "location.href='%s' + '&_move_host_to=' + this.value;" % uri); + "location.href='%s&_move_host_to=' + this.value;" % uri); def move_hosts_to(hostnames, target_filename):
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: New dummy dashlet as replacement if not data
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: bcff444034dba4411293b3c97c7c0370d10f3217 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcff444034dba4…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 13:24:29 2011 +0200 New dummy dashlet as replacement if not data --- web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 5 +++++ web/plugins/pages/shipped.py | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 379b197..974e4ea 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1790,7 +1790,15 @@ div.dashlet table.hoststats th, table.hoststats td { vertical-align: middle; } +div.dashlet div.nograph { + background-color: white; + width: 100%; + height: 100%; +} +div.dashlet div.nograph div.msg { + padding: 10px; +} /* _ _ _ ____ _ diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 358b981..ab31ee4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -548,6 +548,11 @@ if(has_canvas_support()) { def dashlet_pnpgraph(): render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0))) +def dashlet_nodata(): + html.write("<div class=nograph><div class=msg>") + html.write(html.var("message", _("No data available."))) + html.write("</div></div>") + def render_pnpgraph(site, host, service=None, source=0): if not host: html.message("Invalid URL to this dashlet. Missing <tt>host</tt>") diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index b29dcf1..dc90bb7 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -68,5 +68,6 @@ pagehandlers.update({ "dashlet_hoststats" : dashboard.dashlet_hoststats, "dashlet_servicestats" : dashboard.dashlet_servicestats, "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, + "dashlet_nodata" : dashboard.dashlet_nodata, })
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: Dashboard: make numbers match "Tactical Overview" snapin
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 427e5b3d67802a5534cf26f2a521d1468df12c9b URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=427e5b3d67802a…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 12:37:15 2011 +0200 Dashboard: make numbers match "Tactical Overview" snapin --- ChangeLog | 1 + web/htdocs/check_mk.css | 6 ++++++ web/htdocs/dashboard.py | 41 +++++++++++++++++++++++++---------------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1975652..dc39a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * Tactical Overview: make link clickable even if count is zero * Minor cleanup in default dashboard * Dashboard: new dashlet attribute title_url lets you make a title into a link + * Dashboard: make numbers match "Tactical Overview" snapin Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 3daf5ce..379b197 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1760,6 +1760,11 @@ div.dashlet table.hoststats { border-collapse: collapse; border-spacing: 0px; } +div.dashlet table.hoststats.narrow { + margin-top: 4px; +} + + div.dashlet table.hoststats td { text-align: right; padding-right: 6px; @@ -1767,6 +1772,7 @@ div.dashlet table.hoststats td { background-image: url("images/form_background.png"); background-repeat: repeat; } + div.dashlet table.hoststats th { text-align: left; background-color: transparent; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9c41ee5..358b981 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -404,22 +404,22 @@ def dashlet_mk_logo(): def dashlet_hoststats(): table = [ - ( _("Up"), "#0b3", + ( _("up"), "#0b3", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("Down"), "#f00", + ( _("down"), "#f00", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("Unreachable"), "#f80", + ( _("unreachable"), "#f80", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("In downtime"), "#0af", + ( _("in downtime"), "#0af", "Stats: scheduled_downtime_depth > 0\n" \ ) ] @@ -429,35 +429,44 @@ def dashlet_hoststats(): def dashlet_servicestats(): table = [ - ( _("Ok"), "#0b3", + ( _("OK"), "#0b3", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Warning"), "#ff0", + ( _("warning"), "#ff0", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Unknown"), "#f80", + ( _("unknown"), "#f80", "Stats: state = 3\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("Critical"), "#f00", + ( _("critical"), "#f00", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ - "StatsAnd: 3\n"), + "Stats: host_state = 0\n" \ + "StatsAnd: 4\n"), - ( _("In downtime"), "#0af", + ( _("in downtime"), "#0af", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ - "StatsOr: 2\n" \ - ) + "StatsOr: 2\n"), + + ( _("on down host"), "#048", + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "Stats: host_state != 0\n" \ + "StatsAnd: 3\n"), ] filter = "Filter: host_custom_variable_names < _REALNAME\n" @@ -484,7 +493,7 @@ def render_statistics(what, table, filter): html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % (pie_diameter, pie_diameter, what)) - html.write('<table class=hoststats style="float:left">') + html.write('<table class="hoststats narrow" style="float:left">') for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: html.write('<tr><th>%s</th><td class=color style="background-color: %s">' '</td><td>%d</td></tr>' % (name, color, count))
12 years, 8 months
1
0
0
0
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: dbf22b484274287644332874cc528b1456514c9d URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbf22b48427428…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 11:56:17 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: Dashboard: new dashlet attribute title_url
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 2ecd50649b891774b2d13ea68950c3269d5d49db URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ecd50649b8917…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 11:56:12 2011 +0200 Dashboard: new dashlet attribute title_url --- ChangeLog | 1 + web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 7 ++++++- web/plugins/dashboard/builtin.py | 3 +++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3faacd..6c81f22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Added "Administration" snapin to default sidebar * Tactical Overview: make link clickable even if count is zero * Minor cleanup in default dashboard + * Dashboard: new dashlet attribute title_url lets you make a title into a link Livestatus: * Write messages after initialization into an own livestatus.log diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8867279..3daf5ce 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1680,6 +1680,14 @@ div.dashlet div.title { font-size: 10pt; font-weight: bold; } +div.dashlet div.title a { + text-decoration: none; + border-bottom: 1px dotted white; + color: white; +} +div.dashlet div.title a:hover { + color: #00f; +} div.dashlet img.shadow { position: absolute; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 15458e0..ddf77ef 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -173,7 +173,12 @@ def render_dashlet(nr, dashlet, filename): (p, nr, p, p)) if dashlet.get("title"): - html.write('<div class="title" id="dashlet_title_%d">%s</div>' % (nr, dashlet["title"])) + url = dashlet.get("title_url", None) + if url: + title = '<a href="%s">%s</a>' % (url, dashlet["title"]) + else: + title = dashlet["title"] + html.write('<div class="title" id="dashlet_title_%d">%s</div>' % (nr, title)) if dashlet.get("background", True): bg = " background" else: diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 7fc6cdc..9064434 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -55,18 +55,21 @@ builtin_dashboards = { }, { "title" : _("Host Problems"), + "title_url" : "view.py?view_name=hostproblems", "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, 1), "size" : (GROW, 6), }, { "title" : _("Service Problems"), + "title_url" : "view.py?view_name=svcproblems", "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (1, 7), "size" : (GROW, MAX), }, { "title" : _("Events of recent 4 hours"), + "title_url" : "view.py?view_name=events_dash", "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, -1), "size" : (GROW, GROW),
12 years, 8 months
1
0
0
0
Check_MK Git: check_mk: Made profile output file configurable (Variable: g_profile_path)
by lm@mathias-kettner.de
Module: check_mk Branch: master Commit: 690bf2ef1985114e0428c6006cddc7fed8e6d710 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=690bf2ef198511…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 5 16:09:51 2011 +0200 Made profile output file configurable (Variable: g_profile_path) --- ChangeLog | 1 + modules/check_mk.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb5b7f2..843154f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.12b1: Core, Setup, etc.: * FIX: fix cmk -D on cluster hosts + * Made profile output file configurable (Variable: g_profile_path) Checks & Agents: * FIX: j4p_performance: fix inventory functions diff --git a/modules/check_mk.py b/modules/check_mk.py index a6bb428..e69761c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,7 +34,8 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. -g_profile = None +g_profile = None +g_profile_path = 'profile.out' if __name__ == "__main__": opt_debug = '--debug' in sys.argv[1:] @@ -3975,15 +3976,16 @@ def read_all_autochecks(): def output_profile(): if g_profile: - g_profile.dump_stats("profile.out") - file("show_profile.py", "w")\ + g_profile.dump_stats(g_profile_path) + show_profile = os.path.join(os.path.dirname(g_profile_path), 'show_profile.py') + file(show_profile, "w")\ .write("#!/usr/bin/python\n" "import pstats\n" - "stats = pstats.Stats('profile.out')\n" - "stats.sort_stats('time').print_stats()\n") - os.chmod("show_profile.py", 0755) + "stats = pstats.Stats('%s')\n" + "stats.sort_stats('time').print_stats()\n" % g_profile_path) + os.chmod(show_profile, 0755) - sys.stderr.write("Profile 'profile.out' written. Please run ./show_profile.py.\n") + sys.stderr.write("Profile '%s' written. Please run %s.\n" % (g_profile_path, show_profile)) # +----------------------------------------------------------------------+ # | __ __ _ |
12 years, 8 months
1
0
0
0
← Newer
1
...
7
8
9
10
11
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
Results per page:
10
25
50
100
200