Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 164db54f6ba223b19829e4a0d7ddf19d47fa700d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164db54f6ba223… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 14 16:29:46 2016 +0200 wk3027 update, missing graph --- web/plugins/metrics/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 39c2106..b72d0d4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6232,9 +6232,9 @@ def create_hop_response_graph(): "metrics": [], "optional_metrics": [], } - for idx in range(max_hops): + for idx in range(1, max_hops): color = indexed_color(idx, max_hops) - new_graph["metrics"].append( ("hop_%d_response_time%s" % (idx + 1, parse_color_into_hexrgb(color)), "line") ) + new_graph["metrics"].append( ("hop_%d_response_time%s" % (idx, parse_color_into_hexrgb(color)), "line") ) if idx > 0: new_graph["optional_metrics"].append( ("hop_%d_response_time" % (idx + 1)) )

8 years, 5 months

3027 mtr (Matt's traceroute): New agent plugin

by Andreas Boesl

Module: check_mk Branch: master Commit: ed058b15bb3e5803056d242c071c75ed3f6345c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed058b15bb3e58… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 14 16:16:56 2016 +0200 3027 mtr (Matt's traceroute): New agent plugin mtr combines the functionality of the traceroute and ping programs in a single network diagnostic tool. For further information have a look at the mtr manpage. This plugin collects data for every hop to the destination address and creates a plethora of performance values for round trip average, package loss and standard deviation. Keep in mind that services for this new check require quite a large amount of RRD space, due to the large number of performance values. Roughly ~23MB for 10 network hops to a target destination. --- .werks/3027 | 17 ++ ChangeLog | 1 + agents/plugins/mtr | 362 ++++++++++++++++++++++++++++++++++ checkman/mtr | 15 ++ checks/mtr | 166 ++++++++++++++++ web/plugins/metrics/check_mk.py | 122 +++++++++--- web/plugins/wato/check_parameters.py | 52 +++++ 7 files changed, 710 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed058b15bb…

8 years, 5 months

3410 ipmi: now monitors compact/discrete sensors

by Simon Betz

Module: check_mk Branch: master Commit: fd7adb3c8763050dee118c527a850750ee4a7582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd7adb3c876305… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 14 16:16:05 2016 +0200 3410 ipmi: now monitors compact/discrete sensors You also need to install the check_mk_agent.linux --- .werks/3410 | 9 +++ ChangeLog | 1 + agents/check_mk_agent.linux | 4 +- checks/ipmi | 136 ++++++++++++++++++++++++++++++++----------- 4 files changed, 114 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fd7adb3c87…

8 years, 5 months

3409 FIX apt: fixed 'UNKNOWN - Item not found in agent output'

by Simon Betz

error if there are no pending updates Message-ID: <570fa1b9.Jofu7dVeWvTQc529%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 3667851567f54fff28af2e38fb3db6c901ca7f69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3667851567f54f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 14 15:56:10 2016 +0200 3409 FIX apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates --- .werks/3409 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_apt | 15 +++++++++++++-- checks/apt | 9 ++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/3409 b/.werks/3409 new file mode 100644 index 0000000..21d9fc9 --- /dev/null +++ b/.werks/3409 @@ -0,0 +1,10 @@ +Title: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460642074 + + diff --git a/ChangeLog b/ChangeLog index 0fe2aed..de4e421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 3406 FIX: hp_proliant_temp: fixed wrong params data type * 3408 FIX: temperature.include: now does not ignore levels with value 0 any more * 3122 FIX: netapp_fcpio: the rules for this check are now actually used... + * 3409 FIX: apt: fixed 'UNKNOWN - Item not found in agent output' error if there are no pending updates Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_apt b/agents/plugins/mk_apt index 3905e28..5abcf4f 100755 --- a/agents/plugins/mk_apt +++ b/agents/plugins/mk_apt @@ -40,10 +40,21 @@ UPGRADE=upgrade DO_UPDATE=yes -if type apt-get > /dev/null ; then - echo '<<<apt:sep(0)>>>' + +function check_apt_update { if [ "$DO_UPDATE" = yes ] ; then apt-get update -qq fi apt-get -o 'Debug::NoLocking=true' -s -qq "$UPGRADE" | grep -v '^Conf' +} + + +if type apt-get > /dev/null ; then + echo '<<<apt:sep(0)>>>' + out=$(check_apt_update) + if [ -z $out ]; then + echo "No updates pending for installation" + else + echo $out + fi fi diff --git a/checks/apt b/checks/apt index a00ae6c..c9bb04e 100644 --- a/checks/apt +++ b/checks/apt @@ -39,15 +39,18 @@ # Inst libpolkit-gobject-1-0 [0.105-4ubuntu2] (0.105-4ubuntu2.14.04.1 Ubuntu:14.04/trusty-updates [amd64]) # Inst libxext-dev [2:1.3.2-1] (2:1.3.2-1ubuntu0.0.14.04.1 Ubuntu:14.04/trusty-security [amd64]) [] + factory_settings["apt_default_levels"] = { "normal" : 1, "security" : 2, } + # Check that the apt section is in valid format of mk_apt plugin and not # from the apt agent plugin which can be found on the Check_MK exchange. def apt_valid_info(info): - return info and len(info[0]) == 1 and len(info[0][0].split(None, 3)) == 4 + return info and len(info[0]) == 1 and \ + (len(info[0][0].split(None, 3)) == 4 or info[0][0] == "No updates pending for installation") def inventory_apt(info): @@ -59,6 +62,10 @@ def check_apt(_no_item, params, info): if not apt_valid_info(info): return + if info[0][0] == "No updates pending for installation": + yield 0, "No updates pending for installation" + return + sec_regex = regex("^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)") updates = [] sec_updates = []

8 years, 5 months

3123 FIX fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration

by Sebastian Herbord

Module: check_mk Branch: master Commit: 410db589b5b6b47274e17a2a96944d289e89ae9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=410db589b5b6b4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 14 15:23:58 2016 +0200 3123 FIX fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration --- .werks/3123 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.werks/3123 b/.werks/3123 new file mode 100644 index 0000000..f8c7ed9 --- /dev/null +++ b/.werks/3123 @@ -0,0 +1,10 @@ +Title: fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460640119 + + diff --git a/ChangeLog b/ChangeLog index 941f55b..0fe2aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3105 FIX: fixed crash in cmk --dump for services containing non-ascii characters * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... + * 3123 FIX: fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index fc5a7c5..6a7ecf6 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -299,6 +299,13 @@ old_service_descriptions = { "raritan_pdu_inlet" : "Input Phase %s", } +# workaround: set of check-groups that are to be treated as service-checks even if +# the item is None +service_rule_groups = set([ + "temperature" +]) + + #. # .--Modules-------------------------------------------------------------. # | __ __ _ _ | @@ -4886,10 +4893,14 @@ def get_checkgroup_parameters(host, checktype, item): if rules == None: return [] - if item == None: # checks without an item - return host_extra_conf(host, rules) - else: # checks with an item need service-specific rules - return service_extra_conf(host, item, rules) + try: + # checks without an item + if item == None and checkgroup not in service_rule_groups: + return host_extra_conf(host, rules) + else: # checks with an item need service-specific rules + return service_extra_conf(host, item, rules) + except MKGeneralException, e: + raise MKGeneralException(str(e) + " (on host %s, checktype %s)" % (host, checktype)) def output_profile():

8 years, 5 months

3378 FIX Fixed too long contact group names overflowing WATO folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 10b26480aab472d07efc72f943c21e4fd41397d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10b26480aab472… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 17:11:40 2016 +0200 3378 FIX Fixed too long contact group names overflowing WATO folders --- .werks/3378 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.css | 3 +-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3378 b/.werks/3378 new file mode 100644 index 0000000..6a10427 --- /dev/null +++ b/.werks/3378 @@ -0,0 +1,10 @@ +Title: Fixed too long contact group names overflowing WATO folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460560285 + + diff --git a/ChangeLog b/ChangeLog index 15ae1f2..941f55b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -262,6 +262,7 @@ * 3330 FIX: WATO Web-API now allows to specify root folder with / instead of empty string again * 3024 FIX: Fixed WATO GIT version control for older (<2.0) GIT versions * 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns since 1.2.8b9 + * 3378 FIX: Fixed too long contact group names overflowing WATO folders Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index cd9c56f..01e05ea 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -404,8 +404,7 @@ table.validationerror img { position: absolute; bottom: 23px; left: 20px; - width: 140px; - width: 1140px; + right: 20px; color: #bde; overflow:hidden; white-space: nowrap;

8 years, 5 months

Fixed contactgroups overlapping folder graphic on hover

by Lars Michelsen

Module: check_mk Branch: master Commit: fdd133972381c8c5f0fbe9734c9bdb514d09dcc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdd133972381c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 14 13:12:44 2016 +0200 Fixed contactgroups overlapping folder graphic on hover --- web/htdocs/js/wato.js | 4 ++-- web/htdocs/wato.css | 21 ++++++++++++++++++++- web/htdocs/wato.py | 4 +++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 01b2c39..4b51e2b 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -711,9 +711,9 @@ function wato_toggle_folder(event, oDiv, on) { } if(on) { - obj.style.backgroundImage = 'url("images/folder_open.png")'; + add_class(obj, "open"); } else { - obj.style.backgroundImage = 'url("images/folder_closed.png")'; + remove_class(obj, "open"); // Hide the eventual open move dialog var move_dialog = document.getElementById('move_dialog_' + id); diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 01e05ea..9789f7e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -368,6 +368,10 @@ table.validationerror img { height: 140px; } +.wato div.floatfolder.open { + background-image: url('images/folder_open.png'); +} + .wato div.floatfolder .autherr { position: absolute; top: 28px; @@ -405,12 +409,27 @@ table.validationerror img { bottom: 23px; left: 20px; right: 20px; + overflow: hidden; +} + +.wato div.floatfolder .infos .infos_content { color: #bde; - overflow:hidden; + overflow: hidden; white-space: nowrap; + left: 0; + right: 0; text-overflow: ellipsis; } +.wato div.floatfolder.open .infos { + height: 50px; +} + +.wato div.floatfolder.open .infos .infos_content { + position: absolute; + bottom: 0; +} + .wato div.floatfolder .title { position: absolute; bottom: 0; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f915f6b..e9598d7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -599,6 +599,7 @@ def show_subfolder_delete_button(subfolder): def show_subfolder_infos(subfolder): html.write('<div class=infos>') + html.write('<div class=infos_content>') groups = userdb.load_group_information().get("contact", {}) permitted_groups, folder_contact_groups, use_for_services = subfolder.groups() for num, pg in enumerate(permitted_groups): @@ -616,7 +617,8 @@ def show_subfolder_infos(subfolder): html.write("%d %s" % (num_hosts, _("Hosts"))) else: html.write("<i>%s</i>" % _("(no hosts)")) - html.write('</div>') # class=infos + html.write('</div>') + html.write('</div>') def show_hosts(folder):

8 years, 5 months

Updated bug entries #2493

by Lars Michelsen

Module: check_mk Branch: master Commit: c5c24718ee887862ec33b6edc476aa12dcac8564 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5c24718ee8878… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 17:11:59 2016 +0200 Updated bug entries #2493 --- .bugs/2493 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2493 b/.bugs/2493 index 5842a7e..e0ae4e7 100644 --- a/.bugs/2493 +++ b/.bugs/2493 @@ -1,9 +1,11 @@ Title: Contact group name is not stripped at WATO folders Component: wato -State: open +Class: bug +State: done Date: 2016-04-07 19:23:35 Targetversion: 1.2.8 -Class: bug Long names of contact groups are not stripped at WATo folders. The name is displayed over the size of the folder. It looks not very nice. + +2016-04-13 17:11:57: changed state open -> done

8 years, 5 months

3026 FIX Event console: The "Add comment" option of a rule is now able to add the original text (\0)

by Andreas Boesl

Module: check_mk Branch: master Commit: 7518b89b87a8b93390d1ac6850bfbd3e2d3e29ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7518b89b87a8b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 14 12:12:08 2016 +0200 3026 FIX Event console: The "Add comment" option of a rule is now able to add the original text (\0) --- .werks/3026 | 9 +++++++++ ChangeLog | 1 + bin/mkeventd | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3026 b/.werks/3026 new file mode 100644 index 0000000..38e7a5d --- /dev/null +++ b/.werks/3026 @@ -0,0 +1,9 @@ +Title: Event console: The "Add comment" option of a rule is now able to add the original text (\0) +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.9i1 +Date: 1460628605 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fd5d4e5..15ae1f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -296,6 +296,7 @@ * 3348 FIX: Improved error handling when trying to edit not existing rules/rule packs * 3350 FIX: Merged source of Event Console with Check_MK... * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC + * 3026 FIX: Event console: The "Add comment" option of a rule is now able to add the original text (\0) Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/bin/mkeventd b/bin/mkeventd index 7d2a696..3e41564 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2116,12 +2116,12 @@ class EventServer: event["sl"] = rule["sl"] event["first"] = event["time"] event["last"] = event["time"] + if "set_comment" in rule: + event["comment"] = replace_groups(rule["set_comment"], event["text"], groups) if "set_text" in rule: event["text"] = replace_groups(rule["set_text"], event["text"], groups) if "set_host" in rule: event["host"] = replace_groups(rule["set_host"], event["host"], groups) - if "set_comment" in rule: - event["comment"] = replace_groups(rule["set_comment"], event.get("comment", ""), groups) if "set_application" in rule: event["application"] = replace_groups(rule["set_application"], event["application"], groups) if "set_contact" in rule and "contact" not in event:

8 years, 5 months

Fetched changes from downstream plus associated changes.

by Sven Panne

Module: check_mk Branch: master Commit: a4fa829eb6dc057b7e61ca66fd7b499e2375ad1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4fa829eb6dc05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 14 11:25:04 2016 +0200 Fetched changes from downstream plus associated changes. --- livestatus/src/Makefile.am | 4 + livestatus/src/Store.cc | 11 +- livestatus/src/Store.h | 9 +- livestatus/src/TableHosts.cc | 80 ++------- livestatus/src/TableHosts.h | 7 +- livestatus/src/TableHostsByGroup.cc | 85 ++++++++++ livestatus/src/TableHostsByGroup.h | 43 +++++ livestatus/src/TableServices.cc | 242 +++++++--------------------- livestatus/src/TableServices.h | 12 +- livestatus/src/TableServicesByGroup.cc | 87 ++++++++++ livestatus/src/TableServicesByGroup.h | 43 +++++ livestatus/src/TableServicesByHostGroup.cc | 69 ++++++++ livestatus/src/TableServicesByHostGroup.h | 43 +++++ livestatus/src/WorldNagios.cc | 47 ++++++ livestatus/src/WorldNagios.h | 33 ++++ livestatus/src/tables.h | 9 +- 16 files changed, 544 insertions(+), 280 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a4fa829eb6…

8 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016