Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: dee8ae0e8d5beac7e86883ee6e846eaa02b9b30a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dee8ae0e8d5bea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 17:06:34 2016 +0100 Removed debug output Change-Id: Ie92e2bfe9a8677a85b6a12e78a6ba09d59902449 --- checks/mkeventd_status | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/mkeventd_status b/checks/mkeventd_status index ef428ac..373bd93 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -105,7 +105,6 @@ def check_mkeventd_status(item, params, parsed): ("Client connects", "connect", "%.2f/s"), ] rates = {} - print status.keys() this_time = time.time() for title, col, fmt in columns: counter_value = status[col + "s"]

7 years, 9 months

WATO activation: Fixed disabling of new icon buttons during activation

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d922a2677cf51953602256a596b153490d385d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d922a2677cf51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 16:37:15 2016 +0100 WATO activation: Fixed disabling of new icon buttons during activation Change-Id: I129cdd94e64895e959d5a6a295b5f5a568cb110b --- web/htdocs/js/wato.js | 4 ++++ web/htdocs/wato.css | 4 ++++ web/htdocs/wato.py | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1134b02..b6f1065 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -651,6 +651,10 @@ function lock_activation_controls(lock) elements = elements.concat(Array.prototype.slice.call(document.getElementsByClassName("activate_site"), 0)); for (var i = 0; i < elements.length; i++) { + if (lock) + add_class(elements[i], "disabled"); + else + remove_class(elements[i], "disabled"); elements[i].disabled = lock ? "disabled" : false; } } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 2262de1..4105c82 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -892,6 +892,10 @@ div.varname { /* activation */ +.wato table.data.activation a.disabled { + pointer-events: none; +} + .wato table.changes tr.foreign.not_permitted td { color: #f00; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb033bb..2402969 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4911,13 +4911,17 @@ class ModeActivateChanges(WatoMode, ActivateChanges): # State if can_activate_all and need_sync: html.icon_button(url="javascript:void(0)", + id="activate_%s" % site_id, + cssclass=["activate_site"], help=_("This site is not update and needs a replication. Start it now."), icon="need_replicate", onclick="activate_changes(\"site\", \"%s\")" % site_id, ty="icon") if can_activate_all and need_restart: html.icon_button(url="javascript:void(0)", - help=_("This site needs a restart for activating the changes. Start it now."), + id="activate_%s" % site_id, + cssclass=["activate_site"], + help=_("This site needs a restart for activating the changes. Start it now."), icon="need_restart", onclick="activate_changes(\"site\", \"%s\")" % site_id, ty="icon")

7 years, 9 months

4201 mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution

by Mathias Kettner

Module: check_mk Branch: master Commit: dd87f7a6382dfe5f67d9e2e70fa274105ad33612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd87f7a6382dfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 16:21:30 2016 +0100 4201 mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution By not using pre-averaged values anymore but switching to precise performance counters the check now computes are precise average of the counted events (e.g. rule hits) since the last check. This makes the graphs much more precise. It also makes a reschedule of the check show more recent data. Change-Id: I12a891fa4dc5956371b44fd074d5197c0ea68799 --- .werks/4201 | 12 ++++++++++++ ChangeLog | 1 + checks/mkeventd_status | 16 ++++++++++------ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.werks/4201 b/.werks/4201 new file mode 100644 index 0000000..e002ee0 --- /dev/null +++ b/.werks/4201 @@ -0,0 +1,12 @@ +Title: mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482247182 +Class: feature + +By not using pre-averaged values anymore but switching to precise performance counters +the check now computes are precise average of the counted events (e.g. rule hits) +since the last check. This makes the graphs much more precise. It also makes a +reschedule of the check show more recent data. diff --git a/ChangeLog b/ChangeLog index 07d2601..10af144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense' * 4005 agent_activemq: now able to provide BasicAuth credentials... NOTE: Please refer to the migration notes! + * 4201 mkeventd_status: avoid duplicate averaging, make graphs more precise in time resolution... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/checks/mkeventd_status b/checks/mkeventd_status index 9822e7c..ef428ac 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -104,17 +104,21 @@ def check_mkeventd_status(item, params, parsed): ("Created events", "event", "%.2f/s"), ("Client connects", "connect", "%.2f/s"), ] + rates = {} + print status.keys() + this_time = time.time() for title, col, fmt in columns: - value = status["average_%s_rate" % col] - yield 0, ("%s: " + fmt) % (title, value), \ - [("average_%s_rate" % col, value)] + counter_value = status[col + "s"] + rate = get_rate(col, this_time, counter_value) + rates[col] = rate + yield 0, ("%s: " + fmt) % (title, rate), \ + [("average_%s_rate" % col, rate)] # Hit rate - if status["average_rule_trie_rate"] == 0.0: + if rates["rule_trie"] == 0.0: hit_rate_txt = "-" else: - value = status["average_rule_hit_rate"] \ - / status["average_rule_trie_rate"] * 100 + value = rates["rule_hit"] / rates["rule_trie"] * 100 hit_rate_txt = "%.2f%%" % value yield 0, None, [("average_rule_hit_ratio", value)] yield 0, "%s: %s" % ("Rule hit ratio", hit_rate_txt)

7 years, 9 months

4144 FIX Sidebar: Bottom of last snapin was not 100% visible

by Lars Michelsen

Module: check_mk Branch: master Commit: c7dd077153e6bf03d275d17364381b746b5cc2da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7dd077153e6bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 16:14:05 2016 +0100 4144 FIX Sidebar: Bottom of last snapin was not 100% visible Change-Id: Ic44c004d46913c7f2ebe4f4b1f8aa1a64bf7f43f --- .werks/4144 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 3 ++- web/htdocs/sidebar.css | 1 - web/htdocs/sidebar.py | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/4144 b/.werks/4144 new file mode 100644 index 0000000..5ff2d71 --- /dev/null +++ b/.werks/4144 @@ -0,0 +1,9 @@ +Title: Sidebar: Bottom of last snapin was not 100% visible +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1482246812 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 666ffc9..07d2601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... * 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 WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 157dabc..0251792 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -403,7 +403,8 @@ function set_sidebar_size() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight + 4) + 'px'; + // -2 -> take outer border of oHeader and oFooter into account + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 2) + 'px'; } var scrolling = true; diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 9307394..1e5b7b0 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -139,7 +139,6 @@ body.side.screenshotmode { height: 500px; overflow: hidden; color: #000000; - padding-top: 5px; position: absolute; top: 50px; } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a34d582..83509ec 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -316,9 +316,9 @@ def render_snapin_styles(snapin): def render_snapin(name, state): snapin = sidebar_snapins.get(name) - render_snapin_styles(snapin) html.open_div(id_="snapin_container_%s" % name, class_="snapin") + render_snapin_styles(snapin) # When not permitted to open/close snapins, the snapins are always opened if state == "open" or not config.user.may("general.configure_sidebar"): style = None

7 years, 9 months

Remove bogus test code in EC snapin

by Mathias Kettner

Module: check_mk Branch: master Commit: f3f949c51a2b357cd88c01abed0dc69c5410c616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3f949c51a2b35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 16:03:47 2016 +0100 Remove bogus test code in EC snapin Change-Id: Ia74900944baa9205c955bc83bca27b1fe3bc88b7 --- web/plugins/sidebar/mkeventd.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/plugins/sidebar/mkeventd.py b/web/plugins/sidebar/mkeventd.py index 655f5c7..72a180b 100644 --- a/web/plugins/sidebar/mkeventd.py +++ b/web/plugins/sidebar/mkeventd.py @@ -77,8 +77,6 @@ def mkeventd_performance_entries(): entries.append((6, "Processing load", "%.0f%%" % ( min(100.0, status["status_average_processing_time"] * status["status_average_message_rate"] * 100.0)))) - - entries.sort() return entries @@ -87,7 +85,6 @@ def render_mkeventd_performance(): try: entries = mkeventd_performance_entries() except Exception, e: - raise html.show_error(e) return

7 years, 9 months

Improved styling of the WATO activation dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ba796c8a39b8c5b2713b72a10459a572dda575c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ba796c8a39b8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 15:44:29 2016 +0100 Improved styling of the WATO activation dialog Change-Id: Ia7a216e30e1e6d9c68ed2a597755ada591c42dc7 --- web/htdocs/wato.css | 7 +++++- web/htdocs/wato.py | 65 +++++++++++++++++++++++------------------------------ 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 11559c1..2262de1 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -890,11 +890,16 @@ div.varname { text-decoration: italic; } +/* activation */ + .wato table.changes tr.foreign.not_permitted td { color: #f00; } -/* activation */ +.wato table.changes { + width: 100%; +} + .wato table.data div.act_success { } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5024686..cb033bb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4831,23 +4831,24 @@ class ModeActivateChanges(WatoMode, ActivateChanges): table.row(css=" ".join(css)) - table.cell(_("Object")) + table.cell(_("Object"), css="narrow nobr") rendered = self._render_change_object(change["object"]) if rendered: html.write(rendered) - table.cell(_("Time"), render.date_and_time(change["time"])) - table.cell(_("User")) + table.cell(_("Time"), render.date_and_time(change["time"]), css="narrow nobr") + table.cell(_("User"), css="narrow nobr") html.write_text(change["user_id"] if change["user_id"] else "") if self._is_foreign(change): html.icon(_("This change has been made by another user"), "foreign_changes") - table.cell(_("Change"), change["text"]) - table.cell(_("Affected sites")) + table.cell(_("Affected sites"), css="narrow nobr") if self._affects_all_sites(change): html.write_text("<i>%s</i>" % _("All sites")) else: html.write_text(", ".join(sorted(change["affected_sites"]))) + + table.cell(_("Change"), change["text"]) table.end() @@ -4875,7 +4876,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): def _activation_status(self): - table.begin("site-status", searchable=False, sortable=False) + table.begin("site-status", searchable=False, sortable=False, css="activation") for site_id, site in sort_sites(self._activation_sites()): table.row() @@ -4900,12 +4901,6 @@ class ModeActivateChanges(WatoMode, ActivateChanges): if can_activate_all and need_action: html.checkbox("site_%s" % site_id, cssclass="site_checkbox") - table.cell(_("Activate")) - if can_activate_all and need_action: - # TODO: Enable separate action for sync (if needed)? - html.jsbutton("activate_%s" % site_id, _("Activate"), - "activate_changes(\"site\", \"%s\")" % site_id, cssclass="activate_site") - # Iconbuttons table.cell(_("Actions"), css="buttons") @@ -4913,40 +4908,36 @@ class ModeActivateChanges(WatoMode, ActivateChanges): edit_url = folder_preserving_link([("mode", "edit_site"), ("edit", site_id)]) html.icon_button(edit_url, _("Edit the properties of this site"), "edit") + # State + if can_activate_all and need_sync: + html.icon_button(url="javascript:void(0)", + help=_("This site is not update and needs a replication. Start it now."), + icon="need_replicate", + onclick="activate_changes(\"site\", \"%s\")" % site_id, ty="icon") + + if can_activate_all and need_restart: + html.icon_button(url="javascript:void(0)", + help=_("This site needs a restart for activating the changes. Start it now."), + icon="need_restart", + onclick="activate_changes(\"site\", \"%s\")" % site_id, ty="icon") + + if can_activate_all and not need_action: + html.icon(_("This site is up-to-date."), "siteuptodate") + site_url = site.get("multisiteurl") if site_url: html.icon_button(site_url, _("Open this site's local web user interface"), "url", target="_blank") - # ID & Alias - table.cell(_("ID"), site_id) - table.cell(_("Alias"), site.get("alias", "")) + table.cell(_("Site"), site.get("alias", site_id)) # Livestatus - table.cell(_("Status")) + table.cell(_("Status"), css="narrow nobr") html.write('<img src="images/button_sitestatus_%s.png">' % (status)) - # Livestatus-Version - table.cell(_("Version"), site_status.get("livestatus_version", "")) - - # Core-Version - table.cell(_("Core"), site_status.get("program_version", "")) - - # Hosts/services - table.cell(_("Hosts"), css="number") - html.a(site_status.get("num_hosts", ""), href='view.py?view_name=sitehosts&site=%s' % site_id) - table.cell(_("Services"), css="number") - html.a(site_status.get("num_services", ""), href="view.py?view_name=sitesvcs&site=%s" % site_id) - - # State - table.cell("", css="buttons") - if need_sync: - html.icon(_("This site is not update and needs a replication."), "need_replicate") - if need_restart: - html.icon(_("This site needs a restart for activating the changes."), "need_restart") - if not need_action: - html.icon(_("This site is up-to-date."), "siteuptodate") + # Livestatus-/Check_MK-Version + table.cell(_("Version"), site_status.get("livestatus_version", ""), css="narrow nobr") - table.cell(_("Changes"), "%d" % len(self._changes_of_site(site_id)), css="number") + table.cell(_("Changes"), "%d" % len(self._changes_of_site(site_id)), css="number narrow nobr") table.cell(_("Progress"), css="repprogress") html.open_div(id_="site_%s_status" % site_id, class_=["msg"])

7 years, 9 months

Fixed escaped snapin titles

by Lars Michelsen

Module: check_mk Branch: master Commit: ca6b42af19290e82661806c4cb09fcc6f3833c93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6b42af19290e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 12:02:30 2016 +0100 Fixed escaped snapin titles Change-Id: I6dcda485117aff7f6856dd529e9481c2aab94cce --- web/htdocs/sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 9b11343..a34d582 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -361,7 +361,7 @@ def render_snapin(name, state): toggle_actions = {"onclick" : "toggle_sidebar_snapin(this,'%s')" % toggle_url, "onmouseover": "this.style.cursor='pointer'", "onmouseout" : "this.style.cursor='auto'"} - html.b(snapin["title"], class_=["heading"], **toggle_actions) + html.b(HTML(snapin["title"]), class_=["heading"], **toggle_actions) # End of header html.close_div()

7 years, 9 months

Better Labelling of EC Status, fix bug from previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: a838f1b7a9605f64d80d4a3e97c5ffbb90d21d6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a838f1b7a9605f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 15:37:28 2016 +0100 Better Labelling of EC Status, fix bug from previous commit Change-Id: Iae710471d8bafda22070c55f0d042d51a8fe2240 --- web/plugins/wato/mkeventd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 78caf58..958862a 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1665,7 +1665,7 @@ def mkeventd_mibs_button(): def mode_mkeventd_status(phase): if phase == "title": - return _("Event Console - Server Status") + return _("Event Console - Local server status") elif phase == "buttons": home_button() @@ -1701,9 +1701,9 @@ def mode_mkeventd_status(phase): html.show_warning(warning) return - status = mkeventd.get_status() + status = mkeventd.get_local_ec_status() repl_mode = status["status_replication_slavemode"] - html.write("<h3>%s</h3>" % _("Current Server Status")) + html.write("<h3>%s</h3>" % _("Current status of local Event Console")) html.open_ul() html.write("<li>%s</li>" % _("Event Daemon is running.")) html.write("<li>%s: <b>%s</b></li>" % (_("Current replication mode"),

7 years, 9 months

4199 FIX Fix detection of replication mode if EC is distributed

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c4826ddda6099e3402e4a5e3c2864e1862032f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c4826ddda6099… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 15:31:09 2016 +0100 4199 FIX Fix detection of replication mode if EC is distributed If you use the new feature of having a distributed Event Console (consisting of more than one Check_MK site) then the WATO display of the EC status was broken. This has been fixed. WATO still shows only the status of the local EC. This will be fixed in future. Change-Id: Ife7d833e7ddcf65c8b1950a13c7235fe3e7a7a6e --- .werks/4199 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/mkeventd.py | 15 ++++++++++++++- web/plugins/wato/mkeventd.py | 4 ++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.werks/4199 b/.werks/4199 new file mode 100644 index 0000000..2a77e81 --- /dev/null +++ b/.werks/4199 @@ -0,0 +1,12 @@ +Title: Fix detection of replication mode if EC is distributed +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1482244177 +Class: fix + +If you use the new feature of having a distributed Event Console (consisting +of more than one Check_MK site) then the WATO display of the EC status +was broken. This has been fixed. WATO still shows only the status of +the local EC. This will be fixed in future. diff --git a/ChangeLog b/ChangeLog index 33ae80c..9b465a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ NOTE: Please refer to the migration notes! * 4155 FIX: Do not perform actions on events if overflow limit is active... * 4156 FIX: Fix off-by-one error in EC limit handling... + * 4199 FIX: Fix detection of replication mode if EC is distributed... 1.4.0i3: diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index 81b730a..d74e5c7 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, config, re, time +import socket, config, re, time, livestatus import ast import sites @@ -183,6 +183,19 @@ def send_event(event): return rfc +def get_local_ec_status(): + response = livestatus.LocalConnection().query("GET eventconsolestatus") + return dict(zip(response[0], response[1])) + + +def replication_mode(): + try: + status = get_local_ec_status() + return status["status_replication_slavemode"] + except livestatus.MKLivestatusSocketError: + return "stopped" + + # Only use this for master/slave replication. For status queries use livestatus def query_ec_directly(query): try: diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index b111de1..78caf58 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1061,6 +1061,7 @@ def mode_mkeventd_rule_packs(phase): return rep_mode = mkeventd.replication_mode() + if rep_mode in [ "sync", "takeover" ]: copy_url = make_action_link([("mode", "mkeventd_rule_packs"), ("_copy_rules", "1")]) html.show_warning(_("WARNING: This Event Console is currently running as a replication " @@ -1070,6 +1071,9 @@ def mode_mkeventd_rule_packs(phase): "the master into your local slave configuration: ") + \ '<a href="%s">' % copy_url + _("Copy Rules From Master") + '</a>') + elif rep_mode == "stopped": + html.show_error(_("The Event Console is currently not running.")) + # Simulator event = show_event_simulator()

7 years, 9 months

4198 mkeventd_status: rework graph templates, only group metrics where it makes sense'

by Mathias Kettner

Module: check_mk Branch: master Commit: c74bd858dc5d0728ed3316dc1edff57dbf30eba5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c74bd858dc5d07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 20 12:32:24 2016 +0100 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense' Change-Id: I40764751b6cfeb48969e1d980667d628d99e343a --- .werks/4198 | 9 ++++ ChangeLog | 1 + checks/mkeventd_status | 4 +- web/plugins/metrics/check_mk.py | 95 ++++++++++++++++++++++++++++++----------- 4 files changed, 82 insertions(+), 27 deletions(-) diff --git a/.werks/4198 b/.werks/4198 new file mode 100644 index 0000000..13183aa --- /dev/null +++ b/.werks/4198 @@ -0,0 +1,9 @@ +Title: mkeventd_status: rework graph templates, only group metrics where it makes sense' +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482233504 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index df578dd..33ae80c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs * 4170 local: local check is now clusteraware. Best or worst state in cluster mode can be configured... + * 4198 mkeventd_status: rework graph templates, only group metrics where it makes sense' * 4005 agent_activemq: now able to provide BasicAuth credentials... NOTE: Please refer to the migration notes! * 4171 FIX: perle_psmu: fixed value error... diff --git a/checks/mkeventd_status b/checks/mkeventd_status index affdad1..9822e7c 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -74,10 +74,10 @@ def check_mkeventd_status(item, params, parsed): yield 0, "Currently not running" return - yield 0, "Open events: %d" % status["num_open_events"], \ + yield 0, "Current events: %d" % status["num_open_events"], \ [("num_open_events", status["num_open_events"])] - yield 0, "Virtual Memory: %s" % \ + yield 0, "Virtual memory: %s" % \ get_bytes_human_readable(status["virtual_memory_size"]), \ [("process_virtual_size", status["virtual_memory_size"])] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 76e51aa..767ced1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2323,34 +2323,43 @@ metric_info["cmk_time_ds"] = { } +# Note: current can be any phase, not only open, but also +# delayed, couting or ack. metric_info["num_open_events"] = { - "title" : _("Open events"), + "title" : _("Current events"), "unit" : "count", - "color" : "12/a", + "color" : "26/b", } metric_info["average_message_rate"] = { "title" : _("Incoming messages"), "unit" : "1/s", - "color" : "11/a", + "color" : "23/a", +} + +metric_info["average_drop_rate"] = { + "title" : _("Dropped messages"), + "unit" : "1/s", + "color" : "21/b", } +metric_info["average_sync_time"] = { + "title" : _("Average slave sync time"), + "unit" : "s", + "color" : "46/a", +} + + metric_info["average_rule_trie_rate"] = { "title" : _("Rule tries"), "unit" : "1/s", - "color" : "13/a", + "color" : "33/a", } metric_info["average_rule_hit_rate"] = { "title" : _("Rule hits"), "unit" : "1/s", - "color" : "21/a", -} - -metric_info["average_drop_rate"] = { - "title" : _("Message drops"), - "unit" : "1/s", - "color" : "24/a", + "color" : "34/b", } metric_info["average_event_rate"] = { @@ -2360,27 +2369,27 @@ metric_info["average_event_rate"] = { } metric_info["average_connect_rate"] = { - "title" : _("Status: Client connects"), + "title" : _("Client connects"), "unit" : "1/s", - "color" : "34/a", + "color" : "15/a", } metric_info["average_request_time"] = { - "title" : _("Status: Request time"), + "title" : _("Average request response time"), "unit" : "s", - "color" : "41/a", + "color" : "14/a", } metric_info["average_processing_time"] = { "title" : _("Event processing time"), "unit" : "s", - "color" : "31/a", + "color" : "13/a", } metric_info["average_rule_hit_ratio"] = { "title" : _("Rule hit ratio"), "unit" : "%", - "color" : "31/a", + "color" : "#cccccc", } metric_info["log_message_rate"] = { @@ -6840,27 +6849,63 @@ graph_info.append({ ], }) + +graph_info.append({ + "metrics" : [ + ( "num_open_events", "area" ), + ] +}) + + graph_info.append({ - "title" : _("Event Console performance"), + "title" : _("Message processing"), "metrics" : [ ( "average_message_rate", "area" ), - ( "average_rule_trie_rate", "area" ), - ( "average_rule_hit_rate", "area" ), ( "average_drop_rate", "area" ), - ( "average_event_rate", "area" ), - ( "average_connect_rate", "area" ), ], }) + + graph_info.append({ - "title" : _("Event Console times"), + "title" : _("Rule efficiency"), "metrics" : [ - ( "average_request_time", "stack" ), - ( "average_processing_time", "stack" ), + ( "average_rule_trie_rate", "area" ), + ( "average_rule_hit_rate", "area" ), ], }) graph_info.append({ + "metrics" : [ + ( "average_rule_hit_ratio", "area" ), + ] +}) + +graph_info.append({ + "metrics" : [ + ( "average_event_rate", "area" ), + ] +}) + +graph_info.append({ + "metrics" : [ + ( "average_processing_time", "stack" ), + ] +}) + +# ( "average_connect_rate", "area" ), + + + +# graph_info.append({ +# "title" : _("Event Console times"), +# "metrics" : [ +# ( "average_request_time", "stack" ), +# ( "average_processing_time", "stack" ), +# ], +# }) + +graph_info.append({ "title" : _("Livestatus Requests per Connection"), "metrics" : [ ( "livestatus_request_rate,livestatus_connect_rate,/#88aa33", "area",

7 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016