Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64150 discussions

Check_MK Git: check_mk: Agent simulator: also work in simulation mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffe92bd943a13fdb18af290a841844e0231a6840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffe92bd943a13f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 17:37:48 2011 +0200 Agent simulator: also work in simulation mode --- modules/check_mk_base.py | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9667140..31c0aba 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -358,9 +358,6 @@ def get_realhost_info(hostname, ipaddress, checkname, max_cache_age): elif len(output) < 16: raise MKAgentError("Too short output from agent: '%s'" % output) - if agent_simulator: - output = agent_simulator_process(output) - lines = [ l.strip() for l in output.split('\n') ] info = parse_info(lines) store_cached_hostinfo(hostname, info) @@ -414,25 +411,26 @@ def write_cache_file(relpath, output): # In that case it will be looked up if needed. Also caching will # be handled here def get_agent_info(hostname, ipaddress, max_cache_age): - result = read_cache_file(hostname, max_cache_age) - if result: - return result - - # Try to contact every host only once - if hostname in g_broken_agent_hosts: - raise MKAgentError("") + output = read_cache_file(hostname, max_cache_age) + if not output: + # Try to contact every host only once + if hostname in g_broken_agent_hosts: + raise MKAgentError("") + + # If the host ist listed in datasource_programs the data from + # that host is retrieved by calling an external program (such + # as ssh or rsy) instead of a TCP connect. + commandline = get_datasource_program(hostname, ipaddress) + if commandline: + output = get_agent_info_program(commandline) + else: + output = get_agent_info_tcp(hostname, ipaddress) - # If the host ist listed in datasource_programs the data from - # that host is retrieved by calling an external program (such - # as ssh or rsy) instead of a TCP connect. - commandline = get_datasource_program(hostname, ipaddress) - if commandline: - output = get_agent_info_program(commandline) - else: - output = get_agent_info_tcp(hostname, ipaddress) + # Got new data? Write to cache file + write_cache_file(hostname, output) - # Got new data? Write to cache file - write_cache_file(hostname, output) + if agent_simulator: + output = agent_simulator_process(output) return output

13 years, 5 months

Check_MK Git: check_mk: FIX: --flush handles missing cache directory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a816c2baa53b6b9eeae7d30f1bbd1667a165c513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a816c2baa53b6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 29 17:53:51 2011 +0200 FIX: --flush handles missing cache directory --- modules/check_mk.py | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ad6aaa0..189f944 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2644,19 +2644,20 @@ def do_flush(hosts): # cache files d = 0 dir = tcp_cache_dir - for f in os.listdir(dir): - if f == host or f.startswith(host + "."): - try: - os.remove(dir + "/" + f) - d += 1 - flushed = True - except: - pass - if d == 1: - sys.stdout.write(tty_bold + tty_green + " cache") - elif d > 1: - sys.stdout.write(tty_bold + tty_green + " cache(%d)" % d) - sys.stdout.flush() + if os.path.exists(tcp_cache_dir): + for f in os.listdir(dir): + if f == host or f.startswith(host + "."): + try: + os.remove(dir + "/" + f) + d += 1 + flushed = True + except: + pass + if d == 1: + sys.stdout.write(tty_bold + tty_green + " cache") + elif d > 1: + sys.stdout.write(tty_bold + tty_green + " cache(%d)" % d) + sys.stdout.flush() # logfiles dir = logwatch_dir + "/" + host

13 years, 5 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fad1bd616f26647ed860790580ee88850f69397e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad1bd616f2664… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Mar 30 00:02:39 2011 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 71d936f..f06fa6c 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -231 +241

13 years, 5 months

Check_MK Git: check_mk: FIX: mk_logwatch: dont use readlines(), save RAM

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec08b644bc4dbe5b04c7e5e19f9400581c51c016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec08b644bc4dbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 11:15:13 2011 +0100 FIX: mk_logwatch: dont use readlines(), save RAM --- ChangeLog | 1 + agents/plugins/mk_logwatch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed30b95..c4a1994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * FIX: cmctc: add scan function * FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal * FIX: ucd_cpu_util: fix check in case of missing hi, si and st + * FIX: mk_logwatch: improve implementation in order to save RAM * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * printer_supply: Skipping inventory of supplies which have current value diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 567aae7..462054c 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -102,7 +102,7 @@ def read_config(): # /var/test/x12134.log|12345|32444355 def read_status(): status = {} - for line in file(status_filename).readlines(): + for line in file(status_filename): # TODO: Remove variants with spaces. rsplit is # not portale. split fails if logfilename contains # spaces @@ -179,7 +179,7 @@ def process_logfile(logfile, patterns): f = os.fdopen(fl) worst = 0 outputtxt = "" - for line in f.readlines(): + for line in f: level = "." for lev, pattern in patterns: if pattern.search(line[:-1]):

13 years, 5 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: 97f08a5dce4224ca4996085cafc3b4431644a59c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97f08a5dce4224… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 13:48:30 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2675e506d767846441a1be2319f3fba6506932d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2675e506d7678… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 25 09:42:59 2011 +0100 Updated bug entries --- .bugs/184 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/184 b/.bugs/184 new file mode 100644 index 0000000..8336635 --- /dev/null +++ b/.bugs/184 @@ -0,0 +1,18 @@ +Title: if/if64 problem when using description as item when having duplicate descr +Component: checks +Benefit: 6 +State: open +Cost: 3 +Date: 2011-03-25 09:39:07 +Class: bug + +Der if/if64 Check unterschlägt doppelte Interfaces, wenn ein Host mehrere Interfaces +mit dem gleichen Namen hat, sobald man die Description als Item benutzt. + +Man kann die Description kurzzeitig für diesen Host deaktivieren und die Inventur starten, +dann werden alle Interfaces gefunden. Allerdings gehen die Dienste wieder verloren, wenn man +später eine re-Inventur macht mit aktivierten Descriptions. + +Eventuell muss man das in der Inventur erkennen und dann die Interfaces selbs durchnummerieren. + +LM: Ich habe einen Dump von einem Beispiel-System.

13 years, 5 months

Check_MK Git: check_mk: Call snmp(bulk)walk always with the option -Cc

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55dce37b26fd73877c8eacac19875dd6f72a2479 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55dce37b26fd73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 08:22:20 2011 +0100 Call snmp(bulk)walk always with the option -Cc --- ChangeLog | 2 ++ modules/check_mk.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5ee877..ed30b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ CPU ressources) * Agent simulation mode (for internal use and check development) * Call snmpgetnext with the option -Cf (fixes some client errors) + * Call snmp(bulk)walk always with the option -Cc (fixes problems in some + cases where OIDs are missing) Multisite: * FIX: custom_style_sheet now also honored by sidebar diff --git a/modules/check_mk.py b/modules/check_mk.py index d80b9c9..ad6aaa0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -519,7 +519,7 @@ def aggregated_service_name(hostname, servicedesc): # options for authentication. This handles communities and # authentication for SNMP V3. Also bulkwalk hosts def snmp_walk_command(hostname): - return snmp_base_command('walk', hostname) + return snmp_base_command('walk', hostname) + " -Cc" # Constructs the basic snmp commands for a host with all important information # like the commandname, SNMP version and credentials.

13 years, 5 months

Check_MK Git: check_mk: Call snmpgetnext with option -Cf

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c220a703ac50729f639febf972cd20ab3a15e25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c220a703ac507… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 08:18:21 2011 +0100 Call snmpgetnext with option -Cf --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73c7ab3..b5ee877 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ check result files instead of using Nagios command pipe (safes CPU ressources) * Agent simulation mode (for internal use and check development) + * Call snmpgetnext with the option -Cf (fixes some client errors) Multisite: * FIX: custom_style_sheet now also honored by sidebar diff --git a/modules/check_mk.py b/modules/check_mk.py index cec600a..d80b9c9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -539,7 +539,7 @@ def snmp_base_command(what, hostname): if what == 'get': command = 'snmpget' elif what == 'getnext': - command = 'snmpgetnext' + command = 'snmpgetnext -Cf' else: command = 'snmpbulkwalk'

13 years, 5 months

Check_MK Git: check_mk: FIX: Multisite: custom_style_sheet now also honored by sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9087eb59f6b2cf6b410f2dc23fe4f0e054ef85c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9087eb59f6b2cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 08:14:12 2011 +0100 FIX: Multisite: custom_style_sheet now also honored by sidebar --- ChangeLog | 1 + web/htdocs/sidebar.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f77780b..73c7ab3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Agent simulation mode (for internal use and check development) Multisite: + * FIX: custom_style_sheet now also honored by sidebar * Added snmp_uptime, uptime and printer_supply perfometers BI: diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 6872f3e..57a8c8b 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -135,7 +135,11 @@ def page_side(h): <html> <head> <title>Check_MK Sidebar</title> -<link href="check_mk.css" type="text/css" rel="stylesheet"> +<link href="check_mk.css" type="text/css" rel="stylesheet">""") + if config.custom_style_sheet: + html.write('<link rel="stylesheet" type="text/css" href="%s">' % config.custom_style_sheet) + + html.write(""" <script type="text/javascript" src="js/check_mk.js"></script> <script type="text/javascript" src="js/sidebar.js"></script> </head>

13 years, 5 months

Check_MK Git: check_mk: Cleaned up directories

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca8b5074a2745c7aad6c9d57769f41cc8b1e9b94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca8b5074a2745c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 25 08:10:43 2011 +0100 Cleaned up directories --- BI.fehlt | 14 +++++++++++--- figheader => doc/helpers/figheader | 0 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/BI.fehlt b/BI.fehlt index 092d448..96efbe2 100644 --- a/BI.fehlt +++ b/BI.fehlt @@ -20,9 +20,6 @@ Modi, untern denen eine Aggr berechnet werden kann: * mit 'force worst' * Downtimeanalyse (Downtime wie crit behandeln) -Pending muss korrekt behandelt werden. Am einfachsten wäre ein -eigener BI-Status dafür. - Berechtigungen für: Aggregationen ansehen generell?? Assume state ausführen @@ -45,9 +42,20 @@ FEATURE: Icon zum Assumen soll auch bei den normalen Icons erscheinen, wenn: * Überhaupt Aggregationen definiert sind (len(config.aggregations) > 0) * Man das Recht dazu hat, was zu assumen * Die (neue) display option dafür eingeschaltet ist. + * Man könnte auch anstelle der jetzt vorhandenen Legobausteine das Assume-Icon + malen? FEATURE: Downtimes: sollte man hierfür nicht auch einen BI-Status machen? Oder muss diese Information separat noch oben driften? +Wenn ja, dann muss aber klar sein, ob der Status - wenn man die Downtimes +ausklammern - grün wäre? Besser ist es so: +Wenn das Aggregat rot ist gilt es dann als "in downtime", wenn alle Zustände, +die zum rot beitragen, selbst in Downtime sind. Solange die Downtimes nur +Komponenten betreffen, die nicht den kritischen Status hervorrufen, +gilt es nicht als in Downtime? + +Das Aggregat gilt als "in downtime", wenn + FEATURE: Acknowledgements: Sollen wir diese auch nach oben leiten? diff --git a/figheader b/doc/helpers/figheader similarity index 100% rename from figheader rename to doc/helpers/figheader

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits