Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

crawl test: copy previous report file fir later manual checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e76ff8492036641ce133ad9aa79590dce376622 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e76ff84920366… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 15 10:52:00 2017 +0100 crawl test: copy previous report file fir later manual checks Change-Id: I96dbec21e88ad78ea28ce3da3eed45cb16f4aa20 --- tests/web/test_crawl.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 3d90d61..cc8c77e 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -369,6 +369,10 @@ class TestCrawler(object): f.write("Crawled %d URLs in %d seconds. Failures:\n%s\n" % (len(self.visited), time.time() - self.started, "\n".join(self.errors))) + # Copy the previous file for analysis + if os.path.exists(self.report_file()): + open(self.report_file()+".old", "w").write(open(self.report_file()).read()) + os.rename(self.report_file()+".tmp", self.report_file()) if self.errors:

7 years, 3 months

Nuked yet another global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 8aed5e2bb3bebb5f141f6a6bbf9fe212e53d412b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aed5e2bb3bebb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 15 10:03:17 2017 +0100 Nuked yet another global variable. Change-Id: I19ebb7f4cd99bf182ba821ba53353ac556c0aa35 --- livestatus/src/LogCache.cc | 47 +++++++++++++++++++------------------ livestatus/src/LogCache.h | 7 +++--- livestatus/src/MonitoringCore.h | 1 + livestatus/src/Store.cc | 25 ++++++++++---------- livestatus/src/Store.h | 6 ++--- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/module.cc | 4 ++++ 8 files changed, 50 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8aed5e2bb3…

7 years, 3 months

CME: Fixed GUI crawl tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f0d0cc3d88d20d18737867b814d0e2630b6caab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f0d0cc3d88d20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 15 09:48:24 2017 +0100 CME: Fixed GUI crawl tests Change-Id: Ic2830aed776cc10964ed10fd7b7a4c5e005564f8 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 5389e43..c32f7c9 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -326,7 +326,7 @@ class Site(object): if os.path.exists(cme_path()): paths += [ - cme_path() + "/web", + cme_path(), ] for path in paths:

7 years, 3 months

4499 FIX Agent Updater: Prevent broken state files caused by incomplete writes

by Lars Michelsen

Module: check_mk Branch: master Commit: 9804be49663efbe98adec8de3997250e511284e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9804be49663efb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 15 09:43:17 2017 +0100 4499 FIX Agent Updater: Prevent broken state files caused by incomplete writes When the agent updater is being executed it writes it's current deployment state to a state file. When the system is turned of suddenly it could cause a file corruption of the cmk-update-agent.state file. We prevent this now by writing to a temporary file first, flush it and then move it over to the state file path. Change-Id: Ic8075794d25e0fe90be32bda03632525a43b2880 --- .werks/4499 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4499 b/.werks/4499 new file mode 100644 index 0000000..793cf26 --- /dev/null +++ b/.werks/4499 @@ -0,0 +1,13 @@ +Title: Agent Updater: Prevent broken state files caused by incomplete writes +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1489567247 +Class: fix + +When the agent updater is being executed it writes it's current deployment state +to a state file. When the system is turned of suddenly it could cause a file +corruption of the cmk-update-agent.state file. We prevent this now by writing to +a temporary file first, flush it and then move it over to the state file path.

7 years, 3 months

Removed redundant MonitoringCore* members.

by Sven Panne

Module: check_mk Branch: master Commit: 3a88914b4919e6b3b07adf910b80bef14baa50d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a88914b4919e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 15 08:22:59 2017 +0100 Removed redundant MonitoringCore* members. Change-Id: Icb55f91e4dc86a5ba304217af5609da078c2f514 --- livestatus/src/Table.h | 1 + livestatus/src/TableContactGroups.cc | 5 ++--- livestatus/src/TableContactGroups.h | 3 --- livestatus/src/TableEventConsole.cc | 16 ++++++++-------- livestatus/src/TableEventConsole.h | 2 -- livestatus/src/TableLog.cc | 4 ++-- livestatus/src/TableLog.h | 1 - livestatus/src/TableStateHistory.cc | 4 ++-- livestatus/src/TableStateHistory.h | 1 - 9 files changed, 15 insertions(+), 22 deletions(-) diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 95d97bc..80195a7 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -93,6 +93,7 @@ public: virtual bool isAuthorized(contact *ctc, void *data); virtual void *findObject(const std::string &objectspec); + MonitoringCore *core() const { return _mc; } Logger *logger() const; private: diff --git a/livestatus/src/TableContactGroups.cc b/livestatus/src/TableContactGroups.cc index 651f080..05821bb 100644 --- a/livestatus/src/TableContactGroups.cc +++ b/livestatus/src/TableContactGroups.cc @@ -36,8 +36,7 @@ using std::string; extern contactgroup *contactgroup_list; -TableContactGroups::TableContactGroups(MonitoringCore *mc) - : Table(mc), _mc(mc) { +TableContactGroups::TableContactGroups(MonitoringCore *mc) : Table(mc) { addColumn(make_unique<OffsetStringColumn>( "name", "The name of the contactgroup", DANGEROUS_OFFSETOF(contactgroup, group_name), -1, -1, -1)); @@ -61,5 +60,5 @@ void TableContactGroups::answerQuery(Query *query) { } void *TableContactGroups::findObject(const string &objectspec) { - return _mc->find_contactgroup(objectspec); + return core()->find_contactgroup(objectspec); } diff --git a/livestatus/src/TableContactGroups.h b/livestatus/src/TableContactGroups.h index 5116c33..d99e820 100644 --- a/livestatus/src/TableContactGroups.h +++ b/livestatus/src/TableContactGroups.h @@ -39,9 +39,6 @@ public: std::string namePrefix() const override; void answerQuery(Query *query) override; void *findObject(const std::string &objectspec) override; - -private: - MonitoringCore *_mc; }; #endif // TableContactGroups_h diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 03b882c..23d9498 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -98,13 +98,13 @@ private: }; } // namespace -TableEventConsole::TableEventConsole(MonitoringCore *mc) : Table(mc), _mc(mc) {} +TableEventConsole::TableEventConsole(MonitoringCore *mc) : Table(mc) {} void TableEventConsole::answerQuery(Query *query) { - if (_mc->mkeventdEnabled()) { + if (core()->mkeventdEnabled()) { try { // skip "eventconsole" prefix :-P - ECTableConnection(_mc, name().substr(12), query).run(); + ECTableConnection(core(), name().substr(12), query).run(); } catch (const generic_error &ge) { query->invalidRequest(ge.what()); } @@ -127,8 +127,8 @@ bool TableEventConsole::isAuthorizedForEvent(contact *ctc, void *data) { isAuthorizedForEventViaHost(c, r, result) || isAuthorizedForEventViaContactGroups(c, r, result); } else { - Error(_mc->loggerLivestatus()) << "unknown precedence '" << precedence - << "' in table " << name(); + Error(logger()) << "unknown precedence '" << precedence << "' in table " + << name(); result = false; } return result; @@ -142,8 +142,8 @@ bool TableEventConsole::isAuthorizedForEventViaContactGroups( return false; } for (const auto &name : col->getValue(row)) { - if (_mc->is_contact_member_of_contactgroup(_mc->find_contactgroup(name), - ctc)) { + if (core()->is_contact_member_of_contactgroup( + core()->find_contactgroup(name), ctc)) { return (result = true, true); } } @@ -153,7 +153,7 @@ bool TableEventConsole::isAuthorizedForEventViaContactGroups( bool TableEventConsole::isAuthorizedForEventViaHost( MonitoringCore::Contact *ctc, Row *row, bool &result) { if (MonitoringCore::Host *hst = row->_host) { - return (result = _mc->host_has_contact(hst, ctc), true); + return (result = core()->host_has_contact(hst, ctc), true); } return false; } diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index 24f5c4a..167b037 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -196,8 +196,6 @@ protected: bool isAuthorizedForEvent(contact *ctc, void *data); private: - MonitoringCore *_mc; - bool isAuthorizedForEventViaContactGroups(MonitoringCore::Contact *ctc, Row *row, bool &result); bool isAuthorizedForEventViaHost(MonitoringCore::Contact *ctc, Row *row, diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 98befde..fe7c0b5 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -61,7 +61,7 @@ TableLog::TableLog(LogCache *log_cache, #endif , MonitoringCore *mc) - : Table(mc), _mc(mc), _log_cache(log_cache) { + : Table(mc), _log_cache(log_cache) { addColumn(make_unique<OffsetTimeColumn>( "time", "Time of the log event (UNIX timestamp)", DANGEROUS_OFFSETOF(LogEntry, _time), -1, -1, -1)); @@ -150,7 +150,7 @@ string TableLog::namePrefix() const { return "log_"; } void TableLog::answerQuery(Query *query) { lock_guard<mutex> lg(_log_cache->_lock); - if (!_log_cache->logCachePreChecks(_mc)) { + if (!_log_cache->logCachePreChecks(core())) { return; } diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 088a2d4..7898424 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -62,7 +62,6 @@ public: std::shared_ptr<Column> column(std::string colname) override; private: - MonitoringCore *_mc; LogCache *_log_cache; bool answerQuery(Query *, Logfile *, time_t, time_t); }; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index f549cc3..e07f8cf 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -109,7 +109,7 @@ TableStateHistory::TableStateHistory(LogCache *log_cache, #endif , MonitoringCore *mc) - : Table(mc), _mc(mc), _log_cache(log_cache) { + : Table(mc), _log_cache(log_cache) { addColumn(make_unique<OffsetTimeColumn>( "time", "Time of the log event (seconds since 1/1/1970)", DANGEROUS_OFFSETOF(HostServiceState, _time), -1, -1, -1)); @@ -321,7 +321,7 @@ void TableStateHistory::answerQuery(Query *query) { } lock_guard<mutex> lg(_log_cache->_lock); - if (!_log_cache->logCachePreChecks(_mc)) { + if (!_log_cache->logCachePreChecks(core())) { return; } diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 0a21ace..fa3a2b5 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -72,7 +72,6 @@ protected: bool _abort_query; private: - MonitoringCore *_mc; LogCache *_log_cache; int _query_timeframe;

7 years, 3 months

Tables know their monitoring core now, decoupling things quite a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 27386471f315e52e64d2a898ce6b622238b4e035 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27386471f315e5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 15:44:25 2017 +0100 Tables know their monitoring core now, decoupling things quite a bit. Change-Id: I1ee06368cf51a4de3d30484431b127797d96e221 --- livestatus/src/Store.cc | 14 +++++++------- livestatus/src/Table.cc | 5 +++-- livestatus/src/Table.h | 5 +++-- livestatus/src/TableColumns.cc | 2 +- livestatus/src/TableColumns.h | 4 ++-- livestatus/src/TableCommands.cc | 4 ++-- livestatus/src/TableCommands.h | 4 ++-- livestatus/src/TableComments.cc | 3 +-- livestatus/src/TableContactGroups.cc | 2 +- livestatus/src/TableContacts.cc | 2 +- livestatus/src/TableContacts.h | 4 ++-- livestatus/src/TableDowntimes.cc | 3 +-- livestatus/src/TableEventConsole.cc | 3 +-- livestatus/src/TableEventConsoleReplication.cc | 3 +-- livestatus/src/TableHostGroups.cc | 2 +- livestatus/src/TableHostGroups.h | 4 ++-- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableHostsByGroup.cc | 3 +-- livestatus/src/TableLog.cc | 3 +-- livestatus/src/TableServiceGroups.cc | 2 +- livestatus/src/TableServiceGroups.h | 4 ++-- livestatus/src/TableServices.cc | 3 +-- livestatus/src/TableServicesByGroup.cc | 3 +-- livestatus/src/TableServicesByHostGroup.cc | 3 +-- livestatus/src/TableStateHistory.cc | 3 +-- livestatus/src/TableStatus.cc | 2 +- livestatus/src/TableStatus.h | 4 +--- livestatus/src/TableTimeperiods.cc | 2 +- livestatus/src/TableTimeperiods.h | 4 ++-- 29 files changed, 46 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=27386471f3…

7 years, 3 months

Encapsulate Table::_logger.

by Sven Panne

Module: check_mk Branch: master Commit: c9023467be1b100567518a6960ddca45f0b47cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9023467be1b10… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 14:46:31 2017 +0100 Encapsulate Table::_logger. Change-Id: I2370ec1305f31cbb3c2ae0aeafad47cf6b5ec7cf --- livestatus/src/Query.cc | 2 +- livestatus/src/Table.cc | 12 +++++++----- livestatus/src/Table.h | 4 +++- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index ee8114f..f1e84c8 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -78,7 +78,7 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding, , _time_limit_timeout(0) , _current_line(0) , _timezone_offset(0) - , _logger(table->_logger) { + , _logger(table->logger()) { for (auto &line : lines) { vector<char> line_copy(line.begin(), line.end()); line_copy.push_back('\0'); diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 439bcaa..d2da8d2 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -83,21 +83,21 @@ unique_ptr<Column> Table::dynamicColumn(const string &name, const string &rest) { auto it = _dynamic_columns.find(name); if (it == _dynamic_columns.end()) { - Warning(_logger) << "Unknown dynamic column '" << name << "'"; + Warning(logger()) << "Unknown dynamic column '" << name << "'"; return nullptr; } auto sep_pos = rest.find(':'); if (sep_pos == string::npos) { - Warning(_logger) << "Missing separator in dynamic column '" << name - << "'"; + Warning(logger()) << "Missing separator in dynamic column '" << name + << "'"; return nullptr; } string name2 = rest.substr(0, sep_pos); if (name2.empty()) { - Warning(_logger) << "Empty column name for dynamic column '" << name - << "'"; + Warning(logger()) << "Empty column name for dynamic column '" << name + << "'"; return nullptr; } @@ -109,3 +109,5 @@ bool Table::isAuthorized(contact * /*unused*/, void * /*unused*/) { } void *Table::findObject(const string & /*unused*/) { return nullptr; } + +Logger *Table::logger() const { return _logger; } diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 9b8b19a..748de3a 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -92,9 +92,11 @@ public: virtual bool isAuthorized(contact *ctc, void *data); virtual void *findObject(const std::string &objectspec); - Logger *const _logger; + Logger *logger() const; private: + Logger *const _logger; + std::unique_ptr<Column> dynamicColumn(const std::string &name, const std::string &rest); diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index a1dedeb..657037a 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -634,7 +634,7 @@ void TableHosts::addColumns(Table *table, const string &prefix, table->addDynamicColumn(make_unique<DynamicLogwatchFileColumn>( prefix + "mk_logwatch_file", - "This contents of a logfile fetched via mk_logwatch", table->_logger, + "This contents of a logfile fetched via mk_logwatch", table->logger(), mc, indirect_offset, extra_offset, -1)); table->addColumn(make_unique<HostSpecialDoubleColumn>( diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 5a18b22..f69f8e0 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -639,7 +639,7 @@ void TableStateHistory::answerQuery(Query *query) { if (tp_state == nullptr) { // This line is broken... - Warning(_logger) + Warning(logger()) << "Error: Invalid syntax of TIMEPERIOD TRANSITION: " << entry->_complete; free(buffer);

7 years, 3 months

4206 FIX Fix display of host availability annotations in service views

by Mathias Kettner

Module: check_mk Branch: master Commit: 0696a798285da83e5ff1cbae654d498127486b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0696a798285da8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 14 15:17:32 2017 +0100 4206 FIX Fix display of host availability annotations in service views Host annotations are also shown in a service availability table for the host of the shown services. But in the table in the columns {{Service}} of such entries there was displayed a random service name. This has been fixed in the columns are now correctly empty. Change-Id: I53aa958e8bdc7e19ad06fa389b91ea791bbd789d --- .werks/4206 | 14 ++++++++++++++ web/plugins/views/availability.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.werks/4206 b/.werks/4206 new file mode 100644 index 0000000..36b2e4d --- /dev/null +++ b/.werks/4206 @@ -0,0 +1,14 @@ +Title: Fix display of host availability annotations in service views +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489500952 + +Host annotations are also shown in a service availability table for the +host of the shown services. But in the table in the columns {{Service}} +of such entries there was displayed a random service name. This has +been fixed in the columns are now correctly empty. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 4447439..31ae65f 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -658,16 +658,21 @@ def get_relevant_annotations(annotations, by_host, what, avoptions): for site_host, avail_entries in by_host.iteritems(): for service in avail_entries.keys(): - site_host_svc = site_host[0], site_host[1], (service or None) - annotations_to_check = annotations.get(site_host_svc, []) - if what == "service": # Also show host annotations for services - annotations_to_check += annotations.get((site_host[0], site_host[1], None), []) - for annotation in annotations_to_check: - if (annotation["from"] >= from_time and annotation["from"] <= until_time) or \ - (annotation["until"] >= from_time and annotation["until"] <= until_time): - if id(annotation) not in annos_rendered: - annos_to_render.append((site_host_svc, annotation)) - annos_rendered.add(id(annotation)) + for search_what in [ "host", "service" ]: + if what == "host" and search_what == "service": + continue # Service notifications are not relevant for host + + if search_what == "host": + site_host_svc = site_host[0], site_host[1], None + else: + site_host_svc = site_host[0], site_host[1], service # service can be None + + for annotation in annotations.get(site_host_svc, []): + if (annotation["from"] >= from_time and annotation["from"] <= until_time) or \ + (annotation["until"] >= from_time and annotation["until"] <= until_time): + if id(annotation) not in annos_rendered: + annos_to_render.append((site_host_svc, annotation)) + annos_rendered.add(id(annotation)) annos_to_render.sort(cmp=lambda a,b: cmp(a[1]["from"], b[1]["from"]) or cmp(a[0], b[0])) @@ -705,11 +710,15 @@ def render_annotations(annotations, av_rawdata, what, avoptions, omit_service): host_url = "view.py?" + html.urlencode_vars([("view_name", "hoststatus"), ("site", site_id), ("host", host)]) table.cell(_("Host"), '<a href="%s">%s</a>' % (host_url, host)) - if service: - service_url = "view.py?" + html.urlencode_vars([("view_name", "service"), ("site", site_id), ("host", host), ("service", service)]) - # TODO: honor use_display_name. But we have no display names here... - service_name = service - table.cell(_("Service"), '<a href="%s">%s</a>' % (service_url, service_name)) + if what == "service": + if service: + service_url = "view.py?" + html.urlencode_vars([("view_name", "service"), ("site", site_id), ("host", host), ("service", service)]) + # TODO: honor use_display_name. But we have no display names here... + service_name = service + table.cell(_("Service"), '<a href="%s">%s</a>' % (service_url, service_name)) + else: + table.cell(_("Service"), "") # Host annotation in service table + table.cell(_("From"), render_date(annotation["from"]), css="nobr narrow") table.cell(_("Until"), render_date(annotation["until"]), css="nobr narrow")

7 years, 3 months

Improved naming consistency.

by Sven Panne

Module: check_mk Branch: master Commit: 5fd00dabe90fc83d70fb8e5b3bf89cbffb9c4ba7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd00dabe90fc8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 14:12:51 2017 +0100 Improved naming consistency. Change-Id: I927036e3b55b38221c291d2bbe68a9c013e4a065 --- livestatus/src/ContactGroupsColumn.cc | 2 +- livestatus/src/ContactGroupsColumn.h | 8 ++-- .../src/DynamicEventConsoleReplicationColumn.cc | 21 +++++------ .../src/DynamicEventConsoleReplicationColumn.h | 4 +- livestatus/src/DynamicLogwatchFileColumn.cc | 2 +- livestatus/src/DynamicLogwatchFileColumn.h | 6 +-- livestatus/src/LogCache.cc | 5 +-- livestatus/src/LogCache.h | 2 +- livestatus/src/LogwatchListColumn.cc | 2 +- livestatus/src/LogwatchListColumn.h | 6 +-- livestatus/src/Store.cc | 44 +++++++++++----------- livestatus/src/Store.h | 4 +- livestatus/src/TableComments.cc | 8 ++-- livestatus/src/TableComments.h | 2 +- livestatus/src/TableContactGroups.cc | 6 +-- livestatus/src/TableContactGroups.h | 4 +- livestatus/src/TableDowntimes.cc | 8 ++-- livestatus/src/TableDowntimes.h | 2 +- livestatus/src/TableEventConsole.cc | 30 +++++++-------- livestatus/src/TableEventConsole.h | 4 +- livestatus/src/TableEventConsoleEvents.cc | 10 +++-- livestatus/src/TableEventConsoleEvents.h | 2 +- livestatus/src/TableEventConsoleHistory.cc | 12 +++--- livestatus/src/TableEventConsoleHistory.h | 2 +- livestatus/src/TableEventConsoleReplication.cc | 6 +-- livestatus/src/TableEventConsoleReplication.h | 2 +- livestatus/src/TableHosts.cc | 24 ++++++------ livestatus/src/TableHosts.h | 5 +-- livestatus/src/TableHostsByGroup.cc | 6 +-- livestatus/src/TableHostsByGroup.h | 2 +- livestatus/src/TableLog.cc | 4 +- livestatus/src/TableLog.h | 2 +- livestatus/src/TableServices.cc | 14 +++---- livestatus/src/TableServices.h | 4 +- livestatus/src/TableServicesByGroup.cc | 6 +-- livestatus/src/TableServicesByGroup.h | 2 +- livestatus/src/TableServicesByHostGroup.cc | 6 +-- livestatus/src/TableServicesByHostGroup.h | 2 +- livestatus/src/TableStateHistory.cc | 4 +- livestatus/src/TableStateHistory.h | 2 +- 40 files changed, 144 insertions(+), 143 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5fd00dabe9…

7 years, 3 months

Make the pnp path file-local.

by Sven Panne

Module: check_mk Branch: master Commit: 206feb14b6ae05543e24fb4644328cd2f24285a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206feb14b6ae05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 13:21:34 2017 +0100 Make the pnp path file-local. Change-Id: I55e3faa1698934a3e674c0e063412069805a347a --- livestatus/src/HostSpecialIntColumn.cc | 2 +- livestatus/src/MonitoringCore.h | 1 + livestatus/src/ServiceSpecialIntColumn.cc | 3 ++- livestatus/src/ServiceSpecialIntColumn.h | 9 ++++++--- livestatus/src/TableServices.cc | 4 ++-- livestatus/src/module.cc | 14 +++++++------- livestatus/src/pnp4nagios.cc | 15 +++++++-------- livestatus/src/pnp4nagios.h | 8 +++++--- 8 files changed, 31 insertions(+), 25 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index 3809a6d..c4e9361 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -42,7 +42,7 @@ int32_t HostSpecialIntColumn::getValue(void *row, contact * /* auth_user */) { } case Type::pnp_graph_present: - return pnpgraph_present(hst->name); + return pnpgraph_present(_mc, hst->name); case Type::mk_inventory_last: { return mk_inventory_last(_mc->mkInventoryPath() + "/" + diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 270b5d0..304e353 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -53,6 +53,7 @@ public: virtual std::string mkeventdSocketPath() = 0; virtual std::string mkLogwatchPath() = 0; virtual std::string mkInventoryPath() = 0; + virtual std::string pnpPath() = 0; virtual Logger *loggerLivestatus() = 0; }; diff --git a/livestatus/src/ServiceSpecialIntColumn.cc b/livestatus/src/ServiceSpecialIntColumn.cc index 93081db..205322a 100644 --- a/livestatus/src/ServiceSpecialIntColumn.cc +++ b/livestatus/src/ServiceSpecialIntColumn.cc @@ -30,7 +30,8 @@ int32_t ServiceSpecialIntColumn::getValue(void *row, if (auto svc = rowData<service>(row)) { switch (_type) { case Type::pnp_graph_present: - return pnpgraph_present(svc->host_ptr->name, svc->description); + return pnpgraph_present(_mc, svc->host_ptr->name, + svc->description); } } return 0; diff --git a/livestatus/src/ServiceSpecialIntColumn.h b/livestatus/src/ServiceSpecialIntColumn.h index 1fed1fb..78f1aac 100644 --- a/livestatus/src/ServiceSpecialIntColumn.h +++ b/livestatus/src/ServiceSpecialIntColumn.h @@ -30,21 +30,24 @@ #include <string> #include "IntColumn.h" #include "nagios.h" +class MonitoringCore; class ServiceSpecialIntColumn : public IntColumn { public: enum class Type { pnp_graph_present }; ServiceSpecialIntColumn(const std::string& name, - const std::string& description, Type ssic_type, - int indirect_offset, int extra_offset, - int extra_extra_offset) + const std::string& description, MonitoringCore* mc, + Type ssic_type, int indirect_offset, + int extra_offset, int extra_extra_offset) : IntColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) + , _mc(mc) , _type(ssic_type) {} int32_t getValue(void* row, contact* auth_user) override; private: + MonitoringCore* _mc; Type _type; }; diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 487707d..aae1daa 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -351,8 +351,8 @@ void TableServices::addColumns(Table *table, const string &prefix, table->addColumn(make_unique<ServiceSpecialIntColumn>( prefix + "pnpgraph_present", "Whether there is a PNP4Nagios graph present for this service (0/1)", - ServiceSpecialIntColumn::Type::pnp_graph_present, indirect_offset, -1, - -1)); + core, ServiceSpecialIntColumn::Type::pnp_graph_present, indirect_offset, + -1, -1)); table->addColumn(make_unique<ServiceSpecialDoubleColumn>( prefix + "staleness", "The staleness indicator for this service", ServiceSpecialDoubleColumn::Type::staleness, indirect_offset, -1, -1)); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 69422ca..d2ccb68 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -102,8 +102,7 @@ void *g_nagios_handle; int g_unix_socket = -1; int g_max_fd_ever = 0; static char fl_socket_path[4096]; -char pnp_path_storage[4096]; -char *g_pnp_path = pnp_path_storage; +static char fl_pnp_path[4096]; static char fl_mk_inventory_path[4096]; static char fl_mk_logwatch_path[4096]; static char fl_logfile_path[4096]; @@ -607,6 +606,7 @@ public: string mkeventdSocketPath() override { return fl_mkeventd_socket_path; } string mkLogwatchPath() override { return fl_mk_logwatch_path; } string mkInventoryPath() override { return fl_mk_inventory_path; } + string pnpPath() override { return fl_pnp_path; } Logger *loggerLivestatus() override { return fl_logger_livestatus; } @@ -799,7 +799,7 @@ void livestatus_parse_arguments(const char *args_orig) { fl_mkeventd_socket_path[0] = 0; /* there is no default PNP path */ - g_pnp_path[0] = 0; + fl_pnp_path[0] = 0; if (args_orig == nullptr) { return; // no arguments, use default options @@ -909,13 +909,13 @@ void livestatus_parse_arguments(const char *args_orig) { "allowed are strict and loose"; } } else if (strcmp(left, "pnp_path") == 0) { - strncpy(g_pnp_path, right, sizeof(pnp_path_storage) - 1); + strncpy(fl_pnp_path, right, sizeof(fl_pnp_path) - 1); // make sure, that trailing slash is always there if (right[strlen(right) - 1] != '/') { - strncat(g_pnp_path, "/", - sizeof(pnp_path_storage) - strlen(g_pnp_path) - 1); + strncat(fl_pnp_path, "/", + sizeof(fl_pnp_path) - strlen(fl_pnp_path) - 1); } - check_path("PNP perfdata directory", g_pnp_path); + check_path("PNP perfdata directory", fl_pnp_path); } else if (strcmp(left, "mk_inventory_path") == 0) { strncpy(fl_mk_inventory_path, right, sizeof(fl_mk_inventory_path) - 1); diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index b0c77a8..e7a08b4 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -27,16 +27,14 @@ #include "pnp4nagios.h" #include <cstddef> #include <system_error> +#include "MonitoringCore.h" + #ifndef CMC #include "FileSystem.h" #endif using std::string; -// Note: If the path is not empty, it always ends with '/', see -// livestatus_parse_arguments. -extern char* g_pnp_path; - namespace { // TODO(sp): Move this to some kind of C++ string utility file. @@ -56,8 +54,9 @@ string pnp_cleanup(const string& name) { #ifndef CMC // TODO(sp) Merge this with Perfdatabase::getPNPXMLPath -int pnpgraph_present(const string& host, const string& service) { - fs::path pnp_path = g_pnp_path; +int pnpgraph_present(MonitoringCore* mc, const string& host, + const string& service) { + fs::path pnp_path = mc->pnpPath(); if (pnp_path.empty()) { return -1; } @@ -71,9 +70,9 @@ int pnpgraph_present(const string& host, const string& service) { #ifdef CMC // TODO(sp) Merge this with Perfdatabase::getPNPRRDPath -fs::path rrd_path(const string& host, const string& service, +fs::path rrd_path(MonitoringCore* mc, const string& host, const string& service, const string& varname) { - fs::path pnp_path = g_pnp_path; + fs::path pnp_path = mc->pnpPath(); if (pnp_path.empty()) { return ""; } diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 5cfc496..3be82a1 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -27,6 +27,8 @@ #include "config.h" // IWYU pragma: keep #include <string> +class MonitoringCore; + #ifdef CMC #include "FileSystem.h" #endif @@ -34,7 +36,7 @@ std::string pnp_cleanup(const std::string& name); #ifndef CMC -int pnpgraph_present(const std::string& host, +int pnpgraph_present(MonitoringCore* mc, const std::string& host, const std::string& service = "_HOST_"); #endif @@ -42,8 +44,8 @@ int pnpgraph_present(const std::string& host, // Determines if a RRD database exists and returns its path name. Returns an // empty string otherwise. This assumes paths created in the PNP4Nagios style // with storage type MULTIPLE. -fs::path rrd_path(const std::string& host, const std::string& service, - const std::string& varname); +fs::path rrd_path(MonitoringCore* mc, const std::string& host, + const std::string& service, const std::string& varname); #endif #endif // pnp4nagios_h

7 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017