Module: check_mk
Branch: master
Commit: cd1734d1e578d218ea4fd27ac11fbf56dc38050a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd1734d1e578d2…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Sep 23 13:00:27 2016 +0200
updated werk
---
.werks/3864 | 4 ++--
ChangeLog | 2 +-
web/plugins/sidebar/shipped.py | 31 ++++++++++++++++++++++---------
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/.werks/3864 b/.werks/3864
index 1dea583..05262a1 100644
--- a/.werks/3864
+++ b/.werks/3864
@@ -1,4 +1,4 @@
-Title: tactical overview now shows the number of stale hosts and services
+Title: Now tactical overview is able to show the number of stale hosts and services
Level: 1
Component: multisite
Compatible: compat
@@ -6,4 +6,4 @@ Version: 1.4.0i1
Date: 1472469803
Class: feature
-
+If and only if there are some stale hosts or services then an additional column is shown
automatically.
diff --git a/ChangeLog b/ChangeLog
index 85676c0..d4c0235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -431,7 +431,7 @@
* 3640 new filter option for status details: can now be negated
* 3713 new filter: hosts with certain service problems
* 3780 availability: now limit of fetched logfile rows is configurable.
- * 3864 tactical overview now shows the number of stale hosts and services
+ * 3864 Now tactical overview is able to show the number of stale hosts and
services...
* 3847 Painter options can now be reset to defaults...
* 3856 Improved handling of Check_MK GUI request timeouts...
* 3876 New filter option: negation for several service and host groups
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index 77a1f2a..7fd2b76 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -608,29 +608,37 @@ def render_tactical_overview(extra_filter_headers="",
extra_url_variables=None):
html.write("<center>No data from any site</center>")
return
+ td_class = 'col3'
+ if hstdata[-1] or svcdata[-1]:
+ td_class = 'col4'
+
html.write("<table class=\"content_center tacticaloverview\"
cellspacing=2 cellpadding=0 border=0>\n")
for title, data, view, stale_view, what in [
(_("Hosts"), hstdata, 'hostproblems',
'stale_hosts', 'host'),
(_("Services"), svcdata, 'svcproblems',
'uncheckedsvc', 'service')]:
amount, problems, unhandled_problems, stales = data
-
html.write("<tr><th>%s</th><th>%s</th><th>%s</th>"
- "<th>%s</th></tr>\n" % (title,
_('Problems'), _('Unhandled'), _("Stale")))
- html.write("<tr>")
+ title_row =
"<tr><th>%s</th><th>%s</th><th>%s</th>"
% (title, _('Problems'), _('Unhandled'))
+ if td_class == 'col4':
+ title_row += "<th>%s</th></tr>" %
_("Stale")
+ html.write("%s\n" % title_row)
+
+ html.write("<tr>")
url = html.makeuri_contextless([("view_name", "all" + what +
"s")] + extra_url_variables, filename="view.py")
- html.write('<td class=total><a target="main"
href="%s">%d</a></td>' % (url, amount))
+ html.write('<td class="total %s"><a
target="main" href="%s">%d</a></td>' % (td_class,
url, amount))
for value, unhandled in [ (problems, False), (unhandled_problems, True) ]:
url = html.makeuri_contextless([("view_name", view)] +
extra_url_variables, filename="view.py")
if unhandled:
url += "&is_%s_acknowledged=0" % what
text = link(str(value), url)
- html.write('<td class="%s">%s</td>' % (value ==
0 and " " or "states prob", text))
+ html.write('<td class="%s%s">%s</td>' %
(td_class, value == 0 and "" or ' states prob', text))
- url = html.makeuri_contextless([("view_name", stale_view)] +
extra_url_variables, filename="view.py")
- text = link(str(stales), url)
- html.write('<td class="%s">%s</td>' % (stales == 0
and " " or "states prob", text))
+ if td_class == 'col4':
+ url = html.makeuri_contextless([("view_name", stale_view)] +
extra_url_variables, filename="view.py")
+ text = link(str(stales), url)
+ html.write('<td class="%s%s">%s</td>' %
(td_class, value == 0 and "" or ' states prob', text))
html.write("</tr>\n")
html.write("</table>\n")
@@ -672,7 +680,6 @@ table.tacticaloverview th {
vertical-align: bottom;
}
table.tacticaloverview td {
- width: 25%%;
text-align: right;
/* border: 1px solid #123a4a; */
background-color: #6da1b8;
@@ -683,6 +690,12 @@ table.tacticaloverview td {
table.tacticaloverview td.prob {
box-shadow: 0px 0px 4px #ffd000;
}
+table.tacticaloverview td.col3 {
+ width:33%%;
+}
+table.tacticaloverview td.col4 {
+ width:25%%;
+}
table.tacticaloverview a { display: block; margin-right: 2px; }
div.tacticalalert {
font-weight: bold;