Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64138 discussions

Check_MK Git: check_mk: cisco_fan: fixed check bug in critical state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32b6fa72b0660a43d05d679f4a9adaba7dc181a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32b6fa72b0660a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:33:49 2010 +0200 cisco_fan: fixed check bug in critical state --- ChangeLog | 1 + checks/cisco_fan | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 703bab6..64eb7ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * win_dhcp_pools: better handle invalid agent output * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) * megaraid_pdisks: Fixed coding error + * cisco_fan: fixed check bug in case of critical state Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/cisco_fan b/checks/cisco_fan index 48adbec..b2f522b 100644 --- a/checks/cisco_fan +++ b/checks/cisco_fan @@ -34,7 +34,7 @@ def check_cisco_fan(item, params, info): if line[1] == "1": return (0, "OK") else: - return (2, "CRITICAL (state is %ds" % line[1]) + return (2, "CRITICAL (state is %s)" % line[1]) return (3, "UNKNOWN - item not found in snmp data") check_info['cisco_fan'] = (check_cisco_fan, "FAN %s", 0, inventory_cisco_fan)

13 years, 10 months

Check_MK Git: check_mk: ps inventory: make %u optional on GRAB_USER

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a992e1dd5b7fa84e35cd14e571271602043a78c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a992e1dd5b7fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:29:42 2010 +0200 ps inventory: make %u optional on GRAB_USER --- ChangeLog | 2 +- LIESMICH.zutun | 3 +++ checkman/ps | 6 ++++-- checks/ps | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2d9a24..703bab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,7 @@ * logwatch: Fixed typo in 'too many unacknowledged logs' error message * ps: fix bug: inventory with fixed user name now correctly puts that user name into the resulting check - not None. - * ps: inventory with GRAB_USER: require service description to contain + * ps: inventory with GRAB_USER: service description may contain %u. That will be replaced with the user name and thus makes the service description unique. * win_dhcp_pools: better handle invalid agent output diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 3c11e35..cf4dadb 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -12,6 +12,9 @@ konsisten mit den übrigen werden sein. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +Wenn zwei Checks mit dem gleichen Namen existieren bei einem Host +soll mit einem Fehler abgebrochen werden. + win_dhcp_pools sendet: [['MIBCounts:'], ['Discovers', '=', '193.'], diff --git a/checkman/ps b/checkman/ps index 01fd674..8a28fee 100644 --- a/checkman/ps +++ b/checkman/ps @@ -55,8 +55,10 @@ inventory: Specifying {GRAB_USER} makes the created check expect the process to run as the same user as during inventory: the user name will be hardcoded into - the check. In that case you need to put {%u} into the service description, - which will be replace by the actual user name during inventory. + the check. In that case if you put {%u} into the service description, + that will be replaced by the actual user name during inventory. You need + that if your rule might match for more than one user - your would create + duplicate services with the same description otherwise. The {warning and critical levels} are simply copied to the created checks. diff --git a/checks/ps b/checks/ps index bb7a163..946e2bf 100644 --- a/checks/ps +++ b/checks/ps @@ -80,8 +80,6 @@ def inventory_ps(check_name, info): if userspec == GRAB_USER: i_userspec = l_user[0] - if '%u' not in servicedesc: - raise MKGeneralException("Invalid entry in inventory_processes: if you use GRAB_USER, you need to put %%u into the service description. Your description is '%s'" % servicedesc) i_servicedesc = servicedesc.replace("%u", l_user[0]) else: i_userspec = userspec

13 years, 10 months

Check_MK Git: check_mk: Recompiled Windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5b491a4afc275b088cb1bfcc8294cbc2234525f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5b491a4afc275… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 27 13:38:24 2010 +0200 Recompiled Windows agent --- agents/windows/check_mk_agent.exe | Bin 93184 -> 93184 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a37e27c..e906449 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 5e8bac3..00385a7 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0705e66435d14305d5fba540c1fcc366f32ee22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0705e66435d14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 28 20:20:52 2010 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 10 months

Check_MK Git: check_mk: Fixed small coding error in megaraid_pdisks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97c8c01ddb7f907cb5c2e2a99d5d67a7f1d5cdde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c8c01ddb7f90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 27 11:03:39 2010 +0200 Fixed small coding error in megaraid_pdisks --- ChangeLog | 4 ++-- checks/megaraid_pdisks | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a771acb..b2d9a24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,8 +16,8 @@ %u. That will be replaced with the user name and thus makes the service description unique. * win_dhcp_pools: better handle invalid agent output - * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to - Andreas Döhler) + * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) + * megaraid_pdisks: Fixed coding error Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index d327fca..4e2b0db 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -51,6 +51,7 @@ def check_megaraid_pdisks(item, target_state, info): # item is "$ENCLOSURE/$SLOT" # param is the target state for line in info: + found = None if line[0] == "Enclosure": enclosure = int(line[-1]) elif line[0] == "Slot":

13 years, 10 months

Check_MK Git: check_mk: Fixed small coding error in megaraid_pdisks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af9f8bed5de81796977023e3059122a333e14ad5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af9f8bed5de817… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 27 11:12:08 2010 +0200 Fixed small coding error in megaraid_pdisks --- checks/megaraid_pdisks | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 4e2b0db..952d98f 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -50,8 +50,8 @@ def inventory_megaraid_pdisks(checkname, info): def check_megaraid_pdisks(item, target_state, info): # item is "$ENCLOSURE/$SLOT" # param is the target state + found = None for line in info: - found = None if line[0] == "Enclosure": enclosure = int(line[-1]) elif line[0] == "Slot":

13 years, 10 months

Check_MK Git: check_mk: Fixed typo in latest fix for hp_proliant_psu - Thanks again An?==?UTF-8?Q?dreas Döhler

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0cbfc1b17a079390cdd0eb4b1594945f054ce1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0cbfc1b17a079… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 26 23:30:26 2010 +0200 Fixed typo in latest fix for hp_proliant_psu - Thanks again Andreas Döhler --- checks/hp_proliant_psu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 22d4d79..55c2f71 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -39,7 +39,7 @@ def inventory_hp_proliant_psu(checkname, info): def check_hp_proliant_psu(item, params, info): for line in info: - if '/' in item and line[0] + line [1] == itemi or line[0] == item: + if '/' in item and line[0] + '/' + line [1] == item or line[0] == item: chassis, bay, present, status, redundant = line snmp_status = hp_proliant_psu_status_map[int(status)] status = hp_proliant_status2nagios_map[snmp_status]

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4682884a53fb8b4072984fa740fb42b5782f9e46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4682884a53fb8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 17:44:20 2010 +0200 Updated internal doku --- LIESMICH.zutun | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 815e2f4..3c11e35 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -3,9 +3,52 @@ BUGS beheben bis => 1.1.8 -------------------------------------------------------------------------------- CHECK_MK: +bei den Server Perf Werten "Com. buf. max.total" wird nicht der eigene +sonderen einer der anderen sites angezeigt, +Eigentlich: es sollte (meiner Meinung nach) addiert werden oder evtl. +auch das MAX genommen werden. Oder ganz rausfliegen. Es muss unbedingt +konsisten mit den übrigen werden sein. + -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +win_dhcp_pools sendet: +[['MIBCounts:'], + ['Discovers', '=', '193.'], + ['Offers', '=', '193.'], + ['Delayed', 'Offers', '=', '0.'], + ['Requests', '=', '14540.'], + ['Acks', '=', '11767.'], + ['Naks', '=', '2.'], + ['Declines', '=', '0.'], + ['Releases', '=', '39.'], + ['ServerStartTime', '=', '26', 'June', '2010', '04:47:49'], + ['Scopes', '=', '1.'], + ['Scopes', 'with', 'Delay', 'configured=', '0.'], + ['Subnet', '=', '10.3.108.0.'], + ['No.', 'of', 'Addresses', 'in', 'use', '=', '40.'], + ['No.', 'of', 'free', 'Addresses', '=', '150.'], + ['No.', 'of', 'pending', 'offers', '=', '0.']] +Besser: = als Trenner nehmen, dann ist das parsen einfacher. + +ich bin mir nicht sicher ob das nun ein Thruk Problem oder ein Livestatus Problem ist. Vermutlich beides :-) +Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: +GET services +Columns: .. +Filter: description ~~ +Filter: groups >= +Filter: plugin_output ~~ +Filter: long_plugin_output ~~ +Filter: host_name ~~ +Filter: host_alias ~~ +Filter: host_groups >= +Filter: comments ~~ +Filter: downtimes ~~ +Or: 2 +Or: 8 +livestatus: Sorry, Operator 4 for lists not implemented. + + Noch ein Problem mit Umlauten: Ein Drucker sendet per SNMP Latin1 kodierte Wert, z.B. Resttonerbehälter. Daraus baut Check_MK eine Servicedesription, die in nagios/conf.d/check_mk_objects.cfg ein

13 years, 10 months

Check_MK Git: check_mk: Multisite: fix problem with group filter

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba6d73e3dd44f5d4aa0b671cd2bd987fc5e9a228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba6d73e3dd44f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 15:45:20 2010 +0200 Multisite: fix problem with group filter --- ChangeLog | 2 ++ web/plugins/views/filters.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f870d05..a771acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,8 @@ spaces) * Allow non-ASCII character in downtimes and comments * Added nagvis_base_url to multisite.mk example configuration + * Filter for host/service groups: use name instead of alias if + user has no permissions for groups 1.1.8b3: Core, Setup, etc.: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index db384c7..b9ec53b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -150,7 +150,7 @@ class FilterGroupCombo(Filter): current_value = self.current_value(infoname) if current_value: alias = html.live.query_value("GET %sgroups\nColumns: alias\nFilter: name = %s\n" % - (self.what, current_value)) + (self.what, current_value), current_value) return alias

13 years, 10 months

Check_MK Git: check_mk: Table downtimes/comments: new column is_service

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41372a66b6e241e3e88303649da950661e6d9bd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41372a66b6e241… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 12:03:35 2010 +0200 Table downtimes/comments: new column is_service --- ChangeLog | 1 + livestatus/src/DowntimeOrComment.cc | 8 ++++++-- livestatus/src/DowntimeOrComment.h | 1 + livestatus/src/TableDownComm.cc | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eead3fc..f870d05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ this in version 1.1.8...) * Table status: new columns external_commands and external_commands_rate (also due to Mr. Fiebig - he would have quit our workshop otherwise...) + * Table downtimes/comments: new column is_service Multisite: * Snapin Performance: show external command per second and usage and diff --git a/livestatus/src/DowntimeOrComment.cc b/livestatus/src/DowntimeOrComment.cc index e913afe..87e13cd 100644 --- a/livestatus/src/DowntimeOrComment.cc +++ b/livestatus/src/DowntimeOrComment.cc @@ -34,10 +34,14 @@ DowntimeOrComment::DowntimeOrComment(nebstruct_downtime_struct *dt, , _id(id) { _host = find_host(dt->host_name); - if (dt->service_description) + if (dt->service_description) { _service = find_service(dt->host_name, dt->service_description); - else + _is_service = 1; + } + else { _service = 0; + _is_service = 0; + } } diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 632d184..615d4ad 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -92,6 +92,7 @@ struct DowntimeOrComment char * _author_name; char* _comment; unsigned long _id; + int _is_service; DowntimeOrComment(nebstruct_downtime_struct *data, unsigned long id); virtual ~DowntimeOrComment(); diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 0f28db7..342a45a 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -56,6 +56,8 @@ TableDownComm::TableDownComm(bool is_downtime) addColumn(new OffsetIntColumn("type", is_downtime ? "The type of the downtime: 0 if it is active, 1 if it is pending" : "The type of the comment: 1 is host, 2 is service", (char *)&(ref->_type) - (char *)ref)); + addColumn(new OffsetIntColumn("is_service", + "0, if this entry is for a host, 1 if it is for a service", (char *)&(ref->_is_service) - (char *)ref)); if (is_downtime) {

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits