Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64507 discussions

Check_MK Git: check_mk: htmllib: new function http_redirect

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f89fb83ca4c64d2f508ca43508cdb3eaf58f1c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f89fb83ca4c64… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 8 12:39:32 2013 +0100 htmllib: new function http_redirect --- web/htdocs/html_mod_python.py | 4 ++++ web/htdocs/htmllib.py | 3 +++ web/htdocs/wato.py | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index f50d8ad..c8082ec 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -125,6 +125,10 @@ class html_mod_python(htmllib.html): msg = repr(msg) self.req.log_error(msg, apache.APLOG_WARNING) + def http_redirect(self, url): + self.set_http_header('Location', url) + raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY + # Needs to set both, headers_out and err_headers_out to be sure to send # the header on all responses def set_http_header(self, key, val): diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7101834..d9f209c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -713,6 +713,9 @@ class html: def set_browser_reload(self, secs): self.browser_reload = secs + def http_redirect(self, url): + raise MKGeneralException("http_redirect not implemented") + def set_browser_redirect(self, secs, url): self.browser_reload = secs self.browser_redirect = url diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c908506..3728d33 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2295,8 +2295,8 @@ def mode_diag_host(phase): save_folder_and_hosts(g_folder) reload_hosts(g_folder) call_hook_hosts_changed(g_folder) - return 'edithost' + html.http_redirect(make_link([("mode", "edithost"), ("host", hostname), ("folder", g_folder[".path"])])) return html.write('<div class="diag_host">')

10 years, 11 months

Check_MK Git: check_mk: Trying to improve ping feedback during host diag

by Lars Michelsen

Module: check_mk Branch: master Commit: 82004701d773d35720909e96517e53e6db215440 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82004701d773d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 10:36:01 2013 +0100 Trying to improve ping feedback during host diag --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 6c9e5e0..94dc497 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -679,7 +679,7 @@ def automation_diag_host(args): try: if test == 'ping': import subprocess - p = subprocess.Popen('ping -c 3 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) + p = subprocess.Popen('ping -A -i 0.2 -c 2 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) response = p.stdout.read() return (p.wait(), response)

10 years, 11 months

Check_MK Git: check_mk: Fixed exception in latest change

by Lars Michelsen

Module: check_mk Branch: master Commit: 76af8078b194f9e7e666ab8e3980b778dd80ec5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76af8078b194f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 10:28:10 2013 +0100 Fixed exception in latest change --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 16501a8..c908506 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2354,6 +2354,8 @@ def mode_diag_host(phase): def ajax_diag_host(): try: + prepare_folder_info() + if not html.check_transaction(): return @@ -2392,7 +2394,8 @@ def ajax_diag_host(): # Second is treated as text output html.write("%s %s" % (result[0], html.attrencode(result[1]))) except Exception, e: - html.write("1 %s" % _("Exception: %s") % html.attrencode(str(e))) + import traceback + html.write("1 %s" % _("Exception: %s") % html.attrencode(traceback.format_exc())) #. # .-Inventory & Services-------------------------------------------------.

10 years, 11 months

Check_MK Git: check_mk: FIX Fixed locking issue on host diagnose page

by Lars Michelsen

Module: check_mk Branch: master Commit: 05591cd0fed7becb536eb2ff633c12e27cd09fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05591cd0fed7be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 10:21:59 2013 +0100 FIX Fixed locking issue on host diagnose page --- .werks/48 | 8 +++++ ChangeLog | 3 +- web/htdocs/js/wato.js | 2 +- web/htdocs/wato.py | 86 ++++++++++++++++++++++++++++----------------- web/plugins/pages/wato.py | 1 + 5 files changed, 65 insertions(+), 35 deletions(-) diff --git a/.werks/48 b/.werks/48 new file mode 100644 index 0000000..416f020 --- /dev/null +++ b/.werks/48 @@ -0,0 +1,8 @@ +Title: Fixed locking issue on host diagnose page +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1383902500 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 42fffe9..87f435a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... + * 0048 FIX: Fixed locking issue on host diagnose page... Reporting & Availability: * 0051 Option for showing timeline directly in availability table... @@ -155,7 +156,7 @@ * Disabled replication type "peer" in site editor. * Added "permanently ignore" button to inventory services dialog which links directly to the disabled services view - * Added dignose page linked from host edit dialog. This can be used to test + * Added diagnose page linked from host edit dialog. This can be used to test connection capabilities of hosts * The rule "Process inventory" now offers the same configuration options as its manual check equivalent "State and count of processes" diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index f4dcdd6..e4ace12 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -748,7 +748,7 @@ function start_host_diag_test(ident, hostname) { img.src = "images/icon_loading.gif"; log.innerHTML = "..."; - get_url("wato.py?mode=diag_host&host=" + escape(hostname) + "&_test=" + escape(ident) + get_url("wato_ajax_diag_host.py?host=" + escape(hostname) + "&_test=" + escape(ident) + '&_transid=-1' + vars, handle_host_diag_result, ident); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7deb2f0..16501a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2187,6 +2187,15 @@ def delete_host_after_confirm(delname): # | Verify or find out a hosts agent related configuration. | # '----------------------------------------------------------------------' +def diag_host_tests(): + return [ + ('ping', _('Ping')), + ('agent', _('Agent')), + ('snmpv1', _('SNMPv1')), + ('snmpv2', _('SNMPv2c')), + ('snmpv2_nobulk', _('SNMPv2c (without Bulkwalk)')) + ] + def mode_diag_host(phase): hostname = html.var("host") if not hostname: @@ -2261,14 +2270,6 @@ def mode_diag_host(phase): ] ) - tests = [ - ('ping', _('Ping')), - ('agent', _('Agent')), - ('snmpv1', _('SNMPv1')), - ('snmpv2', _('SNMPv2c')), - ('snmpv2_nobulk', _('SNMPv2c (without Bulkwalk)')) - ] - host = g_folder[".hosts"].get(hostname) if not host: @@ -2280,30 +2281,7 @@ def mode_diag_host(phase): if not html.check_transaction(): return - _test = html.var('_test') - if _test: - # Execute a specific test - try: - if _test not in dict(tests).keys(): - raise MKGeneralException(_('Invalid test.')) - args = [ - html.var('ipaddress'), - html.var('snmp_community'), - html.var('agent_port'), - html.var('snmp_timeout'), - html.var('snmp_retries'), - html.var('datasource_program'), - ] - result = check_mk_automation(host[".siteid"], "diag-host", [hostname, _test] + args) - except Exception, e: - result = (1, _("Exception: %s") % html.attrencode(str(e))) - # API is defined as follows: Two data fields, separated by space. - # First is the state: 0 or 1, 0 means success, 1 means failed. - # Second is treated as text output - html.write("%s %s" % (result[0], html.attrencode(result[1]))) - return "" - - elif html.var('_save'): + if html.var('_save'): # Save the ipaddress and/or community mark_affected_sites_dirty(g_folder, hostname) @@ -2358,7 +2336,7 @@ def mode_diag_host(phase): 'connection options you like to try on the right side of the screen and ' 'press the "Test" button. The results will be displayed here.')) else: - for ident, title in tests: + for ident, title in diag_host_tests(): html.write('<h3>%s</h3>' % title) html.write('<table class="data test"><tr class="data odd0">') html.write('<td class="icons"><div>') @@ -2374,6 +2352,48 @@ def mode_diag_host(phase): html.write('</td></tr></table>') html.write('</div>') +def ajax_diag_host(): + try: + if not html.check_transaction(): + return + + if not config.may('wato.diag_host'): + raise MKAuthException(_('You are not permitted to perform this action.')) + + hostname = html.var("host") + if not hostname: + raise MKGeneralException(_('The hostname is missing.')) + + host = g_folder[".hosts"].get(hostname) + + if not host: + raise MKGeneralException(_('The given host does not exist.')) + if ".nodes" in host: + raise MKGeneralException(_('This view does not support cluster hosts.')) + + _test = html.var('_test') + if not _test: + raise MKGeneralException(_('The test is missing.')) + + # Execute a specific test + if _test not in dict(diag_host_tests()).keys(): + raise MKGeneralException(_('Invalid test.')) + args = [ + html.var('ipaddress'), + html.var('snmp_community'), + html.var('agent_port'), + html.var('snmp_timeout'), + html.var('snmp_retries'), + html.var('datasource_program'), + ] + result = check_mk_automation(host[".siteid"], "diag-host", [hostname, _test] + args) + # API is defined as follows: Two data fields, separated by space. + # First is the state: 0 or 1, 0 means success, 1 means failed. + # Second is treated as text output + html.write("%s %s" % (result[0], html.attrencode(result[1]))) + except Exception, e: + html.write("1 %s" % _("Exception: %s") % html.attrencode(str(e))) + #. # .-Inventory & Services-------------------------------------------------. # | ____ _ | diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 4a41a14..bd2eb18 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -34,4 +34,5 @@ pagehandlers.update({ "automation" : wato.page_automation, "user_profile" : wato.page_user_profile, "ajax_set_foldertree" : wato.ajax_set_foldertree, + "wato_ajax_diag_host" : wato.ajax_diag_host, })

10 years, 11 months

Check_MK Git: check_mk: FIX snmpd_mkevent.py: fixed crash on startup

by Mathias Kettner

Module: check_mk Branch: master Commit: 73308da18a1d8f453f6085b8ecfcf27495a1102d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73308da18a1d8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 8 08:55:04 2013 +0100 FIX snmpd_mkevent.py: fixed crash on startup --- .werks/26 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/26 b/.werks/26 index 471516a..4a25e82 100644 --- a/.werks/26 +++ b/.werks/26 @@ -1,4 +1,4 @@ -Title: snmptd_mkevent.py: fixed crash on startup +Title: snmpd_mkevent.py: fixed crash on startup Level: 1 Component: ec Version: 1.2.3i7 diff --git a/ChangeLog b/ChangeLog index 4b3e681..e6418f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,7 +30,7 @@ * 0056 New concept of service periods in availability reporting... Event Console: - * 0026 FIX: snmptd_mkevent.py: fixed crash on startup + * 0026 FIX: snmpd_mkevent.py: fixed crash on startup Livestatus: * 0023 FIX: table statehist: code cleanup / minor performance improvements

10 years, 11 months

Check_MK Git: check_mk: Reserved 1000 Werk IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: dab3582fe55463090b351663899df814649b5900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dab3582fe55463… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 22:39:03 2013 +0100 Reserved 1000 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 598ed30..0b2a2c0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -190 +1190

10 years, 11 months

Check_MK Git: check_mk: Reserved 1000 bug IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3a3f658545305386e8e757c06b120c3ac1ddb938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a3f6585453053… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 22:39:21 2013 +0100 Reserved 1000 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 9c79b4b..c15a35c 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1092 +2092

10 years, 11 months

Check_MK Git: check_mk: Intermediate state of supporting service periods

by Mathias Kettner

Module: check_mk Branch: master Commit: 62aca1857e8bff06393f37b5e7b386b2d2dd7665 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62aca1857e8bff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 7 18:02:57 2013 +0100 Intermediate state of supporting service periods --- livestatus/src/CustomTimeperiodColumn.cc | 50 +++++++++++++++++++++ livestatus/src/CustomTimeperiodColumn.h | 48 ++++++++++++++++++++ livestatus/src/CustomVarsExplicitColumn.h | 2 - livestatus/src/Makefile.am | 2 +- livestatus/src/OffsetTimeperiodColumn.cc | 4 +- livestatus/src/TableHosts.cc | 5 +++ livestatus/src/TableServices.cc | 6 +++ livestatus/src/TableStateHistory.cc | 65 ++++++++++++++++++++++++++++ livestatus/src/TimeperiodsCache.cc | 11 +++++ livestatus/src/TimeperiodsCache.h | 1 + modules/check_mk.py | 9 ++++ web/htdocs/views.css | 4 ++ web/plugins/views/availability.py | 34 +++++++++++++-- web/plugins/wato/check_mk_configuration.py | 30 +++++++++++++ 14 files changed, 262 insertions(+), 9 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=62aca1857e…

10 years, 11 months

Check_MK Git: check_mk: New concept of service periods in availability reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: 66a1d53b913fd28ddea8757a4601a4c24107365b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66a1d53b913fd2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 7 18:52:18 2013 +0100 New concept of service periods in availability reporting There is now a pair of new WATO rules called <i>Service period for hosts</i> and <i>Service period for services</i>. With these you can define a timeperiod for a host and/or service within that object is expected to be available in terms of availability reporting. An object that is out of its service period is still being monitored and also notified. But in the reporting there is now a new option box <i>Service Time</i> for handling this new information. You have either: <ul> <li><i>Base report only on service times</i> - All phase out of the service period of the object in question is not taken into account when computing percentages. It is still visible in the timeline but grayed out. This enabled you to compute the availability of on object just within a define time frame.</li> <li><i>Base report only on non-service times</i> - This does quite the opposite: It just shows the times where the object is <i>out of</i> its service time.</li> <li><i>Include both service and non-service times</i> - This simply ignores the service time</li> </ul> Please note, that any change to a timeperiod definition always affects future times, never the past. <b>But</b>: it is possible to select an alternative timeperiod for a host and object an rerun the reporting. If that timeperiod aready had existed during the reporting time range then everything works as expected. <b>Note</b>: The service period make use of new Livestatus columns. You thus need to update all of your monitoring nodes in order to use the availability reporting - even if you do not use this new feature. --- .werks/56 | 35 +++++++++++++++ ChangeLog | 15 ++++--- livestatus/src/TableHosts.cc | 8 ++-- livestatus/src/TableServices.cc | 8 ++-- livestatus/src/TableStateHistory.cc | 56 +++++++++++------------ modules/check_mk.py | 14 +++--- web/htdocs/images/ooservice.png | Bin 0 -> 222 bytes web/htdocs/views.css | 5 ++- web/plugins/views/availability.py | 66 +++++++++++++++++----------- web/plugins/wato/check_mk_configuration.py | 16 +++---- 10 files changed, 138 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66a1d53b91…

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0836

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8688b60993e38ec4eabb8f43182f29bf8a659a12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8688b60993e38e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 7 17:44:02 2013 +0100 Updated bug entries #0836 --- .bugs/836 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/836 b/.bugs/836 new file mode 100644 index 0000000..0a4b72d --- /dev/null +++ b/.bugs/836 @@ -0,0 +1,8 @@ +Title: libpcap is missing in debian +Component: core +State: open +Date: 2013-11-07 17:42:36 +Targetversion: 1.2.2 +Class: bug + +On Debian with cmc, the libpcap is missing but needed by the icmphelper. Leads to GBs of logfiles and high cpu load from cmc

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits