Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: snmp_info check: Not using snmp_info_single anymore

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 79d2b9dfe4cb95189378309b89359e505c0eb696 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79d2b9dfe4cb95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 15:50:14 2010 +0100 snmp_info check: Not using snmp_info_single anymore --- checks/snmp_info | 8 ++++---- web/htdocs/actions.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/snmp_info b/checks/snmp_info index eb83c86..49b2c83 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -25,17 +25,17 @@ # Boston, MA 02110-1301 USA. def inventory_snmp_info(checktype, info): - if len(info) >= 4: + if len(info[0]) >= 4: return [ (None, None, None) ] def check_snmp_info(checktype, params, info): - if len(info) >= 4: - return (0, "OK - %s, %s, %s, %s" % (info[0][-1], info[2][-1], info[3][-1], info[1][-1])) + if len(info[0]) >= 4: + return (0, "OK - %s, %s, %s, %s" % (info[0][0], info[0][2], info[0][3], info[0][1])) else: return (3, "UNKNOWN - No data retrieved") check_info['snmp_info'] = (check_snmp_info, "SNMP Info", 0, inventory_snmp_info) -snmp_info_single['snmp_info'] = ( None, ".1.3.6.1.2.1.1", [ "1.0", "4.0", "5.0", "6.0" ] ) +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 diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index fc03700..9b49fa1 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -23,7 +23,7 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - + from lib import * import time import config @@ -44,7 +44,7 @@ def ajax_action(h): def action_reschedule(): if not config.may("action.reschedule"): raise MKGeneralException("You are not allowed to reschedule checks.") - + site = html.var("site") host = html.var("host", "") if not host:

13 years, 9 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 430f82564cb879b0cf259890d29b8c98bd07bb97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=430f82564cb879… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 15:50:53 2010 +0100 Updated changelog --- ChangeLog | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b5309a..9afc410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,7 +93,8 @@ * printer_supply: In case of OKI c5900 devices the name of the supply units ins not unique. The color of the supply unit is reported in a dedicated OID and added to the check item name to have a unique name now. - * prnter_supply: Added simple pnp template to have better graph formating for the check results + * printer_supply: Added simple pnp template to have better graph formating for the check results + * snmp_info check: Recoded not to use snmp_info_single anymore Multisite: * The custom open/close states of custom links are now stored for each

13 years, 9 months

Check_MK Git: check_mk: wato: fixed links in wato snapin (reverted latest " fix")

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db3dd53119bc69fa3ccbf192c1393dfe1b9891c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db3dd53119bc69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 11:02:57 2010 +0100 wato: fixed links in wato snapin (reverted latest "fix") --- web/plugins/sidebar/wato.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 86dc9e2..aeba3f7 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -19,7 +19,7 @@ def render_wato_files(): state = html.site_status[sitename]["state"] if state != "disabled": html.write("<h3>%s</h3>\n" % site["alias"]) - ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py?site=" + sitename + ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py" html.javascript("document.write(get_url_sync('%s'));" % ajax_url) else: ajax_wato_files(html) @@ -27,14 +27,10 @@ def render_wato_files(): def ajax_wato_files(h): global html html = h - sitename = html.var('site', '') if config.may("use_wato"): for filename, title, roles in config.config_files: if config.role in roles: - if sitename: - bulletlink(title, "/%s/check_mk/wato.py?filename=%s" % (sitename, filename)) - else: - bulletlink(title, "wato.py?filename=%s" % filename) + bulletlink(title, "wato.py?filename=%s" % filename) sidebar_snapins["wato"] = { @@ -44,5 +40,3 @@ sidebar_snapins["wato"] = { "render" : render_wato_files, "allowed" : [ "admin", "user" ], } - -

13 years, 9 months

Check_MK Git: check_mk: cisco_power: Fixed wrong inventory of not present devices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 47a7a4bf59387ee67e2af11a5acda9ad53c09800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47a7a4bf59387e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 08:52:07 2010 +0100 cisco_power: Fixed wrong inventory of not present devices --- ChangeLog | 1 + LIESMICH.zutun | 10 ++++++++++ checks/cisco_power | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f59d391..8b5309a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * cisco_power: Not using power source as threshold anymore. Improved output * cisco_fan: Does not inventorize 'notPresent' sensors anymore. Improved output * cisco_power: Not using power source as threshold anymore. Improved output + * cisco_power: Excluding 'notPresent' devices from inventory now * cisco_temp_perf: Do not crash if device does not send current temperature * tcp_conn_stats: new check for monitoring number of current TCP connections * blade_*: Added snmp scan functions for better automatic inventory diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 15b8fa6..d13a88b 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -15,6 +15,16 @@ Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- + +Wenn ein Host nur den snmpwalk benutzen soll, versucht cmk trotzdem den Host via SNMP zu kontaktieren. +Beim Inventory sieht das z.B. so aus: +> Host 'BOCBKKMM4000': SNMP Error +> Host 'BOCBKKMM4000': SNMP Error +> Host 'BOCBKKMM4000': SNMP Error +> Host 'BOCBKKMM4000': SNMP Error +Das liegt an den Checks, die noch snmp_info_single nutzen: blade_misc, ironport_misc, snia_sml, snmp_info + + ich bin mir nicht sicher ob das nun ein Thruk Problem oder ein Livestatus Problem ist. Vermutlich beides :-) Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: GET services diff --git a/checks/cisco_power b/checks/cisco_power index 25efbc1..0ecf4d6 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -24,12 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# .1.3.6.1.4.1.9.9.13.1.5.1.2.1 "removed" +# .1.3.6.1.4.1.9.9.13.1.5.1.2.2 "AC Power Supply" +# .1.3.6.1.4.1.9.9.13.1.5.1.3.1 5 +# .1.3.6.1.4.1.9.9.13.1.5.1.3.2 1 +# .1.3.6.1.4.1.9.9.13.1.5.1.4.1 1 +# .1.3.6.1.4.1.9.9.13.1.5.1.4.2 2 + cisco_power_states = ('', 'normal', 'warning', 'critical', 'shutdown', 'notPresent', 'notFunctioning') cisco_power_source = ( '', 'unknown', 'ac', 'dc', 'externalPowerSupply', 'internalRedundant') def inventory_cisco_power(checkname, info): - return [ (line[0], '', '""') for line in info if 'RPS NotExist' not in line[0]] + # 5 in line[1] means cisco_power_states = notPresent + return [ (line[0], '', '""') for line in info if 'RPS NotExist' not in line[0] and line[1] != '5' ] def check_cisco_power(item, params, info): for line in info:

