Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: Eliminated two further references to rra config

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d56fb6fcf6f0a743be08948cf8ee63691119e5d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d56fb6fcf6f0a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 24 09:03:06 2011 +0100 Eliminated two further references to rra config --- check_mk.spec | 1 - make_package_info | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index fbb225e..3a96af5 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -145,7 +145,6 @@ rm -rf $RPM_BUILD_ROOT /usr/share/check_mk/checks /usr/share/check_mk/modules /usr/share/check_mk/pnp-templates/* -/usr/share/check_mk/pnp-rraconf /usr/share/doc/check_mk %dir /var/lib/check_mk %dir %attr(-,nagios,root) /var/lib/check_mk/counters diff --git a/make_package_info b/make_package_info index 6cf6b10..920c2a8 100755 --- a/make_package_info +++ b/make_package_info @@ -18,7 +18,7 @@ package = { "files" : filelists } -parts = [ "checks", "checkman", "agents", "web", "pnp-templates", "pnp-rraconf", "doc" ] +parts = [ "checks", "checkman", "agents", "web", "pnp-templates", "doc" ] for part in parts: tarfile = part + ".tar.gz" filelist = []

12 years, 7 months

Check_MK Git: check_mk: Whitepaper about Cookie authentication

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ddcba51dc0ca374ef23cc489a0b543c680675c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddcba51dc0ca37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 23 12:56:48 2011 +0100 Whitepaper about Cookie authentication --- doc/LIESMICH.cookieauth | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/doc/LIESMICH.cookieauth b/doc/LIESMICH.cookieauth new file mode 100644 index 0000000..9bce743 --- /dev/null +++ b/doc/LIESMICH.cookieauth @@ -0,0 +1,75 @@ +Authentifizierung mit Cookies +----------------------------- + +Zielsetzung: + +* Login nicht per HTTP Auth, sondern über eine hübsche Loginmaske. + Warum? Nur weil es hübsch ist. Andere Vorteile sehe ich aktuell + nicht. Ausloggen geht ja mittlerweile auch über HTTPBasicAuth. + +* Login soll in den Addons Multisite, NagVis und PNP4Nagios funktionieren. + + +Umsetzung: + +* Die Passworte bleiben nach wie vor in der Datei htpasswd (verschlüsselt). + Damit ist man auf jeden Fall kompatibel. + +* Wenn man auf index.py kommt (das Frameset) und hat noch kein Login-Cookie, + dann kommt anstelle des Framesets eine Einloggemaske. Dort gibt man Name + und Passwort ein und kann evtl. noch - wenn wir nett sind - seine Sprache + einstellen. + +* Das eingetippte Passwort wird gegen die htpasswd-Datei geprüft. Dabei wird + zumindest MD5 (verwendet WATO) und crypt (default von htpasswd) unterstützt. + +* Wenn das erfolgreich ist, wird ein Login-Cookie generiert. Dieses enthält + folgende Daten im Klartext: + - Loginname + - Verfallszeit als Timestamp. Wenn das 0 ist heißt es "unendlich" + Die Verfallszeit wird - in multisite.mk einstellbar - auf die Zukunft gesetzt, + z.B. auf 60 Minuten. Das ganze ist pro Benutzeraccount einstellbar. + Nach Ablauf der Zeit verfällt das Cookie. + + Diese beiden Angaben werden jetzt noch kombiniert mit dem verschlüsselten + Passwort und einem Geheimnis, dass in der Datei etc/auth.secret gespeichert + wird. Alle vier Werte werden durch Pipesymbole zusammengehängt, z.B. + "harri|123909495|$1$090775$8M/9Eq3MlnP4yhafnc1ef/|L8jJLlk3ekFL" + Dieser String wird jetzt mit MD5 gehäscht und daraus ein Cookie gebildet, + z.B. "harri|123909495|89a3292c8a1496e864a4ba3d4080cad9". Dies ist dann + der Inhalt des Cookies. + +* Das etc/auth.secret wird automatisch ausgewürfelt, wenn es noch nicht + da ist. + +* Die WATO-Replikation muss auch das Secret mit replizieren, damit eine + Anmeldung auch Remote immer gültig ist. + +* Der Pfad zu etc/auth.secret wird aus dem Pfad zur htpasswd-Datei + gebildet. Diese ist Check_MK bekannt und steht in den Defaults in + der Variable "htpasswd_file". Davon nimmt man den dirname. + +* Zum Überprüfen holt man Loginname und Verfallszeit aus dem Cookie. Ist + die Zeit abgelaufen, wird das Cookie verworfen. Dann holt man sich + das auth.secret und das verschlüsselte Passwort des Users und bildet + erneut den Rohstring und häscht diesen. Wenn die MD5-Summe mit der im + Cookie übereinstimmt darf man weiter. Wenn das Cookie eine Verfallszeit + hat und *keine* Ajax-ID gesetzt ist, wird das Cookie automatisch erneuert. + +* Wenn man irgendeine Seite außer index.py aufruft und *kein korrektes* Cookie hat, + dann wird man irgendwie weitergeleitet auf die Loginmaske. In dieser wird die + eigentlich URL hidden mitgespeichert, so dass man nach dem Einloggen da weitermachen + kann, wo man eigentlich hinwollte. + +* PNP und NagVis müssen ebenfalls in der Lage sein, ein Cookie zu überprüfen + und zu erneuern. Dazu muss man den Code für das Überprüfen des Cookies auch + in PHP schreiben. + +* Die Einstellung, ob man htpasswd oder Cookies macht, ist einfach: Wenn beim + index.py bereits ein user bekannt ist (von Apache), nimmt man den. Ansonsten + nimmt man die Cookies. + +* omd config bekommt eine Variable, die das steuert. Diese schaltet dann + die Apache-Konfiguration für Check_MK, PNP und NagVis um. Wenn andere + Lust haben (Thruk, etc.) können die sich auch dranhängen. +

12 years, 7 months

Check_MK Git: check_mk: Drop RRA-configuration files for PNP4Nagios completely

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0436597a57dabe2aecf6ecf9ca2f81c6212ea67e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0436597a57dabe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 23 09:45:30 2011 +0100 Drop RRA-configuration files for PNP4Nagios completely --- ChangeLog | 1 + Makefile | 1 - modules/check_mk.py | 4 --- pnp-rraconf/README.check_mk_rra | 23 -------------------- pnp-rraconf/avg-max-min.rra.cfg | 16 ------------- pnp-rraconf/avg-max.rra.cfg | 9 ------- pnp-rraconf/avg-min.rra.cfg | 9 ------- pnp-rraconf/avg.rra.cfg | 4 --- pnp-rraconf/check-mk-ping.rra.cfg | 1 - pnp-rraconf/check-mk.rra.cfg | 1 - pnp-rraconf/check_mk-akcp_sensor_humidity.rra.cfg | 1 - pnp-rraconf/check_mk-akcp_sensor_temp.rra.cfg | 1 - pnp-rraconf/check_mk-apc_symmetra.rra.cfg | 1 - pnp-rraconf/check_mk-apc_symmetra.rra.cfg@ | 1 - pnp-rraconf/check_mk-apc_symmetra_ext_temp.rra.cfg | 1 - pnp-rraconf/check_mk-apc_symmetra_temp.rra.cfg | 1 - pnp-rraconf/check_mk-cisco_qos.rra.cfg | 4 --- pnp-rraconf/check_mk-cmctc.temp.rra.cfg | 1 - pnp-rraconf/check_mk-cpu.load.rra.cfg | 1 - pnp-rraconf/check_mk-cpu.loads.rra.cfg | 1 - pnp-rraconf/check_mk-cpu.threads.rra.cfg | 1 - pnp-rraconf/check_mk-decru_cpu.rra.cfg | 1 - pnp-rraconf/check_mk-df.rra.cfg | 1 - pnp-rraconf/check_mk-df_netapp.rra.cfg | 1 - pnp-rraconf/check_mk-df_netapp32.rra.cfg | 1 - pnp-rraconf/check_mk-diskstat.rra.cfg | 1 - pnp-rraconf/check_mk-f5_bigip_temp.rra.cfg | 1 - .../check_mk-fc_brocade_port_detailed.rra.cfg | 1 - pnp-rraconf/check_mk-h3c_lanswitch_cpu.rra.cfg | 1 - pnp-rraconf/check_mk-hpux_cpu.rra.cfg | 1 - pnp-rraconf/check_mk-hpux_if.rra.cfg | 1 - pnp-rraconf/check_mk-hr_cpu.rra.cfg | 1 - pnp-rraconf/check_mk-hr_fs.rra.cfg | 1 - pnp-rraconf/check_mk-hr_mem.rra.cfg | 1 - pnp-rraconf/check_mk-if.rra.cfg | 1 - pnp-rraconf/check_mk-if64.rra.cfg | 1 - pnp-rraconf/check_mk-ipmi.rra.cfg | 1 - pnp-rraconf/check_mk-ipmi_sensors.rra.cfg | 1 - pnp-rraconf/check_mk-kernel.rra.cfg | 1 - pnp-rraconf/check_mk-kernel.util.rra.cfg | 1 - pnp-rraconf/check_mk-lnx_if.rra.cfg | 1 - pnp-rraconf/check_mk-local.rra.cfg | 1 - pnp-rraconf/check_mk-lparstat_aix.rra.cfg | 1 - pnp-rraconf/check_mk-mcdata_fcport.rra.cfg | 1 - pnp-rraconf/check_mk-mem.used.rra.cfg | 1 - pnp-rraconf/check_mk-mem.vmalloc.rra.cfg | 1 - pnp-rraconf/check_mk-mem.win.rra.cfg | 1 - pnp-rraconf/check_mk-netctr.combined.rra.cfg | 1 - pnp-rraconf/check_mk-netctr.rra.cfg | 1 - pnp-rraconf/check_mk-ntp.rra.cfg | 1 - pnp-rraconf/check_mk-ntp.time.rra.cfg | 1 - pnp-rraconf/check_mk-nvidia.temp.rra.cfg | 1 - pnp-rraconf/check_mk-oracle_inst.rra.cfg | 1 - pnp-rraconf/check_mk-oracle_logswitches.rra.cfg | 1 - pnp-rraconf/check_mk-oracle_sessions.rra.cfg | 1 - pnp-rraconf/check_mk-oracle_tablespaces.rra.cfg | 1 - pnp-rraconf/check_mk-ps.perf.rra.cfg | 1 - pnp-rraconf/check_mk-smart.stats.rra.cfg | 1 - pnp-rraconf/check_mk-smart.temp.rra.cfg | 1 - pnp-rraconf/check_mk-snmp_uptime.rra.cfg | 1 - pnp-rraconf/check_mk-statgrab_cpu.rra.cfg | 1 - pnp-rraconf/check_mk-statgrab_disk.rra.cfg | 1 - pnp-rraconf/check_mk-statgrab_load.rra.cfg | 1 - pnp-rraconf/check_mk-statgrab_mem.rra.cfg | 1 - pnp-rraconf/check_mk-statgrab_net.ctr.rra.cfg | 1 - pnp-rraconf/check_mk-steelhead_connections.rra.cfg | 1 - pnp-rraconf/check_mk-sylo.rra.cfg | 1 - pnp-rraconf/check_mk-systemtime.rra.cfg | 1 - pnp-rraconf/check_mk-tcp_conn_stats.rra.cfg | 1 - pnp-rraconf/check_mk-ucd_cpu_load.rra.cfg | 1 - pnp-rraconf/check_mk-ucd_cpu_util.rra.cfg | 1 - pnp-rraconf/check_mk-uptime.rra.cfg | 1 - pnp-rraconf/check_mk-vms_df.rra.cfg | 1 - pnp-rraconf/check_mk-vms_sys.util.rra.cfg | 1 - pnp-rraconf/check_mk-winperf.cpuusage.rra.cfg | 1 - pnp-rraconf/check_mk-winperf_msx_queues.rra.cfg | 1 - pnp-rraconf/check_mk-winperf_phydisk.rra.cfg | 1 - pnp-rraconf/check_mk-wut_webtherm.rra.cfg | 1 - pnp-rraconf/max-min.rra.cfg | 9 ------- pnp-rraconf/max.rra.cfg | 4 --- pnp-rraconf/min.rra.cfg | 4 --- scripts/setup.sh | 15 ------------- 82 files changed, 1 insertions(+), 171 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0436597a57…

12 years, 7 months

Check_MK Git: check_mk: WATO: automation accounts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1748c37a2465a6b9bfc78d904f637051e5b0b4a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1748c37a2465a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 22 16:00:20 2011 +0100 WATO: automation accounts --- .bugs/438 | 11 +++ web/htdocs/config.py | 2 + web/htdocs/htmllib.py | 2 + web/htdocs/images/button_random_hi.png | Bin 0 -> 3565 bytes web/htdocs/images/button_random_lo.png | Bin 0 -> 3965 bytes web/htdocs/js/wato.js | 10 +++ web/htdocs/wato.py | 123 +++++++++++++++++++++++++------- 7 files changed, 123 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1748c37a24…

12 years, 7 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: f3a2c78628045df99f2d77687565f945b82a6dcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3a2c78628045d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 22 16:00:24 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Small logwatch improvements

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b8ed060718d73defde1d9e9cf420d5e1e06ba056 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8ed060718d73d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 22 15:04:38 2011 +0100 Small logwatch improvements * Logwatch: Switched strings in logwatch to i18n strings * Logwatch: Fixed styling of context button when acknowleding log messages * Logwatch: Implemented overview page to show all problematic logfiles --- ChangeLog | 3 + web/htdocs/page_logwatch.py | 112 ++++++++++++++++++++++++++++--------------- 2 files changed, 76 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index e582625..d9cdd23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ * New config option debug_livestatus_queries, normal debug mode does not include this anymore * Icons with link to page URL at bottom of each page + * Logwatch: Switched strings in logwatch to i18n strings + * Logwatch: Fixed styling of context button when acknowleding log messages + * Logwatch: Implemented overview page to show all problematic logfiles WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/page_logwatch.py b/web/htdocs/page_logwatch.py index 1a7001a..d19db15 100644 --- a/web/htdocs/page_logwatch.py +++ b/web/htdocs/page_logwatch.py @@ -30,18 +30,18 @@ import views def page(): - host = html.var('host') filename = html.var('file') if not host: - raise MKGeneralException("You called this page via an invalid URL: missing host") + show_log_list() + return # Check user permissions on the host if not may_see(host): - raise MKAuthException("You are not allowed to access the logs of the host %s" % htmllib.attrencode(host)) + raise MKAuthException(_("You are not allowed to access the logs of the host %s") % htmllib.attrencode(host)) if filename: - if html.has_var('ack') and not html.var("_do_actions") == "No": + if html.has_var('ack') and not html.var("_do_actions") == _("No"): html.live.set_auth_domain('action') do_log_ack(host, filename) else: @@ -49,24 +49,45 @@ def page(): else: show_host_log_list(host) +# Shows a list of all problematic logfiles grouped by host +def show_log_list(): + html.header(_("All problematic Logfiles")) + + html.write("<table class=data>\n") + for host, logs in all_logs(): + html.write('<tr><td colspan=2><h2>%s</h2></td></tr>' % host) + list_logs(host, logs) + html.write("</table>\n") + + html.footer() + +# Shows all problematic logfiles of a host def show_host_log_list(host): - html.header("Logfiles of host " + host) + html.header(_("Logfiles of host %s") % host) html.begin_context_buttons() - html.context_button("Services", "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) + html.context_button(_("Services"), "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) + html.context_button(_("All logfiles"), "logwatch.py") html.end_context_buttons() - logs_shown = False + html.write("<table class=data>\n") + list_logs(host, host_logs(host)) + html.write("</table>\n") + + html.footer() + +# Displays a table of logfiles +def list_logs(host, logfiles): rowno = 0 - for file in host_logs(host): + for log_file in logfiles: rowno += 1 if rowno == 1: - html.write("<table class=data>\n") html.write("<tr class=groupheader>\n") - html.write("<th>Level</th><th>Logfile</th><th>Last Entry</th><th>Entries</th></tr>\n") + html.write("<th>"+_('Level')+"</th><th>"+_('Logfile')+"</th>") + html.write("<th>"+_('Last Entry')+"</th><th>"+_('Entries')+"</th></tr>\n") - file_display = form_file_to_ext(file) + file_display = form_file_to_ext(log_file) - logs = parse_file(host, file) + logs = parse_file(host, log_file) if logs == [] or type(logs) != list: # corrupted logfile if logs == []: logs = "empty" html.write("<tr class=%s0>\n" % (rowno % 2 == 0 and "odd" or "even")) @@ -84,47 +105,44 @@ def show_host_log_list(host): html.write("<td>%s</td><td>%s</td></tr>\n" % \ (form_datetime(last_log['datetime']), len(logs))) - if rowno > 0: - html.write("</table>") - else: - html.write('<p>No logs found for this host.</p>\n') - - html.footer() + if rowno == 0: + html.write('<tr><td colspan=4>'+_('No logs found for this host.')+'</td></tr>\n') def show_file(host, filename): file = form_file_to_int(filename) - html.header("Logfiles of host %s: %s" % (host, filename)) + html.header(_("Logfiles of host %s: %s") % (host, filename)) html.begin_context_buttons() - html.context_button("Services", "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) - html.context_button("All logfiles", "logwatch.py?host=%s" % htmllib.urlencode(host)) + html.context_button(_("Services"), "view.py?view_name=host&site=&host=%s" % htmllib.urlencode(host)) + html.context_button(_("All logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) + html.context_button(_("All logfiles"), "logwatch.py") if html.var('hidecontext', 'no') == 'yes': - hide_context_label = 'Show context' + hide_context_label = _('Show context') hide_context_param = 'no' hide = True else: - hide_context_label = 'Hide context' + hide_context_label = _('Hide context') hide_context_param = 'yes' hide = False logs = parse_file(host, file, hide) if type(logs) != list: html.end_context_buttons() - html.show_error("Unable to show logfile: <b>%s</b>" % logs) + html.show_error(_("Unable to show logfile: <b>%s</b>") % logs) html.footer() return elif logs == []: html.end_context_buttons() - html.message("This logfile contains no unacknowledged messages.") + html.message(_("This logfile contains no unacknowledged messages.")) html.footer() return if config.may("act") and may_see(host): - html.context_button("Acknowledge", "logwatch.py?host=%s&file=%s&ack=1" % \ + html.context_button(_("Acknowledge"), "logwatch.py?host=%s&file=%s&ack=1" % \ (htmllib.urlencode(host), htmllib.urlencode(html.var('file')) )) - html.context_button("Context", 'logwatch.py?host=%s&file=%s&hidecontext=%s">%s</a>' % \ + html.context_button(_("Context"), 'logwatch.py?host=%s&file=%s&hidecontext=%s">%s</a>' % \ (htmllib.urlencode(host), \ htmllib.urlencode(html.var('file')), \ htmllib.urlencode(hide_context_param), \ @@ -152,35 +170,38 @@ def show_file(host, filename): def do_log_ack(host, filename): file = form_file_to_int(filename) file_display = form_file_to_ext(file) - html.header("Acknowledge logfile %s" % file_display) - html.write("<a class=navi href=\"logwatch.py?host=%s\">All logfiles of %s</a>\n" % tuple([htmllib.urlencode(host)] * 2)) + html.header(_("Acknowledge logfile %s - %s") % (htmllib.attrencode(host), file_display)) + + html.begin_context_buttons() + html.context_button(_("All logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) + html.end_context_buttons() + ack = html.var('ack') if not html.confirm(_("Do you really want to acknowledge the log file <tt>%s</tt> by <b>deleting</b> all stored messages?") % filename): html.footer() return if not (config.may("act") and may_see(host)): - html.write("<h1 class=error>Permission denied</h1>\n") - html.write("<div class=error>You are not allowed to acknowledge the logs of the host %s</div>" % htmllib.attrencode(host)) + html.write("<h1 class=error>"+_('Permission denied')+"</h1>\n") + html.write("<div class=error>" + _('You are not allowed to acknowledge the logs of the host %s</div>') % htmllib.attrencode(host)) html.footer() return # filter invalid values if ack != '1': - raise MKUserError('ack', 'Invalid value for ack parameter.') + raise MKUserError('ack', _('Invalid value for ack parameter.')) try: os.remove(defaults.logwatch_dir + '/' + host + '/' + file) - message = '<b>%s: %s Acknowledged</b><br>' % \ - (htmllib.attrencode(host), htmllib.attrencode(file_display)) - message += '<p>The log messages from host "%s" in file' \ - '"%s" have been acknowledged.</p>' % \ - (htmllib.attrencode(host), htmllib.attrencode(file_display)) + message = '<b>'+_('%s: %s Acknowledged') % (htmllib.attrencode(host), htmllib.attrencode(file_display)) +'</b><br>' + message += '<p>' + message += _('The log messages from host "%s" in file "%s" have been acknowledged.') % \ + (htmllib.attrencode(host), htmllib.attrencode(file_display)) + message += '</p>' html.message(message) except Exception, e: - html.show_error('The log file "%s" from host "%s"' - ' could not be deleted: %s.' % \ + html.show_error(_('The log file "%s" from host "%s" could not be deleted: %s.') % \ (htmllib.attrencode(file_display), htmllib.attrencode(host), e)) html.footer() @@ -277,6 +298,19 @@ def host_logs(host): except: return [] +# Returns a list of tuples where the first element is the hostname +# and the second element is a list of logs of this host +def all_logs(): + logs = [] + try: + for host in filter(lambda x: x != '..' and x != '.', os.listdir(defaults.logwatch_dir)): + logs_of_host = host_logs(host) + if may_see(host) and logs_of_host: + logs.append((host, logs_of_host)) + except: + pass + return logs + def may_see(host): if config.may("see_all"): return True

12 years, 7 months

Check_MK Git: check_mk: Livecheck: fixed 4 memory leaks in inline check_icmp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c0e4d32be0eb0356c6939c51762031e9354bf31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c0e4d32be0eb0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 22:37:00 2011 +0100 Livecheck: fixed 4 memory leaks in inline check_icmp Hopefull all. Memory consumption is now constant at 20 kB of heap. --- livestatus/src/check_icmp.c | 26 +++++++++++++++----------- livestatus/src/livechecking.c | 2 -- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/livestatus/src/check_icmp.c b/livestatus/src/check_icmp.c index 9b0919c..5c6ce0f 100644 --- a/livestatus/src/check_icmp.c +++ b/livestatus/src/check_icmp.c @@ -389,6 +389,15 @@ int check_icmp(int argc, char **argv, char *output, int size) exit_code = 3; if (setjmp(exit_jmp)) { close(icmp_sock); + struct rta_host *h = list; + while (h) { + free(h->name); + struct rta_host *n = h->next; + free(h); + h = n; + } + if (table) + free(table); return exit_code; } @@ -484,8 +493,8 @@ int check_icmp(int argc, char **argv, char *output, int size) if(!targets) { errno = 0; do_output(1, "No hosts to check"); - exit_code = 3; - longjmp(exit_jmp, 1); + exit_code = 3; + longjmp(exit_jmp, 1); } if(!ttl) ttl = 64; @@ -675,11 +684,14 @@ wait_for_reply(int sock, u_int t) static int send_icmp_ping(int sock, struct rta_host *host) { + char buf[icmp_pkt_size]; // avoid malloc static union { void *buf; /* re-use so we prevent leaks */ struct icmp *icp; u_short *cksum_in; } packet = { NULL }; + packet.buf = buf; + long int len; struct icmp_ping_data data; struct timeval tv; @@ -692,13 +704,7 @@ send_icmp_ping(int sock, struct rta_host *host) } addr = (struct sockaddr *)&host->saddr_in; - if(!packet.buf) { - if (!(packet.buf = malloc(icmp_pkt_size))) { - do_output(1, "send_icmp_ping(): failed to malloc %d bytes for send buffer", - icmp_pkt_size); - return -1; /* might be reached if we're in debug mode */ - } - } + // Mathias -> Andreas: how can packet.buf be != 0 here? memset(packet.buf, 0, icmp_pkt_size); if((gettimeofday(&tv, &tz)) == -1) return -1; @@ -716,14 +722,12 @@ send_icmp_ping(int sock, struct rta_host *host) len = sendto(sock, packet.buf, icmp_pkt_size, 0, (struct sockaddr *)addr, sizeof(struct sockaddr)); - if(len < 0 || (unsigned int)len != icmp_pkt_size) { return -1; } icmp_sent++; host->icmp_sent++; - return 0; } diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index 855b264..b06d454 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -166,8 +166,6 @@ struct live_helper *get_free_live_helper() int max_fd = 0; for (i=0; i<g_num_livehelpers; i++) { if (g_live_helpers[i].status != LH_WAITING) { - logger(LG_INFO, "Skipping helper %d: state is %d", - g_live_helpers[i].sock, g_live_helpers[i].status); continue; } if (g_live_helpers[i].status != LH_DEAD) {

12 years, 7 months

Check_MK Git: check_mk: Livecheck: stability fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6330061b7635f952949602fc56e94bd5c0a17ebb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6330061b7635f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 21:57:01 2011 +0100 Livecheck: stability fixes - fixed filedesriptor leakage - implemented automatic restart in case of crashing helper --- livestatus/src/livecheck.c | 22 ++++-- livestatus/src/livechecking.c | 163 +++++++++++++++++++++++++++------------- 2 files changed, 126 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6330061b76…

12 years, 7 months

Check_MK Git: check_mk: Performance snapin: add livechecks data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2878f5df491c8fe16dd7667721c93a8e0534a0b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2878f5df491c8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 19:50:55 2011 +0100 Performance snapin: add livechecks data --- livestatus/src/TableStatus.cc | 15 +++++++++++++++ livestatus/src/global_counters.h | 20 +++++++++++--------- livestatus/src/livechecking.c | 3 +++ web/plugins/sidebar/shipped.py | 7 +++++-- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index b09d83d..3c6eab8 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -56,6 +56,8 @@ extern int num_cached_log_messages; extern int interval_length; extern int g_num_hosts; extern int g_num_services; +extern int livechecks_performed; +extern int livecheck_overflows; extern circular_buffer external_command_buffer; extern int external_command_buffer_slots; @@ -102,6 +104,17 @@ TableStatus::TableStatus() addColumn(new GlobalCountersColumn("external_commands_rate", "the averaged number of external commands per second", COUNTER_COMMANDS, true)); + addColumn(new GlobalCountersColumn("livechecks", + "The number of checks executed via livecheck", COUNTER_LIVECHECKS, false)); + addColumn(new GlobalCountersColumn("livechecks_rate", + "The averaged number of livechecks executes per second", COUNTER_LIVECHECKS, true)); + + addColumn(new GlobalCountersColumn("livecheck_overflows", + "The number of times a check could not be executed " + "because now livecheck helper was free", COUNTER_LIVECHECK_OVERFLOWS, false)); + addColumn(new GlobalCountersColumn("livecheck_overflows_rate", + "The number of livecheck overflows per second", COUNTER_LIVECHECK_OVERFLOWS, true)); + // Nagios program status data addColumn(new IntPointerColumn("nagios_pid", "The process ID of the Nagios main process", &nagios_pid )); @@ -164,6 +177,8 @@ TableStatus::TableStatus() "The current number of log messages MK Livestatus keeps in memory", &num_cached_log_messages )); addColumn(new StringPointerColumn("livestatus_version", "The version of the MK Livestatus module", (char *)VERSION)); + + // Livecheck } void TableStatus::answerQuery(Query *query) diff --git a/livestatus/src/global_counters.h b/livestatus/src/global_counters.h index 4d0a63d..fbe953a 100644 --- a/livestatus/src/global_counters.h +++ b/livestatus/src/global_counters.h @@ -35,15 +35,17 @@ typedef uint64_t counter_t; -#define COUNTER_NEB_CALLBACKS 0 -#define COUNTER_REQUESTS 1 -#define COUNTER_CONNECTIONS 2 -#define COUNTER_SERVICE_CHECKS 3 -#define COUNTER_HOST_CHECKS 4 -#define COUNTER_FORKS 5 -#define COUNTER_LOG_MESSAGES 6 -#define COUNTER_COMMANDS 7 -#define NUM_COUNTERS 8 +#define COUNTER_NEB_CALLBACKS 0 +#define COUNTER_REQUESTS 1 +#define COUNTER_CONNECTIONS 2 +#define COUNTER_SERVICE_CHECKS 3 +#define COUNTER_HOST_CHECKS 4 +#define COUNTER_FORKS 5 +#define COUNTER_LOG_MESSAGES 6 +#define COUNTER_COMMANDS 7 +#define COUNTER_LIVECHECKS 8 +#define COUNTER_LIVECHECK_OVERFLOWS 9 +#define NUM_COUNTERS 10 EXTERN counter_t g_counters[NUM_COUNTERS]; EXTERN counter_t g_last_counter[NUM_COUNTERS]; diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index f4b2d42..a51a274 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -29,6 +29,7 @@ #include "nagios.h" #include "logger.h" +#include "global_counters.h" extern int g_debug_level; @@ -62,6 +63,7 @@ void execute_livecheck(struct live_helper *lh, const char *host_name, fprintf(lh->fsock, "%s\n%s\n%.3f\n%s\n", host_name, service_description, latency, command); fflush(lh->fsock); + g_counters[COUNTER_LIVECHECKS]++; } struct live_helper *get_free_live_helper() @@ -151,6 +153,7 @@ int broker_service_livecheck(int event_type __attribute__ ((__unused__)), void * if (!lh) { logger(LG_INFO, "No livecheck helper free."); // Let the core handle this check himself + g_counters[COUNTER_LIVECHECK_OVERFLOWS]++; return NEB_OK; } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 04a9154..5f127b1 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -560,6 +560,7 @@ def render_performance(): data = html.live.query("GET status\nColumns: service_checks_rate host_checks_rate " "external_commands_rate connections_rate forks_rate " + "livechecks_rate livecheck_overflows_rate " "log_messages_rate cached_log_messages\n") for what, col, format in \ [("Service checks", 0, "%.2f/s"), @@ -567,8 +568,10 @@ def render_performance(): ("External commands", 2, "%.2f/s"), ("Livestatus-conn.", 3, "%.2f/s"), ("Process creations", 4, "%.2f/s"), - ("New log messages", 5, "%.2f/s"), - ("Cached log messages", 6, "%d")]: + ("Livechecks", 5, "%.2f/s"), + ("Livecheck overflows", 6, "%.2f/s"), + ("New log messages", 7, "%.2f/s"), + ("Cached log messages", 8, "%d")]: write_line(what + ":", format % sum([row[col] for row in data])) if len(config.allsites()) == 1:

12 years, 7 months

Check_MK Git: check_mk: Multisite: swapped order of bottom page status icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 172744a4b0072fb5198b6e3c815ad1189cd0d5cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=172744a4b0072f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 16:17:15 2011 +0100 Multisite: swapped order of bottom page status icons --- web/htdocs/htmllib.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b3f7f5a..111f391 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -669,13 +669,13 @@ class html: def render_status_icons(self): h = "" - for img, tooltip in self.status_icons.items(): - h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) if True: # self.req.method == "GET": h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_frameurl.png" title="URL to this frame"></a>\n' % \ self.makeuri([]) h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_pageurl.png" title="URL to this page including sidebar"></a>\n' % \ ("index.py?" + urlencode_vars([("start_url", self.makeuri([]))])) + for img, tooltip in self.status_icons.items(): + h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) return h def show_error(self, msg):

12 years, 7 months

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011