Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2333 The Event Console log level can now be configured via GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: e97d86fafa79a4c342b5c4cbe9970c3a4ff5de4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e97d86fafa79a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 09:55:13 2015 +0200 #2333 The Event Console log level can now be configured via GUI The more verbose logging of the mkeventd, which could previously only be enabled using the command line, can now be configured using the Event Console Settings in the GUI. --- .werks/2333 | 11 +++++++++++ ChangeLog | 3 +++ mkeventd/bin/mkeventd | 3 ++- mkeventd/web/plugins/config/mkeventd.py | 1 + mkeventd/web/plugins/wato/mkeventd.py | 16 ++++++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.werks/2333 b/.werks/2333 new file mode 100644 index 0000000..99ecf17 --- /dev/null +++ b/.werks/2333 @@ -0,0 +1,11 @@ +Title: The Event Console log level can now be configured via GUI +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i2 +Date: 1433318056 +Class: feature + +The more verbose logging of the mkeventd, which could previously only +be enabled using the command line, can now be configured using the +Event Console Settings in the GUI. diff --git a/ChangeLog b/ChangeLog index 8178937..b8dcb42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... * 2262 FIX: Fixed deletion of foreign views/dashboards... + Event Console: + * 2333 The Event Console log level can now be configured via GUI... + 1.2.7i1: Core & Setup: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index e2b8a9f..1b099b2 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -201,7 +201,7 @@ def log(text): sys.stderr.write("%s\n" % text) def verbose(text): - if opt_verbose: + if opt_verbose or g_config['log_level']: log(text) g_regex_cache = {} @@ -3559,6 +3559,7 @@ def load_configuration(): "actions" : [], "debug_rules" : False, "rule_optimizer" : True, + "log_level" : 0, "log_rulehits" : False, "log_messages" : False, "retention_interval" : 60, diff --git a/mkeventd/web/plugins/config/mkeventd.py b/mkeventd/web/plugins/config/mkeventd.py index 24c4ecc..8bd2739 100644 --- a/mkeventd/web/plugins/config/mkeventd.py +++ b/mkeventd/web/plugins/config/mkeventd.py @@ -31,6 +31,7 @@ mkeventd_notify_facility = 16 mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10 debug_mkeventd_queries = False +log_level = 0 log_rulehits = False rule_optimizer = True diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 6cb2e8d..14203a2 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2298,6 +2298,22 @@ if mkeventd_enabled: ) register_configvar(group, + "log_level", + DropdownChoice( + choices = [ + (0, _("Normal logging")), + (1, _("Verbose logging")), + ], + default_value = 0, + ), + title = _("Log level"), + help = _("You can configure the mkeventd to log more details about it's actions. " + "These information are logged into the file <tt>%s</tt>") % + site_neutral_path(defaults.log_dir + "/mkeventd.log"), + domain = "mkeventd", + ) + + register_configvar(group, "log_rulehits", Checkbox(title = _("Log rule hits"), label = _("Log hits for rules in log of mkeventd"),

9 years

Check_MK Git: check_mk: #2334 Logging details about loaded SNMP MIB modules during startup

by Lars Michelsen

Module: check_mk Branch: master Commit: a93324a0f5462c5891bff956b70450641c20a20e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a93324a0f5462c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 10:04:58 2015 +0200 #2334 Logging details about loaded SNMP MIB modules during startup --- .werks/2334 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/2334 b/.werks/2334 new file mode 100644 index 0000000..929a847 --- /dev/null +++ b/.werks/2334 @@ -0,0 +1,9 @@ +Title: Logging details about loaded SNMP MIB modules during startup +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i2 +Date: 1433318673 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b8dcb42..ab57e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Event Console: * 2333 The Event Console log level can now be configured via GUI... + * 2334 Logging details about loaded SNMP MIB modules during startup 1.2.7i1: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 1b099b2..9818f71 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1163,6 +1163,10 @@ class EventServer: # This loads all or specified pysnmp MIBs into memory builder.loadModules() + loaded_mib_module_names = builder.mibSymbols.keys() + log('Loaded %d SNMP MIB modules' % len(loaded_mib_module_names)) + verbose('Found modules: %s' % (', '.join(loaded_mib_module_names))) + # This object maintains various indices built from MIBs data self._mib_resolver = MibViewController(builder)

9 years

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: bbbbda4905018410d177b8000a4d36e00bd696b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbbbda49050184… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 09:54:11 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e1bcb22..eebd43c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2333 +2353

9 years

Check_MK Git: check_mk: domino_mailqueues: fix for check man page

by Goetz Golla

Module: check_mk Branch: master Commit: 05b81a5fdcb2666701c94b9d6f77baaf9e3f407b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05b81a5fdcb266… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jun 3 09:42:04 2015 +0200 domino_mailqueues: fix for check man page --- checkman/domino_mailqueues | 3 --- 1 file changed, 3 deletions(-) diff --git a/checkman/domino_mailqueues b/checkman/domino_mailqueues index efd1512..ec33469 100644 --- a/checkman/domino_mailqueues +++ b/checkman/domino_mailqueues @@ -15,9 +15,6 @@ inventory: The names of the mail queues are predefined in the check. If the corresponding oid is found, the corresponding mail queue is inventorized. -[configuration] -domino_mailqueues_defaults (dict) - [parameters] parameters (dict): The parameters can be given in a dictionary based syntax with the single element below.

9 years

Check_MK Git: check_mk: #2261 FIX Fixed wrong pnp template cache path in non OMD environments

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e43fe31e9a2f21de83db754107c0fee918e6e13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e43fe31e9a2f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 15:56:51 2015 +0200 #2261 FIX Fixed wrong pnp template cache path in non OMD environments Previous versions used /temp/check_mk_pnp_template_cache which was working, but not intended. The path has been changed to /tmp/check_mk_pnp_template_cache now. You can savely delete the old directory. This only affects manual installations of Check_MK. --- .werks/2261 | 13 +++++++++++++ ChangeLog | 1 + pnp-templates/default.php | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2261 b/.werks/2261 new file mode 100644 index 0000000..6022e7d --- /dev/null +++ b/.werks/2261 @@ -0,0 +1,13 @@ +Title: Fixed wrong pnp template cache path in non OMD environments +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1433253304 +Class: fix + +Previous versions used /temp/check_mk_pnp_template_cache which was working, +but not intended. The path has been changed to /tmp/check_mk_pnp_template_cache +now. You can savely delete the old directory. + +This only affects manual installations of Check_MK. diff --git a/ChangeLog b/ChangeLog index 0939a4e..6265ae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Multisite: * 2260 Improved load time of Check_MK GUI... * 2324 FIX: Add icon for those checks that cannot be rescheduled... + * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... 1.2.7i1: diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 3c67728..384c3f2 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -9,7 +9,7 @@ if ($omd_site) { } else { $url = "http://localhost/check_mk/"; - $template_cache_dir = "/temp/check_mk_pnp_template_cache"; + $template_cache_dir = "/tmp/check_mk_pnp_template_cache"; } if (!file_exists($template_cache_dir))

9 years

Check_MK Git: check_mk: cleaned up *_min.js handling ( you can now remove the min files from your git dir)

by Lars Michelsen

