Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Sven Panne

Module: check_mk Branch: master Commit: c078ef5ec6f37fbaf03ca3f5c775f8257ad37970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c078ef5ec6f37f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 5 14:59:10 2019 +0200 Add label columns. CMK-1927 Change-Id: Ieb69737dda5db413a62366e411577a70a72ef1e1 --- livestatus/src/MonitoringCore.h | 2 +- livestatus/src/TableContacts.cc | 14 ++++++++++++++ livestatus/src/TableHosts.cc | 15 +++++++++++++++ livestatus/src/TableServices.cc | 15 +++++++++++++++ livestatus/src/module.cc | 6 +++++- 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index e62fd6d..36b3387 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -63,7 +63,7 @@ struct CommentData { }; using Attributes = std::unordered_map<std::string, std::string>; -enum class AttributeKind { custom_variables, tags }; +enum class AttributeKind { custom_variables, tags, labels }; /// An abstraction layer for the monitoring core (nagios or cmc) class MonitoringCore { diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc index dff96b4..c7cb62b 100644 --- a/livestatus/src/TableContacts.cc +++ b/livestatus/src/TableContacts.cc @@ -135,6 +135,20 @@ void TableContacts::addColumns(Table *table, const std::string &prefix, DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "label_names", "A list of all labels of the contact", + indirect_offset, -1, -1, DANGEROUS_OFFSETOF(contact, custom_variables), + table->core(), AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "label_values", + "A list of the values of all labels of the contact", indirect_offset, + -1, -1, DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "labels", "A dictionary of the labels", indirect_offset, -1, + -1, DANGEROUS_OFFSETOF(contact, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<AttributeListAsIntColumn>( prefix + "modified_attributes", "A bitmask specifying which attributes have been modified", diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index a135e24..9c3ef2f 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -517,6 +517,21 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, extra_offset, -1, DANGEROUS_OFFSETOF(host, custom_variables), table->core(), AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "label_names", "A list of the names of all labels", + indirect_offset, extra_offset, -1, + DANGEROUS_OFFSETOF(host, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "label_values", "A list of the values of the labels", + indirect_offset, extra_offset, -1, + DANGEROUS_OFFSETOF(host, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "labels", "A dictionary of the labels", indirect_offset, + extra_offset, -1, DANGEROUS_OFFSETOF(host, custom_variables), + table->core(), AttributeKind::labels)); + // Add direct access to the custom macro _FILENAME. In a future version of // Livestatus this will probably be configurable so access to further custom // variable can be added, such that those variables are presented like diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index c7cfd87..0384588 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -473,6 +473,21 @@ void TableServices::addColumns(Table *table, const std::string &prefix, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), AttributeKind::tags)); + table->addColumn(std::make_unique<CustomVarsNamesColumn>( + prefix + "label_names", + "A list of the names of all labels of the service", indirect_offset, -1, + -1, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsValuesColumn>( + prefix + "label_values", + "A list of the values of all labels of the service", indirect_offset, + -1, -1, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<CustomVarsDictColumn>( + prefix + "labels", "A dictionary of the labels", indirect_offset, -1, + -1, DANGEROUS_OFFSETOF(service, custom_variables), table->core(), + AttributeKind::labels)); + table->addColumn(std::make_unique<ServiceGroupsColumn>( prefix + "groups", "A list of all service groups the service is in", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(service, servicegroups_ptr), diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index f7189cd..b8997e7 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -710,14 +710,18 @@ public: Attributes attrs; for (auto cvm = h; cvm != nullptr; cvm = cvm->next) { bool is_tag = mk::starts_with(cvm->variable_name, "_TAG_"); + bool is_label = mk::starts_with(cvm->variable_name, "_LABEL_"); bool part_of_result = false; switch (kind) { case AttributeKind::custom_variables: - part_of_result = !is_tag; + part_of_result = !is_tag && !is_label; break; case AttributeKind::tags: part_of_result = is_tag; break; + case AttributeKind::labels: + part_of_result = is_label; + break; } if (part_of_result) { attrs.emplace(cvm->variable_name, cvm->variable_value);

5 years, 6 months

Add new host attribute for flexible labels

by Lars Michelsen

Module: check_mk Branch: master Commit: 40a06a5ce380c1bb6e72359bcdfdba6db2e29faf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40a06a5ce380c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 09:33:46 2019 +0200 Add new host attribute for flexible labels * Start with implementation of labels. An alternative concept to the already available host tags. A major difference is, that tags are based on a predefined collection of tags (tag groups, tag ids) in Check_MK. Labels are more flexible and can be created ad-hoc. * The explicit labels attribute is inherited from folders to hosts. Each object may add a set of labels on it's own to the effective labels. * A label has the format "key:value". For example "os:windows". * Each host can have only one value per key. In case folders and hosts define a value for the same key, the value next to the host will win. CMK-1933 Change-Id: Ie6a893636c290cc50d5ecc4fd66f5266474721ec --- cmk/gui/plugins/wato/builtin_attributes.py | 32 ++++++++++++++++++++++ cmk/gui/valuespec.py | 19 +++++++++++++ cmk/gui/wato/pages/folders.py | 3 ++ cmk/gui/watolib/hosts_and_folders.py | 18 ++++++++++++ cmk_base/config.py | 1 + cmk_base/core_config.py | 10 ++++--- cmk_base/default_config/base.py | 1 + tests/unit/cmk/gui/watolib/test_host_attributes.py | 13 +++++++++ tests/unit/cmk_base/test_core_config.py | 31 +++++---------------- 9 files changed, 100 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=40a06a5ce3…

5 years, 6 months

Add host / service label rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: c947cf8b75c8c432a0ad13346a3511c0c4754046 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c947cf8b75c8c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 11:09:28 2019 +0200 Add host / service label rulesets These rulesets can be used to assign labels to hosts and services in addition to the labels configured using the host attribute. Thes ruleset make it possible to assign lables to hosts and services based on tags and other host / service conditions. CMK-1934 Change-Id: I1178eb17bce89f85dc75527e42038a967cf5fc8b --- cmk/gui/plugins/wato/check_mk_configuration.py | 43 +++++++++++++++++++ cmk_base/config.py | 35 +++++++++++++++- cmk_base/default_config/base.py | 2 + tests/unit/cmk_base/test_config.py | 58 ++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 2d1aaae..297a045 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -66,6 +66,7 @@ from cmk.gui.valuespec import ( ID, ListOfCAs, LogLevelChoice, + Labels, ) from cmk.gui.plugins.wato import ( @@ -1321,6 +1322,48 @@ class RulespecServiceTags(ServiceRulespec): seen_ids.append(entry[0]) +(a)rulespec_registry.register +class RulespecServiceLabels(ServiceRulespec): + @property + def group(self): + return RulespecGroupMonitoringConfigurationServiceChecks + + @property + def name(self): + return "service_label_rules" + + @property + def match_type(self): + return "all" + + @property + def item_type(self): + return "dict" + + @property + def valuespec(self): + return Labels(title=_("Service labels")) + + +(a)rulespec_registry.register +class RulespecHostLabels(HostRulespec): + @property + def group(self): + return RulespecGroupMonitoringConfigurationHostChecks + + @property + def name(self): + return "host_label_rules" + + @property + def match_type(self): + return "dict" + + @property + def valuespec(self): + return Labels(title=_("Host labels")) + + @config_variable_registry.register class ConfigVariableUserDowntimeTimeranges(ConfigVariable): def group(self): diff --git a/cmk_base/config.py b/cmk_base/config.py index 52841d0..40344f3 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2713,7 +2713,7 @@ class HostConfig(object): # TODO: Rename self.tags to self.tag_list and self.tag_groups to self.tags self.tags = self._config_cache.tag_list_of_host(self.hostname) self.tag_groups = host_tags.get(hostname, {}) - self.labels = host_labels.get(hostname, {}) + self.labels = self._get_host_labels() # Basic types self.is_tcp_host = self._config_cache.in_binary_hostlist(hostname, tcp_hosts) @@ -2770,6 +2770,20 @@ class HostConfig(object): return rules[0] return "ipv4" + def _get_host_labels(self): + """Returns the effective set of host labels from all available sources + + 1. Discovered labels + 2. Ruleset "Host labels" + 3. Explicit labels (via host/folder config) + + Last one wins. + """ + labels = {} + labels.update(self._config_cache.host_extra_conf_merged(self.hostname, host_label_rules)) + labels.update(host_labels.get(self.hostname, {})) + return labels + #. # .--Configuration Cache-------------------------------------------------. @@ -2908,6 +2922,18 @@ class ConfigCache(object): tags.update(entry) return tags + def labels_of_service(self, hostname, svc_desc): + """Returns the effective set of service labels from all available sources + + 1. Discovered labels + 2. Ruleset "Service labels" + + Last one wins. + """ + labels = {} + labels.update(self.service_extra_conf_merged(hostname, svc_desc, service_label_rules)) + return labels + def set_all_processed_hosts(self, all_processed_hosts): self._all_processed_hosts = set(all_processed_hosts) @@ -3196,6 +3222,13 @@ class ConfigCache(object): return entries + def service_extra_conf_merged(self, hostname, service, ruleset): + rule_dict = {} + for rule in self.service_extra_conf(hostname, service, ruleset): + for key, value in rule.items(): + rule_dict.setdefault(key, value) + return rule_dict + def _convert_service_ruleset(self, ruleset, with_foreign_hosts): new_rules = [] for rule in ruleset: diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index 1312aa9..bb7ae96 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -139,6 +139,8 @@ custom_checks = [] # WATO variant for free-form custom checks without formaliza all_hosts = [] host_tags = {} # store host tag config per host host_labels = {} # store explicit host labels per host +host_label_rules = [] # Assign labels via ruleset to hosts +service_label_rules = [] # Asssing labels via ruleset to services # TODO: This is a derived variable. Should be handled like others # (hosttags, service_service_levels, ...) host_paths = {} diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 3a65b18..92ea603 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -370,6 +370,64 @@ def test_tags_of_service(monkeypatch): assert config_cache.tags_of_service("test-host", "CPU load") == {"tag_group1": "val1"} +def test_host_label_rules_default(): + assert isinstance(config.host_label_rules, list) + + +def test_host_config_labels(monkeypatch): + monkeypatch.setattr(config, "host_labels", { + "test-host": { + "explicit": "ding", + }, + }) + + ruleset = [ + ({ + "from-rule": "rule1" + }, ["abc"], config.ALL_HOSTS, {}), + ({ + "from-rule2": "rule2" + }, ["abc"], config.ALL_HOSTS, {}), + ] + monkeypatch.setattr(config, "host_label_rules", ruleset) + + config_cache = _setup_host(monkeypatch, "test-host", ["abc"]) + + cfg = config_cache.get_host_config("xyz") + assert cfg.labels == {} + + cfg = config_cache.get_host_config("test-host") + assert cfg.labels == { + "explicit": "ding", + "from-rule": "rule1", + "from-rule2": "rule2", + } + + +def test_service_label_rules_default(): + assert isinstance(config.service_label_rules, list) + + +def test_labels_of_service(monkeypatch): + ruleset = [ + ({ + "label1": "val1" + }, ["abc"], config.ALL_HOSTS, ["CPU load$"], {}), + ({ + "label2": "val2" + }, ["abc"], config.ALL_HOSTS, ["CPU load$"], {}), + ] + monkeypatch.setattr(config, "service_label_rules", ruleset) + + config_cache = _setup_host(monkeypatch, "test-host", ["abc"]) + + assert config_cache.labels_of_service("xyz", "CPU load") == {} + assert config_cache.labels_of_service("test-host", "CPU load") == { + "label1": "val1", + "label2": "val2", + } + + def test_config_cache_get_host_config(): cache = config.ConfigCache() assert cache._host_configs == {}

5 years, 6 months

Add nice label input fields

by Lars Michelsen

Module: check_mk Branch: master Commit: d4ab367896869dbdfe47c0a220f0e3f816f7778c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4ab367896869d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 12:21:25 2019 +0200 Add nice label input fields CMK-1934 Change-Id: Ic9c3b0c0d5cfe2e1089117e4bcea9b1742702e32 --- cmk/gui/plugins/wato/check_mk_configuration.py | 10 ++++++++-- cmk/gui/valuespec.py | 18 +++++++++++++++--- package-lock.json | 5 +++++ package.json | 1 + web/htdocs/js/index.js | 2 +- web/htdocs/js/modules/forms.js | 21 ++++++++++++++++++++- web/htdocs/js/modules/valuespecs.js | 2 +- web/htdocs/themes/classic/scss/_pages.scss | 7 +++++++ web/htdocs/themes/classic/theme.scss | 1 + web/htdocs/themes/facelift/scss/_pages.scss | 7 +++++++ web/htdocs/themes/facelift/theme.scss | 1 + 11 files changed, 67 insertions(+), 8 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 297a045..f99d9a6 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -1342,7 +1342,10 @@ class RulespecServiceLabels(ServiceRulespec): @property def valuespec(self): - return Labels(title=_("Service labels")) + return Labels( + title=_("Service labels"), + help=_("Use this ruleset to assign labels to service of your choice."), + ) @rulespec_registry.register @@ -1361,7 +1364,10 @@ class RulespecHostLabels(HostRulespec): @property def valuespec(self): - return Labels(title=_("Host labels")) + return Labels( + title=_("Host labels"), + help=_("Use this ruleset to assign labels to hosts of your choice."), + ) @config_variable_registry.register diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index b9c5490..4a7251a 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -4232,11 +4232,17 @@ class TextOrRegExpUnicode(TextOrRegExp): class Labels(ValueSpec): """Valuespec to render and input a collection of object labels""" + def __init__(self, *args, **kwargs): + kwargs.setdefault("help", "") + kwargs["help"] += _("Labels need to be in the format <tt>[KEY]:[VALUE]</tt>. " + "For example <tt>os:windows</tt>.") + super(Labels, self).__init__(*args, **kwargs) + def canonical_value(self): return {} def from_html_vars(self, varprefix): - return json.loads(html.get_unicode_input(varprefix)) + return dict(e["value"].split(":", 1) for e in json.loads(html.get_unicode_input(varprefix))) def value_to_text(self, value): # TODO: Find a better place for this function and rename it @@ -4244,8 +4250,14 @@ class Labels(ValueSpec): return render_tag_groups(value, "host", with_links=False) def render_input(self, varprefix, value): - # TODO: Add a nice label input mechanism - html.text_input(varprefix, default_value=json.dumps(value)) + html.help(self.help()) + html.text_input( + varprefix, + default_value=json.dumps(["%s:%s" % e for e in value.items()]), + cssclass="labels", + attrs={ + "placeholder": _("Add some tag"), + }) class IconSelector(ValueSpec): diff --git a/package-lock.json b/package-lock.json index 914ce39..21d4f9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -906,6 +906,11 @@ "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", "dev": true }, + "@yaireo/tagify": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@yaireo/tagify/-/tagify-2.15.1.tgz", + "integrity": "sha512-fi8EAna+Z6HWISbkWEEydToMgCJtdNiLWN5zzFMLCBPCGw4PCcnS0FHRY44dDCr7dDiP9CYbHzceC6rl4JZBpw==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", diff --git a/package.json b/package.json index 9470299..dbe3821 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "webpack-fix-style-only-entries": "^0.2.0" }, "dependencies": { + "@yaireo/tagify": "^2.15.1", "jquery": "^3.3.1", "select2": "^4.0.6-rc.1" } diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js index eb174de..d685be6 100644 --- a/web/htdocs/js/index.js +++ b/web/htdocs/js/index.js @@ -62,7 +62,7 @@ try { $(() => { utils.update_header_timer(); - forms.enable_select2(); + forms.enable_dynamic_form_elements(); // TODO: only register when needed? element_dragging.register_event_handlers(); }); diff --git a/web/htdocs/js/modules/forms.js b/web/htdocs/js/modules/forms.js index 8050c1c..1520eb3 100644 --- a/web/htdocs/js/modules/forms.js +++ b/web/htdocs/js/modules/forms.js @@ -24,11 +24,18 @@ import $ from "jquery"; import "select2"; +import Tagify from "@yaireo/tagify"; + import * as utils from "utils"; +export function enable_dynamic_form_elements(container=null) { + enable_select2_dropdowns(container); + enable_label_input_fields(container); +} + // html.dropdown() adds the .select2-enable class for all dropdowns // that should use the select2 powered dropdowns -export function enable_select2(container=null) { +function enable_select2_dropdowns(container) { let elements; if (container) elements = $(container).find(".select2-enable:visible"); @@ -41,6 +48,18 @@ export function enable_select2(container=null) { }); } +function enable_label_input_fields(container) { + if (!container) + container = document; + + let elements = container.querySelectorAll("input.labels"); + elements.forEach(element => { + let tagify = new Tagify(element, { + pattern: /^[^:]+:[^:]+$/, + }); + }); +} + // Handle Enter key in textfields export function textinput_enter_submit(e, submit) { if (!e) diff --git a/web/htdocs/js/modules/valuespecs.js b/web/htdocs/js/modules/valuespecs.js index 57d9318..6434f6c 100644 --- a/web/htdocs/js/modules/valuespecs.js +++ b/web/htdocs/js/modules/valuespecs.js @@ -210,7 +210,7 @@ export function listof_add(varprefix, magic, style) container.appendChild(new_child); utils.execute_javascript_by_object(new_child); - forms.enable_select2(new_child); + forms.enable_dynamic_form_elements(new_child); listof_update_indices(varprefix); } diff --git a/web/htdocs/themes/classic/scss/_pages.scss b/web/htdocs/themes/classic/scss/_pages.scss index 893d0c4..58b3612 100644 --- a/web/htdocs/themes/classic/scss/_pages.scss +++ b/web/htdocs/themes/classic/scss/_pages.scss @@ -1549,3 +1549,10 @@ span.tag_group { border: 1px solid #ccc; border-radius: 3px; } + +.tagify { + border: 0; + tag x { + font-size: 8pt; + } +} diff --git a/web/htdocs/themes/classic/theme.scss b/web/htdocs/themes/classic/theme.scss index 7a749cd..4c00782 100644 --- a/web/htdocs/themes/classic/theme.scss +++ b/web/htdocs/themes/classic/theme.scss @@ -1,4 +1,5 @@ @import "~select2/dist/css/select2"; +@import "~@yaireo/tagify/dist/tagify"; @import "scss/_check_mk.scss"; @import "scss/_pages.scss"; diff --git a/web/htdocs/themes/facelift/scss/_pages.scss b/web/htdocs/themes/facelift/scss/_pages.scss index 7bcd394..5ccf0a0 100644 --- a/web/htdocs/themes/facelift/scss/_pages.scss +++ b/web/htdocs/themes/facelift/scss/_pages.scss @@ -44,3 +44,10 @@ span.tag_group { border: 1px solid #ccc; border-radius: 3px; } + +.tagify { + border: 0; + tag x { + font-size: 8pt; + } +} diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index aff46fb..c4e609d 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -6,6 +6,7 @@ _main.scss */ @import "~select2/dist/css/select2"; +@import "~@yaireo/tagify/dist/tagify"; @import "../classic/scss/_check_mk.scss"; @import "../classic/scss/_pages.scss";

5 years, 6 months

mongodb_collections: adjust manpage

by Moritz Kiemer

Module: check_mk Branch: master Commit: 555d50b6c2758c74fdcb6f4aced005782c65d1bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555d50b6c2758c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 14:20:53 2019 +0200 mongodb_collections: adjust manpage Change-Id: I1317e3f440c1b624fa51f77039f8af143c949632 --- checkman/mongodb_collections | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/mongodb_collections b/checkman/mongodb_collections index 59bfc32..cfd5824 100644 --- a/checkman/mongodb_collections +++ b/checkman/mongodb_collections @@ -4,7 +4,7 @@ catalog: app/mongodb license: GPL distribution: check_mk description: - This check monitors the size and growth of MongoDB collections. + This check monitors the size of MongoDB collections. Note: If the MongoDB is running as a replica set, this check is not discovered on the same host where the {mk_mongodb} plugin is installed. The data is piggybacked

5 years, 6 months

mk_mongodb: last refactoring for now

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9d7c1c36eb674a2a509ddfaa97937259d47f0a6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7c1c36eb674a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 14:45:44 2019 +0200 mk_mongodb: last refactoring for now Change-Id: Icd3c4c857985f43bb48f8b0d580ffed01c6b6e33 --- agents/plugins/mk_mongodb | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 3f2f98b..d264410 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -125,6 +125,15 @@ def section_by_keys(section_name, keys, server_status, output_key=False): sys.stdout.write(fmt % item) +def section_collections(databases): + sys.stdout.write("<<<mongodb_collections:sep(9)>>>\n") + for dbname, dbdata in databases.items(): + for collname, colldata in dbdata.get("collstats", {}).items(): + for key, value in colldata.items(): + if 'size' in key.lower(): + sys.stdout.write("%s\t%s\t%s\t%s\n" % (dbname, collname, key, value)) + + def get_timestamp(text): """parse timestamps like 'Nov 6 13:44:09.345' or '2015-10-17T05:35:24.234'""" text = text.split('.')[0] @@ -194,11 +203,7 @@ def section_logwatch(client): def main(): - # might be implemented in the future.. - host = None - port = None - - client = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) + client = pymongo.MongoClient(read_preference=pymongo.ReadPreference.SECONDARY) try: # connecting is lazy, it might fail only now server_status = client.admin.command("serverStatus") @@ -233,29 +238,11 @@ def potentially_piggybacked_sections(client, server_status): section_flushing(server_status) - # Unused - # server_version = tuple(con.server_info()['version'].split('.')) - #try: - # if server_version >= tuple("2.4.0".split(".")): - # indexCounters = server_status['indexCounters'] - # else: - # indexCounters = server_status['indexCounters']["btree"] - # print "<<<mongodb_indexcounters>>>" - # for key, value in indexCounters.items(): - # print "%s %s" % (key, value) - #except: - # pass - section_by_keys("mem", ("mem", "extra_info"), server_status) section_by_keys("counters", ("opcounters", "opcountersRepl"), server_status, output_key=True) - sys.stdout.write("<<<mongodb_collections:sep(9)>>>\n") - for dbname, dbdata in databases.items(): - for collname, colldata in dbdata.get("collstats", {}).items(): - for key, value in colldata.items(): - if 'size' in key.lower(): - sys.stdout.write("%s\t%s\t%s\t%s\n" % (dbname, collname, key, value)) + section_collections(databases) section_logwatch(client)

5 years, 6 months

freeze time in heartbeat_crm regression test

by Florian Kromer

Module: check_mk Branch: master Commit: f48928a580fc614cde9d7c5029a4e65c9767cba4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f48928a580fc61… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Apr 5 10:03:25 2019 +0200 freeze time in heartbeat_crm regression test Change-Id: I3227f140e3fcac6a3ca7837ce2347836564e10b8 --- tests/unit/checks/generictests/datasets/heartbeat_crm.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/heartbeat_crm.py b/tests/unit/checks/generictests/datasets/heartbeat_crm.py index e965a62..a342709 100644 --- a/tests/unit/checks/generictests/datasets/heartbeat_crm.py +++ b/tests/unit/checks/generictests/datasets/heartbeat_crm.py @@ -4,6 +4,9 @@ checkname = 'heartbeat_crm' +freeze_time = '2019-04-11 12:38:36' + + info = [[u'Stack:', u'corosync'], [u'Current', u'DC:', @@ -108,11 +111,9 @@ discovery = {'': [(None, {'num_nodes': 2, 'num_resources': 10})], (u'st-vmware2', None)]} -checks = { - #TODO the main check uses the current time which can currently not be patched in generic tests - #'': [(None, - # {'max_age': 60, 'num_nodes': 2, 'num_resources': 10}, - # [(3, 'Ignoring reported data (Status output too old: 42 h)', [])])], +checks = {'': [(None, + {'max_age': 60, 'num_nodes': 2, 'num_resources': 10}, + [(3, 'Ignoring reported data (Status output too old: 31 d)', [])])], 'resources': [(u'clone_nfs_sapmnt_IFG', {}, [(0, @@ -142,4 +143,4 @@ checks = { {}, [(0, u'st-vmware2 (stonith:fence_vmware_rest): Started hrssc61i01', - [])])]} + [])])]} \ No newline at end of file

5 years, 6 months

Split up macro expansion into various subclasses.

by Sven Panne

Module: check_mk Branch: master Commit: 49ac20f1f194f16beca270f1dfcab98e479db727 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49ac20f1f194f1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 5 11:24:58 2019 +0200 Split up macro expansion into various subclasses. This is much more in the OO spirit and will make future changes and testing easier. Change-Id: I7eaad30f83328a584a6b5e1a21180915729e300a --- livestatus/src/OffsetStringHostMacroColumn.cc | 43 +++++- livestatus/src/OffsetStringHostMacroColumn.h | 16 ++- livestatus/src/OffsetStringMacroColumn.cc | 160 ++++++++--------------- livestatus/src/OffsetStringMacroColumn.h | 49 +++++-- livestatus/src/OffsetStringServiceMacroColumn.cc | 44 ++++++- livestatus/src/OffsetStringServiceMacroColumn.h | 16 ++- 6 files changed, 200 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=49ac20f1f1…

5 years, 6 months

mk_mongodb: stop sending unused output

by Moritz Kiemer

Module: check_mk Branch: master Commit: e284ceaef290d57a8af1a0b7395a99bb7fc09449 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e284ceaef290d5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 09:29:00 2019 +0200 mk_mongodb: stop sending unused output Change-Id: I5cb59a4541e271d93610f4f0392503c0f544528d --- agents/plugins/mk_mongodb | 5 +- .../generictests/datasets/mongodb_collections_1.py | 54 +--------------------- 2 files changed, 4 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e284ceaef2…

5 years, 6 months

7393 FIX mongodb_collections: New WATO rule and fixed output

by Moritz Kiemer

Module: check_mk Branch: master Commit: a4e8c87b5a4dd91964bb9e2699286fecdab48472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e8c87b5a4dd9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 5 12:12:04 2019 +0200 7393 FIX mongodb_collections: New WATO rule and fixed output The storage size is no longer wrongly treated as total available space, which led to a {CRIT} state. Users who had a rule configured for Mongo DB collections need to set up a new one. CMK-1885 Change-Id: I9333cc75e8151aca4dde7a06df8689a4c441a50c --- .werks/7393 | 13 +++ checks/mongodb_collections | 25 ++--- .../wato/check_parameters/mongodb_collections.py | 26 ++--- .../generictests/datasets/mongodb_collections_1.py | 107 ++++----------------- 4 files changed, 63 insertions(+), 108 deletions(-) diff --git a/.werks/7393 b/.werks/7393 new file mode 100644 index 0000000..20021f5 --- /dev/null +++ b/.werks/7393 @@ -0,0 +1,13 @@ +Title: mongodb_collections: New WATO rule and fixed output +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1554458898 +Class: fix + +The storage size is no longer wrongly treated as total available space, +which led to a {CRIT} state. +Users who had a rule configured for Mongo DB collections need to set +up a new one. diff --git a/checks/mongodb_collections b/checks/mongodb_collections index 5c5208c..d425c08 100644 --- a/checks/mongodb_collections +++ b/checks/mongodb_collections @@ -52,14 +52,19 @@ def parse_mongodb_collections(info): return parsed -def check_mongodb_collections(item, params, parsed): - fslist_blocks = [] - for coll_item, values in parsed.items(): - used_mb = values["size"] / 1024.0**2 - total_mb = values["storageSize"] / 1024.0**2 - fslist_blocks.append((coll_item, total_mb, total_mb - used_mb, 0)) - - return df_check_filesystem_list(item, params, fslist_blocks) +@get_parsed_item_data +def check_mongodb_collections(_no_item, params, data): + for key, label in ( + ("size", "Uncompressed size in memory"), + ("storageSize", "Allocated for document storage"), + ): + if key not in data: + continue + levels = params.get("levels_%s" % key.lower()) + if levels is not None: + levels = (levels[0] * 1024**2, levels[1] * 1024**2) + yield check_levels( + data[key], None, levels, human_readable_func=get_bytes_human_readable, infoname=label) check_info["mongodb_collections"] = { @@ -68,7 +73,5 @@ check_info["mongodb_collections"] = { "check_function": check_mongodb_collections, "service_description": "MongoDB Collection %s", "group": "mongodb_collections", - "default_levels_variable": "filesystem_default_levels", - "includes": ["size_trend.include", "df.include"], - "has_perfdata": True, + "has_perfdata": False, } diff --git a/cmk/gui/plugins/wato/check_parameters/mongodb_collections.py b/cmk/gui/plugins/wato/check_parameters/mongodb_collections.py index b805c30..dbe2502 100644 --- a/cmk/gui/plugins/wato/check_parameters/mongodb_collections.py +++ b/cmk/gui/plugins/wato/check_parameters/mongodb_collections.py @@ -25,19 +25,12 @@ # Boston, MA 02110-1301 USA. from cmk.gui.i18n import _ -from cmk.gui.valuespec import ( - Dictionary, - TextAscii, -) from cmk.gui.plugins.wato import ( - RulespecGroupCheckParametersStorage, CheckParameterRulespecWithItem, + RulespecGroupCheckParametersStorage, rulespec_registry, ) -from cmk.gui.plugins.wato.check_parameters.utils import ( - fs_levels_elements, - size_trend_elements, -) +from cmk.gui.valuespec import Dictionary, Integer, TextAscii, Tuple @rulespec_registry.register @@ -60,8 +53,19 @@ class RulespecCheckgroupParametersMongodbCollections(CheckParameterRulespecWithI @property def parameter_valuespec(self): - return Dictionary(elements=fs_levels_elements + size_trend_elements) + return Dictionary(elements=[ + ("levels_size", self._size_tuple("Uncompressed size in memory", "above")), + ("levels_storagesize", self._size_tuple("Allocated for document storage", "above")), + ]) + + def _size_tuple(self, title, course): + return Tuple( + title=_(title), + elements=[ + Integer(title=_("Warning if %s") % course, unit=_("MiB"), minvalue=0), + Integer(title=_("Critical if %s") % course, unit=_("MiB"), minvalue=0), + ]) @property def item_spec(self): - return TextAscii(title=_("Collection name"),) + return TextAscii(title=_("Database/Collection name ('<DB name> <collection name>')"),) diff --git a/tests/unit/checks/generictests/datasets/mongodb_collections_1.py b/tests/unit/checks/generictests/datasets/mongodb_collections_1.py index 7650011..9980fa8 100644 --- a/tests/unit/checks/generictests/datasets/mongodb_collections_1.py +++ b/tests/unit/checks/generictests/datasets/mongodb_collections_1.py @@ -4,8 +4,7 @@ checkname = 'mongodb_collections' -info = [ - [u'admin', u'system.version', u'avgObjSize', u'59'], +info = [[u'admin', u'system.version', u'avgObjSize', u'59'], [u'admin', u'system.version', u'totalIndexSize', u'16384'], [u'admin', u'system.version', u'storageSize', u'16384'], [u'admin', u'system.version', u'indexSizes', u"{u'_id_': 16384}"], @@ -39,87 +38,23 @@ discovery = {'': [(u'admin system.version', {}), (u'test zips', {})]} -checks = {'': [(u'admin system.version', - {'inodes_levels': (10.0, 5.0), - 'levels': (80.0, 90.0), - 'levels_low': (50.0, 60.0), - 'magic_normsize': 20, - 'show_inodes': 'onlow', - 'show_levels': 'onmagic', - 'show_reserved': False, - 'trend_perfdata': True, - 'trend_range': 24}, - [(0, - '0.36% used (59.00 B of 16.00 kB), trend: 0.00 B / 24 hours', - [(u'admin_system.version', - 5.626678466796875e-05, - 0.0125, - 0.0140625, - 0, - 0.015625), - ('fs_size', 0.015625, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 0.0006510416666666666)])]), - (u'config system.sessions', - {'inodes_levels': (10.0, 5.0), - 'levels': (80.0, 90.0), - 'levels_low': (50.0, 60.0), - 'magic_normsize': 20, - 'show_inodes': 'onlow', - 'show_levels': 'onmagic', - 'show_reserved': False, - 'trend_perfdata': True, - 'trend_range': 24}, - [(0, - '2.42% used (594.00 B of 24.00 kB), trend: 0.00 B / 24 hours', - [(u'config_system.sessions', - 0.0005664825439453125, - 0.01875, - 0.02109375, - 0, - 0.0234375), - ('fs_size', 0.0234375, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 0.0009765625)])]), - (u'local startup_log', - {'inodes_levels': (10.0, 5.0), - 'levels': (80.0, 90.0), - 'levels_low': (50.0, 60.0), - 'magic_normsize': 20, - 'show_inodes': 'onlow', - 'show_levels': 'onmagic', - 'show_reserved': False, - 'trend_perfdata': True, - 'trend_range': 24}, - [(0, - '15.9% used (5.71 of 36.00 kB), trend: 0.00 B / 24 hours', - [(u'local_startup_log', - 0.005573272705078125, - 0.028125, - 0.031640625, - 0, - 0.03515625), - ('fs_size', 0.03515625, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 0.00146484375)])]), - (u'test zips', - {'inodes_levels': (10.0, 5.0), - 'levels': (80.0, 90.0), - 'levels_low': (50.0, 60.0), - 'magic_normsize': 20, - 'show_inodes': 'onlow', - 'show_levels': 'onmagic', - 'show_reserved': False, - 'trend_perfdata': True, - 'trend_range': 24}, - [(2, - '189.7% used (2.65 of 1.39 MB), (warn/crit at 80.0%/90.0%), trend: 0.00 B / 24 hours', - [(u'test_zips', - 2.645620346069336, - 1.115625, - 1.255078125, - 0, - 1.39453125), - ('fs_size', 1.39453125, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 0.05810546875)])])]} +checks = { + '': [ + (u'admin system.version', {}, [ + (0, 'Uncompressed size in memory: 59.00 B', []), + (0, 'Allocated for document storage: 16.00 kB', []), + ]), + (u'config system.sessions', {}, [ + (0, 'Uncompressed size in memory: 594.00 B', []), + (0, 'Allocated for document storage: 24.00 kB', []), + ]), + (u'local startup_log', {}, [ + (0, 'Uncompressed size in memory: 5.71 kB', []), + (0, 'Allocated for document storage: 36.00 kB', []), + ]), + (u'test zips', {"levels_size": (1, 2), "levels_storagesize": (1, 2)}, [ + (2, 'Uncompressed size in memory: 2.65 MB (warn/crit at 1.00 MB/2.00 MB)', []), + (1, 'Allocated for document storage: 1.39 MB (warn/crit at 1.00 MB/2.00 MB)', []), + ]), + ], +}

5 years, 6 months

← Newer
1
...
40
41
42
43
44
45
46
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019