Module: check_mk
Branch: master
Commit: 9266f91d029eb35d210c4a8ab964076a7b33195a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9266f91d029eb3…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Oct 27 11:15:07 2017 +0200
Removed useless parameter.
Change-Id: Id7b2e325762edc8c2464a6c4d5ff1f80e270e8fe
---
livestatus/src/ServiceListColumn.cc | 4 ++--
livestatus/src/ServiceListColumn.h | 4 +---
livestatus/src/TableHosts.cc | 8 ++++----
livestatus/src/TableServiceGroups.cc | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc
index 8b8c849..8ab12f9 100644
--- a/livestatus/src/ServiceListColumn.cc
+++ b/livestatus/src/ServiceListColumn.cc
@@ -49,11 +49,11 @@ void ServiceListColumn::output(Row row, RowRenderer &r,
if ((auth_user == nullptr) ||
is_authorized_for(_mc, auth_user, svc->host_ptr, svc)) {
// show only service name => no sublist
- if (!_show_host && _info_depth == 0) {
+ if (!_hostname_required && _info_depth == 0) {
l.output(std::string(svc->description));
} else {
SublistRenderer s(l);
- if (_show_host) {
+ if (_hostname_required) {
s.output(std::string(svc->host_name));
}
s.output(std::string(svc->description));
diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h
index 68e65ca..0359541 100644
--- a/livestatus/src/ServiceListColumn.h
+++ b/livestatus/src/ServiceListColumn.h
@@ -47,12 +47,11 @@ public:
ServiceListColumn(const std::string &name, const std::string &description,
int indirect_offset, int extra_offset,
int extra_extra_offset, int offset, MonitoringCore *mc,
- bool hostname_required, bool show_host, int info_depth)
+ bool hostname_required, int info_depth)
: Column(name, description, indirect_offset, extra_offset,
extra_extra_offset, offset)
, _mc(mc)
, _hostname_required(hostname_required)
- , _show_host(show_host)
, _info_depth(info_depth) {}
ColumnType type() const override { return ColumnType::list; };
void output(Row row, RowRenderer &r,
@@ -70,7 +69,6 @@ public:
private:
MonitoringCore *_mc;
bool _hostname_required;
- bool _show_host;
int _info_depth;
#ifndef CMC
diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc
index 31693e8..52480e4 100644
--- a/livestatus/src/TableHosts.cc
+++ b/livestatus/src/TableHosts.cc
@@ -613,22 +613,22 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc,
table->addColumn(std::make_unique<ServiceListColumn>(
prefix + "services", "A list of all services of the host",
indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services),
- table->core(), false, false, 0));
+ table->core(), false, 0));
table->addColumn(std::make_unique<ServiceListColumn>(
prefix + "services_with_state",
"A list of all services of the host together with state and
has_been_checked",
indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services),
- table->core(), false, false, 1));
+ table->core(), false, 1));
table->addColumn(std::make_unique<ServiceListColumn>(
prefix + "services_with_info",
"A list of all services including detailed information about each
service",
indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services),
- table->core(), false, false, 2));
+ table->core(), false, 2));
table->addColumn(std::make_unique<ServiceListColumn>(
prefix + "services_with_fullstate",
"A list of all services including full state information. The list of
entries can grow in future versions.",
indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services),
- table->core(), false, false, 3));
+ table->core(), false, 3));
table->addColumn(std::make_unique<MetricsColumn>(
prefix + "metrics",
diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc
index 97f2267..2e86492 100644
--- a/livestatus/src/TableServiceGroups.cc
+++ b/livestatus/src/TableServiceGroups.cc
@@ -70,12 +70,12 @@ void TableServiceGroups::addColumns(Table *table, const std::string
&prefix,
prefix + "members",
"A list of all members of the service group as host/service pairs",
indirect_offset, -1, -1, DANGEROUS_OFFSETOF(servicegroup, members),
- table->core(), true, true, 0));
+ table->core(), true, 0));
table->addColumn(std::make_unique<ServiceListColumn>(
prefix + "members_with_state",
"A list of all members of the service group with state and
has_been_checked",
indirect_offset, -1, -1, DANGEROUS_OFFSETOF(servicegroup, members),
- table->core(), true, true, 1));
+ table->core(), true, 1));
table->addColumn(std::make_unique<ServiceListStateColumn>(
prefix + "worst_service_state",