Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: BI Availability timewarp: new buttons for moving back and forth

by Mathias Kettner

Module: check_mk Branch: master Commit: 88a0f8071d34762a375b7b15b2eeab6d2c08c6cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88a0f8071d3476… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 6 18:05:40 2014 +0200 BI Availability timewarp: new buttons for moving back and forth --- .werks/967 | 8 +++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 3 +++ ...on_close_hi.png => button_closetimewarp_hi.png} | Bin 3132 -> 3132 bytes ...on_close_lo.png => button_closetimewarp_lo.png} | Bin 3760 -> 3760 bytes web/plugins/views/availability.py | 24 ++++++++++++++++++-- 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.werks/967 b/.werks/967 new file mode 100644 index 0000000..317377c --- /dev/null +++ b/.werks/967 @@ -0,0 +1,8 @@ +Title: BI Availability timewarp: new buttons for moving back and forth +Level: 1 +Component: reporting +Version: 1.2.5i3 +Date: 1399392315 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6aa3c1f..f6d99a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... * 0966 CSV export for availability works now also for BI aggregates + * 0967 BI Availability timewarp: new buttons for moving back and forth * 0962 FIX: Fix CSV-Export in availability table Event Console: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b569b51..eceb14b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -332,6 +332,9 @@ class html: def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">') + def disabled_icon_button(self, icon): + self.write('<img class="iconbutton" align=absmiddle src="images/icon_%s.png">' % icon) + def jsbutton(self, varname, text, onclick, style=''): if style: style = ' style="%s"' % style diff --git a/web/htdocs/images/button_close_hi.png b/web/htdocs/images/button_closetimewarp_hi.png similarity index 100% rename from web/htdocs/images/button_close_hi.png rename to web/htdocs/images/button_closetimewarp_hi.png diff --git a/web/htdocs/images/button_close_lo.png b/web/htdocs/images/button_closetimewarp_lo.png similarity index 100% rename from web/htdocs/images/button_close_lo.png rename to web/htdocs/images/button_closetimewarp_lo.png diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 52be48c..9901ada 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -877,7 +877,10 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, table.cell(_("Links"), css="buttons") if what == "bi": url = html.makeuri([("timewarp", str(int(row["from"])))]) - html.icon_button(url, _("Time warp - show BI aggregate during this time period"), "timewarp") + if html.var("timewarp") and int(html.var("timewarp")) == int(row["from"]): + html.disabled_icon_button("timewarp_off") + else: + html.icon_button(url, _("Time warp - show BI aggregate during this time period"), "timewarp") else: url = html.makeuri([("anno_site", tl_site), ("anno_host", tl_host), @@ -1403,7 +1406,24 @@ def render_bi_availability(title, aggr_rows): expansion_level=bi.load_ex_level(), only_problems=False, lazy=False) html.plug() html.write('<h3>') - html.icon_button(html.makeuri([("timewarp", "")]), _("Close Timewarp"), "close") + + # render icons for back and forth + if int(these_rows[0]["from"]) == timewarp: + html.disabled_icon_button("back_off") + have_forth = False + previous_row = None + for row in these_rows: + if int(row["from"]) == timewarp and previous_row != None: + html.icon_button(html.makeuri([("timewarp", str(int(previous_row["from"])))]), _("Jump one phase back"), "back") + elif previous_row and int(previous_row["from"]) == timewarp and row != these_rows[-1]: + html.icon_button(html.makeuri([("timewarp", str(int(row["from"])))]), _("Jump one phase forth"), "forth") + have_forth = True + previous_row = row + if not have_forth: + html.disabled_icon_button("forth_off") + + html.write("   ") + html.icon_button(html.makeuri([("timewarp", "")]), _("Close Timewarp"), "closetimewarp") timewarpcode = html.drain() html.unplug() timewarpcode += '%s %s</h3>' % (_("Timewarp to "), time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timewarp))) + \

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1067

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: de0b3818e981b90d3e5dfd109d2126c5eec97bed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de0b3818e981b9… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue May 6 11:50:20 2014 +0200 Updated bug entries #1067 --- .bugs/1067 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.bugs/1067 b/.bugs/1067 new file mode 100644 index 0000000..df7d40f --- /dev/null +++ b/.bugs/1067 @@ -0,0 +1,24 @@ +Title: Avoid multiple notifications for a single problem on a single host +Component: checks +State: open +Date: 2014-05-06 11:42:27 +Targetversion: 1.2.5i1 +Class: feature + +you have e. g. a machine with some oracle instances +per instance there are multiple checks +now if one instance goes down, you get multiple notifications (one per check) +this is normally unwanted + +in classical Nagios setups service dependencies are used to avoid these +but service dependencies have conceptual weaknesses +a notification may or may not be sent, depending on the timing of the both checks + +as an alternative solution Mathias suggests: +Throw counter wrap exceptions in case a dependent service fails +dependent services should get stale in this case +but this means a check needs to know on which other services it depends +for the named oracle checks this should work fine + +so let's try it this way +for other szenarios we might find a similar way

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1068

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 409dd8a33a5486489909481495861fb50996c57e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=409dd8a33a5486… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue May 6 11:55:09 2014 +0200 Updated bug entries #1068 --- .bugs/1068 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/1068 b/.bugs/1068 new file mode 100644 index 0000000..b6792ff --- /dev/null +++ b/.bugs/1068 @@ -0,0 +1,14 @@ +Title: check_mk_exit_status does not work for SNMP based devices +Component: checks +State: open +Date: 2014-05-06 11:50:46 +Targetversion: 1.2.5i1 +Class: bug + +If you do checks on devices not switched on 24x7, you define a rule +"Status of Check_MK Service", which sets check_mk_exit_status + +For devices using the Check_MK agent, this works fine. +For devices using SNMP it does not work. +But also maybe a printer (queried by SNMP) may be switched off during +none office hours.

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2162

by Andreas Boesl

Module: check_mk Branch: master Commit: 5350703156eb6fac660e671caf49ce515bdebb6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5350703156eb6f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 5 18:15:34 2014 +0200 Updated bug entries #2162 --- .bugs/2162 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2162 b/.bugs/2162 new file mode 100644 index 0000000..56dbf0a --- /dev/null +++ b/.bugs/2162 @@ -0,0 +1,8 @@ +Title: WATO diag page: "Retry this test" only works once +Component: wato +State: open +Date: 2014-05-05 18:14:16 +Targetversion: future +Class: bug + +The javascript only receives one extra transaction id..

10 years, 1 month

Check_MK Git: check_mk: Reserved 20 bug IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: da56f0c40fb4a54bfbf56c85d368ff5f149c5b63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da56f0c40fb4a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 5 18:14:08 2014 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1ff3df5..10a3282 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2162 +2182

10 years, 1 month

Check_MK Git: check_mk: Improved transaction handling to speedup the Web-GUI

by Andreas Boesl

Module: check_mk Branch: master Commit: 62d960b897bb209ec9f1826365430c4dbad0b95a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62d960b897bb20… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 5 18:13:33 2014 +0200 Improved transaction handling to speedup the Web-GUI On some systems the number of transaction ids could get very high, thus slowing down the web interface. This has been improved by re-using the same transaction id on a page multiple times. --- .werks/914 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 12 +++++++++--- web/htdocs/sidebar.py | 2 +- web/htdocs/wato.py | 2 +- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/914 b/.werks/914 new file mode 100644 index 0000000..09d613d --- /dev/null +++ b/.werks/914 @@ -0,0 +1,10 @@ +Title: Improved transaction handling to speedup the Web-GUI +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1399306196 +Class: feature + +On some systems the number of transaction ids could get very high, +thus slowing down the web interface. This has been improved by re-using +the same transaction id on a page multiple times. diff --git a/ChangeLog b/ChangeLog index c6ac540..6aa3c1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) * 0887 Add new column painter "Host Notifications Enabled"... * 0963 New snapin with virtual host trees... + * 0914 Improved transaction handling to speedup the Web-GUI... * 0905 FIX: Multisite context buttons: links in context buttons are no longer called twice... * 0906 FIX: Improved transaction handling in Web GUI... * 0909 FIX: Table checkboxes: Fixed bug where selected checkboxes got ignored... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2cac2e1..b569b51 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -76,6 +76,7 @@ class html: self.caches = {} self.new_transids = [] self.ignore_transids = False + self.current_transid = None RETURN = 13 SHIFT = 16 @@ -178,7 +179,7 @@ class html: enctype, onsubmit)) self.hidden_field("filled_in", name) if add_transid: - self.hidden_field("_transid", str(self.fresh_transid())) + self.hidden_field("_transid", str(self.get_transid())) self.hidden_fields(self.global_vars) self.form_name = name @@ -250,7 +251,7 @@ class html: return filename def makeactionuri(self, addvars): - return self.makeuri(addvars + [("_transid", self.fresh_transid())]) + return self.makeuri(addvars + [("_transid", self.get_transid())]) def makeuri_contextless(self, vars, filename=None): if not filename: @@ -279,7 +280,7 @@ class html: def buttonlink(self, href, text, add_transid=False, obj_id='', style='', title='', disabled=''): if add_transid: - href += "&_transid=%s" % self.fresh_transid() + href += "&_transid=%s" % self.get_transid() if not obj_id: obj_id = self.some_id() obj_id = ' id=%s' % obj_id @@ -963,6 +964,11 @@ class html: self.new_transids.append(transid) return transid + def get_transid(self): + if not self.current_transid: + self.current_transid = self.fresh_transid() + return self.current_transid + # Marks a transaction ID as used. This is done by saving # it in a user specific settings file "transids.mk". At this # time we remove all entries from that list that are older diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 13e9100..31c0869 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -450,7 +450,7 @@ def page_add_snapin(): snapin = sidebar_snapins[name] title = snapin["title"] description = snapin.get("description", "") - transid = html.fresh_transid() + transid = html.get_transid() url = 'sidebar_add_snapin.py?name=%s&_transid=%s&pos=top' % (name, transid) html.write('<div class=snapinadder ' 'onmouseover="this.style.cursor=\'pointer\';" ' diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d153ecc..d6cdd40 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16650,7 +16650,7 @@ def make_link_to(vars, folder): return html.makeuri_contextless(vars) def make_action_link(vars): - return make_link(vars + [("_transid", html.fresh_transid())]) + return make_link(vars + [("_transid", html.get_transid())]) # Show confirmation dialog, send HTML-header if dialog is shown.

10 years, 1 month

Check_MK Git: check_mk: CSV export for availability works now also for BI aggregates

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c34e3d47d400225b6911820ef521486e9808af8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c34e3d47d4002… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 5 17:04:35 2014 +0200 CSV export for availability works now also for BI aggregates --- .werks/966 | 8 ++++++ ChangeLog | 1 + web/plugins/views/availability.py | 56 ++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/.werks/966 b/.werks/966 new file mode 100644 index 0000000..49457be --- /dev/null +++ b/.werks/966 @@ -0,0 +1,8 @@ +Title: CSV export for availability works now also for BI aggregates +Level: 1 +Component: reporting +Version: 1.2.5i3 +Date: 1399302263 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 256f1a2..21eebdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... + * 0966 CSV export for availability works now also for BI aggregates * 0962 FIX: Fix CSV-Export in availability table Event Console: diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index badd942..52be48c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -124,11 +124,7 @@ def render_availability(view, datasource, filterheaders, display_options, if html.output_format == "csv_export": do_csv = True - html.req.content_type = "text/csv; charset=UTF-8" - filename = '%s-%s.csv' % (title, time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) - if type(filename) == unicode: - filename = filename.encode("utf-8") - html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename + av_output_csv_mimetype(title) else: do_csv = False @@ -179,6 +175,13 @@ def render_availability(view, datasource, filterheaders, display_options, if 'H' in display_options: html.body_end() +def av_output_csv_mimetype(title): + html.req.content_type = "text/csv; charset=UTF-8" + filename = '%s-%s.csv' % (title, time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) + if type(filename) == unicode: + filename = filename.encode("utf-8") + html.req.headers_out['Content-Disposition'] = 'Attachment; filename="%s"' % filename + avoption_entries = [ # Time range selection ( "rangespec", @@ -1334,26 +1337,38 @@ def check_av_levels(number, av_levels, considered_duration): # Render availability of a BI aggregate. This is currently # no view and does not support display options def render_bi_availability(title, aggr_rows): + html.add_status_icon("download_csv", _("Export as CSV"), html.makeuri([("output_format", "csv_export")])) + timeline = html.var("timeline") if timeline: title = _("Timeline of ") + title else: title = _("Availability of ") + title - html.body_start(title, stylesheets=["pages","views","status", "bi"], javascripts=['bi']) - html.top_heading(title) - html.begin_context_buttons() - togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) - html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - if timeline: - html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") - elif len(aggr_rows) == 1: - aggr_name = aggr_rows[0]["aggr_name"] - aggr_group = aggr_rows[0]["aggr_group"] - timeline_url = html.makeuri([("timeline", "1"), ("av_aggr_name", aggr_name), ("av_aggr_group", aggr_group)]) - html.context_button(_("Timeline"), timeline_url, "timeline") - html.end_context_buttons() + if html.output_format != "csv_export": + html.body_start(title, stylesheets=["pages","views","status", "bi"], javascripts=['bi']) + html.top_heading(title) + html.begin_context_buttons() + togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) + html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") + if timeline: + html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") + elif len(aggr_rows) == 1: + aggr_name = aggr_rows[0]["aggr_name"] + aggr_group = aggr_rows[0]["aggr_group"] + timeline_url = html.makeuri([("timeline", "1"), ("av_aggr_name", aggr_name), ("av_aggr_group", aggr_group)]) + html.context_button(_("Timeline"), timeline_url, "timeline") + html.end_context_buttons() + html.plug() avoptions = render_availability_options() + range, range_title = avoptions["range"] + avoptions_html = html.drain() + html.unplug() + if html.output_format == "csv_export": + av_output_csv_mimetype(title) + else: + html.write(avoptions_html) + timewarpcode = "" if not html.has_user_errors(): @@ -1400,8 +1415,9 @@ def render_bi_availability(title, aggr_rows): do_render_availability(rows, "bi", avoptions, timeline, timewarpcode) - html.bottom_footer() - html.body_end() + if html.output_format != "csv_export": + html.bottom_footer() + html.body_end() def get_bi_timeline(tree, aggr_group, avoptions, timewarp): range, range_title = avoptions["range"]

10 years, 1 month

Check_MK Git: check_mk: lnx_distro: Now able to detect SuSE distributions

by Andreas Boesl

Module: check_mk Branch: master Commit: d47cd6d86912d48c44c3a9bd186468f30dc52678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d47cd6d86912d4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 5 16:09:41 2014 +0200 lnx_distro: Now able to detect SuSE distributions The software inventory is now able to detect SuSE distributions and its codenames. --- .werks/913 | 8 ++++++++ ChangeLog | 1 + inventory/lnx_distro | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/.werks/913 b/.werks/913 new file mode 100644 index 0000000..42f279f --- /dev/null +++ b/.werks/913 @@ -0,0 +1,8 @@ +Title: lnx_distro: Now able to detect SuSE distributions +Level: 1 +Component: inv +Version: 1.2.5i3 +Date: 1399298913 +Class: feature + +The software inventory is now able to detect SuSE distributions and its codenames. diff --git a/ChangeLog b/ChangeLog index 256f1a2..97c0c5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 0831 FIX: table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax... HW/SW-Inventory: + * 0913 lnx_distro: Now able to detect SuSE distributions... * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list diff --git a/inventory/lnx_distro b/inventory/lnx_distro index 9d522ff..e93c490 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -34,6 +34,8 @@ # <<<lnx_distro:sep(124)>>> # /etc/redhat-release|Red Hat Enterprise Linux Server release 6.5 (Santiago) +# <<<lnx_distro:sep(124):persist(1399310551)>>> +# /etc/SuSE-release|SUSE Linux Enterprise Server 11 (x86_64)|VERSION = 11|PATCHLEVEL = 2 def inv_lnx_distro(info): @@ -45,6 +47,28 @@ def inv_lnx_distro(info): inv_lnx_parse_debian(node, line[1]) elif line[0] == '/etc/redhat-release': inv_lnx_parse_redhat_release(node, line[1]) + elif line[0] == '/etc/SuSE-release': + inv_lnx_parse_suse_release(node, line[1:]) + +def inv_lnx_parse_suse_release(node, line): + node["type"] = "linux" + node["vendor"] = "SuSE" + version = "%s.%s" % (line[1].split()[-1], line[2].split()[-1]) + node["version"] = version + if version == "11.2": + node["code_name"] = "Emerald" + elif version == "11.3": + node["code_name"] = "Teal" + elif version == "11.4": + node["code_name"] = "Celadon" + elif version == "12.1": + node["code_name"] = "Asparagus" + elif version == "12.2": + node["code_name"] = "Mantis" + elif version == "12.3": + node["code_name"] = "Darthmouth" + elif version == "13.1": + node["code_name"] = "Bottle" def inv_lnx_parse_redhat_release(node, line): node["type"] = "linux"

10 years, 1 month

Check_MK Git: check_mk: Better naming of SNMP bulkwalk/v2c rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 317302fee706d8ea887d5b85ad95175c6d06c3a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=317302fee706d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 5 15:43:46 2014 +0200 Better naming of SNMP bulkwalk/v2c rules --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 65a9e47..43b84da 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2137,7 +2137,7 @@ register_rule(group, register_rule(group, "bulkwalk_hosts", - title = _("Hosts using bulk walk (and SNMP v2c)"), + title = _("Hosts using SNMP bulk walk (enforces SNMP v2c)"), help = _("Most SNMP hosts support SNMP version 2c. However, Check_MK defaults to version 1, " "in order to support as many devices as possible. Please use this ruleset in order " "to configure SNMP v2c for as many hosts as possible. That version has two advantages: " @@ -2157,7 +2157,7 @@ register_rule(group, register_rule(group, "snmpv2c_hosts", - title = _("Hosts using SNMP v2c (and no bulk walk)"), + title = _("Hosts using SNMP v2c"), help = _("There exist a few devices out there that behave very badly when using SNMP bulk walk. " "If you want to use SNMP v2c on those devices, nevertheless, then use this rule set. " "One reason is enabling 64 bit counters."))

10 years, 1 month

Check_MK Git: check_mk: ps: added agent plugin for outputting CPU usage on Linux

by Mathias Kettner

Module: check_mk Branch: master Commit: 895b546df9b38873465650e5195125f2f3e39061 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895b546df9b388… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 5 10:30:13 2014 +0200 ps: added agent plugin for outputting CPU usage on Linux The output of this plugin is not yet being used. --- agents/plugins/lnx_psperf | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/agents/plugins/lnx_psperf b/agents/plugins/lnx_psperf new file mode 100755 index 0000000..02a3813 --- /dev/null +++ b/agents/plugins/lnx_psperf @@ -0,0 +1,23 @@ +#!/bin/bash +# Needed to get read CPU usage of processes (and other data) on Linux, since +# ps only outputs the cumulated CPU usage since the process start + +# Configuration: /etc/check_mk/psperf.cfg +# Each line contains one pattern for pgrep. Arguments of pgrep are supported +# Example: +# cups +# -u ntp +# This will find processes with the name 'cups' and processes owned by the user ntp. +# The check ps will parse this additional information in order to compute +# the current CPU utilization of a process. + +if [ -e "$MK_CONFDIR/psperf.cfg" ] ; then + echo '<<<ps>>>' + echo '[proc_stat]' + while read LINE + do + for pid in $(pgrep $LINE) ; do + cat /proc/$pid/stat + done + done < "$MK_CONFDIR/psperf.cfg" +fi

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014