Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Further layout fix in host stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd0c9d721da84dbe58cfb05636c3e67fe0265637 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd0c9d721da84d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 26 16:26:20 2012 +0200 Further layout fix in host stats --- web/htdocs/images/globe.png | Bin 18592 -> 18605 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/globe.png b/web/htdocs/images/globe.png index 7cde4f0..3e7dd3f 100644 Binary files a/web/htdocs/images/globe.png and b/web/htdocs/images/globe.png differ

12 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' into tobi

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1fa4db6d374d9339f0914e68a9b6dc84924c5d51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fa4db6d374d93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 15:56:50 2012 +0100 Merge branch 'master' into tobi ---

12 years, 3 months

Check_MK Git: check_mk: Further layout fix in host stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de28cc8f46ee9fb4bcb01c40cabee1f1e363408e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de28cc8f46ee9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 26 16:25:09 2012 +0200 Further layout fix in host stats --- web/htdocs/dashboard.css | 10 +++++----- web/htdocs/dashboard.py | 18 +++++++++--------- web/htdocs/images/globe.png | Bin 12042 -> 18592 bytes 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 8108e87..a216fbf 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -153,8 +153,8 @@ img.globe { div.dashlet table.hoststats { margin-top: 10px; - margin-left: 5px; - width: 143px; + margin-left: 13px; + width: 135px; height: 142px; border-collapse: collapse; border-spacing: 0px; @@ -176,8 +176,7 @@ div.dashlet table.hoststats td { text-align: right; padding-right: 4px; padding-left: 4px; - background-image: url("images/form_background.png"); - background-repeat: repeat; + background-color: #95bbcd; } div.dashlet table.hoststats th { @@ -187,7 +186,7 @@ div.dashlet table.hoststats th { } div.dashlet table.hoststats td.color { padding: 0px; - width: 3px; + width: 4px; } div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px; @@ -199,6 +198,7 @@ div.dashlet table.hoststats th, table.hoststats td { } div.dashlet table.hoststats.narrow th, table.hoststats.narrow td { font-size: 8pt; + font-weight: normal; } div.dashlet_inner div.stats { diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d540ea8..1582ce1 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -414,25 +414,25 @@ def dashlet_mk_logo(): def dashlet_hoststats(): table = [ - ( _("up"), "#0b3", + ( _("Up"), "#0b3", "searchhost&is_host_scheduled_downtime_depth=0&hst0=on", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("down"), "#f00", + ( _("Down"), "#f00", "searchhost&is_host_scheduled_downtime_depth=0&hst1=on", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("unreachable"), "#f80", + ( _("Unreachable"), "#f80", "searchhost&is_host_scheduled_downtime_depth=0&hst2=on", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), - ( _("in downtime"), "#0af", + ( _("In Downtime"), "#0af", "searchhost&search=1&is_host_scheduled_downtime_depth=1", "Stats: scheduled_downtime_depth > 0\n" \ ) @@ -452,20 +452,20 @@ def dashlet_servicestats(): "Stats: host_has_been_checked = 1\n" \ "StatsAnd: 5\n"), - ( _("in downtime"), "#0af", + ( _("In Downtime"), "#0af", "searchsvc&is_in_downtime=1", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ "StatsOr: 2\n"), - ( _("on down host"), "#048", + ( _("On Down host"), "#048", "searchsvc&hst1=on&hst2=on&hstp=on&is_in_downtime=0", "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state != 0\n" \ "StatsAnd: 3\n"), - ( _("warning"), "#ff0", + ( _("Warning"), "#ff0", "searchsvc&hst0=on&st1=on&is_in_downtime=0", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ @@ -474,7 +474,7 @@ def dashlet_servicestats(): "Stats: host_has_been_checked = 1\n" \ "StatsAnd: 5\n"), - ( _("unknown"), "#f80", + ( _("Unknown"), "#f80", "searchsvc&hst0=on&st3=on&is_in_downtime=0", "Stats: state = 3\n" \ "Stats: scheduled_downtime_depth = 0\n" \ @@ -483,7 +483,7 @@ def dashlet_servicestats(): "Stats: host_has_been_checked = 1\n" \ "StatsAnd: 5\n"), - ( _("critical"), "#f00", + ( _("Critical"), "#f00", "searchsvc&hst0=on&st2=on&is_in_downtime=0", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ diff --git a/web/htdocs/images/globe.png b/web/htdocs/images/globe.png index 88c0374..7cde4f0 100644 Binary files a/web/htdocs/images/globe.png and b/web/htdocs/images/globe.png differ

12 years, 3 months

Check_MK Git: check_mk: Make master control foldable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8083b297bb48eb5d540cd79f4fb5b44e378ce784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8083b297bb48eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 17:06:04 2012 +0100 Make master control foldable --- web/plugins/sidebar/shipped.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 24e0435..46ea3c1 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -952,21 +952,21 @@ def render_master_control(): html.live.set_prepend_site(True) data = html.live.query("GET status\nColumns: %s" % " ".join([ i[0] for i in items ])) html.live.set_prepend_site(False) - html.write("<table class=master_control>\n") for siteline in data: siteid = siteline[0] if siteid: sitealias = html.site_status[siteid]["site"]["alias"] - html.write("<tr><td class=left colspan=2>") - heading(sitealias) - html.write("</tr>\n") + html.begin_foldable_container("master_control", siteid, True, sitealias) + html.write("<table class=master_control>\n") for i, (colname, title) in enumerate(items): colvalue = siteline[i + 1] url = defaults.url_prefix + ("check_mk/switch_master_state.py?site=%s&switch=%s&state=%d" % (siteid, colname, 1 - colvalue)) onclick = "get_url('%s', updateContents, 'snapin_master_control')" % url enabled = colvalue and "enabled" or "disabled" html.write("<tr><td class=left>%s</td><td class=%s><a onclick=\"%s\" href=\"#\">%s</a></td></tr>\n" % (title, enabled, onclick, enabled)) - html.write("</table>") + html.write("</table>") + if siteid: + html.end_foldable_container() sidebar_snapins["master_control"] = { "title" : _("Master control"), @@ -977,7 +977,7 @@ sidebar_snapins["master_control"] = { "styles" : """ div.snapin table.master_control { width: %dpx; - margin: 0px; + margin: 0px 0px 8px 0px; border-spacing: 0px; } @@ -1017,7 +1017,7 @@ div.snapin table.master_control td.disabled a { border-color: #c00; color: #fff; } -""" % snapin_width +""" % (snapin_width - 20) } def ajax_switch_masterstate():

12 years, 3 months

Check_MK Git: check_mk: Fixed spacing of host stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54657fdeedb2053b3e573d8a838d6d946b08bda7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54657fdeedb205… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 26 16:00:02 2012 +0200 Fixed spacing of host stats --- web/htdocs/dashboard.css | 23 ++++++++++++++++------- web/htdocs/dashboard.py | 12 +++++++++--- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 5adbcd4..8108e87 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -137,14 +137,14 @@ table.dashlet_overview h2 { /* Styles for various builtin dashlets */ canvas.pie { - margin-top: 10px; + margin-top: 5px; margin-left: 10px; z-index: 20; } img.globe { position: absolute; - top: 10px; + top: 5px; left: 10px; } img.globe { @@ -155,12 +155,12 @@ div.dashlet table.hoststats { margin-top: 10px; margin-left: 5px; width: 143px; - height: 136px; + height: 142px; border-collapse: collapse; border-spacing: 0px; } div.dashlet table.hoststats.narrow { - margin-top: 4px; + margin-top: 6px; } div.dashlet table.hoststats a { @@ -186,12 +186,13 @@ div.dashlet table.hoststats th { padding-left: 4px; } div.dashlet table.hoststats td.color { - padding: 2px; + padding: 0px; + width: 3px; } div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px; padding-bottom: 3px; - border-color: #fff; + border-color: #498aa6; border-style: solid none; border-width: 1px; vertical-align: middle; @@ -200,6 +201,15 @@ div.dashlet table.hoststats.narrow th, table.hoststats.narrow td { font-size: 8pt; } +div.dashlet_inner div.stats { + background-color: #6da1b8; + position: absolute; + height: 100%; + width: 100%; + padding: 0px; + margin: 0px; +} + div.dashlet div.nograph { background-color: #fff; width: 100%; @@ -210,4 +220,3 @@ div.dashlet div.nograph div.msg { padding: 10px; } - diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index b826768..d540ea8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -498,6 +498,7 @@ def dashlet_servicestats(): def render_statistics(pie_id, what, table, filter): + html.write("<div class=stats>") pie_diameter = 130 pie_left_aspect = 0.5 pie_right_aspect = 0.8 @@ -522,8 +523,12 @@ def render_statistics(pie_id, what, table, filter): html.write('<img src="images/globe.png" class="globe">') html.write('<table class="hoststats%s" style="float:left">' % ( - len(pies) > 5 and " narrow" or "")) - for (name, color, viewurl, query), count in pies + [ ((_("Total"), "", "all%s" % what, ""), total) ]: + len(pies) > 1 and " narrow" or "")) + table_entries = pies + while len(table_entries) < 6: + table_entries = table_entries + [ (("", "fff", "", ""), " ") ] + table_entries.append(((_("Total"), "", "all%s" % what, ""), total)) + for (name, color, viewurl, query), count in table_entries: url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \ + htmllib.urlencode(html.var("wato_folder", "")) html.write('<tr><th><a href="%s">%s</a></th>' % (url, name)) @@ -531,7 +536,7 @@ def render_statistics(pie_id, what, table, filter): if color: style = ' style="background-color: %s"' % color html.write('<td class=color%s>' - '</td><td><a href="%s">%d</a></td></tr>' % (style, url, count)) + '</td><td><a href="%s">%s</a></td></tr>' % (style, url, count)) html.write("</table>") @@ -563,6 +568,7 @@ def render_statistics(pie_id, what, table, filter): sum_separator -= separator + html.write("</div>") html.javascript(""" function chart_pie(pie_id, x_scale, radius, color) { var context = document.getElementById(pie_id + "_stats").getContext('2d');

12 years, 3 months

Check_MK Git: check_mk: Last layout improvement before merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03e86e0fde839860d68331fc460b1edb07203416 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e86e0fde8398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 26 18:07:36 2012 +0200 Last layout improvement before merge --- web/.f12 | 3 ++- web/htdocs/check_mk.css | 31 +++++++++++++++++++------------ web/htdocs/images/globe.png | Bin 18605 -> 18247 bytes web/htdocs/images/image_button_l.png | Bin 1133 -> 1114 bytes web/htdocs/login.css | 7 ++++--- web/htdocs/pages.css | 34 ++++++++++++++++++---------------- web/htdocs/sidebar.py | 2 +- web/htdocs/wato.css | 24 +++++------------------- 8 files changed, 49 insertions(+), 52 deletions(-) diff --git a/web/.f12 b/web/.f12 index ab3747a..21184a1 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,5 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} -C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) +# C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) +C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l) echo "$C files copied" # sudo omd restart $SITE apache diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index e210b5e..0cf4b61 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -71,6 +71,11 @@ input, select, textarea { -moz-border-radius: 3px; border-radius: 3px; background-color: #fff; + font-family: arial, helvetica, sans-serif; +} + +select { + padding: 1px 3px; } form { @@ -115,29 +120,30 @@ a.button { /* Image submit button styling */ label.image_button { - display: block; - margin: 0 auto; + display: inline-block; + margin: -5px -5px -0px 0; /* margin: 0 3px 0 0; */ background: transparent url('images/image_button_l.png') no-repeat; - background-position: 0 -30px; - padding: 0 0 0 14px; + background-position: -5px -30px; + padding: 0 0 0 8px; height: 30px; - float: left; margin-right: 5px; } label.image_button:hover { - background-position: 0 -60px; + background-position: -5px -60px; } label.image_button:active { - background-position: 0 -90px; + background-position: -5px -90px; } label.image_button input { height: 30px; color: #fff; border: none; - padding-right: 10px; + padding-right: 11px; + padding-top: 5px; background: transparent url('images/image_button_r.png') no-repeat; background-position: right -30px; float: left; + font-size: 8pt; } label.image_button input:hover { background-position: right -60px; @@ -266,23 +272,24 @@ table.debug_vars td { '-------------------------------------------------------------------------*/ div.really { - background-color: #f88; + background-color: #fdc400; border-color: #800; } div.success { - background-color: #8f8; + background-color: #9dbecd; border-color: #080; } div.message { - background-color: #8cf; + background-color: #9dbecd; border-color: #048; } div.error { - background-color: #f84; + background-color: #e70000; border-color: #e40; + color: white; } div.warning { diff --git a/web/htdocs/images/globe.png b/web/htdocs/images/globe.png index 3e7dd3f..9478ce2 100644 Binary files a/web/htdocs/images/globe.png and b/web/htdocs/images/globe.png differ diff --git a/web/htdocs/images/image_button_l.png b/web/htdocs/images/image_button_l.png index 3b18a86..0312e3e 100644 Binary files a/web/htdocs/images/image_button_l.png and b/web/htdocs/images/image_button_l.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 6563332..545c9e8 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -134,8 +134,8 @@ label { #button_text { position: absolute; - top: 351px; - left: 505px; + top: 356px; + left: 513px; text-align: center; width: 61px; color: white; @@ -147,7 +147,7 @@ label { #login_error { position: absolute; top: 347px; - left: 285px; + left: 320px; width: 180px; height: 30px; z-index: 100; @@ -163,6 +163,7 @@ label { background-color: transparent; margin: 0px; padding: 8px 0px 0px 0px; + color: black; } #foot { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1bb2a3f..ba65df5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -395,16 +395,21 @@ table.form img.toggleheader.hover { /* Left side where title and help is printed */ table.form td.legend, table.form td.title { - color: #274750; - border: 1px solid #fff; + color: #000; + border-width: 1px; + border-style: solid; + border-color: #2f5f73; padding-top: 10px; padding-bottom: 10px; + border-right-style: none; } /* Bottom row with action buttons, right justified */ table.form td.buttons { color: #274750; - border: 1px solid #fff; + border-width: 1px; + border-style: solid; + border-color: #2f5f73; padding-top: 10px; text-align: right; } @@ -431,10 +436,13 @@ table.form td.lgend.button { table.form td.content { padding-right: 2ex; - border: 1px solid #fff; + border-width: 1px; + border-style: solid; + border-color: #2f5f73; border-left-style: none; - padding-top: 10px; - padding-bottom: 10px; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 10px; } td.legend, td.content { @@ -473,7 +481,7 @@ input.date, input.time { font-family: monospace; } -.inputerror input, .inputerror textarea, span.checkbox { +.inputerror input, .inputerror textarea, .inputerror span.checkbox { background-color: #f84; } @@ -503,11 +511,11 @@ span.checkbox { | Confirmation dialogs, success and error messages when performing actions | '-------------------------------------------------------------------------*/ div.really, div.success, div.error, div.message, div.warning { - margin: 2em 2em 2em 2em; + margin: 2em 0em; -moz-border-radius: 1ex; padding: 1em 2em; - border-width: 2px; - border-style: solid; + /* border-width: 2px; + border-style: solid;*/ } div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { @@ -518,9 +526,3 @@ div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { margin-left: 0px; } -div.really input { - font-weight: bold; - margin-top: 1em; - padding: 0.5ex 2em; -} - diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 6340f4e..ee45bff 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -132,7 +132,7 @@ def sidebar_foot(): if config.may("logout"): html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) html.write('</ul>') - html.write("<div class=copyright>%s</div>\n" % _("© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) + html.write("<div class=copyright>%s</div>\n" % _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') # Standalone sidebar diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 7309cab..3205aa8 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -52,12 +52,6 @@ Boston, MA 02110-1301 USA. background-color: #508aa1; background-color: #73a1b4; } -.wato input[type=submit], .wato input[type=button], .wato select { - box-shadow: 0px 0px 1px #888888; -} -.wato input[type=submit]:hover, .wato input[type=button]:hover, .wato select:hover { - box-shadow: 0px 0px 1px white; -} @@ -66,7 +60,7 @@ Boston, MA 02110-1301 USA. -moz-border-radius: 4px 0px 0px 0px; } .wato table.data td { - border-style: dashed; + /* border-style: dashed; */ } .wato table.data td.select { @@ -87,15 +81,13 @@ Boston, MA 02110-1301 USA. } .wato table.form td { - border-style: dashed; + /* border-style: dashed; */ } .wato table.form td.legend { width: 300px; padding-bottom: 8px; padding-left: 20px; - border-left-style: none; - border-right-style: none; } .wato table.form td.legend h3 { @@ -105,7 +97,7 @@ Boston, MA 02110-1301 USA. font-weight: normal; } .wato table.form td.title { - border-style: none none dashed none; + border-style: none none solid none; } .wato table.form td.title i { @@ -127,12 +119,6 @@ Boston, MA 02110-1301 USA. padding-top: 7px; padding-bottom: 7px; padding-right: 20px; - border-left-style: dashed; - border-right-style: none; -} - -.wato table.form td.buttons { - border-style: solid none none none; } .wato table.form tr.top td, @@ -153,8 +139,8 @@ Boston, MA 02110-1301 USA. vertical-align: top; text-align: right; border-width: 1px; - border-color: #fff; - border-style: dashed none dashed none; + border-style: solid none solid none; + border-color: #2f5f73; } .wato div.sitestatus {

12 years, 3 months

Check_MK Git: check_mk: Minor facelift for tactical overview snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 499716813e30b9eef4c8ee49f67870f69bbd83b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=499716813e30b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:57:50 2012 +0100 Minor facelift for tactical overview snapin --- web/plugins/sidebar/shipped.py | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 107199c..24e0435 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -524,7 +524,7 @@ def render_tactical_overview(): (_("Hosts"), hstdata, 'hostproblems', 'host'), (_("Services"), svcdata, 'svcproblems', 'service'), ]: - html.write("<tr><th>%s</th><th>%s</th><th>%s</th></tr>\n" % \ + html.write("<tr><th><span>%s</span></th><th><span>%s</span></th><th><span>%s</span></th></tr>\n" % \ (title, _('Problems'), _('Unhandled'))) html.write("<tr>") @@ -556,15 +556,20 @@ table.tacticaloverview { * border-spacing: 5px 2px; */ width: %dpx; - margin-top: 0; + margin-top: -9px; } table.tacticaloverview th { - font-size: 7pt; - text-align: left; - color: #123a4a; - font-weight: normal; - padding: 0; - padding-top: 2px; + font-size: 8pt; + text-align: left; + color: #123a4a; + font-weight: normal; + padding: 0; + padding-top: 2px; + vertical-align: bottom; +} +table.tacticaloverview th span { + position: relative; + top: 2px; } table.tacticaloverview td { width: 33.3%%; @@ -573,6 +578,7 @@ table.tacticaloverview td { background-color: #6da1b8; padding: 0px; height: 14px; + box-shadow: 0px 0px 1px #386068; } table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width

12 years, 3 months

Check_MK Git: check_mk: Changed Dashboard raster from 32x32 to 10x10

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7b9855added291e21d7cb92a41c5966dcf892d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7b9855added29… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 17:41:23 2012 +0100 Changed Dashboard raster from 32x32 to 10x10 --- web/htdocs/dashboard.py | 6 +++--- web/htdocs/js/dashboard.js | 2 +- web/plugins/dashboard/builtin.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ce2ccf9..b826768 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -50,7 +50,7 @@ screen_margin = 5 # Distance from the left border of the main-fra dashlet_padding = 21, 5, 5, 0 # Margin (N, E, S, W) between outer border of dashlet and its content corner_overlap = 22 title_height = 0 # Height of dashlet title-box -raster = 32, 32 # Raster the dashlet choords are measured in +raster = 10, 10 # Raster the dashlet choords are measured in # Load plugins in web/plugins/dashboard and declare permissions, # note: these operations produce language-specific results and @@ -498,8 +498,8 @@ def dashlet_servicestats(): def render_statistics(pie_id, what, table, filter): - pie_diameter = 130 - pie_left_aspect = 0.4 + pie_diameter = 130 + pie_left_aspect = 0.5 pie_right_aspect = 0.8 # Is the query restricted to a certain WATO-path? diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 5fabf24..b8275db 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -104,7 +104,7 @@ function resize_dashlets(id, code) function set_dashboard_size() { - var body_padding = 0; + var body_padding = 5; var width = pageWidth(); var height = pageHeight(); width = width - 2*screen_margin - 2*body_padding; diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index caa7591..e4249dd 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -38,7 +38,7 @@ builtin_dashboards["main"] = { "title" : _("Host Statistics"), "url" : "dashlet_hoststats.py", "position" : (1, 1), - "size" : (10, 6), + "size" : (30, 18), "shadow" : True, "background" : True, "refresh" : 60, @@ -46,8 +46,8 @@ builtin_dashboards["main"] = { { "title" : _("Service Statistics"), "url" : "dashlet_servicestats.py", - "position" : (11, 1), - "size" : (10, 6), + "position" : (31, 1), + "size" : (30, 18), "shadow" : True, "background" : True, "refresh" : 60, @@ -57,13 +57,13 @@ builtin_dashboards["main"] = { "title_url" : "view.py?view_name=hostproblems&is_host_acknowledged=0", "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, 1), - "size" : (GROW, 6), + "size" : (GROW, 18), }, { "title" : _("Service Problems (unhandled)"), "title_url" : "view.py?view_name=svcproblems&is_service_acknowledged=0", "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (1, 7), + "position" : (1, 19), "size" : (GROW, MAX), }, {

12 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' into tobi

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68bde0d24dad3404c9b7ea5856bb4150e3256653 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68bde0d24dad34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 26 18:08:07 2012 +0200 Merge branch 'master' into tobi ---

12 years, 3 months

Check_MK Git: check_mk: New version of statistics PIE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffef7c3e4bf40a8d464280836115d916d0ffcdb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffef7c3e4bf40a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 17:10:30 2012 +0100 New version of statistics PIE --- web/.f12 | 2 +- web/htdocs/dashboard.css | 10 +++++ web/htdocs/dashboard.py | 79 +++++++++++++++++++++++++++--------------- web/htdocs/images/globe.png | Bin 0 -> 10926 bytes 4 files changed, 62 insertions(+), 29 deletions(-) diff --git a/web/.f12 b/web/.f12 index eb354ad..ab3747a 100644 --- a/web/.f12 +++ b/web/.f12 @@ -2,4 +2,4 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) echo "$C files copied" -sudo omd restart $SITE apache +# sudo omd restart $SITE apache diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 9aceab3..5adbcd4 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -139,6 +139,16 @@ table.dashlet_overview h2 { canvas.pie { margin-top: 10px; margin-left: 10px; + z-index: 20; +} + +img.globe { + position: absolute; + top: 10px; + left: 10px; +} +img.globe { + z-index: 10; } div.dashlet table.hoststats { diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5c4b666..ce2ccf9 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -452,6 +452,19 @@ def dashlet_servicestats(): "Stats: host_has_been_checked = 1\n" \ "StatsAnd: 5\n"), + ( _("in downtime"), "#0af", + "searchsvc&is_in_downtime=1", + "Stats: scheduled_downtime_depth > 0\n" \ + "Stats: host_scheduled_downtime_depth > 0\n" \ + "StatsOr: 2\n"), + + ( _("on down host"), "#048", + "searchsvc&hst1=on&hst2=on&hstp=on&is_in_downtime=0", + "Stats: scheduled_downtime_depth = 0\n" \ + "Stats: host_scheduled_downtime_depth = 0\n" \ + "Stats: host_state != 0\n" \ + "StatsAnd: 3\n"), + ( _("warning"), "#ff0", "searchsvc&hst0=on&st1=on&is_in_downtime=0", "Stats: state = 1\n" \ @@ -478,19 +491,6 @@ def dashlet_servicestats(): "Stats: host_state = 0\n" \ "Stats: host_has_been_checked = 1\n" \ "StatsAnd: 5\n"), - - ( _("in downtime"), "#0af", - "searchsvc&is_in_downtime=1", - "Stats: scheduled_downtime_depth > 0\n" \ - "Stats: host_scheduled_downtime_depth > 0\n" \ - "StatsOr: 2\n"), - - ( _("on down host"), "#048", - "searchsvc&hst1=on&hst2=on&hstp=on&is_in_downtime=0", - "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" @@ -498,6 +498,10 @@ def dashlet_servicestats(): def render_statistics(pie_id, what, table, filter): + pie_diameter = 130 + pie_left_aspect = 0.4 + pie_right_aspect = 0.8 + # Is the query restricted to a certain WATO-path? wato_folder = html.var("wato_folder") if wato_folder: @@ -512,10 +516,10 @@ def render_statistics(pie_id, what, table, filter): result = html.live.query_summed_stats(query) pies = zip(table, result) total = sum([x[1] for x in pies]) - pie_diameter = 136 - html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % + html.write('<canvas class=pie width=%d height=%d id="%s_stats" style="float: left"></canvas>' % (pie_diameter, pie_diameter, pie_id)) + html.write('<img src="images/globe.png" class="globe">') html.write('<table class="hoststats%s" style="float:left">' % ( len(pies) > 5 and " narrow" or "")) @@ -534,30 +538,49 @@ def render_statistics(pie_id, what, table, filter): r = 0.0 pie_parts = [] if total > 0: - for (name, color, viewurl, q), value in pies: - perc = 100.0 * value / total - pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, r, r + perc, color)) - r += perc + # Counter number of non-zero classes + num_nonzero = 0 + for info, value in pies: + if value > 0: + num_nonzero += 1 + + # Each non-zero class gets at least a view pixels of visible thickness + separator = 0.05 # 5% of radius + rest_radius = 1 - num_nonzero * separator + + # Make sure, that each class that is not zero has at least a certain + # amount so that it will be visible + totalpart = 1 + # Loop over classes, begin with red (most inner ball) + sum_separator = num_nonzero * separator + for (name, color, viewurl, q), value in pies[::1]: + part = float(value) / total + if value > 0 and totalpart > 0: + radius = sum_separator + rest_radius * totalpart ** (1/3.0) + pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, pie_right_aspect, radius, color)) + pie_parts.append('chart_pie("%s", -%f, %f, %r);' % (pie_id, pie_left_aspect, radius, color)) + totalpart -= part + sum_separator -= separator + html.javascript(""" -function chart_pie(pie_id, from, to, color) { +function chart_pie(pie_id, x_scale, radius, color) { var context = document.getElementById(pie_id + "_stats").getContext('2d'); if (!context) return; var pie_x = %(x)f; var pie_y = %(y)f; var pie_d = %(d)f; + context.fillStyle = color; + context.save(); + context.translate(pie_x, pie_y); + context.scale(x_scale, 1); context.beginPath(); - context.moveTo(pie_x, pie_y); - context.arc(pie_x, pie_y, pie_d / 2 - 2, rad(from), rad(to), false); + context.moveTo(0, 0); + context.arc(0, 0, (pie_d / 2) * radius, 1.5 * Math.PI, 0.5 * Math.PI, false); context.closePath(); - context.fillStyle = color; - context.shadowOffsetX = 5; - context.shadowOffsetY = 5; - context.shadowBlur = 10; - context.strokeStyle = "#ffffff"; context.fill(); - context.stroke(); + context.restore(); context = null; } diff --git a/web/htdocs/images/globe.png b/web/htdocs/images/globe.png new file mode 100644 index 0000000..e8ae881 Binary files /dev/null and b/web/htdocs/images/globe.png differ

12 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012