Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 950c3495a278ae419360307edd4b14fbbd035f45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950c3495a278ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 10 16:37:44 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 9 months

Check_MK Git: check_mk: WATO: Fixed omd mode/site detection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3b136952c5390f590558382c7898f2c2fb143c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b136952c5390… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 10 16:36:55 2010 +0100 WATO: Fixed omd mode/site detection --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 19 ++++++++++++++----- web/htdocs/wato.py | 5 +++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87316aa..c1189b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 1.1.9i2: Checks & Agents: * ibm_imm_health: fix inventory function + + Multisite: + * WATO: Fixed omd mode/site detection 1.1.9i1: INCOMPATIBLE CHANGES: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 333fda4..bd9bdce 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -495,9 +495,18 @@ class html: if config.debug: self.write("Booom (%s)" % url) + def apache_user(self): + return pwd.getpwuid( os.getuid() )[ 0 ] + def omd_mode(self): - apache_user = pwd.getpwuid( os.getuid() )[ 0 ] - if 'OMD_SITE' in self.req.subprocess_env and 'OMD_MODE' in self.req.subprocess_env: - return (apache_user, self.req.subprocess_env['OMD_MODE'], self.req.subprocess_env['OMD_SITE']) - else: - return (apache_user, None, None) + # Load mod_python env into regular environment + os.environ.update(self.req.subprocess_env) + + omd_mode = None + omd_site = None + if 'OMD_SITE' in os.environ: + omd_site = os.environ['OMD_SITE'] + omd_mode = 'shared' + if omd_site == self.apache_user(): + omd_mode = 'own' + return (omd_mode, omd_site) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d84e751..0231071 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -493,7 +493,7 @@ def check_mk_automation(command, args=[], indata=""): commandargs = defaults.check_mk_automation.split() cmd = commandargs + [ command ] + args else: - apache_user, omd_mode, omd_site = html.omd_mode() + omd_mode, omd_site = html.omd_mode() if not omd_mode or omd_mode == 'own': commandargs = [ 'check_mk', '--automation' ] cmd = commandargs + [ command ] + args @@ -513,7 +513,8 @@ def check_mk_automation(command, args=[], indata=""): "%s ALL = (root) NOPASSWD: %s\ *\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (apache_user, apache_user, " ".join(commandargs[1:-1] + [ commandargs[-1].replace(' ', '\ ')]))) + (html.apache_user(), html.apache_user(), " ".join(commandargs[1:-1] + [ commandargs[-1].replace(' ', '\ ')]))) + try: p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7df1a9d83cf4216b6b4846298499776c9d6e50cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7df1a9d83cf421… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 10 15:36:36 2010 +0100 Updated internal doku --- LIESMICH.zutun | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 6214324..7498d5b 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -54,8 +54,17 @@ Der Service wird auch nicht in die aggregierten Services eines Summary Hosts aufgenommen. Das kann dazu führen, dass die Anzahl der Services in einem Summary-Host variabel ist. -Cluster-Inventur: Wenn ein Service auf der Node sitzt und man die Regeln -zu Clustered services ändert, entfernt ein -II das nicht von der node +Cluster-Inventur(1): Wenn man ein check_mk -II macht, dann werden clustered +services nicht entfernt. Um das sauber hinzubekommen, muss man sicherstellen, +dass der Anwender check_mk -II mit *allen* nodes aufgerufen hat. Denn nur +so darf man die Checks auf dem Cluster entfernen. Sonst kann man nicht sicher +sein, dass Services wegfliegen, die eigentlich von einem anderem Node kommen. +Das müsste dann auch micht clustered_services_of funktionieren. Ich muss +einfach alle Cluster durchgehen, feststellen, ob jeweils alle deren Nodes +inventurisiert werden, und darf dann die betroffenen Services wegwerfen. + +Cluster-Inventur(2): Wenn ein Service auf der Node sitzt und man die Regeln +zu Clustered services ändert, entfernt ein -II das nicht von der node. Livestatus: wenn man mehrere StatsGroupBy macht, wird der Speicher von den alten nicht freigegeben (ist momentan eh nicht erlaubt. Fehlermeldung ausgeben).

13 years, 9 months

Check_MK Git: check_mk: ibm_imm_health: fix inventory function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05534f5a295a54b7549951b1fd0fc7595f0e810e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05534f5a295a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 10 09:49:49 2010 +0100 ibm_imm_health: fix inventory function --- ChangeLog | 4 ++++ checks/ibm_imm_health | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf3e566..87316aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i2: + Checks & Agents: + * ibm_imm_health: fix inventory function + 1.1.9i1: INCOMPATIBLE CHANGES: * TCP / SNMP: hosts using TCP and SNMP now must use the tags 'tcp' diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 79a3d46..142a9c8 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -52,5 +52,5 @@ def check_ibm_imm_health(_no_item, _no_params, info): else: return (3, "UNKNOWN - " + infotext) -check_info['ibm_imm_health'] = ( check_ibm_imm_health, "System health", 0, no_inventory_possible ) +check_info['ibm_imm_health'] = ( check_ibm_imm_health, "System health", 0, inventory_ibm_imm_health ) snmp_info['ibm_imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] )

13 years, 9 months

Check_MK Git: check_mk: Updated ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76527f6232107b97fa44ddb4b3b13286a8fc594b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76527f6232107b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 17:47:35 2010 +0100 Updated ChangeLog --- ChangeLog | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5f4654..bf3e566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ -1.1.9i1 +1.1.9i1: INCOMPATIBLE CHANGES: + * TCP / SNMP: hosts using TCP and SNMP now must use the tags 'tcp' + and 'snmp'. Hosts with the tag 'ping' will not inventorize any + service. New configuration variable tcp_hosts. + * Inventory: The call syntax for inventory has been simplified. Just + call check_mk -I HOSTNAME now. Omit the "tcp" or "snmp". If you + want to do inventory just for certain check types, type "check_mk --checks=snmp_info,if -I hostnames..." + instead * perfdata_format now defaults to "pnp". Previous default was "standard". You might have to change that in main.mk if you are not using PNP (only relevant for MRPE checks) @@ -10,21 +17,18 @@ * snmp_communites is now initialized with [], not with {}. It cannot be a dict any longer. * bulkwalk_hosts is now initizlized with []. You can do += here just - is with all other rule variables. + as with all other rule variables. * Configuration check (-X) is now always done. It is now impossible to call any Check_MK action with an invalid configuration. This saves - you agains mistyped variables. + you against mistyped variables. * Check kernel: converted performance data from counters to rates. This fixes RRD problems (spikes) on reboots and also allows better access to the peformance data for the Perf-O-Meters. Also changed service - descriptions. You need to reinventurize the kernel checks. You old + descriptions. You need to reinventurize the kernel checks. Your old RRDs will not be deleted, new ones will be created. * Multisite: parameters nagios_url, nagios_cgi_url and pnp_url are now obsolete. Instead the new parameter url_prefix is used (which must end with a /). - * TCP / SNMP: hosts using TCP and SNMP now must use the tags 'tcp' - and 'snmp'. Hosts with the tag 'ping' will not inventorize any - service. New configuration variable tcp_hosts. Core, Setup, etc.: * Improve error handling: if hosts are monitored with SNMP *and* TCP,

13 years, 9 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6063de85e54cfcd1559a23692a1b2e24d2c76cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6063de85e54cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 16:36:18 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90972aaa9f7299fd21a5ba9f3eec7bbb55365025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90972aaa9f7299… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 16:36:14 2010 +0100 Updated internal doku --- LIESMICH.zutun | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 92eb8d0..6214324 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -521,4 +521,14 @@ Snapins: die letzten 10 Notifikationen, die letzten 10 Alerts Acknowledgements: Ankreuzung, ob persistent oder nicht - +Tactical Overview: Man könnte folgendes machen: Die Kästchen +enthalten ja Links zu Views, welche die entsprechenden Probleme +anzeigen. Man könnte jetzt den Spieß umdrehen und aus den Views +die Filter-ausdrücke rausholen und diese für die Anfragen +verwenden (und dort nur noch ein Stats: und ein Filter: has_been_ack = 0 +anhängen). Somit wäre die Logik von Tactical Overview konfigurierbar. + +Bei den Views z.B. im Titel die Anzahl der Antwortzeilen der Anfrage +anzeigen - Generell und bei jeder View. Bei Gruppierten Views evtl. +die Anzahl der Gruppen? Dann wüsste man die Zahl aber erst nach dem +rendern. Also geht das nicht...

13 years, 9 months

Check_MK Git: check_mk: Removed missing nagios_cgi_url from Sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70a463c4c5892d0cf7745a1c3a3ee0632b5445a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a463c4c5892d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 15:15:01 2010 +0100 Removed missing nagios_cgi_url from Sidebar --- web/htdocs/sidebar.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ac8cd10..ce87741 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -88,8 +88,8 @@ def iconbutton(what, url, target="side", handler="", name=""): html.write("<a href=\"%s\" %s %s><img class=iconbutton onmouseover=\"hilite_icon(this, 1)\" onmouseout=\"hilite_icon(this, 0)\" align=absmiddle src=\"%scheck_mk/images/button_%s_lo.png\"></a>\n " % (href, onclick, tg, defaults.url_prefix, what)) def nagioscgilink(text, target): - html.write("<li class=sidebar><a target=\"main\" class=link href=\"%s/%s\">%s</a></li>" % \ - (defaults.nagios_cgi_url, target, htmllib.attrencode(text))) + html.write("<li class=sidebar><a target=\"main\" class=link href=\"%s/nagios/cgi-bin/%s\">%s</a></li>" % \ + (defaults.url_prefix, target, htmllib.attrencode(text))) def heading(text): html.write("<h3>%s</h3>\n" % htmllib.attrencode(text))

13 years, 9 months

Check_MK Git: check_mk: setup.sh: fix missing Nagios URLs in check_mk_templates.cfg

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64ff4e1c629f636593663208408c26e322c4f519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64ff4e1c629f63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 14:59:56 2010 +0100 setup.sh: fix missing Nagios URLs in check_mk_templates.cfg --- scripts/setup.sh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index a6097ff..88eeb73 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -666,10 +666,9 @@ do chmod 755 $DESTDIR$bindir/check_mk && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg && sed -i "s#@VARDIR@#$vardir#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@CGIURL@#$cgiurl#g" $DESTDIR$docdir/check_mk_templates.cfg && sed -i "s#@CHECK_ICMP@#$check_icmp_path#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@NAGIOSURL@#$nagiosurl#g" $DESTDIR$docdir/check_mk_templates.cfg && - sed -i "s#@PNPURL@#$pnp_url#g" $DESTDIR$docdir/check_mk_templates.cfg && + sed -i "s#@CGIURL@#${url_prefix}nagios/cgi-bin/#g" $DESTDIR$docdir/check_mk_templates.cfg && + sed -i "s#@PNPURL@#${url_prefix}pnp4nagios/#g" $DESTDIR$docdir/check_mk_templates.cfg && mkdir -p "$DESTDIR$nagconfdir" if [ ! -e $DESTDIR$nagconfdir/check_mk_templates.cfg ] ; then ln -s $docdir/check_mk_templates.cfg $DESTDIR$nagconfdir 2>/dev/null

13 years, 9 months

Check_MK Git: check_mk: Multisite: remove finally - make run on Python 2. 4 again

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a58a17da1aae27c071161d97b7703c21ce1d7dbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a58a17da1aae27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 9 14:46:23 2010 +0100 Multisite: remove finally - make run on Python 2.4 again --- web/htdocs/actions.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 9b49fa1..10b3f2f 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -74,6 +74,7 @@ def action_reschedule(): "Columns: last_check state plugin_output\n" "Filter: host_name = %s\n%s" % (what, host, service, now, config.reschedule_timeout * 1000, host, add_filter)) + html.live.set_only_sites() last_check = row[0] if last_check < now: html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) @@ -82,6 +83,5 @@ def action_reschedule(): html.write("['OK', %d, %d, %r]\n" % (row[0], row[1], row[2].encode("utf-8"))) except Exception, e: - raise MKGeneralException("Cannot reschedule check: %s" % e) - finally: html.live.set_only_sites() + raise MKGeneralException("Cannot reschedule check: %s" % e)

13 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010