Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: changed float -> int in pandacom_temp_default_levels

by Simon Betz

Module: check_mk Branch: master Commit: ed58631304e51aeab31c69b05c75275e470837d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed58631304e51a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 29 13:36:15 2015 +0200 changed float -> int in pandacom_temp_default_levels --- checks/pandacom_temp.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/pandacom_temp.include b/checks/pandacom_temp.include index 9063c30..da55dd3 100644 --- a/checks/pandacom_temp.include +++ b/checks/pandacom_temp.include @@ -27,7 +27,7 @@ # suggested by customer factory_settings["pandacom_temp_default_levels"] = { - "levels" : (35.0, 40.0) + "levels" : (35, 40) }

8 years, 11 months

Check_MK Git: check_mk: Fixed broken manpage

by Lars Michelsen

Module: check_mk Branch: master Commit: aa463a5f938811251dbf94f15df0e5aa20d5f686 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa463a5f938811… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 12:01:55 2015 +0200 Fixed broken manpage --- checkman/artec_processes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkman/artec_processes b/checkman/artec_processes index d5612ba..42f18c2 100644 --- a/checkman/artec_processes +++ b/checkman/artec_processes @@ -1,10 +1,11 @@ -witle: ARTEC Mail Archive Appliance: Processes +title: ARTEC Mail Archive Appliance: Processes agents: snmp catalog: hw/other license: GPL distribution: check_mk description: This check monitors the processes of the ARTEC Mail Archive Appliance. + Upper default levels are set to 80, 90 %. These levels are configurable. item:

8 years, 11 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: efc9bce6c687b055973a53c70d47b59a993c4811 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efc9bce6c687b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 12:01:31 2015 +0200 Testcommit --- checkman/artec_processes | 1 - 1 file changed, 1 deletion(-) diff --git a/checkman/artec_processes b/checkman/artec_processes index 8144932..d5612ba 100644 --- a/checkman/artec_processes +++ b/checkman/artec_processes @@ -5,7 +5,6 @@ license: GPL distribution: check_mk description: This check monitors the processes of the ARTEC Mail Archive Appliance. - Upper default levels are set to 80, 90 %. These levels are configurable. item:

8 years, 11 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 462d12c551d7076fca4c3a6d018b7b29b41ada55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=462d12c551d707… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 12:00:11 2015 +0200 Testcommit --- modules/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0c0c00b..1118770 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3558,6 +3558,7 @@ def parse_man_header(checkname, path): return parsed + def load_manpage(checkname): filename = all_manuals().get(checkname) if not filename:

8 years, 11 months

Check_MK Git: check_mk: Improved validation of invalid man pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cafb69177baa6af11621de3ea2866f97c7a94c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cafb69177baa6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 11:58:45 2015 +0200 Improved validation of invalid man pages --- modules/check_mk.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index bfe067d..0c0c00b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3546,10 +3546,12 @@ def parse_man_header(checkname, path): lineno, path, line)) break - if "agents" not in parsed: - raise Exception("Section agents missing in man page of %s\n" % (checkname)) - else: - parsed["agents"] = parsed["agents"].replace(" ","").split(",") + # verify mandatory keys. FIXME: This list may be incomplete + for key in [ "title", "agents", "license", "distribution", "description", ]: + if key not in parsed: + raise Exception("Section %s missing in man page of %s" % (key, checkname)) + + parsed["agents"] = parsed["agents"].replace(" ","").split(",") if parsed.get("catalog"): parsed["catalog"] = parsed["catalog"].split("/")

8 years, 11 months

Check_MK Git: check_mk: Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 019308b8a69becda56481830241f536839e5f470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019308b8a69bec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 11:58:58 2015 +0200 Merge mathias-kettner.de:check_mk ---

8 years, 11 months

Check_MK Git: check_mk: #2635 pandacom_psu, pandacom_fan,

by Simon Betz

