Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: AIX agent: output name of template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ddfa1ab28d8e5d844d75a8f30076b198c427549c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddfa1ab28d8e5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 15:11:23 2011 +0200 AIX agent: output name of template --- ChangeLog | 1 + agents/check_mk_agent.aix | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d13ca10..0e5acd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ list (compatible to bulkwalk_hosts) use their hostname as IP address. Checks & Agents: + * FIX: AIX agent: output name of template in case of MRPE * FIX: cisco_temp: skip non-present sensors at inventory * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * FIX: Added PNP-template for winperf_phydisk diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7a5576e..c925afd 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -115,7 +115,8 @@ then grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe.cfg" | \ while read descr cmdline do + PLUGIN=${cmdline%% *} OUTPUT=$($cmdline) - echo "$descr $? $OUTPUT" + echo "(${PLUGIN##*/}) $descr $? $OUTPUT" done fi

13 years, 1 month

Check_MK Git: check_mk: snmp_info, snmp_uptime: added scan functions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36cb67e8d33d257ab37d17ca21313a38515bfdc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36cb67e8d33d25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 17:52:44 2011 +0200 snmp_info, snmp_uptime: added scan functions Please use ignored_checktypes or ignored_checks, if not wantet. Wenn really need a scan function in order for WATO to work. --- .bugs/174 | 33 ++++++++++++++++++++++++++++----- ChangeLog | 2 ++ checks/snmp_info | 4 ++-- checks/snmp_uptime | 4 ++-- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.bugs/174 b/.bugs/174 index 1d552aa..4cef006 100644 --- a/.bugs/174 +++ b/.bugs/174 @@ -1,9 +1,32 @@ -Title: Reinventory removes e.g. snmp_uptime check when not given via cmdline +Title: Reinventory removes e.g. snmp_info check when not given via cmdline Component: core +State: done +Class: bug +Date: 2011-03-03 09:56:23 Benefit: 3 -State: open Cost: 2 -Date: 2011-03-03 09:56:23 -Class: bug +Fun: 0 + +When a service has been added with --checks info -I <hostname> and one executes +a re-inventory for all checks then snmp_info check is lost and needs to be re-added with +--checks snmp_info -I or --checks snmp_info -II. + +What could be a solution? Possible are: + +- Do not remove checks without a a scan function on -II. + But how do we know that there is no scan function? Or just + remove checks with a positive result of the scan function? + Sound complicated to implement. + Maybe add an option -III which then removes all? Or depend + on --flush for removing all autochecks. + + Problem is anyway: Check without a scan function do not + work well (at all) in WATO. + +- Make a scan function for snmp_info and friends and + propose ignored_checktypes in the Migration notes. + -When a service has been added with --checks snmp_uptime -I <hostname> and one executes a re-inventory for all checks the snmp_uptime check is lost and needs to be re-added with --checks snmp_uptime -I or --checks snmp_uptime -II. +2011-08-13 17:49:57: changed state discuss -> done +Added scan functions. Will add a note to the migration notes +of how to disable the check. diff --git a/ChangeLog b/ChangeLog index 0e5acd1..317afe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ * FIX: cisco_temp_perf: add critical level to performance data * FIX: windows agent: hopefully fix case with quotes in directory name * FIX: printer_supply: fixed logic of Perf-O-Meter (mixed up crit with ok) + * snmp_uptime, snmp_info: added scan functions. These checks will now + always be added. Please use ingored_checktypes to disable, if non needed. * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/checks/snmp_info b/checks/snmp_info index 635d241..a0b9f54 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -37,5 +37,5 @@ def check_snmp_info(checktype, params, info): check_info['snmp_info'] = (check_snmp_info, "SNMP Info", 0, inventory_snmp_info) snmp_info['snmp_info'] = ( ".1.3.6.1.2.1.1", [ '1.0', '4.0', '5.0', '6.0', ] ) -# Do not use this check per default -snmp_scan_functions['snmp_info'] = lambda oid: False +# This check works on all SNMP hosts +snmp_scan_functions['snmp_info'] = lambda oid: oid(".1.3.6.1.2.1.1.1.0") != None diff --git a/checks/snmp_uptime b/checks/snmp_uptime index 70e7aea..b0131ff 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -47,5 +47,5 @@ def check_snmp_uptime(checktype, params, info): check_info['snmp_uptime'] = (check_snmp_uptime, "Uptime", 1, inventory_snmp_uptime) snmp_info['snmp_uptime'] = ( ".1.3.6.1.2.1.1", [ '3.0' ] ) # DISMAN-EVENT-MIB::sysUpTime -# Do not use this check per default -snmp_scan_functions['snmp_uptime'] = lambda oid: False +# This check works on all SNMP hosts +snmp_scan_functions['snmp_uptime'] = lambda oid: oid(".1.3.6.1.2.1.1.1.0") != None

13 years, 1 month

Check_MK Git: check_mk: Updated bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22ba41fd291fda7ec025f995ee04c84f793fddcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22ba41fd291fda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 17:53:22 2011 +0200 Updated bugs --- .bugs/160 | 10 +++++++--- .bugs/232 | 14 +++++++++++--- .bugs/config | 9 +++++---- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.bugs/160 b/.bugs/160 index 4aaa475..e5a0ef7 100644 --- a/.bugs/160 +++ b/.bugs/160 @@ -1,9 +1,13 @@ Title: Uptime-Check for SNMP hosts Component: checks +State: done +Class: feature +Date: 2011-02-27 13:18:21 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-27 13:18:21 -Class: feature +Fun: 0 Like the agent based one but retrieved via SNMP. + +2011-08-13 17:46:18: changed state open -> done +Such a check exists now (snmp_uptime). diff --git a/.bugs/232 b/.bugs/232 index efe65a4..914ea49 100644 --- a/.bugs/232 +++ b/.bugs/232 @@ -1,12 +1,20 @@ Title: lnx_if greift auch bei nicht-linux agents Component: checks +State: wontfix +Class: bug +Date: 2011-04-11 16:41:52 Benefit: 5 -State: open Cost: 2 -Date: 2011-04-11 16:41:52 -Class: bug +Fun: 0 offenbar greift der lnx_if auch wenn ein agent-OS != linux vom agent gemeldet wird. das fuehrt dazu, dass durch das umstellen des linux if-checks andere OS auch betroffen sind und ihre interfaces nicht mehr inventorisierbar sind. beim reinventorisieren muss man also mindestens mit tag "linux" arbeiten oder so. waere aber schoener, wenn agent OS - und auch die agent version - angescden + +2011-08-13 16:55:51: changed state open -> wontfix +Der Free-BSD agent sollte nicht versuchen, die Ausgabe von Linux +nachzubauen. Besser man macht hier einen eigenen Check, der seinerseits +auch auf if.include aufsetzt. + +Die alten Linux-Checks fliegen zur 1.1.13i raus. diff --git a/.bugs/config b/.bugs/config index bc9ba69..291e284 100644 --- a/.bugs/config +++ b/.bugs/config @@ -1,8 +1,9 @@ states = { - "open" : tty_blue, - "done" : tty_green, - "closed" : tty_normal, - "wontfix" : tty_magenta, + "open" : tty_blue, + "done" : tty_green, + "closed" : tty_normal, + "wontfix" : tty_magenta, + "discuss" : tty_red, } components = [

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92c9614bd82b6b9f6ccad63f984251313fdeaa02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92c9614bd82b6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 11:09:04 2011 +0200 Updated bug entries --- .bugs/243 | 11 ++++++++--- .bugs/264 | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bugs/243 b/.bugs/243 index f42eddb..28359dc 100644 --- a/.bugs/243 +++ b/.bugs/243 @@ -1,10 +1,11 @@ Title: Removal of brackets from regular expression is broken Component: bi +State: wontfix +Class: bug +Date: 2011-04-07 17:52:29 Benefit: 1 -State: open Cost: 2 -Date: 2011-04-07 17:52:29 -Class: bug +Fun: 0 Invalid regular expression '(zbghora12)):((zbghora13)$': unbalanced parenthesis. @@ -33,3 +34,7 @@ aggregation_rules["database_cluster"] = ( Problem here: from ((.*))((.*)) we must not remove the leftmost and rightmost brackets! + +2011-08-13 18:02:07: changed state open -> wontfix +This does not apply anymore. The whole regular expression +matching has been removed from BI meanwhile. diff --git a/.bugs/264 b/.bugs/264 index d236250..820ffc8 100644 --- a/.bugs/264 +++ b/.bugs/264 @@ -1,10 +1,11 @@ Title: Windows agent: handle quotes in directory names Component: checks +State: done +Class: bug +Date: 2011-05-04 13:05:20 Benefit: 2 -State: open Cost: 2 -Date: 2011-05-04 13:05:20 -Class: bug +Fun: 0 The Windows agent has Problems in W2008 64 Bit since there are appearing nasty quotes in the directory names. Here is @@ -90,3 +91,7 @@ die ich beim Programmierer abzwacken konnte… Ein Feature Request wäre die Übernahme der Änderungen in den nächsten Innovations build und die Anführungszeichen automatisch beim Installieren des Services. + +2011-08-13 18:01:06: changed state open -> done +Das sollte jetzt funktionieren. Ein erfolgreicher +Test steht noch aus.

13 years, 1 month

Check_MK Git: check_mk: Multisite: play sounds in problem views, precisely

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0a125165ceafd898fed195fe7f456e3f76627d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0a125165ceafd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 14:52:06 2011 +0200 Multisite: play sounds in problem views, precisely --- ChangeLog | 2 ++ web/htdocs/htmllib.py | 11 +++++++---- web/plugins/views/builtin.py | 11 ++++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c63f90..d13ca10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,8 @@ with a dict of "dirty" hosts * Added column painter for host contacts * Detail views of host/service now show contacts + * Fix playing of sounds: All problem views now have play_sounds activated, + all other deactivated. WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f7d8440..0ac7057 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -722,11 +722,14 @@ class html: return name in self.events def play_sound(self, url): - self.write('<object type="audio/x-wav" data="%s" height="0" width="0">' - '<param name="filename" value="%s">' - '<param name="autostart" value="true"><param name="playcount" value="1"></object>' % (url, url)) + self.write('<object type="audio/x-wav" data="%s" height="0" width="0">\n' + '<param name="filename" value="%s">\n' + '<param name="src" value="%s">\n' + '<param name="autostart" value="true">\n' + '<param name="playcount" value="1">\n' + '</object>\n' % (url, url, url)) if config.debug: - self.write("Booom (%s)" % url) + self.write("(playing sound %s)" % url) def apache_user(self): return pwd.getpwuid( os.getuid() )[ 0 ] diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index bee3110..15ef3b7 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -128,7 +128,7 @@ multisite_builtin_views.update({ ('svc_state_age', None), ('svc_check_age', None), ('perfometer', None)], - 'play_sounds': True, + 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', 'optservicegroup', @@ -646,7 +646,7 @@ multisite_builtin_views.update({ ('service_icons', None), ('svc_state_age', None), ('svc_check_age', None)], - 'play_sounds': True, + 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', 'optservicegroup', @@ -766,6 +766,7 @@ multisite_builtin_views.update({ ('num_services_crit', 'host_crit'), ('num_services_unknown', 'host_unknown'), ('num_services_pending', 'host_pending')], + 'play_sounds' : True, 'public': True, 'show_filters': ['host_in_notification_period', 'hoststate', @@ -929,7 +930,7 @@ multisite_builtin_views.update({ ('num_services_crit', 'host_crit'), ('num_services_unknown', 'host_unknown'), ('num_services_pending', 'host_pending')], - 'play_sounds': True, + 'play_sounds': False, 'public': True, 'show_filters': ['host_scheduled_downtime_depth', 'host_in_notification_period', @@ -1937,7 +1938,7 @@ multisite_builtin_views.update({ ('sitename_plain', None, ''), ('host_address', None, ''), ('svc_check_command', None, '')], - 'play_sounds': True, + 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', 'service_notifications_enabled', @@ -2310,7 +2311,7 @@ multisite_builtin_views.update({ 'painters': [('aggr_state', None, ''), ('aggr_treestate', None, ''), ('aggr_hosts', None, '')], - 'play_sounds': False, + 'play_sounds': True, 'public': False, 'show_filters': ['aggr_hosts', 'aggr_name',

13 years, 1 month

Check_MK Git: check_mk: printer_supply: fixed logic of Perf-O-Meter ( mixed up crit with ok)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e98f1ba67093f3c1bb76964938d7ca23abb75f86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e98f1ba67093f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 10:56:08 2011 +0200 printer_supply: fixed logic of Perf-O-Meter (mixed up crit with ok) --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4e011f..1c63f90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ speed information. * FIX: cisco_temp_perf: add critical level to performance data * FIX: windows agent: hopefully fix case with quotes in directory name + * FIX: printer_supply: fixed logic of Perf-O-Meter (mixed up crit with ok) * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index f978e06..a7c74e9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -321,24 +321,20 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): s = row['service_description'].lower() fg_color = '#000000' - if 'black' in s: + if 'black' in s or s[-1] == 'k': colors = [ '#000000', '#6E6F00', '#6F0000' ] fg_color = '#ffffff' - elif 'magenta' in s: + elif 'magenta' in s or s[-1] == 'm': colors = [ '#fc00ff', '#FC7FFF', '#FEDFFF' ] - elif 'yellow' in s: + elif 'yellow' in s or s[-1] == 'y': colors = [ '#ffff00', '#FEFF7F', '#FFFFCF' ] - elif 'cyan' in s: + elif 'cyan' in s or s[-1] == 'c': colors = [ '#00ffff', '#7FFFFF', '#DFFFFF' ] else: colors = [ '#cccccc', '#ffff00', '#ff0000' ] - if left > warn: - color = colors[0] - elif left > crit: - color = colors[1] - else: - color = colors[2] + st = min(2, row['service_state']) + color = colors[st] return "<font color=\"%s\">%.0f%%</font>" % (fg_color, left), perfometer_linear(left, color)

13 years, 1 month

Check_MK Git: check_mk: ntp.time: make CRIT, if peers are present but not used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35dc41428f2dd5c04a347ee4dffb78b35064ab6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35dc41428f2dd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 10:39:57 2011 +0200 ntp.time: make CRIT, if peers are present but not used --- checkman/ntp.time | 4 ++++ checks/ntp | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/checkman/ntp.time b/checkman/ntp.time index 72086a7..4de01e9 100644 --- a/checkman/ntp.time +++ b/checkman/ntp.time @@ -15,6 +15,10 @@ description: is UNKNOWN if no system peer is present or the system peer is unreachable. + The check is CRIT, when there are NTP peers reachable but non + of those is used by the NTP daemon. That is the case if the time + provided by those peers is too bad. + Note: If you want to check the health of the peers, you might want to use {ntp}, which creates one individual check per NTP peer. diff --git a/checks/ntp b/checks/ntp index b108b44..6c988a5 100644 --- a/checks/ntp +++ b/checks/ntp @@ -144,7 +144,7 @@ def check_ntp_summary(item, params, info): state, text, perfdata = check_ntp(line[1], params, [line]) text += " (synchronized on %s)" % line[1] return (state, text, perfdata) - return (3, "UNKNOWN - no system peer found") + return (2, "CRIT - found %d peers, but none is suitable" % len(info)) check_info['ntp'] = (check_ntp, "NTP Peer %s", 1, inventory_ntp) check_info['ntp.time'] = (check_ntp_summary, "NTP Time", 1, inventory_ntp_summary)

13 years, 1 month

Check_MK Git: check_mk: ntp.time: handle case where ntpq has empty output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 46e0f8f02f5f6ee2a502c3d3f63318f8061aeff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46e0f8f02f5f6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 10:36:36 2011 +0200 ntp.time: handle case where ntpq has empty output --- checks/ntp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/checks/ntp b/checks/ntp index 62708d1..b108b44 100644 --- a/checks/ntp +++ b/checks/ntp @@ -134,6 +134,10 @@ def check_ntp(item, params, info): return (3, "UNKNOWN - peer not found") def check_ntp_summary(item, params, info): + # No information at all? NTP daemon not running or timeout in ntpq -p + if len(info) == 0: + return (3, "UNKNOWN - no information from NTP: timeout in ntpq -p or NTP daemon not running") + # We only are interested in our system peer or pulse per second source (pps) for line in info: if line[0] in [ "*", "o" ]:

13 years, 1 month

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: 2ae3987c1d8207708bd9bc1b68d34eec4e834aa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ae3987c1d8207… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 10:17:21 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: new config variable dyndns_hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 65d7e18e6c3d10dd46557ea5be653516a62d5b90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65d7e18e6c3d10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 10:17:17 2011 +0200 new config variable dyndns_hosts --- ChangeLog | 2 ++ modules/check_mk.py | 41 ++++++++++++++++++++++++++++++++++++++++- modules/check_mk_base.py | 22 ---------------------- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index c858576..e793301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ TCP port (default is 6556) on a per-host basis. * new config variable snmp_ports, allowing to specify the UDP port to used with SNMP, on a per-host basis. + * new config variable dyndns_hosts. Hosts listed in this configuration + list (compatible to bulkwalk_hosts) use their hostname as IP address. Checks & Agents: * FIX: cisco_temp: skip non-present sensors at inventory diff --git a/modules/check_mk.py b/modules/check_mk.py index 1376e5e..cacaede 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -265,6 +265,7 @@ snmp_hosts = [ (['snmp'], ALL_HOSTS) ] tcp_hosts = [ (['tcp'], ALL_HOSTS), (NEGATE, ['snmp'], ALL_HOSTS), (['!ping'], ALL_HOSTS) ] bulkwalk_hosts = [] usewalk_hosts = [] +dyndns_hosts = [] # use host name as ip address for these hosts ignored_checktypes = [] # exclude from inventory ignored_services = [] # exclude from inventory ignored_checks = [] # exclude from inventory @@ -940,6 +941,39 @@ def get_datasource_program(hostname, ipaddress): else: return programs[0].replace("<IP>", ipaddress).replace("<HOST>", hostname) +# Determine the IP address of a host +def lookup_ipaddress(hostname): + # Quick hack, where all IP addresses are faked (--fake-dns) + if fake_dns: + return fake_dns + + # Honor simulation mode und usewalk hosts. Never contact the network. + elif simulation_mode or opt_use_snmp_walk or \ + (is_usewalk_host(hostname) and is_snmp_host(hostname)): + return "127.0.0.1" + + # Now check, if IP address is hard coded by the user + ipa = ipaddresses.get(hostname) + if ipa: + return ipa + + # Hosts listed in dyndns hosts always use dynamic DNS lookup. + # The use their hostname as IP address at all places + if in_binary_hostlist(hostname, dyndns_hosts): + return hostname + + # Address has already been resolved in prior call to this function? + if hostname in g_dns_cache: + return g_dns_cache[hostname] + + # No do the actual DNS lookup + try: + ipa = socket.gethostbyname(hostname) + except: + g_dns_cache[hostname] = None + raise + g_dns_cache[hostname] = ipa + return ipa def agent_port_of(hostname): ports = host_extra_conf(hostname, agent_ports) @@ -2250,13 +2284,18 @@ no_inventory_possible = None ipa = lookup_ipaddress(node) needed_ipaddresses[node] = ipa nodes.append( (node, ipa) ) - ipaddress = None + try: + ipaddress = lookup_ipaddress(hostname) # might throw exception + needed_ipaddresses[hostname] = ipaddress + except: + ipaddress = None else: ipaddress = lookup_ipaddress(hostname) # might throw exception needed_ipaddresses[hostname] = ipaddress nodes = [ (hostname, ipaddress) ] output.write("ipaddresses = %r\n\n" % needed_ipaddresses) + output.write("def lookup_ipaddress(hostname):\n return ipaddresses.get(hostname)\n\n"); # datasource programs. Is this host relevant? # ACHTUNG: HIER GIBT ES BEI CLUSTERN EIN PROBLEM!! WIR MUESSEN DIE NODES diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 47a5e59..22d5c76 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -541,28 +541,6 @@ def parse_info(lines): return info -def lookup_ipaddress(hostname): - if fake_dns: - return fake_dns - - elif simulation_mode or opt_use_snmp_walk or \ - (is_usewalk_host(hostname) and is_snmp_host(hostname)): - return "127.0.0.1" - elif hostname in g_dns_cache: - return g_dns_cache[hostname] - else: - ipa = ipaddresses.get(hostname) - if ipa: - return ipa - else: - try: - ipa = socket.gethostbyname(hostname) - except: - g_dns_cache[hostname] = None - raise - g_dns_cache[hostname] = ipa - return ipa - def cachefile_age(filename): try: return time.time() - os.stat(filename)[8]

13 years, 1 month

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011