Module: check_mk Branch: master Commit: 889108d68179e0cbe76947f767160792de850e48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889108d68179e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 08:26:04 2015 +0200 cleaned up *_min.js handling (you can now remove the min files from your git dir) --- .gitignore | 1 - Makefile | 15 ++++++++------- web/.f12 | 8 ++++++-- web/htdocs/js/checkmk.js | 1 + 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0f5e6e0..530c05a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ check_mk-*.tar.gz mk-livestatus-*.tar.gz mkeventd-*.tar.gz check-mk-*.exe -*_min.js var/ .bugs/.my_ids .bugs/.last diff --git a/Makefile b/Makefile index ecfc10a..7a41b4d 100644 --- a/Makefile +++ b/Makefile @@ -206,15 +206,16 @@ optimize-images: minify-js: @if type slimit >/dev/null 2>&1; then \ + [ -n "$(DESTDIR)" ] && DESTDIR="$(DESTDIR)/" ; \ for F in $$(cd web/htdocs/js ; ls *.js); do \ if [ $${F/_min/} == $$F ] ; then \ - NAME=$${F%.*} ; \ - SRC=web/htdocs/js/$$F ; \ - DST=web/htdocs/js/$${NAME}_min.js ; \ - if [ ! -f $$DST ] || [ $$(stat -c%Y $$SRC) -gt $$(stat -c%Y $$DST) ]; then \ - echo "Minifying $$F..." ; \ - cat $$SRC | slimit > $$DST ; \ - fi ; \ + NAME=$${F%.*} ; \ + SRC=web/htdocs/js/$$F ; \ + DST=$${DESTDIR}web/htdocs/js/$${NAME}_min.js ; \ + if [ ! -f $$DST ] || [ $$(stat -c%Y $$SRC) -gt $$(stat -c%Y $$DST) ]; then \ + echo "Minifying $$F..." ; \ + cat $$SRC | slimit > $$DST ; \ + fi ; \ fi ; \ done ; \ else \ diff --git a/web/.f12 b/web/.f12 index d29bc30..9b4e557 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,7 +1,6 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -make -C .. minify-js sudo rsync \ --exclude=defaults.py \ --exclude "*mkevent*" \ @@ -14,7 +13,12 @@ if [ "$SITE" != - ] ; then sudo omd restart $SITE apache fi -# Nicht mit minifizierten Dateien entwickeln +# Per Default wird geguckt, ob die *_min.js-Dateien älter sind, als +# die Original-Dateien. Wenn ja, dann werden sie neu erstellt. +make DESTDIR=/omd/sites/$SITE/share/check_mk -C .. minify-js +# Wenn man ohne die min-Dateien entwickeln will, kann man das hier +# auskommentieren. Dies räumt dann auch die Dateien weg, die +# schon in der original-Installation vom OMD vorhanden waren. #sudo rm -f /omd/sites/$SITE/share/check_mk/web/htdocs/js/*_min.js # Gecache PNP-Schablonen entfernen diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a0db9da..8c39889 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. + //# .-General------------------------------------------------------------. //# | ____ _ | //# | / ___| ___ _ __ ___ _ __ __ _| | |

9 years

Check_MK Git: check_mk: #2262 FIX Fixed deletion of foreign views/ dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: 80eeefd1bddb70235d2895c34bb343c45b3b2d3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80eeefd1bddb70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 16:21:40 2015 +0200 #2262 FIX Fixed deletion of foreign views/dashboards When a user tried to delete dashboards or views of foreign users this was shown as being successfull, but after accessing the list of views or dashboards again one could see that the view or dashboard was not deleted. This has been fixed now. --- .werks/2262 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 13 ++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.werks/2262 b/.werks/2262 new file mode 100644 index 0000000..8116d85 --- /dev/null +++ b/.werks/2262 @@ -0,0 +1,12 @@ +Title: Fixed deletion of foreign views/dashboards +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1433254800 +Class: fix + +When a user tried to delete dashboards or views of foreign +users this was shown as being successfull, but after accessing +the list of views or dashboards again one could see that the +view or dashboard was not deleted. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 6265ae6..8178937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 2260 Improved load time of Check_MK GUI... * 2324 FIX: Add icon for those checks that cannot be rescheduled... * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... + * 2262 FIX: Fixed deletion of foreign views/dashboards... 1.2.7i1: diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index f925efa..7a97e65 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -96,12 +96,15 @@ def load_plugins(): # | | # '----------------------------------------------------------------------' -def save(what, visuals): +def save(what, visuals, user_id = None): + if user_id == None: + user_id = config.user_id + uservisuals = {} - for (user_id, name), visual in visuals.items(): - if config.user_id == user_id: + for (owner_id, name), visual in visuals.items(): + if user_id == owner_id: uservisuals[name] = visual - config.save_user_file('user_' + what, uservisuals) + config.save_user_file('user_' + what, uservisuals, user = user_id) def load(what, builtin_visuals, skip_func = None): @@ -294,7 +297,7 @@ def page_list(what, title, visuals, custom_columns = [], c = html.confirm(_("Please confirm the deletion of \"%s\".") % deltitle) if c: del visuals[(user_id, delname)] - save(what, visuals) + save(what, visuals, user_id) html.reload_sidebar() elif c == False: html.footer()

9 years

Check_MK Git: check_mk: small addition for mknotifyd check

by Mathias Kettner

Module: check_mk Branch: master Commit: 047d85e56e8337ddc55846a3cb894530bccee3a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=047d85e56e8337… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 2 16:06:54 2015 +0200 small addition for mknotifyd check --- checks/mknotifyd | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/checks/mknotifyd b/checks/mknotifyd index a839d54..f6ceecf 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -80,8 +80,12 @@ def parse_mknotifyd(info): else: if value == "None": value = None - elif value and varname not in [ "Type", "State", "Version", "Status Message", "Pending Acknowledgements" ]: + elif value and varname not in [ + "Type", "State", "Version", "Status Message", + "Pending Acknowledgements", "Connect Time" ]: value = int(value.split()[0]) + elif varname == "Connect Time": + value = float(value.split()[0]) sub_entry[varname] = value # Fixup names of the connections. For incoming connections the remote @@ -213,6 +217,9 @@ def check_mknotifyd_connection(item, _no_params, parsed): age = now - connection["Since"] yield 0, "Uptime: %s" % get_age_human_readable(age) + if "Connect Time" in connection: + yield 0, "Connect time: %.3f sec" % connection["Connect Time"] + # Stats for what in ( "Sent", "Received" ): num = connection["Notifications " + what]

9 years

Check_MK Git: check_mk: Updated bug entries #2337

by Mathias Kettner

Module: check_mk Branch: master Commit: 2cc86bdf37afa3efe6697e723a08edfe251482a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cc86bdf37afa3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 2 15:18:35 2015 +0200 Updated bug entries #2337 --- .bugs/2337 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.bugs/2337 b/.bugs/2337 new file mode 100644 index 0000000..03c1ef2 --- /dev/null +++ b/.bugs/2337 @@ -0,0 +1,39 @@ +Title: Better handling of situation where /sbin/sendmail is missing +Component: notifcation +State: open +Date: 2015-06-02 15:16:00 +Targetversion: future +Class: bug + +If you do not have installed a local SMTP agent then the notification +plugin mail will crash with an exception: + +2015-06-02 15:14:26 Got raw notification (slave;Notification Connection slave-13.13.13.13:6555) context with 60 variables +2015-06-02 15:14:26 Global rule 'Notify all contacts of a host/service via HTML email'... +2015-06-02 15:14:26 -> matches! +2015-06-02 15:14:26 - adding notification of omdadmin via mail +2015-06-02 15:14:26 Executing 1 notifications: +2015-06-02 15:14:26 * notifying omdadmin via mail, parameters: (no parameters), bulk: no +2015-06-02 15:14:26 executing /omd/sites/slave/share/check_mk/notifications/mail +2015-06-02 15:14:26 Output: Unable to fetch number of graphs: Unable to fetch graph infos: <p>XML file "/omd/sites/slave/var/pnp4nagios/perfdata/slave/Notification_Connection_slave-13.13.13.13_6555.xml" not found. <a href="http://docs.pnp4nagios.org/faq/6">Read FAQ online</a></p> +2015-06-02 15:14:26 Output: Traceback (most recent call last): +2015-06-02 15:14:26 Output: File "/omd/sites/slave/share/check_mk/notifications/mail", line 688, in <module> +2015-06-02 15:14:26 Output: main() +2015-06-02 15:14:26 Output: File "/omd/sites/slave/share/check_mk/notifications/mail", line 686, in main +2015-06-02 15:14:26 Output: send_mail(m, mailto, from_address) +2015-06-02 15:14:26 Output: File "/omd/sites/slave/share/check_mk/notifications/mail", line 391, in send_mail +2015-06-02 15:14:26 Output: p = subprocess.Popen(cmd, stdin = subprocess.PIPE) +2015-06-02 15:14:26 Output: File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ +2015-06-02 15:14:26 Output: errread, errwrite) +2015-06-02 15:14:26 Output: File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child +2015-06-02 15:14:26 Output: raise child_exception +2015-06-02 15:14:26 Output: OSError: [Errno 2] No such file or directory +2015-06-02 15:14:26 Plugin exited with code 1 + +But no further information is being displayed at the GUI. + +- Could we display some warning the WATO module if the mail plugin + is being used? But the master/local system might not do the noticatio + itself... + +- Do some default monitoring of errors in the notification log.

9 years

Check_MK Git: check_mk: omd_apache: Added parse function, fixed problem with multiple sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 5745442d5305e6f2b03d5ab23c7a8904d5bad040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5745442d5305e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 15:46:10 2015 +0200 omd_apache: Added parse function, fixed problem with multiple sites --- checks/omd_apache | 75 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/checks/omd_apache b/checks/omd_apache index 15505fe..e35125d 100644 --- a/checks/omd_apache +++ b/checks/omd_apache @@ -24,6 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# <<<omd_apache:sep(124)>>> +# [heute] +# /heute/check_mk/view.py?view_name=allhosts&_display_options=htbfcoderuw&_do_actions=&_ajaxid=1433252694|200|5067|13465 +# /heute/check_mk/sidebar_snapin.py?names=tactical_overview,admin|200|4046|8109 +# /heute/check_mk/index.py?start_url=%2Fheute%2Fcheck_mk%2Fview.py%3Fview_name%3Dallhosts|200|515|7528 +# /heute/check_mk/view.py?view_name=allhosts|200|37656|57298 +# /heute/check_mk/side.py|200|39885|108178 +# /heute/check_mk/js/graphs-2015.06.02.js|200|28895|1823 +# [heute2] + omd_apache_patterns = [ # perf keys url matching regex ('cmk_views' , '^check_mk/view\.py'), @@ -43,12 +53,25 @@ omd_apache_patterns = [ ('other' , '.*'), ] -def inventory_omd_apache(info): +# Parses the agent data to a dictionary, using the site name as keys +# which holds +def parse_omd_apache(info): + parsed = {} + site = None for line in info: if line[0][0] == '[': - yield line[0][1:-1], None + site = line[0][1:-1] + parsed[site] = [] + elif site: + parsed[site].append(line) + return parsed + + +def inventory_omd_apache(parsed): + return [ (k, None) for k in parsed.keys() ] -def check_omd_apache(item, _no_params, info): + +def check_omd_apache(item, _no_params, parsed): # First initialize all possible values to be able to always report all perf keys stats = {'requests': {}, 'secs': {}, 'bytes': {}} for key, pattern in omd_apache_patterns: @@ -56,34 +79,28 @@ def check_omd_apache(item, _no_params, info): stats['secs'][key] = 0 stats['bytes'][key] = 0 - active = False - found = False - for line in info: - if line[0] == '[' + item + ']': - active = True - elif active and line[0] == '[': - break - elif active: - url, status, size_bytes, microsec = line - for key, pattern in omd_apache_patterns: - # make url relative to site directory - if regex(pattern).search(url[len('/'+item+'/'):]): - found = True - stats['requests'].setdefault(key, 0) - stats['requests'][key] += 1 - - stats['secs'].setdefault(key, 0) - stats['secs'][key] += int(microsec) / 1000.0 / 1000.0 - - stats['bytes'].setdefault(key, 0) - stats['bytes'][key] += int(size_bytes) - - break # don't call a line twice - - if not found: + if item not in parsed: + return + elif not parsed[item]: yield 0, "No activity since last check" return + for url, status, size_bytes, microsec in parsed[item]: + for key, pattern in omd_apache_patterns: + # make url relative to site directory + if regex(pattern).search(url[len('/'+item+'/'):]): + found = True + stats['requests'].setdefault(key, 0) + stats['requests'][key] += 1 + + stats['secs'].setdefault(key, 0) + stats['secs'][key] += int(microsec) / 1000.0 / 1000.0 + + stats['bytes'].setdefault(key, 0) + stats['bytes'][key] += int(size_bytes) + + break # don't call a line twice + # Now process the result. Break down the gathered values to values per second. # the output is showing total values, for the graphing we provide detailed data this_time = time.time() @@ -99,7 +116,9 @@ def check_omd_apache(item, _no_params, info): total = ty == 'bytes' and get_bytes_human_readable(total) or '%.2f' % total yield 0, '%s %s' % (total, title) + check_info['omd_apache'] = { + 'parse_function' : parse_omd_apache, 'check_function' : check_omd_apache, 'inventory_function' : inventory_omd_apache, 'service_description' : 'OMD %s apache',

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015