pandacom_sys_temp, pandacom_10gm_temp, pandacom_fc_temp: new checks for Pandacom SpeedCarrier Chassis 5u Message-ID: <560a5d50.zn+PRE6P10vRqQeR%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: 416f76e4b0ec93248082ce936424a4b4414ef24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416f76e4b0ec93… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 29 11:43:27 2015 +0200 #2635 pandacom_psu, pandacom_fan, pandacom_sys_temp, pandacom_10gm_temp, pandacom_fc_temp: new checks for Pandacom SpeedCarrier Chassis 5u These checks monitor the power supply and fan states, the system temperature and the FC and 10GM modules temperature of a Pandacom SpeedCarrier Chassis 5u. --- .werks/2635 | 10 ++++++++++ ChangeLog | 1 + checkman/pandacom_10gm_temp | 20 ++++++++++++++++++++ checkman/pandacom_fan | 16 ++++++++++++++++ checkman/pandacom_fc_temp | 20 ++++++++++++++++++++ checkman/pandacom_psu | 16 ++++++++++++++++ checkman/pandacom_sys_temp | 17 +++++++++++++++++ 7 files changed, 100 insertions(+) diff --git a/.werks/2635 b/.werks/2635 new file mode 100644 index 0000000..5b4e9c5 --- /dev/null +++ b/.werks/2635 @@ -0,0 +1,10 @@ +Title: pandacom_psu, pandacom_fan, pandacom_sys_temp, pandacom_10gm_temp, pandacom_fc_temp: new checks for Pandacom SpeedCarrier Chassis 5u +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1443519683 +Class: feature + +These checks monitor the power supply and fan states, the system temperature and the FC and 10GM modules +temperature of a Pandacom SpeedCarrier Chassis 5u. diff --git a/ChangeLog b/ChangeLog index 3a021a5..54c4900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 2633 cisco_stackpower: new check which monitors the link status of stack ports of Cisco Switches 3750-E Series * 2634 artec_disk, artec_documents, artec_load, artec_mem, artec_processes, artec_temp: new checks for ARTEC Mail Archive Appliance... * 2632 oracle_diva_csm, oracle_diva_csm.actor, oracle_diva_csm.archive, oracle_diva_csm.drive: new checks for DIVA CSM devices + * 2635 pandacom_psu, pandacom_fan, pandacom_sys_temp, pandacom_10gm_temp, pandacom_fc_temp: new checks for Pandacom SpeedCarrier Chassis 5u... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/pandacom_10gm_temp b/checkman/pandacom_10gm_temp new file mode 100644 index 0000000..c65644e --- /dev/null +++ b/checkman/pandacom_10gm_temp @@ -0,0 +1,20 @@ +title: Pandacom SpeedCarrier Chassis 5u: 10 GM Module Temperature +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the temperature of the 10 GM modules + of a Pandacom SpeedCarrier Chassis 5u. + + Upper default levels are 35, 40 celsius. Device warning and + critical levels are 45, 60 celsius. The default levels are + prefered. This behaviour is configurable. + + Upper and lower levels are configurable. + +item: + The module number. + +inventory: + One service per module is created. diff --git a/checkman/pandacom_fan b/checkman/pandacom_fan new file mode 100644 index 0000000..feeb7d6 --- /dev/null +++ b/checkman/pandacom_fan @@ -0,0 +1,16 @@ +title: Pandacom SpeedCarrier Chassis 5u: Fan State +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the fan states of a + Pandacom SpeedCarrier Chassis 5u. + + The device sends the state itself. + +item: + The fan number. + +inventory: + One service per fan is created. diff --git a/checkman/pandacom_fc_temp b/checkman/pandacom_fc_temp new file mode 100644 index 0000000..8b4cc94 --- /dev/null +++ b/checkman/pandacom_fc_temp @@ -0,0 +1,20 @@ +title: Pandacom SpeedCarrier Chassis 5u: FC Module Temperature +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the temperature of the FC modules + of a Pandacom SpeedCarrier Chassis 5u. + + Upper default levels are 35, 40 celsius. Device warning and + critical levels are 45, 60 celsius. The default levels are + prefered. This behaviour is configurable. + + Upper and lower levels are configurable. + +item: + The module number number. + +inventory: + One service per module is created. diff --git a/checkman/pandacom_psu b/checkman/pandacom_psu new file mode 100644 index 0000000..aeb8ea6 --- /dev/null +++ b/checkman/pandacom_psu @@ -0,0 +1,16 @@ +title: Pandacom SpeedCarrier Chassis 5u: Power Supply State +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the power supply states of a + Pandacom SpeedCarrier Chassis 5u. + + The device sends the state itself. + +item: + The power supply number. + +inventory: + One service per power supply is created. diff --git a/checkman/pandacom_sys_temp b/checkman/pandacom_sys_temp new file mode 100644 index 0000000..8126d65 --- /dev/null +++ b/checkman/pandacom_sys_temp @@ -0,0 +1,17 @@ +title: Pandacom SpeedCarrier Chassis 5u: System Temperature +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the system temperature of + Pandacom SpeedCarrier Chassis 5u. + + Upper default levels are 35, 40 celsius. + Upper and lower levels are configurable. + +item: + System. + +inventory: + One service is created.

