Module: check_mk
Branch: master
Commit: d7302d02a6e10d16bce7b62345aa32a12752384a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7302d02a6e10d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 17 09:02:35 2019 +0100
7073 New API call to control bulk discovery
Two new web API calls have been added for the bulk discovery. The call
<tt>bulk_discovery_start</tt> has been added to start a bulk discovery for
a collection of hosts which will be executed asynchronously. The call
<tt>bulk_discovery_status</tt> can be used to get the status of such a
job.
The <tt>bulk_discovery_start</tt> call requires the <tt>hostnames</tt>
parameter to be a list of host names to execute the discovery for. It
accepts the following optional keys:
<ul>
<li>mode (default: "new")</li>
<li>use_cache (default: True)</li>
<li>do_scan (default: True)</li>
<li>bulk_size (default: 10)</li>
<li>ignore_single_check_errors (default: True)</li>
</ul>
The defaults may be customized using the global setting <i>Bulk discovery</i>.
The global setting also describes the possible options in detail.
The <tt>bulk_discovery_status</tt> call does not accept any parameter.
Change-Id: I7e01458246a5abc68026a7330a202f19ec1ca093
---
.werks/7073 | 31 +++++++
cmk/gui/plugins/webapi/bulk_discovery.py | 141 +++++++++++++++++++++++++++++++
cmk/gui/wato/pages/bulk_discovery.py | 31 ++-----
cmk/gui/watolib/bulk_discovery.py | 34 ++++++--
tests/integration/cmk/gui/test_webapi.py | 81 +++++++++++++++++-
tests/testlib/__init__.py | 14 +++
tests/unit/cmk/gui/test_webapi_unit.py | 2 +
7 files changed, 304 insertions(+), 30 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7302d02a6…
Module: check_mk
Branch: master
Commit: bfa148ae3764ce6f5c0f2a395524cb81a72de038
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa148ae3764ce…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 16 15:14:13 2019 +0100
7072 Availability: Plugin output can now be hidden from availability timeline
The last known plugin output column can now be hidden from the availability timeline
view and report to make the report show a bit less detailed information.
CMK-921
Change-Id: I12ad7596949755aafe340f5e15acd32d75be9599
---
.werks/7072 | 11 +++++++++++
cmk/gui/availability.py | 1 +
cmk/gui/plugins/views/availability.py | 4 +++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/7072 b/.werks/7072
new file mode 100644
index 0000000..73c814b
--- /dev/null
+++ b/.werks/7072
@@ -0,0 +1,11 @@
+Title: Availability: Plugin output can now be hidden from availability timeline
+Level: 1
+Component: multisite
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1547647999
+Class: feature
+
+The last known plugin output column can now be hidden from the availability timeline
+view and report to make the report show a bit less detailed information.
diff --git a/cmk/gui/availability.py b/cmk/gui/availability.py
index 4810d6d..13f02f8 100644
--- a/cmk/gui/availability.py
+++ b/cmk/gui/availability.py
@@ -165,6 +165,7 @@ def get_av_display_options(what):
("show_alias", _("Display the host alias")),
("use_display_name", _("Use alternative display name for services")),
("omit_buttons", _("Do not display icons for history and timeline")),
+ ("omit_timeline_plugin_output", _("Do not display plugin output in timeline")),
("display_timeline_legend", _("Display legend for timeline")),
("omit_av_levels", _("Do not display legend for availability levels")),
])),
diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py
index f458d01..466032c 100644
--- a/cmk/gui/plugins/views/availability.py
+++ b/cmk/gui/plugins/views/availability.py
@@ -418,7 +418,9 @@ def render_availability_timeline(what, av_entry, avoptions):
table.cell(_("Until"), row["until_text"], css="nobr narrow")
table.cell(_("Duration"), row["duration_text"], css="narrow number")
table.cell(_("State"), row["state_name"], css=row["css"] + " state narrow")
- table.cell(_("Last Known Plugin Output"), row.get("log_output", ""))
+
+ if "omit_timeline_plugin_output" not in avoptions["labelling"]:
+ table.cell(_("Last Known Plugin Output"), row.get("log_output", ""))
# Legend for timeline
if "display_timeline_legend" in avoptions["labelling"]: