Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: aec959116985be2728bb340930eeb78d4953cf6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aec959116985be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 09:04:23 2019 +0200 Cleanup config.tags_of_host * Using the precomputed host_config.tags instead now * Cleaned up HostConfig constructor a bit Change-Id: I33a673ffa17ef49448f8a5d074b32e18658fc54f --- cmk_base/check_api.py | 8 +++++++- cmk_base/config.py | 20 ++++++++------------ cmk_base/core_config.py | 2 +- cmk_base/data_sources/__init__.py | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index 8c5811e..20fa1bc 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -223,9 +223,15 @@ get_rule_options = _config.get_rule_options # the future check API. It's kept here for compatibility reasons for now. in_extraconf_hostlist = _config.in_extraconf_hostlist hosttags_match_taglist = _config.hosttags_match_taglist -tags_of_host = _config.tag_list_of_host all_matching_hosts = _config.all_matching_hosts + +# These functions were used in some specific checks until 1.6. Don't add it to +# the future check API. It's kept here for compatibility reasons for now. +def tags_of_host(hostname): + return _config.get_config_cache().get_host_config(hostname).tags + + nagios_illegal_chars = _config.nagios_illegal_chars is_ipv6_primary = _config.is_ipv6_primary is_cmc = _config.is_cmc diff --git a/cmk_base/config.py b/cmk_base/config.py index ceb037e..70c995e 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -603,10 +603,6 @@ def strip_tags(tagged_hostlist): return result -def tag_list_of_host(hostname): - return get_config_cache().tag_list_of_host(hostname) - - #. # .--HostCollections-----------------------------------------------------. # | _ _ _ ____ _ _ _ _ | @@ -776,7 +772,7 @@ def all_configured_offline_hosts(): def host_is_member_of_site(hostname, site): - for tag in tag_list_of_host(hostname): + for tag in get_config_cache().get_host_config(hostname).tags: if tag.startswith("site:"): return site == tag[5:] # hosts without a site: tag belong to all sites @@ -2753,9 +2749,8 @@ class HostConfig(object): self.is_cluster = is_cluster(hostname) self.part_of_clusters = self._config_cache.clusters_of(hostname) - tags = self._config_cache.tag_list_of_host(self.hostname) # TODO: Rename self.tags to self.tag_list and self.tag_groups to self.tags - self.tags = tags + self.tags = self._config_cache.tag_list_of_host(self.hostname) self.tag_groups = host_tags.get(hostname, {}) # Basic types @@ -2780,18 +2775,19 @@ class HostConfig(object): self.is_dual_host = self.is_tcp_host and self.is_snmp_host self.is_all_agents_host = "all-agents" in self.tags - self.is_all_special_agents_host = "special-agents" in tags + self.is_all_special_agents_host = "special-agents" in self.tags # IP addresses # Whether or not the given host is configured not to be monitored via IP - self.is_no_ip_host = "no-ip" in tags - self.is_ipv6_host = "ip-v6" in tags + self.is_no_ip_host = "no-ip" in self.tags + self.is_ipv6_host = "ip-v6" in self.tags # Whether or not the given host is configured to be monitored via IPv4. # This is the case when it is set to be explicit IPv4 or implicit (when # host is not an IPv6 host and not a "No IP" host) - self.is_ipv4_host = "ip-v4" in tags or (not self.is_ipv6_host and not self.is_no_ip_host) + self.is_ipv4_host = "ip-v4" in self.tags or (not self.is_ipv6_host and + not self.is_no_ip_host) - self.is_ipv4v6_host = "ip-v6" in tags and "ip-v4" in tags + self.is_ipv4v6_host = "ip-v6" in self.tags and "ip-v4" in self.tags # Whether or not the given host is configured to be monitored primarily via IPv6 self.is_ipv6_primary = (not self.is_ipv4v6_host and self.is_ipv6_host) \ diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 294be85..e8a6eb0 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -391,7 +391,7 @@ def get_host_attributes(hostname, config_cache): # Pre 1.6 legacy attribute. We have changed our whole code to use the # livestatus column "tags" which is populated by all attributes starting with # "__TAG_" instead. We may deprecate this is one day. - attrs["_TAGS"] = " ".join(sorted(config_cache.tag_list_of_host(hostname))) + attrs["_TAGS"] = " ".join(sorted(config_cache.get_host_config(hostname).tags)) attrs.update(_get_tag_attributes(config_cache.tags_of_host(hostname))) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index a30a453..bef1f14 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -134,7 +134,7 @@ class DataSources(object): source.set_main_agent_data_source() self._add_source(source) - if "no-piggyback" not in config.tag_list_of_host(self._hostname): + if self._host_config.is_piggyback_host: self._add_source(PiggyBackDataSource(self._hostname, self._ipaddress)) def _initialize_snmp_data_sources(self):

5 years, 3 months

mk_mongodb: nitpicking: it's a client

by Moritz Kiemer

Module: check_mk Branch: master Commit: 604f79fc5b4f0544f8d51c87e08fa5d8635c9e67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=604f79fc5b4f05… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 09:13:54 2019 +0200 mk_mongodb: nitpicking: it's a client Change-Id: Ic3617a41153631ad26a384d6e49e5a82484f8aeb --- agents/plugins/mk_mongodb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 248cdd6..b272559 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -52,10 +52,10 @@ def main(): host = None port = None - con = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) + client = pymongo.MongoClient(host, port, read_preference=pymongo.ReadPreference.SECONDARY) try: # connecting is lazy, it might fail only now - server_status = con.admin.command("serverStatus") + server_status = client.admin.command("serverStatus") except pymongo.errors.ConnectionFailure: sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") sys.stdout.write("error\tInstance is down\n") @@ -70,12 +70,12 @@ def main(): if repl_info: sys.stdout.write("<<<<%s>>>>\n" % repl_info["setName"]) - potentially_piggybacked_sections(con, server_status, repl_info) + potentially_piggybacked_sections(client, server_status, repl_info) if repl_info: sys.stdout.write("<<<<>>>>\n") -def potentially_piggybacked_sections(con, server_status, repl_info): +def potentially_piggybacked_sections(client, server_status, repl_info): # pylint: disable=too-many-branches,too-many-locals if repl_info: sys.stdout.write("<<<mongodb_replica:sep(9)>>>\n") @@ -84,7 +84,7 @@ def potentially_piggybacked_sections(con, server_status, repl_info): sys.stdout.write("arbiters\t%s\n" % " ".join(repl_info.get("arbiters"))) sys.stdout.write("<<<mongodb_replstatus>>>\n") - sys.stdout.write(pprint.pformat(con.admin.command("replSetGetStatus"))) + sys.stdout.write(pprint.pformat(client.admin.command("replSetGetStatus"))) sys.stdout.write("<<<mongodb_asserts>>>\n") for key, value in server_status.get("asserts", {}).items(): @@ -94,12 +94,12 @@ def potentially_piggybacked_sections(con, server_status, repl_info): sys.stdout.write("%s\n" % "\n".join("%s %s" % x for x in server_status["connections"].items())) try: - databases = {x: {} for x in con.list_database_names()} + databases = {x: {} for x in client.list_database_names()} except AttributeError: # pymongo < 3.6 - databases = {x: {} for x in con.database_names()} + databases = {x: {} for x in client.database_names()} for name in databases: - database = con[name] + database = client[name] databases[name]["collections"] = database.collection_names() databases[name]["stats"] = database.command("dbstats") databases[name]["collstats"] = {} @@ -107,7 +107,7 @@ def potentially_piggybacked_sections(con, server_status, repl_info): databases[name]["collstats"][collection] = database.command("collstats", collection) sys.stdout.write("<<<mongodb_chunks>>>\n") - col = con.config.chunks + col = client.config.chunks for db_name, db_data in databases.items(): shards = col.distinct("shard") sys.stdout.write("shardcount %d\n" % len(shards)) @@ -163,7 +163,7 @@ def potentially_piggybacked_sections(con, server_status, repl_info): sys.stdout.write("<<<logwatch>>>\n") sys.stdout.write("[[[MongoDB startupWarnings]]]\n") - startup_warnings = con.admin.command({"getLog": "startupWarnings"}) + startup_warnings = client.admin.command({"getLog": "startupWarnings"}) var_dir = os.environ.get("MK_VARDIR") if var_dir:

5 years, 3 months

Fixed test dependency.

by Sven Panne

Module: check_mk Branch: master Commit: 69b25d413a9c80461e8d8337b237b62f4b4fdf34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69b25d413a9c80… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 4 09:54:11 2019 +0200 Fixed test dependency. Change-Id: I7b9b8756ad88a4e0875274a3edb279a162ce35dd --- livestatus/src/test/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am index c6d8a9f..b08b3d9 100644 --- a/livestatus/src/test/Makefile.am +++ b/livestatus/src/test/Makefile.am @@ -55,8 +55,7 @@ test_neb_LDFLAGS = \ @RE2_LDFLAGS@ test_neb_LDADD = \ -lstdc++fs \ - -L.. \ - -llivestatus \ + ../liblivestatus.a \ -lpthread \ @BOOST_ASIO_LIB@ \ @RE2_LIBS@

5 years, 3 months

GUI CSS: Moved commented out dashboard styles from classic to facelift theme ( CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 92a9c125ba1477754e5cb9be2e093f2618ef5ff8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92a9c125ba1477… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Mar 29 10:01:42 2019 +0100 GUI CSS: Moved commented out dashboard styles from classic to facelift theme (CMK-1171) Change-Id: I5d6c3d31179d1f36afdab1512f4f92d662e84be0 --- web/htdocs/themes/classic/scss/_dashboard.scss | 2 +- web/htdocs/themes/facelift/scss/_dashboard.scss | 637 ++++++++++++++++++++++++ web/htdocs/themes/facelift/theme.scss | 1 + 3 files changed, 639 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=92a9c125ba…

5 years, 3 months

GUI CSS: Deployed part of the dashboard styles and moved according ones away from _main.scss (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: b7379a583b821f3e1ddbfabfdaffec9b5903428b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7379a583b821f… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Mar 29 16:25:17 2019 +0100 GUI CSS: Deployed part of the dashboard styles and moved according ones away from _main.scss (CMK-1171) Change-Id: I9d6e71fe28f0a71080a4cb6fe8d0ad62a84a4128 --- web/htdocs/themes/facelift/scss/_dashboard.scss | 385 ++++++++++++++---------- web/htdocs/themes/facelift/scss/_main.scss | 64 ---- 2 files changed, 222 insertions(+), 227 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b7379a583b…

5 years, 3 months

GUI CSS: Decoupled styles for bi from classic theme (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 875436862f4982fb674ba26b594de4095ecf5ef0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=875436862f4982… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Mar 28 12:01:41 2019 +0100 GUI CSS: Decoupled styles for bi from classic theme (CMK-1171) Change-Id: Ie526fc1239c634699aaf6c13119557a43dcbbd68 --- web/htdocs/themes/facelift/scss/_bi.scss | 195 +++++++++++++++++++++++++++++ web/htdocs/themes/facelift/scss/_main.scss | 23 +--- web/htdocs/themes/facelift/theme.scss | 2 +- 3 files changed, 197 insertions(+), 23 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_bi.scss b/web/htdocs/themes/facelift/scss/_bi.scss new file mode 100644 index 0000000..5912636 --- /dev/null +++ b/web/htdocs/themes/facelift/scss/_bi.scss @@ -0,0 +1,195 @@ +/* ++------------------------------------------------------------------+ +| ____ _ _ __ __ _ __ | +| / ___| |__ ___ ___| | __ | \/ | |/ / | +| | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +| | |___| | | | __/ (__| < | | | | . \ | +| \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +| | +| Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | ++------------------------------------------------------------------+ + +This file is part of Check_MK. +The official homepage is at http://mathias-kettner.de/check_mk. + +check_mk is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation in version 2. check_mk is distributed +in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more de- +ails. You should have received a copy of the GNU General Public +License along with GNU Make; see the file COPYING. If not, write +to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301 USA. + +*/ + +/*-------------------------------------------------------------------------. +| ____ ___ | +| | __ )_ _| | +| | _ \| | | +| | |_) | | | +| |____/___| | +| | ++--------------------------------------------------------------------------+ +| Styles used by the Business-Intelligence module. | +'-------------------------------------------------------------------------*/ + +.aggrtree ul.subtree { + padding-top: 0; + padding-bottom: 3px; + padding-left: 3px; + margin-top: 4px; + margin-left: 34px; + list-style-type: none; + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; + border-left: 1px solid #aaa; + border-radius: 3px; +} + +tr.odd0 .aggrtree ul.subtree { + border-color: #ccc; +} +tr.even0 .aggrtree ul.subtree { + border-color: #aaa; +} +.aggrtree ul.subtree li { + padding: 0; + padding-bottom: 1px; + margin: 0; + margin-top: 2px; +} + +.aggrtree span.title span.content.name { + cursor: pointer; +} + +.aggrtree span.state { + display: inline-block; + width: 34px; + padding: 0; + margin-right: 3px; + font-weight: bold; + text-align: center; + border-color: #eee #888 #999 #ccc; + border-style: solid; + border-width: 1px; + border-radius: 3px; +} + +.aggrtree a.assumption img.icon, +.aggrtree img.bi.icon { + width: 13px; + height: 13px; + margin: 0; + margin-right: 0; + vertical-align: middle; +} + +.aggrtree img.bi.icon { + position: relative; + top: -1px; + margin-right: 5px; + margin-left: 0; +} + +b.bullet { + margin: 0 5px; + color: #aaa; +} + +.state.assumed { + background-image: url("images/assume_bg.png"); + background-repeat: repeat; +} + +.aggrtree img.treeangle { + width: 15px; + height: 15px; + margin-right: 2px; + margin-left: 0; + vertical-align:middle; +} + +table.aggrtree { + width: 100%; + border-collapse: collapse; +} +table.aggrtree td.leaf.odd { + background-color: #e0e0e0; +} +table.aggrtree td.leaf.even { + background-color: #f0f0f0; +} +table.aggrtree td.node { + background-color: #e8e8e8; +} + +td.aggrtree_box { + line-height: 22px; +} +.bibox_box { + padding: 1px 3px; + margin: 0 0 0 0; + margin-right: 3px; + cursor: pointer; + border-color: black; + border-style: solid; + border-width: 1px; +} +.bibox_box.open.noleaf { + box-shadow: inset 0.5px 0.5px 3px #444; +} +.bibox_box.noleaf:hover { + border-style: dashed; +} +.bibox_box.closed.noleaf { + box-shadow: 0.5px 0.5px 3px #000; +} +.bibox_box.leaf { + border-color: white; +} +.bibox { + padding: 0; +} +table.aggrtree.ltr td { + padding: 3px; + border: 1px solid #ccc; +} + +body.main .aggrtree img.treeangle { + filter: invert(0%); +} + +table.data.table .bi_tree_container .title { + padding: 0; + font-weight: $theme-font-weight-global; + color: $theme-color-text; +} + +table.data.table .bi_tree_container .title li { + padding: 4px 8px; + list-style-type: none; +} + +table.data.table .bi_tree_container .title ul.subtree { + padding: 0 0 0 18px; + margin: 8px 0 0 18px; + list-style-type: none; + border: none; + border-left: 1px solid $theme-color-darkgrey; + border-radius: 0; +} + +table.data.table .bi_tree_container .title ul.subtree li { + margin-top: 8px; + list-style-type: none; +} + +table.data.table .bi_tree_container .title .state { + padding: 0 6px; + margin-right: 4px; + border-radius: 2px; +} diff --git a/web/htdocs/themes/facelift/scss/_main.scss b/web/htdocs/themes/facelift/scss/_main.scss index f0a40b7..c15dda1 100644 --- a/web/htdocs/themes/facelift/scss/_main.scss +++ b/web/htdocs/themes/facelift/scss/_main.scss @@ -116,7 +116,7 @@ body.main .popup_menu a, body.main .popup_menu span, body.main table.footer, bod .op { width: 60px !important; } -.aggrtree img.treeangle, .bi_rule_tree img.treeangle, .invtree img.treeangle, .grouped_row_header img.treeangle.nform { +.bi_rule_tree img.treeangle, .invtree img.treeangle, .grouped_row_header img.treeangle.nform { filter: invert(0%) !important; } table { @@ -322,27 +322,6 @@ table { font-size: $theme-font-size-global; text-transform: uppercase; letter-spacing: $theme-letter-spacing-table; } - table.data.table .bi_tree_container .title { - color: $theme-color-text; - font-weight: $theme-font-weight-global; - padding: 0px; } - table.data.table .bi_tree_container .title li { - padding: 4px 8px; - list-style-type: none; } - table.data.table .bi_tree_container .title ul.subtree { - border: none; - border-left: 1px solid $theme-color-darkgrey; - padding: 0px 0px 0px 18px; - border-radius: 0px; - margin: 8px 0px 0px 18px; - list-style-type: none; } - table.data.table .bi_tree_container .title ul.subtree li { - margin-top: 8px; - list-style-type: none; } - table.data.table .bi_tree_container .title .state { - border-radius: 2px; - padding: 0px 6px; - margin-right: 4px; } table.data.check_catalog tbody tr td.title { display: table-cell; } table.data.headerleft.sla tbody tr td, table.data.headerleft.sla tbody tr td.sla { diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index 9635d04..c6b4512 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -10,7 +10,6 @@ @import "../classic/scss/_check_mk.scss"; @import "../classic/scss/_pages.scss"; @import "../classic/scss/_status.scss"; -@import "../classic/scss/_bi.scss"; @import "../classic/scss/_dashboard.scss"; @import "../classic/scss/_logwatch.scss"; @import "../classic/scss/_prediction.scss"; @@ -34,6 +33,7 @@ @import "scss/_variables.scss"; @import "scss/_main.scss"; @import "scss/_pages.scss"; +@import "scss/_bi.scss"; @import "scss/_login.scss"; @import "scss/_tables.scss"; @import "scss/_sidebar.scss";

5 years, 3 months

GUI CSS: Refactored dashboard styles to nested structure and for sass linting ( CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: b303aa0b05950b022546d7d8f81b5b883a5c9290 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b303aa0b05950b… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Mar 29 17:04:55 2019 +0100 GUI CSS: Refactored dashboard styles to nested structure and for sass linting (CMK-1171) Change-Id: I9f3e8dec149fde885b61869083a7e693455084d6 --- web/htdocs/themes/facelift/scss/_dashboard.scss | 289 ++++++++++++------------ 1 file changed, 147 insertions(+), 142 deletions(-) diff --git a/web/htdocs/themes/facelift/scss/_dashboard.scss b/web/htdocs/themes/facelift/scss/_dashboard.scss index 483d34f..7c4b36b 100644 --- a/web/htdocs/themes/facelift/scss/_dashboard.scss +++ b/web/htdocs/themes/facelift/scss/_dashboard.scss @@ -27,223 +27,228 @@ Boston, MA 02110-1301 USA. /* Styles used by the dashboard only */ body.dashboard { - overflow: hidden; + overflow: hidden; } div#dashboard { - position: absolute; - padding: 0; - margin: 0; + position: absolute; + padding: 0; + margin: 0; } div.dashlet { - position: absolute; - padding: 0; - margin: 0; - display: none; - z-index: 1; -} - -/* content area of dashlet, if no iframes are used */ -div.dashlet div.dashlet_inner { + position: absolute; + z-index: 1; + display: none; + padding: 0; + margin: 0; + + /* content area of dashlet, if no iframes are used */ + div.dashlet_inner { position: absolute; padding: 0; margin: 0; overflow: hidden; -} - -/* Dashlets with "background" set to True */ -.dashlet .dashlet_inner.background { - background-color: #cbd6da; -} -/* TODO: Reproduce these html elements */ -div.dashlet div.really, -div.dashlet div.success, -div.dashlet div.error, -div.dashlet div.message, -div.dashlet div.warning { + /* Dashlets with "background" set to True */ + .dashlet_inner.background { + background-color: #cbd6da; + } + } + + /* TODO: Reproduce these html elements */ + div.really, + div.success, + div.error, + div.message, + div.warning { margin: 0; border-radius: 0; box-shadow: 0; -} + } -div.dashlet iframe { + iframe { border-style: none; -} + } -div.dashlet > div.title { + > div.title { position: absolute; - background: $theme-color-white; - /* IE < 9 */ - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#4c000000', endColorstr='#4c000000'); left: 0; width: 150px; /* will be changed by javascript later */ - color: $theme-color-table-text; - padding: 0px; - margin: 0px; - border: 1px solid $theme-color-table-border; - border-bottom: 0px solid; - border-radius: 5px 5px 0 0; - padding-left: 9px; + height: 17px; + padding: 0; padding-top: 4px; - font-weight: 500; + padding-left: 9px; + margin: 0; overflow: hidden; - height: 17px; - white-space: nowrap; font-size: $theme-font-size-small; - text-transform: uppercase; + font-weight: 500; letter-spacing: 2px; -} + color: $theme-color-table-text; + text-transform: uppercase; + white-space: nowrap; + background: $theme-color-white; + border: 1px solid $theme-color-table-border; + border-bottom: none solid; + border-radius: 5px 5px 0 0; + /* IE < 9 */ + filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#4c000000', endColorstr='#4c000000'); -div.dashlet > div.title span { - padding-left: 8px; -} + span { + padding-left: 8px; + } + } -div.dashlet.edit div.title span { + &.edit div.title span { padding-left: 27px; -} + } -div.dashlet div.title a { + div.title a { + color: #fff; text-decoration: none; - color: white; -} - -div.dashlet div.title a:hover { - text-decoration: underline; -} -div.dashlet > div.title span a, div.dashlet > div.title span body.main .popup_menu span, body.main .popup_menu div.dashlet > div.title span span { - color: $theme-color-table-text; -} + &:hover { + text-decoration: underline; + } + } -/* Overview dashlet is not selectable TODO: Check if this style can be dropped */ -table.dashlet_overview h2 { - margin: 8px 0px 8px 0px; - font-size: 10pt; -} - -/* Styles for various builtin dashlets */ -div.dashlet canvas.pie { + /* Styles for various builtin dashlets */ + canvas.pie { position: absolute; top: 7px; left: 10px; z-index: 10; transform: scale(0.8, 0.8); transform-origin: center; -} + } -div.dashlet img.globe { + img.globe { position: absolute; top: 5px; left: 10px; z-index: 20; + filter: grayscale(100%); transform: scale(0.8, 0.8); transform-origin: center; - filter: grayscale(100%); -} + } -div.dashlet table.hoststats { - margin-top: 0px; + table.hoststats { + position: absolute; + right: 0; width: 135px; height: 142px; + margin-top: 0; border-collapse: collapse; - border-spacing: 0px; - position:absolute; - right: 0px; -} - -/* TODO: Remove this style after decoupling from classic theme */ -div.dashlet table.hoststats.narrow { - margin-top: 0px; -} - -div.dashlet table.hoststats th, table.hoststats td { - padding: 0px 4px; - border-color: #498aa6; - border-style: solid none; - border-width: 1px; - vertical-align: middle; -} - -div.dashlet table.hoststats th { - text-align: left; - background-color: transparent; -} - -div.dashlet table.hoststats td { - text-align: right; - background-color: #95bbcd; -} - -div.dashlet table.hoststats th.color, div.dashlet table.hoststats td.color { - padding: 0px; - width: 4px; + border-spacing: 0; + + &.narrow { + /* TODO: Remove this style after decoupling from classic theme */ + margin-top: 0; + + th, td { + font-size: 11px; + font-weight: normal; + } + } + + th, td { + padding: 0 4px; + vertical-align: middle; + border-color: #498aa6; + border-style: solid none; + border-width: 1px; + + &.color { + width: 4px; + padding: 0; + } + } + + th { + text-align: left; + background-color: transparent; + } + + td { + text-align: right; + background-color: #95bbcd; + } + + a { + color: #000; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + } +} + +div.dashlet > div.title span a, +div.dashlet > div.title span body.main .popup_menu span, +body.main .popup_menu div.dashlet > div.title span span { + color: $theme-color-table-text; } -div.dashlet table.hoststats.narrow th, table.hoststats.narrow td { - font-size: 8pt; - font-weight: normal; -} - -div.dashlet table.hoststats a { - color: black; - text-decoration: none; -} -div.dashlet table.hoststats a:hover { - text-decoration: underline; +/* Overview dashlet is not selectable TODO: Check if this style can be dropped */ +table.dashlet_overview h2 { + margin: 8px 0; + font-size: 13px; } -div.dashlet_inner div.stats table.hoststats a, div.dashlet_inner div.stats table.hoststats body.main .popup_menu span, body.main .popup_menu div.dashlet_inner div.stats table.hoststats span { - color: $theme-color-text; +div.dashlet_inner div.stats table.hoststats a, +div.dashlet_inner div.stats table.hoststats body.main .popup_menu span, +body.main .popup_menu div.dashlet_inner div.stats table.hoststats span { + color: $theme-color-text; } div.dashlet_inner div.stats { - background-color: $theme-color-white; - position: relative; - height: 100%; - width: 100%; - padding: 0px; - margin: 0px; + position: relative; + width: 100%; + height: 100%; + padding: 0; + margin: 0; + background-color: $theme-color-white; + + table th, table td { + background: $theme-color-white; + border-top: 1px solid $theme-color-table-border; + border-bottom: none; + } } body.main.dashlet { - padding: 8px 0px; + padding: 8px 0; background: transparent; border-top: none; box-sizing: border-box; -} -body.main.dashlet table.data.table { - padding: 0px 8px; -} + table.data.table { + padding: 0 8px; -body.main.dashlet table.data.table tr.data { - background: $theme-color-nuance-13; - transition: .15s ease-in-out; -} - -body.main.dashlet table.data.table tr.data:hover { - background-color: $theme-color-background; -} + tr.data { + background: $theme-color-nuance-13; + transition: .15s ease-in-out; -div.dashlet_inner div.stats table th, div.dashlet_inner div.stats table td { - background: $theme-color-white; - border-top: 1px solid $theme-color-table-border; - border-bottom: none; + &:hover { + background-color: $theme-color-background; + } + } + } } div[id^=dashlet] div.dashlet_inner > div { border: 1px solid $theme-color-table-border; - box-sizing: border-box; border-top: none; + box-sizing: border-box; transition: .15s ease-in-out; } iframe[id^=dashlet_iframe] { - transition: .15s ease-in-out; background: $theme-color-white; + transition: .15s ease-in-out; } ///**

5 years, 3 months

mk_mongodb: refactor II: make pylint happy

by Moritz Kiemer

Module: check_mk Branch: master Commit: b4bd8b849d68f16a2c692b837bfc1c2a70be45d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4bd8b849d68f1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:22:52 2019 +0200 mk_mongodb: refactor II: make pylint happy CMK-1885 Change-Id: I68b462b0a436964b90a79af75270c3e76da69a9c --- agents/plugins/mk_mongodb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 2297800..35e22b2 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -18,14 +18,13 @@ import time try: import pymongo -except ImportError, e: +except ImportError: sys.stderr.write("ERROR: Unable to import pymongo module\n") sys.exit(2) -def main(): - # pylint: disable=too-many-branches,unused-variable - # TODO: might be implemented in the future.. +def main(): # pylint: disable=too-many-branches,too-many-locals + # might be implemented in the future.. host = None port = None @@ -34,7 +33,7 @@ def main(): try: # pylint: disable=no-member con = pymongo.database_names() - except: + except Exception: # pylint: disable=broad-except con = pymongo.MongoClient(None, None, read_preference=pymongo.ReadPreference.SECONDARY) con.admin.read_preference = pymongo.ReadPreference.SECONDARY @@ -45,13 +44,11 @@ def main(): # sys.exit("Username/Password incorrect") server_status = con.admin.command("serverStatus") - except: + except Exception: # pylint: disable=broad-except sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") sys.stdout.write("error\tInstance is down\n") sys.exit(0) - server_version = tuple(con.server_info()['version'].split('.')) - repl_info = server_status.get("repl") sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") @@ -126,6 +123,7 @@ def main(): sys.stdout.write("flushed %s\n" % server_status["backgroundFlushing"]["flushes"]) # Unused + # server_version = tuple(con.server_info()['version'].split('.')) #try: # if server_version >= tuple("2.4.0".split(".")): # indexCounters = server_status['indexCounters'] @@ -171,7 +169,7 @@ def main(): try: result = time.mktime(time.strptime(text, pattern)) return result - except: + except Exception: # pylint: disable=broad-except continue year_available = False

5 years, 3 months

mk_mongodb: remove no-op error handling

by Moritz Kiemer

Module: check_mk Branch: master Commit: d0b872bb8e2ec658e08e426586f14c235c5a24e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0b872bb8e2ec6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:26:46 2019 +0200 mk_mongodb: remove no-op error handling CMK-1885 Change-Id: I0d75cf46e9713cab6a64cb2201455d576534c11f --- agents/plugins/mk_mongodb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 99cbd43..489ba72 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -15,12 +15,7 @@ import os import pprint import sys import time - -try: - import pymongo -except ImportError: - sys.stderr.write("ERROR: Unable to import pymongo module\n") - sys.exit(2) +import pymongo # pylint: disable=import-error def main(): # pylint: disable=too-many-branches,too-many-locals

5 years, 3 months

mk_mongodb: refactor III: create docstring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 930565d7184f69797c7ca221e6d77b1424792b27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930565d7184f69… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 3 15:24:11 2019 +0200 mk_mongodb: refactor III: create docstring CMK-1885 Change-Id: Iabbd92bbe6aa428e86b9e65b952481a055ac4759 --- agents/plugins/mk_mongodb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 35e22b2..99cbd43 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -1,21 +1,21 @@ #!/usr/bin/python -# Monitor MongoDB on Linux - +"""Monitor MongoDB on Linux + +This agent plugin creates various sections out of the MongoDB server status information. +Important: 1) If MongoDB runs as single instance the agent data is assigned + to the host same host where the plugin resides. + + 2) If MongoDB is deployed as replica set the agent data is piggybacked + to a different hostname, name after the replica set name. + You have to create a new host in the monitoring system matching the + replica set name, or use the piggyback translation rule to modify the + hostname according to your needs. +""" import os import pprint import sys import time -# This agent plugin creates various sections out of the MongoDB server status information. -# Important: 1) If MongoDB runs as single instance the agent data is assigned -# to the host same host where the plugin resides. -# -# 2) If MongoDB is deployed as replica set the agent data is piggybacked -# to a different hostname, name after the replica set name. -# You have to create a new host in the monitoring system matching the -# replica set name, or use the piggyback translation rule to modify the -# hostname according to your needs. - try: import pymongo except ImportError:

5 years, 3 months

← Newer
1
...
47
48
49
50
51
52
53
...
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