Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64454 discussions

Check_MK Git: check_mk: agent_vsphere: fix wrong connect timeout

by Mathias Kettner

Module: check_mk Branch: master Commit: e1cfdf79926a33597c2aed598dc41f0416c03259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1cfdf79926a33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 2 09:39:01 2013 +0200 agent_vsphere: fix wrong connect timeout --- agents/special/agent_vsphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 0be9c33..eeb6250 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -128,7 +128,7 @@ else: sys.stderr.write("ERROR: Please specify exactly one host.\n") sys.exit(1) -socket.setdefaulttimeout(1) +socket.setdefaulttimeout(opt_timeout) def get_agent_info_tcp(hostname): output = ""

11 years, 5 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 513e4f682f5228768b1ce7ba8b569d1e09a6d971 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=513e4f682f5228… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 2 09:39:03 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Added draft LIESMICH.globalsettings

by Mathias Kettner

Module: check_mk Branch: master Commit: a77770fa6c7a34cc48986c6a71ff7810dbcd556f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a77770fa6c7a34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 1 09:47:39 2013 +0200 Added draft LIESMICH.globalsettings --- doc/drafts/LIESMICH.globalsettings | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/doc/drafts/LIESMICH.globalsettings b/doc/drafts/LIESMICH.globalsettings new file mode 100644 index 0000000..4a624c9 --- /dev/null +++ b/doc/drafts/LIESMICH.globalsettings @@ -0,0 +1,41 @@ +Manche der globalen Einstellungen wären schön, wenn man sie pro Host +einstellen könnte. Dazu gehört z.B. das if_inventory_uses_description. Aber +auch Dinge wie agent_min_version, agent_simulator, simulation_mode, +inventory_max_cachefile_age, inventory_check_interval, inventory_check_severity +und andere könnte man gut pro Host gebrauchen. + +Folgende Idee könnte das elegant lösen: Wir führen eine neue +generische Regelkette global_setting_per_host[] ein. Diese +ist eigentlich ein dict von Ketten. Beispiel: + +global_setting_per_host["inventory_check_interval"] = [ + ( 120, [ "linux", "prod" ], ALL_HOSTS ), + ( 1440, [ "linux", "test" ], ALL_HOSTS ), +] + +Die Umsetzung ist denkbar einfach: Nach dem Laden der Konfig +wird die Variable einmal ausgewertet und die entsprechenden +globalen Varialen gesetzt. Beim precompile muss man garnix +ändern, weil diese Variablen dann ja schon gesetzt sind +und korrekt einkodiert werden. + +In Fällen, in denen es um mehrere Host geht (z.B. cmk -I), +muss die Funktion, die die globalen Variablen setzt, immer +dann aufgerufen werden, wenn auf einen neuen Host umgeschaltet +wird. Hier kann man evtl. noch ein Caching einführen, wenn +das zulange dauert. + +Im WATO können wir dann etliche Variablen aus den global +settings umziehen. Frage ist, ob wir dann auch automatisch +eine Migration machen. Die könnte so gehen: Bei jeder globalen +Variable, die vom Default abweicht und bei der eine Regelkette +in der neuen Form existiert, wird - wenn diese Kette leer ist - +eine Regeln eingefügt mit ALL_HOSTS, die genau den geänderten +Wert einsetzt. Gleichzeitig setzen wir den Wert dann wieder +auf den Default zurück. + +Dumm noch: der Benutzer sieht jetzt den Defaultwert nicht +mehr. Aber das Problem haben wir bei allen Regelketten. +Hier müsste man sowieso mal den Defaultwert anzeigen, der +dann gilt, wenn keine Regel greift. +

11 years, 5 months

Check_MK Git: check_mk: Check_MK check: enable extended performance data per default now

by Mathias Kettner

Module: check_mk Branch: master Commit: d1aee14d30c1938bc9ec6233711c7ecb2e0bb67b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1aee14d30c193… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 1 09:39:04 2013 +0200 Check_MK check: enable extended performance data per default now --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5232a64..0c0d87b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * logwatch, logwatch.ec: detect error in agent configuration * Linux agent: cups_queues: do not monitor non-local queues (thanks to Olaf Morgenstern) * AIX agent: call lparstat with argument 1 1, this give more accurate data + * Check_MK check: enable extended performance data per default now Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/modules/check_mk.py b/modules/check_mk.py index 2fff1de..96a8d3e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -227,7 +227,7 @@ piggyback_translation = [] # Ruleset for translating piggyback host simulation_mode = False agent_simulator = False perfdata_format = "pnp" # also possible: "standard" -check_mk_perfdata_with_times = False +check_mk_perfdata_with_times = True debug_log = None monitoring_host = None # deprecated max_num_processes = 50

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 32e97cae4bd677cf1e13b889725b29d99b572c56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32e97cae4bd677… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 15:34:43 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Fixed passive check interval mixup

