Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65241 discussions

Check_MK Git: check_mk: if/if64: fixed various problem with averaging

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1eafe3a0e4b22a64197ffe60fa84003caacf436c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eafe3a0e4b22a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 13 11:52:02 2010 +0100 if/if64: fixed various problem with averaging --- modules/check_mk_base.py | 2 ++ pnp-templates/check_mk-if.php | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index abf2d1b..2207999 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1059,6 +1059,8 @@ def get_nic_speed_human_readable(speed): speed = "100MBit/s" elif speedi == 1000000000: speed = "1GBit/s" + elif speed < 1500000000: + speed = "%dMBit/s" % (speedi / 1000000) else: speed = "%dGBit/s" % (speedi / 1000000000) except: diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index c7106d0..1bf60cb 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -66,12 +66,14 @@ if($bandwidth > $base * $base * $base) { } $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"MB/sec\" -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc\" "; $def[1] = "HRULE:0#c0c0c0 ". "LINE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s \" ". - "LINE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%.1f", $warn) . " ".$bwuom."Bit/s \" ". - "LINE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%.1f", $crit) . " ".$bwuom."Bit/s\\n\" ". + "LINE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%.1f", $warn) . " ".$bwuom."Byte/s \" ". + "LINE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%.1f", $crit) . " ".$bwuom."Byte/s\\n\" ". + "LINE:-$mByteWarn#ffff00: ". + "LINE:-$mByteCrit#ff0000: ". "LINE:-$mByteBandwidth#808080: ". "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". @@ -91,8 +93,8 @@ if (isset($DS[12])) { $def[1] .= "DEF:inbytesa=$RRDFILE[12]:$DS[12]:MAX ". "DEF:outbytesa=$RRDFILE[13]:$DS[13]:MAX ". - "CDEF:inmba=inbytes,1048576,/ ". - "CDEF:outmba=outbytes,1048576,/ ". + "CDEF:inmba=inbytesa,1048576,/ ". + "CDEF:outmba=outbytesa,1048576,/ ". "CDEF:minusoutmba=0,outmb,- ". "LINE:inmba#007030:\"in (avg) \" ". "GPRINT:inbytesa:LAST:\"%5.1lf %sB/s last\" ". @@ -102,7 +104,6 @@ if (isset($DS[12])) { "GPRINT:outbytesa:LAST:\"%5.1lf %sB/s last\" ". "GPRINT:outbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". "GPRINT:outbytesa:MAX:\"%5.1lf %sB/s max\\n\" "; - } # Graph 2: packets

13 years, 10 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: f6dab2316073978ba8e6ff958098ea05c87d6630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6dab231607397… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 13 11:52:23 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 291acef5789b02783d5b49786b31953de2e352f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=291acef5789b02… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 13 07:33:27 2010 +0100 Updated internal doku --- LIESMICH.zutun | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 7498d5b..c7c6af7 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -1,3 +1,6 @@ +Hostnamen in ipaddresses eintragen: Das sollte man dokumentieren +(wegen dynamischen Hosts.) + Man-Pages zu df_netapp und df_netapp32 fehlen (df_netapp geht nur mit bulkwalk_hosts!!) Livestatus: is_contact_member_of_contactgroup selbst programmieren,

13 years, 10 months

Check_MK Git: check_mk: Disabling browser built-in completion list in quicksearch field

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: acac14f6dd7bb121955ed8a1eb6c11b523ce9398 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acac14f6dd7bb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Dec 11 21:42:06 2010 +0100 Disabling browser built-in completion list in quicksearch field --- ChangeLog | 2 ++ web/plugins/sidebar/search.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1189b8..5dac6be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Multisite: * WATO: Fixed omd mode/site detection + * Sidebar Quicksearch: Now really disabling browser built-in completion + dropdown selections 1.1.9i1: INCOMPATIBLE CHANGES: diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 0d3c5e1..d721d39 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -46,7 +46,7 @@ def render_searchform(): limit = 80 html.write('<div id="mk_side_search" onclick="mkSearchClose();">') - html.write('<input id="mk_side_search_field" type="text" name="search" />') + html.write('<input id="mk_side_search_field" type="text" name="search" autocomplete="off" />') html.write('</div>') html.write("<script type='text/javascript' src='search.js'></script>\n") html.write("<script type='text/javascript'>\n")

13 years, 10 months

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, 11 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, 11 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, 11 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, 11 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, 11 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, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits