Checkmk git commits October 2010

checkmk-commits@lists.checkmk.com

3 participants
42 discussions

Check_MK Git: check_mk: hp_proliant_psu: Fixed multiple PSU detection on one system ( Thanks to Andreas Döhler)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4e4d56a4e40576fa9b9301e4c5974225c55a350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e4d56a4e4057… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 24 22:54:01 2010 +0200 hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) --- ChangeLog | 2 ++ checks/hp_proliant_psu | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 031b037..9e34fb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,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) Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 236dd0a..22d4d79 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -33,13 +33,13 @@ hp_proliant_redundant_map = { 1: 'other', 2: 'notRedundant', 3: 'redundant' } def inventory_hp_proliant_psu(checkname, info): if len(info) > 0: - return [ (line[0], None) for line in info if line[2] == '3' ] + return [ (line[0] + '/' + line[1], None) for line in info if line[2] == '3' ] else: return [] def check_hp_proliant_psu(item, params, info): for line in info: - if line[0] == item: + if '/' in item and line[0] + line [1] == itemi 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, 8 months

Check_MK Git: check_mk: cluster host check: use service IP if available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd56f2b31e57210326371a63565ed46a249a7484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd56f2b31e5721… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:37:11 2010 +0200 cluster host check: use service IP if available --- ChangeLog | 2 ++ modules/check_mk.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 031b037..3da991f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core, Setup, etc.: * setup.sh: turn off Python debugging * Cleaned up documentation directory + * cluster host: use real IP address for host check if cluster has + one (e.g. service IP address) Checks & Agents: * Added missing PNP template for check_mk-hr_cpu diff --git a/modules/check_mk.py b/modules/check_mk.py index 0961e18..8a69f09 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1169,7 +1169,7 @@ def create_nagios_hostdefs(outfile, hostname): except: if not is_cluster(hostname): raise MKGeneralException("Cannot determine ip address of %s. Please add to ipaddresses." % hostname) - ip = "0.0.0.0" + ip = None # _ # / | @@ -1181,7 +1181,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write("\ndefine host {\n") outfile.write(" host_name\t\t\t%s\n" % hostname) outfile.write(" use\t\t\t\t%s\n" % (is_clust and cluster_template or host_template)) - outfile.write(" address\t\t\t%s\n" % ip) + outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) # Host groups: If the host has no hostgroups it gets the default @@ -1219,6 +1219,10 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) + # Host check uses (service-) IP address if available + if ip: + outfile.write(" check_command\t\t\tcheck-mk-ping\n") + outfile.write(" alias\t\t\t\t%s\n" % alias) # Custom configuration last -> user may override all other values @@ -1237,7 +1241,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" host_name\t\t\t%s\n" % summary_hostname(hostname)) outfile.write(" use\t\t\t\t%s-summary\n" % (is_clust and cluster_template or host_template)) outfile.write(" alias\t\t\t\tSummary of %s\n" % alias) - outfile.write(" address\t\t\t%s\n" % ip) + outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) outfile.write(" __REALNAME\t\t\t%s\n" % hostname) outfile.write(" parents\t\t\t%s\n" % hostname)

13 years, 8 months

Check_MK Git: check_mk: Changed internel compile helper for OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe163fbde2eed498238fa33cf41a5097b740cf56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe163fbde2eed4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:37:22 2010 +0200 Changed internel compile helper for OMD --- modules/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/.f12 b/modules/.f12 index bb771a7..98c404c 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1 +1 @@ -cp *.py /usr/share/check_mk/modules +sudo cp -v *.py /omd/versions/default/share/check_mk/modules/

13 years, 8 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a77796445a80b07135b9f11174b804c5ec3b5d15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a77796445a80b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:38:30 2010 +0200 Updated internal doku --- LIESMICH.zutun | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 4561976..815e2f4 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -3,9 +3,6 @@ BUGS beheben bis => 1.1.8 -------------------------------------------------------------------------------- CHECK_MK: -Clusters mit IP-Adressen: Der Host-Check soll die IP-Adresse verwenden, -wenn sie vorhanden ist. - -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- @@ -66,16 +63,15 @@ geloggt wird nur das Starten und Beenden (was ja im Hauptthread läuft). Windows-Agent: Memory-Check neu machen. Swap stimmt nicht. Evtl. zwei getrennte Checks für Memory and Pagefile. ---snmpwalk: Braucht man das translaten noch? Ich arbeite doch jetzt eh -nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen! - - ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- check_mk -X erzwingen. Das -R soll nur noch klappen, wenn kein Configfehler auftritt. +--snmpwalk: Braucht man das translaten noch? Ich arbeite doch jetzt eh +nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen! + filesystem_levels rausnehmen. Hinweis, dass check_parameters verwendet werden soll.

13 years, 8 months

Check_MK Git: check_mk: setup: initial check_mk package didn' t contain rra-config (now does)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c3cdadcbea0721beeb72c31aa1730c8e6c94947 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c3cdadcbea072… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:20:58 2010 +0200 setup: initial check_mk package didn't contain rra-config (now does) --- LIESMICH.zutun | 3 --- make_package_info | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 020b2fe..4561976 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -6,9 +6,6 @@ CHECK_MK: Clusters mit IP-Adressen: Der Host-Check soll die IP-Adresse verwenden, wenn sie vorhanden ist. -check_mk -P Unterverzeichnis von Agents mit Datei darin wird scheinbar -nicht korrekt installiert. - -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- diff --git a/make_package_info b/make_package_info index 920c2a8..6cf6b10 100755 --- a/make_package_info +++ b/make_package_info @@ -18,7 +18,7 @@ package = { "files" : filelists } -parts = [ "checks", "checkman", "agents", "web", "pnp-templates", "doc" ] +parts = [ "checks", "checkman", "agents", "web", "pnp-templates", "pnp-rraconf", "doc" ] for part in parts: tarfile = part + ".tar.gz" filelist = []

13 years, 8 months

Check_MK Git: check_mk: install_nagios.sh: add note to OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d97b434e1149382ec7a0307e84f21a7a491e81a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d97b434e114938… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 21:23:17 2010 +0200 install_nagios.sh: add note to OMD --- scripts/install_nagios.sh | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 7d2bb94..c122e7c 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -23,6 +23,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +cat <<EOF + + NOTE + ---------------------------------------------------------- + This is the last version of this script. There is a better + alternative for installing and maintaining Nagios plus + Addons now: + + OMD - The Open Monitoring Distribution + + Please visit OMD at http://omdistro.org/ + + OMD has been invented and founded by Mathias Kettner and is + developed by a team of many well-known monitoring experts. + ---------------------------------------------------------- + +Press enter to continue... +EOF +read + # Make sure, /usr/local/bin is in the PATH, since we install

13 years, 8 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bb0a8351c7a6da1d525a430c9c281bede6589630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb0a8351c7a6da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 21:18:12 2010 +0200 Updated internal doku --- LIESMICH.zutun | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 4561976..020b2fe 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -6,6 +6,9 @@ CHECK_MK: Clusters mit IP-Adressen: Der Host-Check soll die IP-Adresse verwenden, wenn sie vorhanden ist. +check_mk -P Unterverzeichnis von Agents mit Datei darin wird scheinbar +nicht korrekt installiert. + -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 --------------------------------------------------------------------------------

13 years, 8 months

Check_MK Git: check_mk: win_dhcp_pools: handle invalid ints

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac34b7426a2924cfca780078a33c90c2083cefea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac34b7426a2924… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 19:53:35 2010 +0200 win_dhcp_pools: handle invalid ints --- ChangeLog | 1 + checks/win_dhcp_pools | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 834a353..031b037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * ps: inventory with GRAB_USER: require service description to 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 Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 59c0f93..bc96e1a 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -104,7 +104,7 @@ def check_win_dhcp_pools(item, params, info): key = ' '.join(line[:-2]) if key in win_dhcp_pools_stats_translate: key = win_dhcp_pools_stats_translate[key] - poolStats.append(int(line[-1].rstrip('.'))) + poolStats.append(saveint(line[-1].rstrip('.'))) if len(poolStats) == 3: break @@ -149,7 +149,7 @@ def check_win_dhcp_pools_stats(item, params, info): if key in [ 'Discovers', 'Offers', 'Requests', 'Acks', 'Nacks', 'Declines', 'Releases', 'Scopes' ]: - value = int(line[2].rstrip('.')) + value = saveint(line[2].rstrip('.')) try: timedif, per_sec = get_counter("win_dhcp_stats.%s" % key, this_time, value) except MKCounterWrapped:

13 years, 8 months

Check_MK Git: check_mk: Cleaned up doc/ directory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d604b970185a44171332b9a9ae3198e2e6d582e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d604b970185a44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 19:24:18 2010 +0200 Cleaned up doc/ directory --- doc/LIESMICH.bugs_in_nagios | 128 ---------- doc/check_mk.1 | 250 -------------------- doc/{ => treasures}/check_mk_agent.hp | 3 +- .../fsc-celsius-m470-sel-1.2.tar.gz | Bin 10058 -> 10058 bytes doc/{ => treasures}/fsc_ipmi_mem_status.sh | 0 doc/treasures/zombies.mk | 20 ++ doc/zombies.mk | 8 - 7 files changed, 22 insertions(+), 387 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d604b97018…

13 years, 8 months

Check_MK Git: check_mk: Install complete doc/ directory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9426b50ac6c41ee00bb0346c9053f6cfbc398a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9426b50ac6c41… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 19:26:35 2010 +0200 Install complete doc/ directory --- Makefile | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4517d2a..35db533 100644 --- a/Makefile +++ b/Makefile @@ -65,11 +65,7 @@ dist: mk-livestatus tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar czf $(DISTNAME)/pnp-rraconf.tar.gz $(TAROPTS) -C pnp-rraconf $$(cd pnp-rraconf ; ls *.rra.cfg README.rra) - tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc --exclude .svn --exclude "*~" \ - check_mk_templates.cfg check_mk.1 \ - check_mk.css screenshot1.png README treasures helpers check_mk_agent.hp \ - check_mk{,.trans}.200.png windows \ - README.sounds + tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls) tar rf $(DISTNAME)/doc.tar $(TAROPTS) COPYING AUTHORS ChangeLog tar rf $(DISTNAME)/doc.tar $(TAROPTS) livestatus/api --exclude "*~" --exclude "*.pyc" --exclude ".gitignore" --exclude .f12 gzip $(DISTNAME)/doc.tar

13 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2010