Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

Make the path to the mkeventd socket file-local.

by Sven Panne

Module: check_mk Branch: master Commit: 80cfdc8c638981c70e0fa6ff57b4ffd85512f5d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80cfdc8c638981… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 10:36:35 2017 +0100 Make the path to the mkeventd socket file-local. Change-Id: Ia414e360dc65bfa85b63b5ca8f76ccc74f12b866 --- livestatus/src/module.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 87ef796..b823b9d 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -107,7 +107,7 @@ char *g_pnp_path = pnp_path_storage; char g_mk_inventory_path[4096]; // base path of Check_MK inventory files char g_mk_logwatch_path[4096]; // base path of Check_MK logwatch files static char fl_logfile_path[4096]; -char g_mkeventd_socket_path[4096]; +static char fl_mkeventd_socket_path[4096]; static bool fl_should_terminate = false; struct ThreadInfo { @@ -603,7 +603,7 @@ public: // TODO(sp) Do we need a separate NEB argument for this? bool mkeventdEnabled() override { return true; } - string mkeventdSocketPath() override { return g_mkeventd_socket_path; } + string mkeventdSocketPath() override { return fl_mkeventd_socket_path; } Logger *loggerLivestatus() override { return fl_logger_livestatus; } @@ -793,7 +793,7 @@ void livestatus_parse_arguments(const char *args_orig) { strncpy(slash + 1, "livestatus.log", 15); } - g_mkeventd_socket_path[0] = 0; + fl_mkeventd_socket_path[0] = 0; /* there is no default PNP path */ g_pnp_path[0] = 0; @@ -825,8 +825,8 @@ void livestatus_parse_arguments(const char *args_orig) { } else if (strcmp(left, "log_file") == 0) { strncpy(fl_logfile_path, right, sizeof(fl_logfile_path)); } else if (strcmp(left, "mkeventd_socket_path") == 0) { - strncpy(g_mkeventd_socket_path, right, - sizeof(g_mkeventd_socket_path)); + strncpy(fl_mkeventd_socket_path, right, + sizeof(fl_mkeventd_socket_path)); } else if (strcmp(left, "max_cached_messages") == 0) { g_max_cached_messages = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) @@ -957,19 +957,19 @@ void livestatus_parse_arguments(const char *args_orig) { } } - if (g_mkeventd_socket_path[0] == 0) { - strncpy(g_mkeventd_socket_path, g_socket_path, - sizeof(g_mkeventd_socket_path)); - char *slash = strrchr(g_mkeventd_socket_path, '/'); - char *pos = slash == nullptr ? g_mkeventd_socket_path : (slash + 1); + if (fl_mkeventd_socket_path[0] == 0) { + strncpy(fl_mkeventd_socket_path, g_socket_path, + sizeof(fl_mkeventd_socket_path)); + char *slash = strrchr(fl_mkeventd_socket_path, '/'); + char *pos = slash == nullptr ? fl_mkeventd_socket_path : (slash + 1); strncpy( pos, "mkeventd/status", - &g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path)] - pos); - g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path) - 1] = 0; + &fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path)] - pos); + fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path) - 1] = 0; } Warning(fl_logger_nagios) << "g_socket_path=[" << g_socket_path - << "], g_mkeventd_socket_path=[" - << g_mkeventd_socket_path << "]"; + << "], fl_mkeventd_socket_path=[" + << fl_mkeventd_socket_path << "]"; // free(args); won't free, since we use pointers? }

7 years, 3 months

Make the path to the logwatch directory file-local.

by Sven Panne

Module: check_mk Branch: master Commit: 47df48a3b1778d96ba72ffe7b63a19b712b76b32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47df48a3b1778d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 11:11:18 2017 +0100 Make the path to the logwatch directory file-local. Change-Id: I662f20a636fbf7461635ff24c2597e996c979708 --- livestatus/src/DynamicLogwatchFileColumn.cc | 3 ++- livestatus/src/DynamicLogwatchFileColumn.h | 10 +++++----- livestatus/src/LogwatchListColumn.cc | 6 ++++-- livestatus/src/LogwatchListColumn.h | 7 ++++--- livestatus/src/MonitoringCore.h | 2 ++ livestatus/src/Store.cc | 3 +-- livestatus/src/TableComments.h | 5 +++-- livestatus/src/TableDowntimes.h | 5 +++-- livestatus/src/TableEventConsoleEvents.cc | 6 +++--- livestatus/src/TableEventConsoleEvents.h | 3 ++- livestatus/src/TableEventConsoleHistory.cc | 2 +- livestatus/src/TableHosts.cc | 7 +++---- livestatus/src/TableHosts.h | 11 +++++++---- livestatus/src/TableHostsByGroup.h | 8 +++++--- livestatus/src/TableLog.cc | 4 ++-- livestatus/src/TableServices.h | 11 +++++++---- livestatus/src/TableServicesByGroup.h | 8 +++++--- livestatus/src/TableServicesByHostGroup.h | 8 +++++--- livestatus/src/TableStateHistory.cc | 4 ++-- livestatus/src/module.cc | 18 ++++++++++-------- 20 files changed, 76 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47df48a3b1…

7 years, 3 months

Make the path to the inventory file-local.

by Sven Panne

Module: check_mk Branch: master Commit: 7e9c6f6b784ad4978e31a89808c1cd69328d825e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e9c6f6b784ad4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 11:53:58 2017 +0100 Make the path to the inventory file-local. Change-Id: Ia8106e2d7b96a138a0dd38db65acf47ae39a3f9a --- livestatus/src/HostSpecialIntColumn.cc | 4 ++-- livestatus/src/HostSpecialIntColumn.h | 7 +++++-- livestatus/src/MonitoringCore.h | 3 ++- livestatus/src/StatusSpecialIntColumn.cc | 3 ++- livestatus/src/StatusSpecialIntColumn.h | 10 +++++----- livestatus/src/Store.cc | 2 +- livestatus/src/TableHosts.cc | 11 +++++------ livestatus/src/TableHostsByGroup.cc | 1 - livestatus/src/TableStatus.cc | 6 ++---- livestatus/src/TableStatus.h | 8 +++++--- livestatus/src/module.cc | 19 ++++++++++--------- 11 files changed, 39 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7e9c6f6b78…

7 years, 3 months

Make the path to the livestatus socket file-local.

by Sven Panne

Module: check_mk Branch: master Commit: c730ad347378dc9b6f067e58358780f16f2634d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c730ad347378dc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 12:56:07 2017 +0100 Make the path to the livestatus socket file-local. Change-Id: Ib4674c16a70136c22343802e0957c675d3a70fd8 --- livestatus/src/module.cc | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5b95149..69422ca 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -101,7 +101,7 @@ extern int g_disable_statehist_filtering; void *g_nagios_handle; int g_unix_socket = -1; int g_max_fd_ever = 0; -char g_socket_path[4096]; +static char fl_socket_path[4096]; char pnp_path_storage[4096]; char *g_pnp_path = pnp_path_storage; static char fl_mk_inventory_path[4096]; @@ -369,13 +369,13 @@ void terminate_threads() { bool open_unix_socket() { struct stat st; - if (stat(g_socket_path, &st) == 0) { - if (unlink(g_socket_path) == 0) { + if (stat(fl_socket_path, &st) == 0) { + if (unlink(fl_socket_path) == 0) { Debug(fl_logger_nagios) << "removed old socket file " - << g_socket_path; + << fl_socket_path; } else { generic_error ge("cannot remove old socket file " + - string(g_socket_path)); + string(fl_socket_path)); Alert(fl_logger_nagios) << ge; return false; } @@ -395,14 +395,15 @@ bool open_unix_socket() { Informational(fl_logger_nagios) << ge; } - // Bind it to its address. This creates the file with the name g_socket_path + // Bind it to its address. This creates the file with the name + // fl_socket_path struct sockaddr_un sockaddr; sockaddr.sun_family = AF_UNIX; - strncpy(sockaddr.sun_path, g_socket_path, sizeof(sockaddr.sun_path)); + strncpy(sockaddr.sun_path, fl_socket_path, sizeof(sockaddr.sun_path)); if (bind(g_unix_socket, reinterpret_cast<struct sockaddr *>(&sockaddr), sizeof(sockaddr)) < 0) { generic_error ge("cannot bind UNIX socket to address " + - string(g_socket_path)); + string(fl_socket_path)); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; @@ -410,9 +411,9 @@ bool open_unix_socket() { // Make writable group members (fchmod didn't do nothing for me. Don't know // why!) - if (0 != chmod(g_socket_path, 0660)) { + if (0 != chmod(fl_socket_path, 0660)) { generic_error ge("cannot change file permissions for UNIX socket at " + - string(g_socket_path) + " to 0660"); + string(fl_socket_path) + " to 0660"); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; @@ -420,19 +421,19 @@ bool open_unix_socket() { if (0 != listen(g_unix_socket, 3 /* backlog */)) { generic_error ge("cannot listen to UNIX socket at " + - string(g_socket_path)); + string(fl_socket_path)); Error(fl_logger_nagios) << ge; close(g_unix_socket); return false; } Informational(fl_logger_nagios) << "opened UNIX socket at " - << g_socket_path; + << fl_socket_path; return true; } void close_unix_socket() { - unlink(g_socket_path); + unlink(fl_socket_path); if (g_unix_socket >= 0) { close(g_unix_socket); g_unix_socket = -1; @@ -783,7 +784,7 @@ void check_path(const char *name, char *path) { void livestatus_parse_arguments(const char *args_orig) { /* set default socket path */ - strncpy(g_socket_path, default_socket_path, sizeof(g_socket_path)); + strncpy(fl_socket_path, default_socket_path, sizeof(fl_socket_path)); /* set default path to our logfile to be in the same path as nagios.log */ strncpy(fl_logfile_path, log_file, @@ -811,7 +812,7 @@ void livestatus_parse_arguments(const char *args_orig) { char *left = next_token(&part, '='); char *right = next_token(&part, 0); if (right == nullptr) { - strncpy(g_socket_path, left, sizeof(g_socket_path)); + strncpy(fl_socket_path, left, sizeof(fl_socket_path)); } else { if (strcmp(left, "debug") == 0) { int debug_level = atoi(right); @@ -961,7 +962,7 @@ void livestatus_parse_arguments(const char *args_orig) { } if (fl_mkeventd_socket_path[0] == 0) { - strncpy(fl_mkeventd_socket_path, g_socket_path, + strncpy(fl_mkeventd_socket_path, fl_socket_path, sizeof(fl_mkeventd_socket_path)); char *slash = strrchr(fl_mkeventd_socket_path, '/'); char *pos = slash == nullptr ? fl_mkeventd_socket_path : (slash + 1); @@ -970,7 +971,7 @@ void livestatus_parse_arguments(const char *args_orig) { &fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path)] - pos); fl_mkeventd_socket_path[sizeof(fl_mkeventd_socket_path) - 1] = 0; } - Warning(fl_logger_nagios) << "g_socket_path=[" << g_socket_path + Warning(fl_logger_nagios) << "fl_socket_path=[" << fl_socket_path << "], fl_mkeventd_socket_path=[" << fl_mkeventd_socket_path << "]"; @@ -980,7 +981,7 @@ void livestatus_parse_arguments(const char *args_orig) { void omd_advertize() { Notice(fl_logger_nagios) << "Livestatus " << VERSION << " by Mathias Kettner. Socket: '" - << g_socket_path << "'"; + << fl_socket_path << "'"; Notice(fl_logger_nagios) << "Please visit us at http://mathias-kettner.de/"; if (char *omd_site = getenv("OMD_SITE")) { Informational(fl_logger_nagios) << "running on OMD site " << omd_site

7 years, 3 months

4498 FIX cmk-update-agent: Temporary files cmk-update-agent-verify-* were not deleted

by Lars Michelsen

Module: check_mk Branch: master Commit: 57f14ee1239a8f335b32954b5e1ab008c9d95a9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57f14ee1239a8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 14 13:13:51 2017 +0100 4498 FIX cmk-update-agent: Temporary files cmk-update-agent-verify-* were not deleted When using the Check_MK Agent Updater on some systems it could happen that small temporary files named cmk-update-agent-verify-* could be left over after program execution in the system temporary paths like /tmp on Linux and %TEMP% on Windows. New versions of the updater are now cleaning up the files created during the agent signature verification. Files created by older versions of the updater need to be cleaned up manually. Change-Id: I3a1037bb24b129acf1a8e8b59f4d3a9ab9b00f32 --- .werks/4498 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.werks/4498 b/.werks/4498 new file mode 100644 index 0000000..10cd143 --- /dev/null +++ b/.werks/4498 @@ -0,0 +1,18 @@ +Title: cmk-update-agent: Temporary files cmk-update-agent-verify-* were not deleted +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1489493094 + +When using the Check_MK Agent Updater on some systems it could happen +that small temporary files named cmk-update-agent-verify-* could be +left over after program execution in the system temporary paths like +/tmp on Linux and %TEMP% on Windows. + +New versions of the updater are now cleaning up the files created during +the agent signature verification. Files created by older versions of the +updater need to be cleaned up manually.

7 years, 3 months

Removed psutil requirement

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d6876840ef4232527c5f20ba0e274a7ee7c0613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d6876840ef423… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 14 13:18:27 2017 +0100 Removed psutil requirement Change-Id: I9b6801db4fe20ba28bb70b5016bb16b128bff3d0 --- agents/windows/frozen_binaries/Makefile.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/windows/frozen_binaries/Makefile.include b/agents/windows/frozen_binaries/Makefile.include index 4a0f38e..4cd6564 100644 --- a/agents/windows/frozen_binaries/Makefile.include +++ b/agents/windows/frozen_binaries/Makefile.include @@ -35,8 +35,7 @@ prepare-python: src/python-$(PYTHON_VERSION).msi src/get-pip.py src/pyinstaller cd ../../.. ; \ wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install pypiwin32 ; \ wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install pyopenssl ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install requests ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install psutil + wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install requests setup: sudo apt-get install scons upx-ucl wine

7 years, 3 months

CME: Extended the site filter to be able to handle customers

by Lars Michelsen

Module: check_mk Branch: master Commit: 237f7f7477d458a38eaea759ac95db99a2616803 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=237f7f7477d458… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 14 10:13:04 2017 +0100 CME: Extended the site filter to be able to handle customers Change-Id: I7b17aa7f7a6741ea15a0684d802683de70faab3a --- livestatus/api/python/livestatus.py | 9 ++++++-- web/htdocs/sites.py | 9 +++++++- web/htdocs/visuals.py | 3 +++ web/plugins/visuals/filters.py | 41 ++++++++++++++++++++++++++----------- 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 45f521a..7a5a6d2 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -601,8 +601,13 @@ class MultiSiteConnection(Helpers): def set_prepend_site(self, p): self.prepend_site = p - def set_only_sites(self, os = None): - self.only_sites = os + def set_only_sites(self, sites=None): + """Make future queries only contact the given sites. + + Provide a list of site IDs to not contact all configured sites, but only the listed + site IDs. In case None is given, the limitation is removed. + """ + self.only_sites = sites # Impose Limit on number of returned datasets (distributed amoung sites) def set_limit(self, limit = None): diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 0e7844d..003cd7d 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk + import config import livestatus @@ -106,7 +108,12 @@ def _connect_multiple_sites(): global _live enabled_sites, disabled_sites = _get_enabled_and_disabled_sites() _set_initial_site_states(enabled_sites, disabled_sites) - _live = livestatus.MultiSiteConnection(enabled_sites, disabled_sites) + + if cmk.is_managed_edition(): + import managed + _live = managed.CMEMultiSiteConnection(enabled_sites, disabled_sites) + else: + _live = livestatus.MultiSiteConnection(enabled_sites, disabled_sites) # Fetch status of sites by querying the version of Nagios and livestatus # This may be cached by a proxy for up to the next configuration reload. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 8be6f07..3c18941 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -83,6 +83,8 @@ def load_plugins(force): global ubiquitary_filters ; ubiquitary_filters = [] # Always show these filters load_web_plugins('visuals', globals()) + declare_site_filters() + loaded_with_language = current_language #. @@ -850,6 +852,7 @@ def show_filter(f): except Exception, e: #TODO: html.plugged_text = '' #TODO: html.unplug() + log_exception() tb = sys.exc_info()[2] tbs = ['Traceback (most recent call last):\n'] tbs += traceback.format_tb(tb) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 77a9a65..60128b5 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -689,21 +689,27 @@ class FilterSite(Filter): Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), 'host', ["site"], []) self.enforce = enforce + def visible(self): return config.is_multisite() + def display(self): - if not config.is_multisite(): - choices = [("", _("(local)"))] + html.select("site", self._choices()) + + + def _choices(self): + if self.enforce: + choices = [] else: - if self.enforce: - choices = [] - else: - choices = [("","")] - for sitename, state in sites.states().items(): - if state["state"] == "online": - choices.append((sitename, config.site(sitename)["alias"])) - html.sorted_select("site", choices) + choices = [("","")] + + for sitename, state in sites.states().items(): + if state["state"] == "online": + choices.append((sitename, config.site(sitename)["alias"])) + + return sorted(choices, key=lambda a: a[1].lower()) + def heading_info(self): current_value = html.var("site") @@ -711,11 +717,22 @@ class FilterSite(Filter): alias = config.site(current_value)["alias"] return alias + def variable_settings(self, row): return [("site", row["site"])] -declare_filter(500, FilterSite("siteopt", False), _("Optional selection of a site")) -declare_filter(501, FilterSite("site", True), _("Selection of site is enforced, use this filter for joining")) + + +def declare_site_filters(): + if cmk.is_managed_edition(): + cls = FilterCMESite + else: + cls = FilterSite + + declare_filter(500, cls("siteopt", False), + _("Optional selection of a site")) + declare_filter(501, cls("site", True), + _("Selection of site is enforced, use this filter for joining")) # name: internal id of filter # title: user displayed title of the filter

7 years, 3 months

quicksearch: removed last hardcoded plugin code

by Andreas Boesl

Module: check_mk Branch: master Commit: 987b23c86ed07fa9fc25987718501291511d21e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=987b23c86ed07f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 14 11:37:13 2017 +0100 quicksearch: removed last hardcoded plugin code Change-Id: I3f64b829174edcefc471a48ed3474faff0f184c4 --- web/htdocs/sidebar.py | 36 +++++++++++++----------------------- web/plugins/sidebar/search.py | 18 ++++++++++++------ 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index c574800..252ab22 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -856,34 +856,24 @@ class LivestatusSearchConductor(object): # Hostgroups -> Hosts -> Services # Servicegroups -> Services - # TODO: This is currently hardcoded - # So whenever a new filter is introduced this block - # requires an update too.. - table_to_query = "" - - if "hg" in self._used_filters: - table_to_query = "hostgroups" - - if "h" in self._used_filters: - table_to_query = "hosts" - - if "ad" in self._used_filters: - table_to_query = "hosts" - - if "al" in self._used_filters: - table_to_query = "hosts" + preferred_tables = [] + for shortname in self._used_filters.keys(): + plugin = self._get_plugin_with_shortname(shortname) + preferred_tables.append(plugin.get_preferred_livestatus_table()) - if "tg" in self._used_filters: - table_to_query = "hosts" - if "sg" in self._used_filters: - if table_to_query in ["hosts", "hostgroups"]: + table_to_query = "" + if "services" in preferred_tables: + table_to_query = "services" + elif "servicegroups" in preferred_tables: + if "hosts" in preferred_tables or "hostgroups" in preferred_tables: table_to_query = "services" else: table_to_query = "servicegroups" - - if "s" in self._used_filters: - table_to_query = "services" + elif "hosts" in preferred_tables: + table_to_query = "hosts" + elif "hostgroups" in preferred_tables: + table_to_query = "hostgroups" self._livestatus_table = table_to_query diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index c437f85..5bc00d1 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -142,9 +142,10 @@ sidebar_snapins["search"] = { class QuicksearchMatchPlugin(object): - def __init__(self, livestatus_tables, filter_shortname): + def __init__(self, supported_livestatus_tables, preferred_livestatus_table, filter_shortname): self._filter_shortname = filter_shortname - self._livestatus_tables = livestatus_tables + self._supported_livestatus_tables = supported_livestatus_tables + self._preferred_livestatus_table = preferred_livestatus_table super(QuicksearchMatchPlugin, self).__init__() @@ -152,13 +153,17 @@ class QuicksearchMatchPlugin(object): return self._filter_shortname + def get_preferred_livestatus_table(self): + return self._preferred_livestatus_table + + def is_filter_set(self, used_filters): return self.get_filter_shortname() in used_filters def is_used_for_table(self, livestatus_table, used_filters): # Check if this filters handles the table at all - if livestatus_table not in self._livestatus_tables: + if livestatus_table not in self._supported_livestatus_tables: return False if self.get_filter_shortname() not in used_filters: @@ -199,6 +204,7 @@ class QuicksearchMatchPlugin(object): class GroupMatchPlugin(QuicksearchMatchPlugin): def __init__(self, group_type = None, filter_shortname = None): super(GroupMatchPlugin, self).__init__(["%sgroups" % group_type, "%ss" % group_type, "services"], + "%sgroups" % group_type, filter_shortname) self._group_type = group_type @@ -271,7 +277,7 @@ class GroupMatchPlugin(QuicksearchMatchPlugin): class ServiceMatchPlugin(QuicksearchMatchPlugin): def __init__(self): - super(ServiceMatchPlugin, self).__init__(["services"], "s") + super(ServiceMatchPlugin, self).__init__(["services"], "services", "s") def get_match_topic(self): @@ -309,7 +315,7 @@ class ServiceMatchPlugin(QuicksearchMatchPlugin): class HostMatchPlugin(QuicksearchMatchPlugin): def __init__(self, livestatus_field = None, filter_shortname = None): - super(HostMatchPlugin, self).__init__(["hosts", "services"], filter_shortname) + super(HostMatchPlugin, self).__init__(["hosts", "services"], "hosts", filter_shortname) self._livestatus_field = livestatus_field # address, name or alias @@ -386,7 +392,7 @@ class HostMatchPlugin(QuicksearchMatchPlugin): class HosttagMatchPlugin(QuicksearchMatchPlugin): def __init__(self): - super(HosttagMatchPlugin, self).__init__(["hosts", "services"], "tg") + super(HosttagMatchPlugin, self).__init__(["hosts", "services"], "hosts", "tg") def _get_hosttag_dict(self):

7 years, 3 months

4430 FIX Fixed logwatch-related Livestatus queries in NEB module

by Sven Panne

Module: check_mk Branch: master Commit: 184f01ae11b94ba220c9b139beada2119df210dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=184f01ae11b94b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 14 09:50:23 2017 +0100 4430 FIX Fixed logwatch-related Livestatus queries in NEB module The 'mk_logwatch_files' and 'mk_logwatch_file' columns in the 'hosts' table didn't work when the Nagios core was used, they were always empty. The net result was that logwatch-related things in the GUI always looked OK, even when there were problems. This has been fixed. Note that the CMC was not affected by this bug. Change-Id: I9ebc41b848a857dd2513e488e3e323c862b2357f --- .werks/4430 | 15 +++++++++++++++ livestatus/src/module.cc | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/4430 b/.werks/4430 new file mode 100644 index 0000000..178fd0f --- /dev/null +++ b/.werks/4430 @@ -0,0 +1,15 @@ +Title: Fixed logwatch-related Livestatus queries in NEB module +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489480904 +Class: fix + +The 'mk_logwatch_files' and 'mk_logwatch_file' columns in the 'hosts' table +didn't work when the Nagios core was used, they were always empty. The net +result was that logwatch-related things in the GUI always looked OK, even +when there were problems. This has been fixed. + +Note that the CMC was not affected by this bug. diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5ef59a1..87ef796 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -964,7 +964,7 @@ void livestatus_parse_arguments(const char *args_orig) { char *pos = slash == nullptr ? g_mkeventd_socket_path : (slash + 1); strncpy( pos, "mkeventd/status", - &g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path)] - slash); + &g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path)] - pos); g_mkeventd_socket_path[sizeof(g_mkeventd_socket_path) - 1] = 0; } Warning(fl_logger_nagios) << "g_socket_path=[" << g_socket_path

7 years, 3 months

8624 FIX brocade_fcport: Fix usage of port name during discovery

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1e24b69c9a3ebfeb93e238fe9162c590ee12e2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e24b69c9a3ebf… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 14 09:20:18 2017 +0100 8624 FIX brocade_fcport: Fix usage of port name during discovery The rule allowing to use the port name in the service description never took effect, due to no port name being found. This has been fixed. Change-Id: I35c0a0bb9465e53e97332cdde8a699e20c90399a --- .werks/8624 | 12 ++++++++++++ checks/brocade_fcport | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/8624 b/.werks/8624 new file mode 100644 index 0000000..261cb94 --- /dev/null +++ b/.werks/8624 @@ -0,0 +1,12 @@ +Title: brocade_fcport: Fix usage of port name during discovery +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489479514 + +The rule allowing to use the port name in the service description never took +effect, due to no port name being found. This has been fixed. diff --git a/checks/brocade_fcport b/checks/brocade_fcport index d928b39..1a0509e 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -144,7 +144,7 @@ def inventory_brocade_fcport(info): admstate = int(line[3]) except: # missing vital data. Skipping this port continue - portname = line[13] + portname = line[14] is_isl = line[0] in isl_ports if admstate in admstates and \

7 years, 3 months

← Newer
1
...
13
14
15
16
17
18
19
...
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