Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Manfred

Module: check_mk Branch: master Commit: 2032496495f6b198b5f6c11b5b38d03058430375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2032496495f6b1… Author: Manfred <mb(a)mathias-kettner.de> Date: Wed Jan 18 14:55:26 2017 +0100 Reserved 5 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4f96904..a21bed9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4307 +4312

7 years, 5 months

introduced get_value function for rule class (preliminary, till this topic is clarified)

by Andreas Boesl

Module: check_mk Branch: master Commit: 617ceb706a2b95c8f55eaf0dc4e2f40c872ab213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=617ceb706a2b95… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 18 10:36:06 2017 +0100 introduced get_value function for rule class (preliminary, till this topic is clarified) Change-Id: Icba6f3f2c0bc4cf4839963cc64e65e75b96a3df8 --- web/htdocs/watolib.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 331cdd5..5576ee2 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6538,6 +6538,10 @@ class Rule(object): self._initialize() + def get_value(self): + return self.value + + def clone(self): cloned = Rule(self.folder, self.ruleset) cloned.from_config(self._format_rule())

7 years, 5 months

Increased size of checkboxes

by Lars Michelsen

Module: check_mk Branch: master Commit: e2ab432f437025d89fd3f4b8c86b34faf2009214 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ab432f437025… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 17:18:59 2017 +0100 Increased size of checkboxes Change-Id: I16cb44877b7cec527cea1efb7fd300cc0bac8129 --- web/htdocs/check_mk.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2e3872a..7a8cbbc 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -121,12 +121,12 @@ input[type="checkbox"] + label:before { background-color: #fff; content: "\00a0"; display: inline-block; - font-size: 7pt; - height: 7.5pt; + font-size: 9pt; + height: 9.5pt; margin: 0 .6em 0 0; padding: 0; vertical-align: middle; - width: 7.5pt; + width: 9.5pt; } input[type="checkbox"]:checked + label:before {

7 years, 5 months

4280 FIX Interactive login is now denied for automation users

by Lars Michelsen

Module: check_mk Branch: master Commit: 095dc7d63c4c9a92e633e61eaed6adf9a8a7ae2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=095dc7d63c4c9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 16:56:27 2017 +0100 4280 FIX Interactive login is now denied for automation users It was possible to log into the Check_MK GUI interactively (using the login form) as automation user. This was never intended and was a bug. Automation users are only meant to authenticate with the GUI for a single page or API call using the URL variables (<tt>_username</tt> and <tt>_secret</tt>). In case you want to login interactively to access multiple pages, you need a "normal" user that has a password configured instead of an automation secret. Change-Id: I6901bdb04a34ab1c4d170f0dbff8e08bc35c29f0 --- .werks/4280 | 16 ++++++++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 4 ++++ web/plugins/userdb/htpasswd.py | 3 +++ 4 files changed, 24 insertions(+) diff --git a/.werks/4280 b/.werks/4280 new file mode 100644 index 0000000..9ed838e --- /dev/null +++ b/.werks/4280 @@ -0,0 +1,16 @@ +Title: Interactive login is now denied for automation users +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1484667468 +Class: fix + +It was possible to log into the Check_MK GUI interactively (using the login form) +as automation user. This was never intended and was a bug. + +Automation users are only meant to authenticate with the GUI for a single page or API +call using the URL variables (<tt>_username</tt> and <tt>_secret</tt>). + +In case you want to login interactively to access multiple pages, you need a "normal" +user that has a password configured instead of an automation secret. diff --git a/ChangeLog b/ChangeLog index 4d64795..bbe59da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 4220 FIX: WATO folder filter: improve output of unknown folders * 4226 FIX: Custom inventory painters are now correctly loaded when declared with inventory_displayhints * 4228 FIX: Context links to HW/SW inventory views are only shown when useful + * 4280 FIX: Interactive login is now denied for automation users... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index beff081..3ca11ad 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -212,6 +212,10 @@ def create_non_existing_user(connection_id, username): hook_sync(connection_id = connection_id, only_username = username) +def is_automation_user(user_id): + return os.path.isfile(cmk.paths.var_dir + "/web/" + user_id.encode("utf-8") + "/automation.secret") + + # This function is called very often during regular page loads so it has to be efficient # even when having a lot of users. # diff --git a/web/plugins/userdb/htpasswd.py b/web/plugins/userdb/htpasswd.py index ab20287..4265547 100644 --- a/web/plugins/userdb/htpasswd.py +++ b/web/plugins/userdb/htpasswd.py @@ -63,6 +63,9 @@ class HtpasswdUserConnector(UserConnector): if username not in users: return None # not existing user, skip over + if is_automation_user(username): + raise MKUserError(None, _("Automation user rejected")) + if self.password_valid(users[username], password): return username else:

7 years, 5 months

Generalized snapin site choice code

by Lars Michelsen

Module: check_mk Branch: master Commit: ca031ce2e1000775e8e8b71082315985d42c501e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca031ce2e10007… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 14:58:00 2017 +0100 Generalized snapin site choice code Change-Id: I206bad7dd697163eafbda6801e1bdb30b321cffd --- web/htdocs/js/sidebar.js | 4 ++-- web/htdocs/sidebar.py | 33 +++++++++++++++++++++++++++++---- web/plugins/pages/shipped.py | 2 +- web/plugins/sidebar/mkeventd.py | 14 ++------------ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 6a7470d..9289f83 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -902,8 +902,8 @@ function add_html_var(url, varname, value) { * Event console site selection *************************************************/ -function mkeventd_performance_set_ec_site(select_field) { - get_url('sidebar_ajax_set_ec_site.py?site=' + encodeURIComponent(select_field.value)); +function set_snapin_site(ident, select_field) { + get_url('sidebar_ajax_set_snapin_site.py?ident=' + encodeURIComponent(ident) + '&site=' + encodeURIComponent(select_field.value)); location.reload(); } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d2baaa8..e61dd0a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -132,10 +132,29 @@ def footnotelinks(links): end_footnote_links() - def heading(text): html.write("<h3>%s</h3>\n" % html.attrencode(text)) + +def snapin_site_choice(ident, choices): + sites = config.user.load_file("sidebar_sites", {}) + site = sites.get(ident, "") + if site == "": + only_sites = None + else: + only_sites = [site] + + import wato + site_choices = wato.get_event_console_site_choices() + if len(site_choices) <= 1: + return None + + site_choices = [ ("", _("All sites")), ] + site_choices + html.select("site", site_choices, site, onchange="set_snapin_site(%s, this)" % json.dumps(ident)) + + return only_sites + + # Load current state of user's sidebar. Convert from # old format (just a snapin list) to the new format # (dictionary) on the fly @@ -622,8 +641,12 @@ def ajax_tag_tree_enter(): config.user.save_file("virtual_host_tree", tree_conf) -def ajax_set_ec_site(): - site = html.var("site") +def ajax_set_snapin_site(): + ident = html.var("ident") + if ident not in sidebar_snapins: + raise MKUserError(None, _("Invalid ident")) + + site = html.var("site") import wato site_choices = dict([ ("", _("All sites")), ] \ + wato.get_event_console_site_choices()) @@ -631,7 +654,9 @@ def ajax_set_ec_site(): if site not in site_choices: raise MKUserError(None, _("Invalid site")) - config.user.save_file("mkeventd_performance_site", site) + sites = config.user.load_file("sidebar_sites", {}, lock=True) + sites[ident] = site + config.user.save_file("sidebar_sites", sites, unlock=True) def ajax_switch_site(): diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 2d4e0f0..0d9da17 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -81,7 +81,7 @@ pagehandlers.update({ "sidebar_ajax_speedometer" : sidebar.ajax_speedometer, "sidebar_ajax_tag_tree" : sidebar.ajax_tag_tree, "sidebar_ajax_tag_tree_enter" : sidebar.ajax_tag_tree_enter, - "sidebar_ajax_set_ec_site" : sidebar.ajax_set_ec_site, + "sidebar_ajax_set_snapin_site" : sidebar.ajax_set_snapin_site, "sidebar_get_messages" : sidebar.ajax_get_messages, "sidebar_message_read" : sidebar.ajax_message_read, "ajax_search" : sidebar.ajax_search, diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 51435d4..8356011 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -82,19 +82,9 @@ def mkeventd_performance_entries(only_sites): def render_mkeventd_performance(): - site = config.user.load_file("mkeventd_performance_site", "") - if site == "": - only_sites = None - else: - only_sites = [site] + only_sites = snapin_site_choice("mkeventd_performance", + wato.get_event_console_site_choices()) - import wato - site_choices = wato.get_event_console_site_choices() - if len(site_choices) > 1: - site_choices = [ ("", _("All sites")), ] + site_choices - html.select("site", site_choices, site, onchange="mkeventd_performance_set_ec_site(this)") - else: - only_sites = None try: entries = mkeventd_performance_entries(only_sites)

7 years, 5 months

4279 Performance snapins: Added site selection field to all performance snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: 89d44cb6c4e58a992066def7460d34a70d567bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89d44cb6c4e58a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 15:09:55 2017 +0100 4279 Performance snapins: Added site selection field to all performance snapins Change-Id: I62a3830a20ffe21054eee402d0b6e4d18615af3e --- .werks/4279 | 9 +++++++++ ChangeLog | 1 + web/htdocs/config.py | 20 ++++++++++++++++++++ web/htdocs/sidebar.py | 6 ++---- web/htdocs/watolib.py | 22 +++------------------- web/plugins/sidebar/mkeventd.py | 3 +-- web/plugins/sidebar/shipped.py | 27 +++++++++++++++++++++------ web/plugins/wato/mkeventd.py | 2 +- 8 files changed, 58 insertions(+), 32 deletions(-) diff --git a/.werks/4279 b/.werks/4279 new file mode 100644 index 0000000..802d16e --- /dev/null +++ b/.werks/4279 @@ -0,0 +1,9 @@ +Title: Performance snapins: Added site selection field to all performance snapins +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1484662169 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d9f331c..4d64795 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... * 4229 New Web GUI logging configuration... * 4011 Quicksearch: Introduced new filters tg, ad and al... + * 4279 Performance snapins: Added site selection field to all performance snapins * 4143 FIX: Fixed possible log spam "MKAuthException: Invalid credentials" in web.log... * 4004 FIX: Fixed exception when viewing availability of BI aggregations... * 4144 FIX: Sidebar: Bottom of last snapin was not 100% visible diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 26fef3a..cdd4f2f 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -695,6 +695,26 @@ def is_single_local_site(): sitename = sites.keys()[0] return site_is_local(sitename) + +def site_choices(filter_func=None): + choices = [] + for site_id, site in sites.items(): + if filter_func and not filter_func(site_id, site): + continue + + title = site_id + if site.get("alias"): + title += " - " + site["alias"] + + choices.append((site_id, title)) + + return sorted(choices, key=lambda s: s[1]) + + +def get_event_console_site_choices(): + return site_choices(filter_func=lambda site_id, site: site_is_local(site_id) or site.get("replicate_ec")) + + #. # .--Plugins-------------------------------------------------------------. # | ____ _ _ | diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e61dd0a..e30c66f 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -144,8 +144,7 @@ def snapin_site_choice(ident, choices): else: only_sites = [site] - import wato - site_choices = wato.get_event_console_site_choices() + site_choices = config.get_event_console_site_choices() if len(site_choices) <= 1: return None @@ -647,9 +646,8 @@ def ajax_set_snapin_site(): raise MKUserError(None, _("Invalid ident")) site = html.var("site") - import wato site_choices = dict([ ("", _("All sites")), ] \ - + wato.get_event_console_site_choices()) + + config.get_event_console_site_choices()) if site not in site_choices: raise MKUserError(None, _("Invalid site")) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a0f2dd3..331cdd5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3545,27 +3545,11 @@ def get_login_sites(): # Returns a list of site ids which gets the Event Console configuration replicated def get_event_console_sync_sites(): - return [ s[0] for s in get_event_console_site_choices() ] + return [ s[0] for s in config.get_event_console_site_choices() ] -def get_event_console_site_choices(): - return site_choices(filter_func=lambda site_id, site: config.site_is_local(site_id) or site.get("replicate_ec")) - - -def site_choices(filter_func=None): - choices = [] - for site_id, site in config.sites.items(): - if filter_func and not filter_func(site_id, site): - continue - - title = site_id - if site.get("alias"): - title += " - " + site["alias"] - - choices.append((site_id, title)) - - return sorted(choices, key=lambda s: s[1]) - +# TODO: cleanup all call sites to this name +site_choices = config.site_choices def declare_site_attribute(): diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 8356011..7059740 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -83,8 +83,7 @@ def mkeventd_performance_entries(only_sites): def render_mkeventd_performance(): only_sites = snapin_site_choice("mkeventd_performance", - wato.get_event_console_site_choices()) - + config.get_event_console_site_choices()) try: entries = mkeventd_performance_entries(only_sites) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1eae6be..b3155f0 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -856,6 +856,8 @@ sidebar_snapins["tactical_overview"] = { # '----------------------------------------------------------------------' def render_performance(): + only_sites = snapin_site_choice("performance", + config.site_choices()) def write_line(left, right): html.open_tr() @@ -865,9 +867,15 @@ def render_performance(): html.open_table(class_=["content_center", "performance"]) - data = sites.live().query("GET status\nColumns: service_checks_rate host_checks_rate " - "external_commands_rate connections_rate forks_rate " - "log_messages_rate cached_log_messages\n") + try: + sites.live().set_only_sites(only_sites) + data = sites.live().query( + "GET status\nColumns: service_checks_rate host_checks_rate " + "external_commands_rate connections_rate forks_rate " + "log_messages_rate cached_log_messages\n") + finally: + sites.live().set_only_sites(None) + for what, col, format in \ [("Service checks", 0, "%.2f/s"), ("Host checks", 1, "%.2f/s"), @@ -878,9 +886,12 @@ def render_performance(): ("Cached log messages", 6, "%d")]: write_line(what + ":", format % sum(row[col] for row in data)) - if len(config.allsites()) == 1: - data = sites.live().query("GET status\nColumns: external_command_buffer_slots " - "external_command_buffer_max\n") + if only_sites is None and len(config.allsites()) == 1: + try: + data = sites.live().query("GET status\nColumns: external_command_buffer_slots " + "external_command_buffer_max\n") + finally: + sites.live().set_only_sites(None) size = sum([row[0] for row in data]) maxx = sum([row[1] for row in data]) write_line(_('Com. buf. max/total'), "%d / %d" % (maxx, size)) @@ -895,6 +906,10 @@ sidebar_snapins["performance"] = { "render" : render_performance, "allowed" : [ "admin", ], "styles" : """ +#snapin_performance select { + margin-bottom: 2px; + width: 100%%; +} table.performance { width: %dpx; border-radius: 2px; diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 7c5b08a..983d0d8 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -889,7 +889,7 @@ vs_mkeventd_event = Dictionary( )), ("site", DropdownChoice( title = _("Simulate for site"), - choices = get_event_console_site_choices, + choices = config.get_event_console_site_choices, )), ])

7 years, 5 months

Equal styling for performance snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: e0e4174caa789a5b450c20f23de77dc22335a012 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0e4174caa789a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 14:42:41 2017 +0100 Equal styling for performance snapins Change-Id: I48e5bb56cc75293afced0423e99bf677f0ac958a --- web/plugins/sidebar/mkeventd.py | 2 +- web/plugins/sidebar/shipped.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 6ba13fa..51435d4 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -124,7 +124,7 @@ if mkeventd_enabled: background-color: rgba(0, 0, 0, 0.1); border-style: solid; border-color: rgba(0, 0, 0, 0.3) rgba(255, 255, 255, 0.3) rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.3); - border-width: 1.5px; */ + border-width: 1.5px; } #snapin_mkeventd_performance select { diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 6ca712c..1eae6be 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -897,13 +897,11 @@ sidebar_snapins["performance"] = { "styles" : """ table.performance { width: %dpx; - -moz-border-radius: 5px; - background-color: #589; - /* background-color: #6da1b8;*/ + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.1); border-style: solid; - border-color: #444 #bbb #eee #666; - /* The border needs to be substracted from the width */ - border-width: 1px; + border-color: rgba(0, 0, 0, 0.3) rgba(255, 255, 255, 0.3) rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0.3); + border-width: 1.5px; } table.performance td { padding: 0px 2px;

7 years, 5 months

Event console performance snapin: The site to get the values from can now be choosen in distributed EC environments

by Lars Michelsen

Module: check_mk Branch: master Commit: 86c8e32f810e1a64b943eaabc506cd3114cc4597 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86c8e32f810e1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 14:38:19 2017 +0100 Event console performance snapin: The site to get the values from can now be choosen in distributed EC environments Change-Id: Ib5a1dd890ce5e46fbb15477703fe88a446de8b73 --- web/htdocs/js/sidebar.js | 8 ++++++++ web/htdocs/mkeventd.py | 20 +++++++++++++------- web/htdocs/sidebar.py | 12 ++++++++++++ web/plugins/pages/shipped.py | 1 + web/plugins/sidebar/mkeventd.py | 25 ++++++++++++++++++++++--- 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 0251792..6a7470d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -898,6 +898,14 @@ function add_html_var(url, varname, value) { return new_url; } +/************************************************ + * Event console site selection + *************************************************/ + +function mkeventd_performance_set_ec_site(select_field) { + get_url('sidebar_ajax_set_ec_site.py?site=' + encodeURIComponent(select_field.value)); + location.reload(); +} /************************************************ * Popup Message Handling diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index 9d3b9d7..5cc4292 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -225,7 +225,7 @@ def execute_command(name, args=None, site=None): sites.live().command(query, site) -def get_total_stats(): +def get_total_stats(only_sites): stats_keys = [ "status_average_message_rate", "status_average_rule_trie_rate", @@ -240,7 +240,7 @@ def get_total_stats(): "status_average_sync_time", ] - stats_per_site = list(get_stats_per_site(stats_keys)) + stats_per_site = list(get_stats_per_site(only_sites, stats_keys)) # First simply add rates. Times must then be averaged # weighted by message rate or connect rate @@ -251,7 +251,10 @@ def get_total_stats(): total_stats.setdefault(key, 0.0) total_stats[key] += value if not total_stats: - return None # No site answered + if only_sites is None: + raise MKGeneralException(_("Got no data from any site")) + else: + raise MKGeneralException(_("Got no data from this site")) for row in stats_per_site: for time_key, in_relation_to in [ @@ -276,10 +279,13 @@ def get_total_stats(): return total_stats -def get_stats_per_site(stats_keys): - for list_row in sites.live().query("GET eventconsolestatus\nColumns: %s" % " ".join(stats_keys)): - yield dict(zip(stats_keys, list_row)) - +def get_stats_per_site(only_sites, stats_keys): + try: + sites.live().set_only_sites(only_sites) + for list_row in sites.live().query("GET eventconsolestatus\nColumns: %s" % " ".join(stats_keys)): + yield dict(zip(stats_keys, list_row)) + finally: + sites.live().set_only_sites(None) # Rule matching for simulation. Yes - there is some hateful code duplication diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 6c90b7c..d2baaa8 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -622,6 +622,18 @@ def ajax_tag_tree_enter(): config.user.save_file("virtual_host_tree", tree_conf) +def ajax_set_ec_site(): + site = html.var("site") + import wato + site_choices = dict([ ("", _("All sites")), ] \ + + wato.get_event_console_site_choices()) + + if site not in site_choices: + raise MKUserError(None, _("Invalid site")) + + config.user.save_file("mkeventd_performance_site", site) + + def ajax_switch_site(): # _site_switch=sitename1:on,sitename2:off,... if not config.user.may("sidesnap.sitestatus"): diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index e4e3610..2d4e0f0 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -81,6 +81,7 @@ pagehandlers.update({ "sidebar_ajax_speedometer" : sidebar.ajax_speedometer, "sidebar_ajax_tag_tree" : sidebar.ajax_tag_tree, "sidebar_ajax_tag_tree_enter" : sidebar.ajax_tag_tree_enter, + "sidebar_ajax_set_ec_site" : sidebar.ajax_set_ec_site, "sidebar_get_messages" : sidebar.ajax_get_messages, "sidebar_message_read" : sidebar.ajax_message_read, "ajax_search" : sidebar.ajax_search, diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 72a180b..6ba13fa 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -32,8 +32,8 @@ except: mkeventd_enabled = False -def mkeventd_performance_entries(): - status = mkeventd.get_total_stats() # combination of several sites +def mkeventd_performance_entries(only_sites): + status = mkeventd.get_total_stats(only_sites) # combination of several sites entries = [] # TODO: Reorder these values and create a useful order. @@ -82,8 +82,22 @@ def mkeventd_performance_entries(): def render_mkeventd_performance(): + site = config.user.load_file("mkeventd_performance_site", "") + if site == "": + only_sites = None + else: + only_sites = [site] + + import wato + site_choices = wato.get_event_console_site_choices() + if len(site_choices) > 1: + site_choices = [ ("", _("All sites")), ] + site_choices + html.select("site", site_choices, site, onchange="mkeventd_performance_set_ec_site(this)") + else: + only_sites = None + try: - entries = mkeventd_performance_entries() + entries = mkeventd_performance_entries(only_sites) except Exception, e: html.show_error(e) return @@ -113,6 +127,11 @@ if mkeventd_enabled: border-width: 1.5px; */ } + #snapin_mkeventd_performance select { + margin-bottom: 2px; + width: 100%%; + } + table.mkeventd_performance td { padding: 0px 2px; font-size: 8pt;

7 years, 5 months

Added new eventconsolerules table to livestatus

by Lars Michelsen

Module: check_mk Branch: master Commit: 70c8593df6c7fe34a947a2dd51a5b1a70f750221 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70c8593df6c7fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 13:54:46 2017 +0100 Added new eventconsolerules table to livestatus Change-Id: Ie44f1fdb65598033429a0739e3fe69ad4791a566 --- livestatus/src/Makefile.am | 1 + livestatus/src/Store.cc | 4 ++- livestatus/src/Store.h | 2 ++ livestatus/src/TableEventConsoleRules.cc | 46 ++++++++++++++++++++++++++++++++ livestatus/src/TableEventConsoleRules.h | 40 +++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 74dd51c..f4ded8c 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -129,6 +129,7 @@ livestatus_so_SOURCES = \ TableEventConsoleEvents.cc \ TableEventConsoleHistory.cc \ TableEventConsoleReplication.cc \ + TableEventConsoleRules.cc \ TableEventConsoleStatus.cc \ TableHostGroups.cc \ TableHosts.cc \ diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index e1f3ea4..59abfc0 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -76,7 +76,8 @@ Store::Store(MonitoringCore *core) , _table_eventconsoleevents(core, _downtimes, _comments) , _table_eventconsolehistory(core, _downtimes, _comments) , _table_eventconsolestatus(core) - , _table_eventconsolereplication(core) { + , _table_eventconsolereplication(core) + , _table_eventconsolerules(core) { addTable(&_table_columns); addTable(&_table_commands); addTable(&_table_comments); @@ -98,6 +99,7 @@ Store::Store(MonitoringCore *core) addTable(&_table_eventconsolehistory); addTable(&_table_eventconsolestatus); addTable(&_table_eventconsolereplication); + addTable(&_table_eventconsolerules); } void Store::addTable(Table *table) { diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 8b51c05..5e4e2df 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -42,6 +42,7 @@ #include "TableEventConsoleEvents.h" #include "TableEventConsoleHistory.h" #include "TableEventConsoleReplication.h" +#include "TableEventConsoleRules.h" #include "TableEventConsoleStatus.h" #include "TableHostGroups.h" #include "TableHosts.h" @@ -97,6 +98,7 @@ private: TableEventConsoleHistory _table_eventconsolehistory; TableEventConsoleStatus _table_eventconsolestatus; TableEventConsoleReplication _table_eventconsolereplication; + TableEventConsoleRules _table_eventconsolerules; std::map<std::string, Table *> _tables; diff --git a/livestatus/src/TableEventConsoleRules.cc b/livestatus/src/TableEventConsoleRules.cc new file mode 100644 index 0000000..9682652 --- /dev/null +++ b/livestatus/src/TableEventConsoleRules.cc @@ -0,0 +1,46 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 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- +// tails. 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. + +#include "TableEventConsoleRules.h" +#include <memory> +#include "Column.h" + +using std::make_unique; +using std::string; + +TableEventConsoleRules::TableEventConsoleRules(MonitoringCore *mc) + : TableEventConsole(mc) { + addColumn(make_unique<StringEventConsoleColumn>( + "rule_id", "The ID of the rule")); + + addColumn(make_unique<IntEventConsoleColumn>( + "rule_hits", + "The times rule matched an incoming message")); +} + +string TableEventConsoleRules::name() const { return "eventconsolerules"; } + +string TableEventConsoleRules::namePrefix() const { + return "eventconsolerules_"; +} diff --git a/livestatus/src/TableEventConsoleRules.h b/livestatus/src/TableEventConsoleRules.h new file mode 100644 index 0000000..180c579 --- /dev/null +++ b/livestatus/src/TableEventConsoleRules.h @@ -0,0 +1,40 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 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- +// tails. 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. + +#ifndef TableEventConsoleRules_h +#define TableEventConsoleRules_h + +#include "config.h" // IWYU pragma: keep +#include <string> +#include "TableEventConsole.h" +class MonitoringCore; + +class TableEventConsoleRules : public TableEventConsole { +public: + explicit TableEventConsoleRules(MonitoringCore *mc); + std::string name() const override; + std::string namePrefix() const override; +}; + +#endif // TableEventConsoleRules_h

7 years, 5 months

Bugfix: Repaired automatic integration test generation.

by Roland Halbig

Module: check_mk Branch: master Commit: 45c58c8b914ee5ed249912eb750d2e20691f9646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45c58c8b914ee5… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Jan 17 12:56:28 2017 +0100 Bugfix: Repaired automatic integration test generation. Change-Id: Ib8df2e0ff28cfd092a4242a6105f1aac12d71ef9 --- tests/web/auto_build_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/web/auto_build_test.py b/tests/web/auto_build_test.py index 9458560..290a88d 100644 --- a/tests/web/auto_build_test.py +++ b/tests/web/auto_build_test.py @@ -180,4 +180,7 @@ if __name__ == "__main__": print line if(counter > 0): + auto.write(indent + indent.join(old_line)) + auto.write(indent + indent.join(new_line)) + auto.write("\n\n") auto.write(function_end)

7 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017