13 years, 9 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c0bad52c4402d15fe6ed2306763a2512b4912d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c0bad52c4402d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 5 19:29:04 2010 +0100 Updated internal doku --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7761070..f59d391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,10 @@ * Multisite view "Recently changed services": sort newest first * Added options show_header and show_controls to remove the page headers from views + * Cool: new button for an immediate reschedule of a host or service + check: the view is redisplayed exactly at the point of time when + Nagios has finished the check. This makes use of MK Livestatus' + unique waiting feature. 1.1.8: Core, Setup, etc.:

13 years, 9 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: 3618dc99ff3b6eb793133a033b6e5bdeb22e12dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3618dc99ff3b6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 5 19:29:25 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Added missing reloading image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60b48504e7cf46d4ba57ee6d1b94ecd0fbbcb7ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b48504e7cf46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:48:15 2010 +0100 Added missing reloading image --- web/htdocs/images/icon_reloading.gif | Bin 0 -> 7696 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_reloading.gif b/web/htdocs/images/icon_reloading.gif new file mode 100644 index 0000000..5b30ae7 Binary files /dev/null and b/web/htdocs/images/icon_reloading.gif differ

13 years, 9 months

Check_MK Git: check_mk: Added new title for reschedule button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 322dc2e62cad9e88f5407f35e6c27812b2dab34f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=322dc2e62cad9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:40:38 2010 +0100 Added new title for reschedule button --- web/plugins/views/painters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index ad2e5d5..bfb6c7f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -184,7 +184,7 @@ def paint_icons(what, row): # what is "host" or "service" if what == 'service': name2 = row['service_description'] output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ - '<img class=icon title="Reschedule and imediate check of this %s" ' \ + '<img class=icon title="Reschedule an immediate check of this %s" ' \ 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2, what) return "icons", output

13 years, 9 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: 38dc1400974b380633940406c9d78472b0bac4d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38dc1400974b38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 3 17:40:50 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Multisite: fix reschedule problem for fast checks

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4aa9de9a931fef03ecf7850340b301dbea7e965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4aa9de9a931fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 3 17:50:54 2010 +0100 Multisite: fix reschedule problem for fast checks --- web/htdocs/actions.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 9bd247a..fc03700 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -42,6 +42,9 @@ def ajax_action(h): html.write("['ERROR', %r]\n" % str(e)) def action_reschedule(): + if not config.may("action.reschedule"): + raise MKGeneralException("You are not allowed to reschedule checks.") + site = html.var("site") host = html.var("host", "") if not host: @@ -65,14 +68,14 @@ def action_reschedule(): row = html.live.query_row( "GET %ss\n" "WaitObject: %s %s\n" - "WaitCondition: last_check > %d\n" + "WaitCondition: last_check >= %d\n" "WaitTimeout: %d\n" "WaitTrigger: check\n" "Columns: last_check state plugin_output\n" "Filter: host_name = %s\n%s" % (what, host, service, now, config.reschedule_timeout * 1000, host, add_filter)) last_check = row[0] - if last_check <= now: + if last_check < now: html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) else:

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010