[checkmk-commits] Check_MK Git: check_mk: Add missing graph for lnx_thermal

Module: check_mk Branch: master Commit: e0ac0df33de5808bf49a7d13c0f2bd3a79a17985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ac0df33de580… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 19 07:18:05 2015 +0100 Add missing graph for lnx_thermal --- web/htdocs/check_mk.css | 58 +++++++++++++++++++++++++++++++++------ web/htdocs/views.css | 2 +- web/plugins/metrics/check_mk.py | 8 ++++-- 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index ac40c1e..8ff0a64 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -544,13 +544,18 @@ div.popup span { color: white; } -/* TEST */ +/* Graphs */ table.graph { border: 1px solid black; - box-shadow: 0.5px 0.5px 2px #888; + box-shadow: 0.5px 0.5px 3px #888; border-spacing: 0px; - background-color: #eeeeee; - padding: 10px 10px; + background-color: #f8f4f0; + padding: 8px 16px 4px 8px; +} + +table.graph td.title { + text-align: center; + font-weight: bold; } table.graph canvas { @@ -560,13 +565,49 @@ table.prediction td { padding: 0px; } -table.graph td.legend { - padding-left: 43px; +table.graph tr > td.legend { color: #000000; - padding-bottom: 12px; - padding-top: 2px; + padding: 5px; + padding-left: 49px; +} + +table.graph tr > td.legend > table { + border-collapse: collapse; + width: 100%; +} + +table.graph tr > td.legend > table th, +table.graph tr > td.legend > table td { + padding: 2px 8px 3px 2px; + white-space: nowrap; +} + +table.graph tr > td.legend > table .scalar { + padding: 1px 10px; + width: 80px; } +table.graph tr > td.legend > table th, +table.graph tr > td.legend > table th.scalar { + background-color: transparent; + border-style: none; + color: black; + text-align: right; + padding-bottom: 3px; + border-bottom: 1px solid #bbb; + color: #888; + font-weight: bold; +} + +table.graph tr > td.legend > table > tbody > tr:nth-child(2) td { + padding-top: 4px; +} + +table.graph tr > td.legend > table td.scalar { + text-align: right; +} + + table.graph td.legend div { display: inline-block; float: none; @@ -580,6 +621,7 @@ table.graph td.legend div.color { display: inline-block; box-shadow: 0.5px 0.5px 1px #888; } + table.graph td.legend div.entry { margin-right: 20px; margin-left: 5px; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 827cffe..3c53ac5 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -356,7 +356,7 @@ table.data.single { empty-cells: show; } -table.data.single tr.data td { +table.data.single tr.data > td { padding-bottom: 4px; padding: 4px 5px 2px 5px; text-align: left; diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 5ab342d..484c5c6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -803,14 +803,18 @@ perfometer_info.append(("dual", [ # | Definitions of time series graphs | # '----------------------------------------------------------------------' graph_info.append({ - # "title" : _("Das ist der Titel"), # Wenn fehlt, dann nimmt er den Titel der ersten Metrik - # "vertical_label" : _("Das hier kommt vertikal"), # Wenn fehlt, dann nimmt er die Unit der ersten Metrik "metrics" : [ ( "fs_used", "area" ), ] }) graph_info.append({ + "metrics" : [ + ( "temp", "area" ), + ] +}) + +graph_info.append({ "title" : _("CPU utilization"), "metrics" : [ ( "user", "area" ),