8 years, 11 months

Check_MK Git: check_mk: Trivial code cleanup in pandacom

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b3458b1381f0f7f8d54d1d803ad2440c2f14a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b3458b1381f0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 29 11:29:34 2015 +0200 Trivial code cleanup in pandacom --- checks/pandacom_psu | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/checks/pandacom_psu b/checks/pandacom_psu index 0263b87..43c5414 100644 --- a/checks/pandacom_psu +++ b/checks/pandacom_psu @@ -59,11 +59,15 @@ def parse_pandacom_psu(info): "3" : (0, "pass"), } parsed = {} - for fan_nr, index_type, index_state in [("1", 5, 2), ("2", 6, 3), ("3", 10, 11)]: - if info[index_state][0] != "0": - parsed[fan_nr] = { - "type" : map_psu_type[info[index_type][0]], - "state" : map_psu_state[info[index_state][0]], + for psu_nr, type_index, state_index in [ + ("1", 5, 2), + ("2", 6, 3), + ("3", 10, 11), + ]: + if info[state_index][0] != "0": + parsed[psu_nr] = { + "type" : map_psu_type[info[type_index][0]], + "state" : map_psu_state[info[state_index][0]], } return parsed

8 years, 11 months

Check_MK Git: check_mk: #2616 LDAP: Improved handling of multiple connections (Name conflicts, cross directory sync)

by Lars Michelsen

Module: check_mk Branch: master Commit: 75304fa38f9d216f820e8d0a57558fa43f0c7b93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75304fa38f9d21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 11:26:17 2015 +0200 #2616 LDAP: Improved handling of multiple connections (Name conflicts, cross directory sync) Since Check_MK can synchronize with multiple LDAP directories at the same time, new situations could occur which Check_MK did not handle properly for all cases yet. For example it is possible that name conflicts (user id) occur between LDAP connections when different LDAP directories have equal named users. Previous versions did synchronize the user using the first connection to be synchronized (take a look at the configuration to check the connection order) and silently skipped equal named users from other directories. This version intruces so called "LDAP connection suffixes" to solve this situation. This suffix is used identify name conflicting users between directories. You can use whatever you like as suffix, but for better identification it is recommended to use the official domain name as suffix. For example "corp.de" if you domain is identified like this. The connection suffix is appended to the user id for all user accounts having name conflicts during the synchronisation. Additionally, when a user tries to log in with his regular user name, for example <tt>hh</tt>, but the login is refused due to the name conflict, he can add the domain suffix to his username, e.g. <tt>hh(a)corp.de</tt> to tell Check_MK which directory he is associated to. Addionionally, it is now possible to configure the role and group sync plugins to gather group memberships for the users of a connection from another one. This might be needed when you have multiple LDAP directories somehow connected (Active Directory forest) where the users belong to one LDAP directory and the groups are found in another LDAP directory. Now, when these groups have members of the other LDAP directory, these memberships could not be synchronized to Check_MK in previous versions. This is now possible to be configured. But the default is to gather the group memberships of users from the connection they are associated with. --- .werks/2616 | 33 ++++++ ChangeLog | 1 + web/htdocs/wato.py | 96 ++++++++++------- web/plugins/userdb/ldap.py | 244 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 302 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=75304fa38f…

8 years, 11 months

Check_MK Git: check_mk: Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fad8db8005a8b652f3b0ab9a3ae49226e14d9b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fad8db8005a8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 29 11:26:53 2015 +0200 Merge mathias-kettner.de:check_mk Conflicts: ChangeLog ---

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015