by Lars Michelsen

Module: check_mk Branch: master Commit: d7657a44d6eaf9678b142a3476598dbaab3933b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7657a44d6eaf9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 15:34:41 2013 +0200 Fixed passive check interval mixup --- modules/check_mk.py | 6 +++--- modules/check_mk_base.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d807c4..4a9837d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -703,7 +703,7 @@ def check_interval_of(hostname, checkname): return # no values at all for non snmp checks for match, minutes in host_extra_conf(hostname, snmp_check_interval): if match is None or match == checkname: - return minutes * 60 # use first match + return minutes # use first match def get_single_oid(hostname, ipaddress, oid): # New in Check_MK 1.1.11: oid can end with ".*". In that case @@ -1784,11 +1784,11 @@ def create_nagios_servicedefs(outfile, hostname): # Add the check interval of either the Check_MK service or # (if configured) the snmp_check_interval for snmp based checks - check_interval = 60 # default hardcoded interval + check_interval = 1 # default hardcoded interval # Customized interval of Check_MK service values = service_extra_conf(hostname, "Check_MK", extra_service_conf.get('check_interval', [])) if values: - check_interval = int(values[0]) * 60 + check_interval = int(values[0]) value = check_interval_of(hostname, checkname) if value is not None: check_interval = value diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 6bd27d6..a24a650 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -340,7 +340,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che check_interval = check_interval_of(hostname, check_type) if not ignore_check_interval \ and check_interval is not None and os.path.exists(cache_path) \ - and cachefile_age(cache_path) < check_interval: + and cachefile_age(cache_path) < check_interval * 60: # cache file is newer than check_interval, skip this check raise MKSkipCheck()

11 years, 5 months

Check_MK Git: check_mk: livestatus.log: another instance of utf8 encoding debug logging

by Andreas Boesl

Module: check_mk Branch: master Commit: 4be9b3857ec4fec364bc8e96e52600dd723b7187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4be9b3857ec4fe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 30 15:24:14 2013 +0200 livestatus.log: another instance of utf8 encoding debug logging --- livestatus/src/Query.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index bfd941c..0d111d4 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1060,7 +1060,8 @@ void Query::outputString(const char *value) } } else { - logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + if (g_debug_level >= 2) + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); } }

11 years, 5 months

Check_MK Git: check_mk: check_mk.py: new option --snmptranslate

by Andreas Boesl

Module: check_mk Branch: master Commit: 4e3188752c1337bc8ed9fbe3e6fa594935833c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e3188752c1337… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 30 15:17:56 2013 +0200 check_mk.py: new option --snmptranslate --- ChangeLog | 1 + modules/check_mk.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 916e180..5232a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * new variable check_mk_exit_status: allows to make Check_MK service OK, even if host in not reachable. * set always_cleanup_autochecks to True per default now + * check_mk: new option --snmptranslate Multisite: * New availability view for arbitrary host/service collections diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d807c4..bf49f14 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -59,6 +59,7 @@ if omd_root: local_notifications_dir = local_share + "/notifications" local_check_manpages_dir = local_share + "/checkman" local_agents_dir = local_share + "/agents" + local_mibs_dir = local_share + "/mibs" local_web_dir = local_share + "/web" local_pnp_templates_dir = local_share + "/pnp-templates" local_doc_dir = omd_root + "/local/share/doc/check_mk" @@ -68,6 +69,7 @@ else: local_notifications_dir = None local_check_manpages_dir = None local_agents_dir = None + local_mibs_dir = None local_web_dir = None local_pnp_templates_dir = None local_doc_dir = None @@ -3610,6 +3612,61 @@ def output_plain_hostinfo(hostname): sys.stdout.write(get_piggyback_info(hostname)) +def do_snmptranslate(walk): + walk = walk[0] + + path_walk = "%s/%s" % (snmpwalks_dir, walk) + if not os.path.exists(path_walk): + print "Walk does not exist" + return + + def translate(lines): + result_lines = [] + try: + oids_for_command = [] + for line in lines: + oids_for_command.append(line.split(" ")[0]) + + extra_mib_path = "" + if local_mibs_dir: + extra_mib_path = " -M+%s" % local_mibs_dir + command = "snmptranslate -m ALL%s %s 2>/dev/null" % (extra_mib_path, " ".join(oids_for_command)) + process = os.popen(command, "r") + output = process.read() + result = output.split("\n")[0::2] + for idx, line in enumerate(result): + result_lines.append((line, lines[idx])) + + # Add missing fields one by one + for line in lines[len(result_lines):]: + result_lines.extend(translate([line])) + except Exception, e: + print e + + return result_lines + + + # Translate n-oid's per cycle + entries_per_cycle = 50 + translated_lines = [] + + walk_lines = file(path_walk).readlines() + print("Processing %d lines (%d per dot)" % (len(walk_lines), entries_per_cycle)) + for i in range(0, len(walk_lines), entries_per_cycle): + sys.stdout.write(".") + sys.stdout.flush() + process_lines = walk_lines[i:i+entries_per_cycle] + translated_lines.extend(translate(process_lines)) + + # Output formatted + longest_translation = 40 + for translation, line in translated_lines: + longest_translation = max(longest_translation, len(translation)) + + format_string = "%%-%ds %%s" % longest_translation + for translation, line in translated_lines: + sys.stdout.write(format_string % (translation, line)) + def do_snmpwalk(hostnames): if len(hostnames) == 0: sys.stderr.write("Please specify host names to walk on.\n") @@ -3922,6 +3979,7 @@ def usage(): check_mk --flush [HOST1 HOST2...] flush all data of some or all hosts check_mk --donate Email data of configured hosts to MK check_mk --snmpwalk HOST1 HOST2 ... Do snmpwalk on host + check_mk --snmptranslate HOST Do snmptranslate on walk check_mk --snmpget OID HOST1 HOST2 ... Fetch single OIDs and output them check_mk --scan-parents [HOST1 HOST2...] autoscan parents, create conf.d/parents.mk check_mk -P, --package COMMAND do package operations @@ -4015,10 +4073,13 @@ NOTES: Check_MK and developing checks by donating hosts. This is completely voluntary and turned off by default. - --snmpwalk does a complete snmpwalk for the specifies hosts both + --snmpwalk does a complete snmpwalk for the specified hosts both on the standard MIB and the enterprises MIB and stores the result in the directory %s. + --snmptranslate does not contact the host again, but reuses the hosts + walk from the directory %s.%s + --scan-parents uses traceroute in order to automatically detect hosts's parents. It creates the file conf.d/parents.mk which defines gateway hosts and parent declarations. @@ -4031,6 +4092,8 @@ NOTES: """ % (check_mk_configfile, precompiled_hostchecks_dir, snmpwalks_dir, + snmpwalks_dir, + local_mibs_dir and ("\n You can add further mibs to %s" % local_mibs_dir) or "", ) @@ -4850,8 +4913,8 @@ if __name__ == "__main__": short_options = 'SHVLCURODMd:Ic:nhvpXPuN' long_options = [ "help", "version", "verbose", "compile", "debug", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", - "flush", "package", "localize", "donate", "snmpwalk", "usewalk", - "scan-parents", "procs=", "automation=", "notify", + "flush", "package", "localize", "donate", "snmpwalk", "snmptranslate", + "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", @@ -4971,6 +5034,9 @@ if __name__ == "__main__": elif o == '--snmpwalk': do_snmpwalk(args) done = True + elif o == '--snmptranslate': + do_snmptranslate(args) + done = True elif o == '--snmpget': do_snmpget(a, args) done = True

11 years, 5 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 5f422b0c4fadedfa57e9ed1eb229b30137ac6d4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f422b0c4faded… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 30 15:17:59 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Improved esx datastore perfometer

by Lars Michelsen

Module: check_mk Branch: master Commit: 824cf5a6acf73b9ce46d0db4c22fb883b3091e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=824cf5a6acf73b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 30 14:45:06 2013 +0200 Improved esx datastore perfometer --- web/plugins/perfometer/check_mk.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 38c33a7..5c09397 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -79,7 +79,6 @@ def perfometer_esx_vsphere_datastores(row, check_command, perf_data): perc_used = 100 * (float(used_mb) / float(maxx)) perc_uncommitted = 100 * (float(uncommitted_mb) / float(maxx)) perc_totally_free = 100 - perc_used - perc_uncommitted - perc_free = 100 - perc_used h = '<table><tr>' if perc_used + perc_uncommitted <= 100: @@ -91,11 +90,11 @@ def perfometer_esx_vsphere_datastores(row, check_command, perf_data): # Visualize overcommitted space by scaling to total overcommittment value # and drawing the capacity as red line in the perfometer total = perc_used + perc_uncommitted - perc_used = perc_used * 100 / total - perc_uncommitted = perc_uncommitted * 100 / total - perc_free = perc_free * 100 / total + perc_used_bar = perc_used * 100 / total + perc_uncommitted_bar = perc_uncommitted * 100 / total + perc_free = (100 - perc_used) * 100 / total - h += perfometer_td(perc_used, "#00ffc6") + h += perfometer_td(perc_used_bar, "#00ffc6") h += perfometer_td(perc_free, "#eeccff") h += perfometer_td(1, "red") # This line visualizes the capacity h += perfometer_td(perc_uncommitted - perc_free, "#eeccff")

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits