[checkmk-commits] Check_MK Git: check_mk: Dashboard: insert links to views into statistics

Module: check_mk Branch: master Commit: b5b015693c1e4ee0b8761d7123cca510d71f3229 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5b015693c1e4e… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Oct 24 18:04:52 2011 +0200 Dashboard: insert links to views into statistics --- ChangeLog | 1 + web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 23 ++++++++++++++++++----- web/plugins/views/builtin.py | 1 + 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 771c3a1..cc238bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Multisite: * Dashboard: fix font size of service statistics table + * Dashboard: insert links to views into statistics 1.1.12b2: Core, Setup, etc.: diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 815cfe7..2038acd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1764,6 +1764,14 @@ div.dashlet table.hoststats.narrow { margin-top: 4px; } +div.dashlet table.hoststats a { + color: black; + text-decoration: none; +} +div.dashlet table.hoststats a:hover { + text-decoration: underline; +} + div.dashlet table.hoststats td { text-align: right; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 582d5ef..f461580 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -413,21 +413,25 @@ def dashlet_mk_logo(): def dashlet_hoststats(): table = [ ( _("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", + "searchhost&is_host_scheduled_downtime_depth=0&hst1=on", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), ( _("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", + "searchhost&search=1&is_host_scheduled_downtime_depth=1", "Stats: scheduled_downtime_depth > 0\n" \ ) ] @@ -438,6 +442,7 @@ def dashlet_hoststats(): def dashlet_servicestats(): table = [ ( _("OK"), "#0b3", + "searchsvc&hst0=on&st0=on&is_in_downtime=0", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -445,6 +450,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("warning"), "#ff0", + "searchsvc&hst0=on&st1=on&is_in_downtime=0", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -452,6 +458,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("unknown"), "#f80", + "searchsvc&hst0=on&st3=on&is_in_downtime=0", "Stats: state = 3\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -459,6 +466,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("critical"), "#f00", + "searchsvc&hst0=on&st2=on&is_in_downtime=0", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -466,11 +474,13 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("in downtime"), "#0af", + "searchsvc&hst0=on&is_in_downtime=0", "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", "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state != 0\n" \ @@ -490,7 +500,7 @@ def render_statistics(what, table, filter): query = "GET %s\n" % what for entry in table: - query += entry[2] + query += entry[3] query += filter result = html.live.query_summed_stats(query) @@ -503,16 +513,19 @@ def render_statistics(what, table, filter): html.write('<table class="hoststats%s" style="float:left">' % ( len(pies) > 5 and " narrow" or "")) - 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)) + for (name, color, viewurl, query), count in pies + [ ((_("Total"), "", "all%s" % what, ""), total) ]: + url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&filename=" \ + + htmllib.urlencode(html.var("filename", "")) + html.write('<tr><th><a href="%s">%s</a></th>' % (url, name)) + html.write('<td class=color style="background-color: %s">' + '</td><td><a href="%s">%d</a></td></tr>' % (color, url, count)) html.write("</table>") r = 0.0 pie_parts = [] if total > 0: - for (name, color, q), value in pies: + for (name, color, viewurl, q), value in pies: perc = 100.0 * value / total pie_parts.append('chart_pie("%s", %f, %f, %r);' % (what, r, r + perc, color)) r += perc diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3c4efd5..951f7f5 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1006,6 +1006,7 @@ multisite_builtin_views.update({ 'summary_host', 'serviceregex', 'check_command', + 'hoststate', 'svcstate', 'opthostgroup', 'opthost_contactgroup',