Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #2335

by Mathias Kettner

Module: check_mk Branch: master Commit: b4a11e98fff9b78e75dcc71ff493908761d1e58e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4a11e98fff9b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 16:29:29 2015 +0200 Updated bug entries #2335 --- .bugs/2335 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2335 b/.bugs/2335 new file mode 100644 index 0000000..9e951f7 --- /dev/null +++ b/.bugs/2335 @@ -0,0 +1,9 @@ +Title: Trailing backslash in Quicksearch creates nasty exception +Component: multisite +State: open +Date: 2015-06-01 16:28:34 +Targetversion: future +Class: nastiness + +Try e.g. searching for FOO\. This will show a nasty exception that +garbles the layout of the quicksearch snapin.

9 years

Check_MK Git: check_mk: Optimized compression of images

by Lars Michelsen

Module: check_mk Branch: master Commit: a87230be79fca4c0014ad2a3ab9cbc3f98e7b344 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a87230be79fca4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 16:28:24 2015 +0200 Optimized compression of images --- web/htdocs/images/alert_ackstop.png | Bin 3985 -> 3111 bytes web/htdocs/images/alert_cmk_notify.png | Bin 3682 -> 3063 bytes web/htdocs/images/button_check_plugins_hi.png | Bin 2506 -> 2311 bytes web/htdocs/images/button_check_plugins_lo.png | Bin 2981 -> 2463 bytes web/htdocs/images/button_download_agents_lo.png | Bin 3383 -> 2720 bytes web/htdocs/images/button_icons_lo.png | Bin 4709 -> 3837 bytes web/htdocs/images/button_magic_move_hi.png | Bin 3399 -> 3202 bytes web/htdocs/images/button_menu_hi.png | Bin 808 -> 745 bytes web/htdocs/images/button_menu_lo.png | Bin 803 -> 739 bytes web/htdocs/images/button_static_checks_hi.png | Bin 2774 -> 2583 bytes web/htdocs/images/button_static_checks_lo.png | Bin 3242 -> 2755 bytes web/htdocs/images/dashboard_menuarrow.png | Bin 452 -> 327 bytes web/htdocs/images/dashlet_anchor_hi.png | Bin 706 -> 582 bytes web/htdocs/images/dashlet_anchor_lo.png | Bin 685 -> 577 bytes web/htdocs/images/dashlet_anchor_off.png | Bin 655 -> 547 bytes web/htdocs/images/dashlet_arrow_b_grow.png | Bin 310 -> 222 bytes web/htdocs/images/dashlet_arrow_b_max.png | Bin 307 -> 219 bytes web/htdocs/images/dashlet_arrow_l_grow.png | Bin 285 -> 202 bytes web/htdocs/images/dashlet_arrow_l_max.png | Bin 285 -> 202 bytes web/htdocs/images/dashlet_arrow_r_grow.png | Bin 306 -> 209 bytes web/htdocs/images/dashlet_arrow_r_max.png | Bin 305 -> 208 bytes web/htdocs/images/dashlet_arrow_t_grow.png | Bin 320 -> 222 bytes web/htdocs/images/dashlet_arrow_t_max.png | Bin 319 -> 222 bytes web/htdocs/images/dashlet_del_hi.png | Bin 705 -> 516 bytes web/htdocs/images/dashlet_del_lo.png | Bin 719 -> 579 bytes web/htdocs/images/dashlet_edit_hi.png | Bin 692 -> 511 bytes web/htdocs/images/dashlet_edit_lo.png | Bin 721 -> 576 bytes web/htdocs/images/dashlet_nodata.png | Bin 5009 -> 3993 bytes web/htdocs/images/dashlet_snapin.png | Bin 3190 -> 2569 bytes web/htdocs/images/icon_action.png | Bin 3381 -> 2680 bytes web/htdocs/images/icon_cached.png | Bin 3979 -> 3246 bytes web/htdocs/images/icon_check_plugins.png | Bin 2981 -> 2463 bytes web/htdocs/images/icon_crash.png | Bin 2803 -> 2368 bytes web/htdocs/images/icon_crash_glow.png | Bin 3395 -> 3300 bytes web/htdocs/images/icon_discard.png | Bin 3550 -> 2756 bytes web/htdocs/images/icon_download_agents.png | Bin 3383 -> 2720 bytes web/htdocs/images/icon_email.png | Bin 2465 -> 2071 bytes web/htdocs/images/icon_enabled.png | Bin 2855 -> 2217 bytes web/htdocs/images/icon_icons.png | Bin 4709 -> 3837 bytes web/htdocs/images/icon_menu.png | Bin 1794 -> 1731 bytes web/htdocs/images/icon_nagios.png | Bin 618 -> 521 bytes web/htdocs/images/icon_networking.png | Bin 2991 -> 2527 bytes web/htdocs/images/icon_notes.png | Bin 5009 -> 3993 bytes web/htdocs/images/icon_notif_man_disabled.png | Bin 5161 -> 5001 bytes web/htdocs/images/icon_npassive.png | Bin 5552 -> 4669 bytes web/htdocs/images/icon_outofnot.png | Bin 3209 -> 2741 bytes web/htdocs/images/icon_plugins_agentless.png | Bin 4733 -> 3830 bytes web/htdocs/images/icon_plugins_app.png | Bin 2696 -> 2222 bytes web/htdocs/images/icon_plugins_generic.png | Bin 2981 -> 2463 bytes web/htdocs/images/icon_plugins_hw.png | Bin 3021 -> 2565 bytes web/htdocs/images/icon_plugins_os.png | Bin 13055 -> 12990 bytes web/htdocs/images/icon_reload_cmk.png | Bin 3626 -> 3120 bytes web/htdocs/images/icon_static_checks.png | Bin 3242 -> 2755 bytes web/htdocs/images/icon_user_locked.png | Bin 4520 -> 4458 bytes web/htdocs/images/icons/5floppy_mount.png | Bin 3004 -> 2952 bytes web/htdocs/images/icons/5floppy_unmount.png | Bin 1961 -> 1792 bytes web/htdocs/images/icons/acroread.png | Bin 3975 -> 3926 bytes web/htdocs/images/icons/background.png | Bin 3292 -> 3169 bytes web/htdocs/images/icons/cdaudio_mount.png | Bin 4203 -> 4161 bytes web/htdocs/images/icons/cdaudio_unmount.png | Bin 4355 -> 4287 bytes web/htdocs/images/icons/checkmk.png | Bin 2052 -> 1704 bytes web/htdocs/images/icons/cisco.png | Bin 1310 -> 1004 bytes web/htdocs/images/icons/gnome_apps.png | Bin 4508 -> 4452 bytes web/htdocs/images/icons/input_devices_settings.png | Bin 3239 -> 3177 bytes web/htdocs/images/icons/joystick.png | Bin 3477 -> 3418 bytes web/htdocs/images/icons/kcmdevices.png | Bin 1926 -> 1803 bytes web/htdocs/images/icons/kcmmemory.png | Bin 3400 -> 3325 bytes web/htdocs/images/icons/kcmpci.png | Bin 2489 -> 2428 bytes web/htdocs/images/icons/kcmprocessor.png | Bin 3966 -> 3679 bytes web/htdocs/images/icons/kcmx.png | Bin 3158 -> 2984 bytes web/htdocs/images/icons/kdat.png | Bin 1817 -> 1669 bytes web/htdocs/images/icons/kjobviewer.png | Bin 3455 -> 3386 bytes web/htdocs/images/icons/klpq.png | Bin 3455 -> 3386 bytes web/htdocs/images/icons/kmousetool.png | Bin 3072 -> 3007 bytes web/htdocs/images/icons/krdc.png | Bin 2760 -> 2566 bytes web/htdocs/images/icons/ksim.png | Bin 5034 -> 4981 bytes web/htdocs/images/icons/ksim_cpu.png | Bin 4040 -> 3722 bytes web/htdocs/images/icons/laptop_pcmcia.png | Bin 3413 -> 3361 bytes web/htdocs/images/icons/linux.png | Bin 2918 -> 2673 bytes web/htdocs/images/icons/memory.png | Bin 3400 -> 3325 bytes web/htdocs/images/icons/modem.png | Bin 2408 -> 2150 bytes web/htdocs/images/icons/mycomputer.png | Bin 4127 -> 4042 bytes web/htdocs/images/icons/netscape.png | Bin 2950 -> 2777 bytes web/htdocs/images/icons/networkdevice.png | Bin 3623 -> 3467 bytes web/htdocs/images/icons/nfs_unmount.png | Bin 2657 -> 2565 bytes web/htdocs/images/icons/ooo_gulls.png | Bin 3486 -> 3432 bytes web/htdocs/images/icons/opera.png | Bin 3695 -> 3625 bytes web/htdocs/images/icons/package_games.png | Bin 3654 -> 3561 bytes web/htdocs/images/icons/print_printer.png | Bin 3337 -> 3158 bytes web/htdocs/images/icons/printer.png | Bin 3455 -> 3386 bytes web/htdocs/images/icons/printer1.png | Bin 3348 -> 3248 bytes web/htdocs/images/icons/processor.png | Bin 6030 -> 5570 bytes web/htdocs/images/icons/raid.png | Bin 2607 -> 2475 bytes web/htdocs/images/icons/samba.png | Bin 3858 -> 3779 bytes web/htdocs/images/icons/scanner.png | Bin 3710 -> 3570 bytes web/htdocs/images/icons/windows.png | Bin 846 -> 740 bytes web/htdocs/images/icons/zip_mount.png | Bin 3090 -> 3049 bytes web/htdocs/images/icons/zip_unmount.png | Bin 2272 -> 2167 bytes 98 files changed, 0 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a87230be79…

9 years

Check_MK Git: check_mk: #2260 Improved load time of Check_MK GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: b67e8d53b6c9c1e0b93337b7e09fe46576233d16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b67e8d53b6c9c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 15:46:15 2015 +0200 #2260 Improved load time of Check_MK GUI We did several things to further improve the load time of the Check_MK GUI. For example we are now shipping minified (compressed) version of the Stylesheets and Javascript source code files. If those files are available on a system, they will be used. If you encounter any problems related to the <tt>*_min*.js</tt> files, please let us know. If you remove those compressed files, the uncompressed files will be used. --- .gitignore | 1 + .werks/2260 | 16 ++++++++++++++++ ChangeLog | 3 +++ Makefile | 31 ++++++++++++++++++------------- web/.f12 | 4 ++++ web/htdocs/htmllib.py | 15 +++++++++++++-- 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 530c05a..0f5e6e0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ 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/.werks/2260 b/.werks/2260 new file mode 100644 index 0000000..7156a8d --- /dev/null +++ b/.werks/2260 @@ -0,0 +1,16 @@ +Title: Improved load time of Check_MK GUI +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1433166250 +Class: feature + +We did several things to further improve the load time of the Check_MK GUI. +For example we are now shipping minified (compressed) version of the Stylesheets +and Javascript source code files. If those files are available on a system, they +will be used. + +If you encounter any problems related to the <tt>*_min*.js</tt> files, please +let us know. If you remove those compressed files, the uncompressed files will +be used. diff --git a/ChangeLog b/ChangeLog index 00f500d..3f1d7f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.7i2: + Multisite: + * 2260 Improved load time of Check_MK GUI... + 1.2.7i1: Core & Setup: diff --git a/Makefile b/Makefile index 6a92aa5..fbaf00a 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,7 @@ help: @echo "make version --> switch to new version" @echo "make headers --> create/update fileheades" @echo "make healspaces --> remove trailing spaces in code" + @echo "setup --> prepare system for development" check-permissions: @echo -n "Checking permissions... with find -not -perm -444..." && [ -z "$$(find -not -perm -444)" ] && echo OK @@ -84,6 +85,7 @@ dist: mk-livestatus mk-eventd tar czf $(DISTNAME)/notifications.tar.gz $(TAROPTS) -C notifications $$(cd notifications ; ls) tar czf $(DISTNAME)/inventory.tar.gz $(TAROPTS) -C inventory $$(cd inventory ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) + $(MAKE) minify-js optimize-images tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/mkeventd.tar.gz $(TAROPTS) -C mkeventd $$(cd mkeventd ; echo * ) @@ -198,25 +200,28 @@ optimize-images: mv $$F.opt $$F; \ done +minify-js: + @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 ; \ + fi ; \ + done + clean: rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \ mkeventd-*.tar.gz mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ - precompiled cache + precompiled cache web/htdocs/js/*_min.js find -name "*~" | xargs rm -f mrproper: git clean -xfd -e .bugs 2>/dev/null || git clean -xfd - -## Do we really need this crap here any longer? -## setup: -## $(MAKE) dist -## rm -rf $(DISTNAME) -## tar xzf $(DISTNAME).tar.gz -## cd $(DISTNAME) && ./setup.sh --yes -## rm -rf $(DISTNAME) -## check_mk -R -## /etc/init.d/apache2 reload - - +setup: + sudo apt-get install figlet pngcrush slimit diff --git a/web/.f12 b/web/.f12 index bfab15b..d29bc30 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,6 +1,7 @@ #!/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*" \ @@ -13,5 +14,8 @@ if [ "$SITE" != - ] ; then sudo omd restart $SITE apache fi +# Nicht mit minifizierten Dateien entwickeln +#sudo rm -f /omd/sites/$SITE/share/check_mk/web/htdocs/js/*_min.js + # Gecache PNP-Schablonen entfernen sudo rm -f /omd/sites/$SITE/var/check_mk/pnp_template_cache/* diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8d34682..4d75dd1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -804,6 +804,8 @@ class html: if defaults.omd_root: if os.path.exists(defaults.omd_root + "/share/check_mk/web/htdocs/" + css + ".css"): fname = '%s-%s.css' % (css, defaults.check_mk_version) + else: + continue else: fname = '%s.css' % css @@ -815,13 +817,22 @@ class html: self.add_custom_style_sheet() - # Load specified Javascript files + # Load specified javascript files. We have some special handling here: + # a) files which can not be found shal not be loaded + # b) in OMD environments, add the Check_MK version to the version (prevents update problems) + # c) load the minified javascript when not in debug mode for js in [ "checkmk", "graphs" ] + javascripts: if defaults.omd_root: - if os.path.exists(defaults.omd_root + "/share/check_mk/web/htdocs/js/" + js + ".js"): + base_dir = defaults.omd_root + "/share/check_mk/web/htdocs/js" + if not self.enable_debug and os.path.exists(base_dir + "/" + js + "_min.js"): + fname = '%s_min-%s' % (js, defaults.check_mk_version) + elif os.path.exists(base_dir + "/" + js + ".js"): fname = '%s-%s' % (js, defaults.check_mk_version) + else: + continue else: fname = '%s' % js + self.javascript_file(fname) if self.browser_reload != 0:

9 years

Check_MK Git: check_mk: #2323 FIX df: Fix new graphs for all filesystem checks in case of existing inode information

by Mathias Kettner

Module: check_mk Branch: master Commit: e48eb33837093eab55a0af907d29b67acd70518b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e48eb33837093e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 16:17:29 2015 +0200 #2323 FIX df: Fix new graphs for all filesystem checks in case of existing inode information --- .werks/2323 | 10 ++++++++++ ChangeLog | 3 +++ web/plugins/metrics/check_mk.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2323 b/.werks/2323 new file mode 100644 index 0000000..ccd6481 --- /dev/null +++ b/.werks/2323 @@ -0,0 +1,10 @@ +Title: df: Fix new graphs for all filesystem checks in case of existing inode information +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433168217 + + diff --git a/ChangeLog b/ChangeLog index 00f500d..c20f122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.7i2: + Checks & Agents: + * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information + 1.2.7i1: Core & Setup: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f634445..9dbc06e 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1245,7 +1245,7 @@ check_metrics["check_mk-tcp_conn_stats"] = { } df_translation = { - "~(?!fs_size|growth|trend|fs_provisioning).*" : { "name" : "fs_used", "scale" : MB }, + "~(?!inodes_used|fs_size|growth|trend|fs_provisioning).*" : { "name" : "fs_used", "scale" : MB }, "fs_size" : { "scale" : MB }, "growth" : { "name" : "fs_growth", "scale" : MB / 86400.0 }, "trend" : { "name" : "fs_trend", "scale" : MB / 86400.0 },

9 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6bd6e4cb613571cb90b3fcba273b4c45c68fe5ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bd6e4cb613571… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 16:14:49 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7279bd1..e1bcb22 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2323 +2333

9 years

Check_MK Git: check_mk: Cleanup for LVM Checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: ff2e0aa58d9e196973373687671ca958d3407b3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff2e0aa58d9e19… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 1 15:00:28 2015 +0200 Cleanup for LVM Checks --- .werks/1251 | 2 +- ChangeLog | 2 +- agents/plugins/lvm | 4 ++-- checkman/lvm_pvs | 15 --------------- checkman/lvm_vgs | 2 +- checks/lvm_pvs | 39 --------------------------------------- checks/lvm_vgs | 21 +++++++++++++++------ 7 files changed, 20 insertions(+), 65 deletions(-) diff --git a/.werks/1251 b/.werks/1251 index 52c96ea..1b8c96f 100644 --- a/.werks/1251 +++ b/.werks/1251 @@ -1,4 +1,4 @@ -Title: lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes +Title: lvm_vgs: New Checks for LVM volume groups Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 3e61790..e939efa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,7 +195,7 @@ * 1249 alcatel_cpu, alcatel_temp, alcatel_fans: New checks for Alcatel switches based on IND1 MIB * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... - * 1251 lvm_pvs, lvm_vgs: New Checks for LVM volume groups and physical volumes... + * 1251 lvm_vgs: New Checks for LVM volume groups... * 2280 agent_vsphere: now provides more information if the login attempt fails... * 2116 bluenet_sensor, bluenet_sensor.hum: new checks to monitor temperature and humidity of Bachmann Bluenet PDUs * 1252 hitachi_hus_status: New check to monitor global status on Hitachi Hus Systems diff --git a/agents/plugins/lvm b/agents/plugins/lvm index 26dc110..6f0b9de 100755 --- a/agents/plugins/lvm +++ b/agents/plugins/lvm @@ -2,5 +2,5 @@ echo "<<<lvm_vgs>>>" vgs --units b --nosuffix --noheadings --separator ' ' -echo "<<<lvm_pvs>>>" -pvs --units b --nosuffix --noheadings --separator ' ' +#echo "<<<lvm_pvs>>>" +#pvs --units b --nosuffix --noheadings --separator ' ' diff --git a/checkman/lvm_pvs b/checkman/lvm_pvs deleted file mode 100644 index 1812655..0000000 --- a/checkman/lvm_pvs +++ /dev/null @@ -1,15 +0,0 @@ -title: LVM: Physical volume -agents: linux -catalog: os/storage -license: GPL -distribution: check_mk -description: - This Check monitors the size and the usage of physical volumes in LVM. - It useses same configuration like normal filesystems and supports almost the same - options (except inodes etc.) - - You need to install the agent plugin {lvm}. - - -inventory: - One item is generated per physical volume diff --git a/checkman/lvm_vgs b/checkman/lvm_vgs index 4a5b450..76d7815 100644 --- a/checkman/lvm_vgs +++ b/checkman/lvm_vgs @@ -4,7 +4,7 @@ catalog: os/storage license: GPL distribution: check_mk description: - This Check monitors the size and the usage of LVM volume groups. + This Check monitors the usage of LVM volume groups. It useses same configuration like normal filesystems and supports almost the same options (except inodes etc.) diff --git a/checks/lvm_pvs b/checks/lvm_pvs deleted file mode 100644 index 6962c8d..0000000 --- a/checks/lvm_pvs +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- - -# (c) 2013 Heinlein Support GmbH -# Robert Sander <r.sander(a)heinlein-support.de> - -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. This file is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# 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. - -lvm_pvs_default_values = ( 90, 95 ) - -def inventory_lvm_pvs(info): - for line in info: - yield line[0], {} - -def check_lvm_pvs(item, params, info): - pvlist = [] - for pv, vg, fmt, attr, size, free in info: - size_mb = int(size) / 1048576 - avail_mb = int(free) / 1048576 - pvlist.append((pv, size_mb, avail_mb, 0)) - return df_check_filesystem_list(item, params, pvlist) - -check_info['lvm_pvs'] = { - "check_function" : check_lvm_pvs, - "inventory_function" : inventory_lvm_pvs, - "service_description" : "LVM PVs %s", - "has_perfdata" : True, - "group" : "filesystem", - "default_levels_variable" : "filesystem_default_levels", -} diff --git a/checks/lvm_vgs b/checks/lvm_vgs index b3b5f10..38c9c67 100644 --- a/checks/lvm_vgs +++ b/checks/lvm_vgs @@ -1,12 +1,21 @@ #!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- - -# (c) 2013 Heinlein Support GmbH -# Robert Sander <r.sander(a)heinlein-support.de> - -# This is free software; you can redistribute it and/or modify it +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. This file is distributed +# the Free Software Foundation in version 2. check_mk is distributed # in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- # out even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public License for more de-

9 years

Check_MK Git: check_mk: #2259 FIX Raw Edition: Added missing agent download icons to WATO quickaccess snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 73f2292775fc2f0705573a43bf806a54601e1036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f2292775fc2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 14:37:24 2015 +0200 #2259 FIX Raw Edition: Added missing agent download icons to WATO quickaccess snapin --- .werks/2259 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/images/button_download_agents_hi.png | Bin 0 -> 2780 bytes web/htdocs/images/button_download_agents_lo.png | Bin 0 -> 3383 bytes 4 files changed, 11 insertions(+) diff --git a/.werks/2259 b/.werks/2259 new file mode 100644 index 0000000..70b6a2e --- /dev/null +++ b/.werks/2259 @@ -0,0 +1,10 @@ +Title: Raw Edition: Added missing agent download icons to WATO quickaccess snapin +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1433162230 + + diff --git a/ChangeLog b/ChangeLog index 0fb4c23..9fed31a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -528,6 +528,7 @@ * 2263 FIX: Bulk service discovery: Fixed error when doing bulk inventory on locked folders... * 2254 FIX: Fixed error message in parameter columns of discovered services... * 2230 FIX: Fix two exceptions in case of errors during bulk discovery + * 2259 FIX: Raw Edition: Added missing agent download icons to WATO quickaccess snapin Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/images/button_download_agents_hi.png b/web/htdocs/images/button_download_agents_hi.png new file mode 100644 index 0000000..2198e83 Binary files /dev/null and b/web/htdocs/images/button_download_agents_hi.png differ diff --git a/web/htdocs/images/button_download_agents_lo.png b/web/htdocs/images/button_download_agents_lo.png new file mode 100644 index 0000000..c8a65a7 Binary files /dev/null and b/web/htdocs/images/button_download_agents_lo.png differ

9 years

Check_MK Git: check_mk: omd_apache: added man page

by Lars Michelsen

Module: check_mk Branch: master Commit: 459497cd4b2e5d0183d7a88995e497a3c5642f7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=459497cd4b2e5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 11:28:59 2015 +0200 omd_apache: added man page --- checkman/omd_apache | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/checkman/omd_apache b/checkman/omd_apache new file mode 100644 index 0000000..19414c1 --- /dev/null +++ b/checkman/omd_apache @@ -0,0 +1,21 @@ +title: Apache access statistics of OMD sites +agents: linux +catalog: app/omd +license: GPL +distribution: check_mk +description: + This check creates statistics about the requests handled by the apache + webserver running in OMD sites. It records the number of requests, + bytes sent and time needed for processing the requests. These statistics + are grouped by type of the request, for example Check_MK Views, NagVis + AJAX calls, but also by type e.g. for images, stylesheets etc. + + The check uses a specific log file which must be located at + {var/log/apache/stats} to gather the access statistics. This file will + be truncated each time it has been checked. + +item: + The name of the site (string). + +inventory: + One check per site will be created for each site.

9 years

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 173809304eda59a45b4ae4affcc1b17708ef0040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=173809304eda59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 11:22:40 2015 +0200 Conflicts: ChangeLog checks/windows_multipath --- .werks/2258 | 10 ++++++++++ ChangeLog | 1 + checks/windows_multipath | 5 ++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/2258 b/.werks/2258 new file mode 100644 index 0000000..ebaa35a --- /dev/null +++ b/.werks/2258 @@ -0,0 +1,10 @@ +Title: windows_multipath: Fixed exception in case check reports more paths than expected +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1433150408 + + diff --git a/ChangeLog b/ChangeLog index 3e61790..0fb4c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -389,6 +389,7 @@ * 2255 FIX: checkpoint_*: Fixed exception in scan function when sysDescr has less than 2 spaces... * 2278 FIX: printer_supply: now able to toggle the point of view for used and remaining material... NOTE: Please refer to the migration notes! + * 2258 FIX: windows_multipath: Fixed exception in case check reports more paths than expected Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/windows_multipath b/checks/windows_multipath index f5a1936..54a91d8 100644 --- a/checks/windows_multipath +++ b/checks/windows_multipath @@ -44,16 +44,15 @@ def check_windows_multipath(item, params, info): all_paths = params # Anything less than 51% of paths is considered crit - if num_paths == all_paths: + if num_paths == all_paths: state = 0 elif num_paths <= all_paths / 2: state = 2 - elif num_paths < all_paths: + else: state = 1 return (state, "paths reported %d, expected paths %d" % (num_paths, all_paths) + state * "!") - check_info["windows_multipath"] = { "check_function" : check_windows_multipath, "inventory_function" : inventory_windows_multipath,

9 years

Check_MK Git: check_mk: omd_apache: Added check for OMD site apache statistics

by Lars Michelsen

Module: check_mk Branch: master Commit: d4a6e99afeea207808e2092ca7ea7df962320515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4a6e99afeea20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 1 10:13:43 2015 +0200 omd_apache: Added check for OMD site apache statistics --- checks/omd_apache | 101 ++++++++++++++++++++++++++++++++++++++ modules/check_mk_base.py | 12 +++-- web/plugins/metrics/check_mk.py | 102 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 209 insertions(+), 6 deletions(-) diff --git a/checks/omd_apache b/checks/omd_apache new file mode 100644 index 0000000..b90263e --- /dev/null +++ b/checks/omd_apache @@ -0,0 +1,101 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# 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. + +omd_apache_patterns = [ + # perf keys url matching regex + ('cmk_views' , '^check_mk/view\.py'), + ('cmk_wato' , '^check_mk/wato\.py'), + ('cmk_bi' , '^check_mk/bi\.py'), + ('cmk_snapins' , '^check_mk/sidebar_snapin\.py'), + ('cmk_dashboards' , '^check_mk/dashboard\.py'), + ('cmk_other' , '^check_mk/.*\.py'), + + ('nagvis_snapin' , '^nagvis/server/core/ajax_handler\.php?mod=Multisite&act=getMaps'), + ('nagvis_ajax' , '^nagvis/server/core/ajax_handler\.php'), + ('nagvis_other' , '^nagvis/.*\.php'), + + ('images' , '\.(jpg|png|gif)$'), + ('styles' , '\.css$'), + ('scripts' , '\.js$'), + ('other' , '.*'), +] + +def inventory_omd_apache(info): + for line in info: + if line[0][0] == '[': + yield line[0][1:-1], None + +def check_omd_apache(item, _no_params, info): + active = False + found = False + stats = {'requests': {}, 'secs': {}, 'bytes': {}} + for line in info: + if line[0] == '[' + item + ']': + active = True + elif active and line[0] == '[': + break + elif active: + method, 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: + yield 0, "No activity since last check" + return + + # 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() + for ty, title in [ ('requests', 'Requests/s'), ('secs', 'Seconds serving/s'), + ('bytes', 'Sent/s') ]: + total = 0 + for key, value in sorted(stats[ty].items(), key = lambda (k,v): v, reverse=True): + rate = get_rate("omd_apache.%s.%s.%s" % (item, ty, key), this_time, value, + onwrap=SKIP, is_rate=True) + total += rate + yield 0, None, [(ty+'_'+key, rate)] + + total = ty == 'bytes' and get_bytes_human_readable(total) or '%.2f' % total + yield 0, '%s %s' % (total, title) + +check_info['omd_apache'] = { + 'check_function' : check_omd_apache, + 'inventory_function' : inventory_omd_apache, + 'service_description' : 'OMD %s apache', + 'has_perfdata' : True, +} diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4d42ed6..5b1a339 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1025,9 +1025,9 @@ def clear_counters(pattern, older_than): # within one checked item. So e.g. you could use "bcast" as name and not "if.%s.bcast" % item # Idea (2): Check_MK should fetch a time stamp for each info. This should also be # available as a global variable, so that this_time would be an optional argument. -def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP): +def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP, is_rate=False): try: - timedif, rate = get_counter(countername, this_time, this_val, allow_negative) + timedif, rate = get_counter(countername, this_time, this_val, allow_negative, is_rate) return rate except MKCounterWrapped, e: if onwrap is RAISE: @@ -1041,7 +1041,7 @@ def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP # Legacy. Do not use this function in checks directly any more! -def get_counter(countername, this_time, this_val, allow_negative=False): +def get_counter(countername, this_time, this_val, allow_negative=False, is_rate=False): global g_counters # First time we see this counter? Do not return @@ -1066,7 +1066,11 @@ def get_counter(countername, this_time, this_val, allow_negative=False): # update counter for next time g_counters[countername] = (this_time, this_val) - valuedif = this_val - last_val + if not is_rate: + valuedif = this_val - last_val + else: + valuedif = this_val + if valuedif < 0 and not allow_negative: # Do not try to handle wrapper counters. We do not know # wether they are 32 or 64 bit. It also could happen counter diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 9029d9a..92db6aa 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1070,12 +1070,90 @@ metric_info["messages"] = { "color" : "#aa44cc", } -metric_info["call_legs"] = { +metric_info["call_legs"] = { "title" : _("Call legs"), "unit" : "count", "color" : "#60bbbb", } +metric_info["requests_cmk_views"] = { + "title" : _("%s Requests/s") % "Views", + "unit" : "1/s", + "color": "#ff8080", +} + +metric_info["requests_cmk_wato"] = { + "title" : _("%s Requests/s") % "WATO", + "unit" : "1/s", + "color": "#377cab", +} + +metric_info["requests_cmk_bi"] = { + "title" : _("%s Requests/s") % "BI", + "unit" : "1/s", + "color": "#4eb0f2", +} + +metric_info["requests_cmk_snapins"] = { + "title" : _("%s Requests/s") % "Snapins", + "unit" : "1/s", + "color": "#ff4040", +} + +metric_info["requests_cmk_dashboards"] = { + "title" : _("%s Requests/s") % "Dashboards", + "unit" : "1/s", + "color": "#4040ff", +} + +metric_info["requests_cmk_other"] = { + "title" : _("%s Requests/s") % "Other", + "unit" : "1/s", + "color": "#5bb9eb", +} + +metric_info["requests_nagvis_snapin"] = { + "title" : _("%s Requests/s") % "NagVis Snapin", + "unit" : "1/s", + "color": "#f2904e", +} + +metric_info["requests_nagvis_ajax"] = { + "title" : _("%s Requests/s") % "NagVis AJAX", + "unit" : "1/s", + "color": "#af91eb", +} + +metric_info["requests_nagvis_other"] = { + "title" : _("%s Requests/s") % "NagVis Other", + "unit" : "1/s", + "color": "#f2df40", +} + +metric_info["requests_images"] = { + "title" : _("%s Requests/s") % "Image", + "unit" : "1/s", + "color": "#91cceb", +} + +metric_info["requests_styles"] = { + "title" : _("%s Requests/s") % "Styles", + "unit" : "1/s", + "color": "#c6f24e", +} + +metric_info["requests_scripts"] = { + "title" : _("%s Requests/s") % "Scripts", + "unit" : "1/s", + "color": "#4ef26c", +} + +metric_info["requests_other"] = { + "title" : _("%s Requests/s") % "Other", + "unit" : "1/s", + "color": "#4eeaf2", +} + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -1350,7 +1428,7 @@ check_metrics["check_mk-cisco_srst_call_legs"] = {} check_metrics["check_mk-logwatch.ec"] = {} check_metrics["check_mk-logwatch.ec_single"] = {} - +check_metrics["check_mk-omd_apache"] = {} #. # .--Perf-O-Meters-------------------------------------------------------. @@ -2047,3 +2125,23 @@ graph_info.append({ ( "call_legs", "area" ) ], }) + +graph_info.append({ + "title" : _("Handled Requests"), + "metrics" : [ + ("requests_cmk_views", "stack"), + #("requests_cmk_wato'", "stack"), + #("requests_cmk_bi", "stack"), + #("requests_cmk_snapins", "stack"), + #("requests_cmk_dashboards", "stack"), + #("requests_cmk_other", "stack"), + #("requests_nagvis_snapin", "stack"), + #("requests_nagvis_ajax", "stack"), + #("requests_nagvis_other", "stack"), + #("requests_images", "stack"), + #("requests_styles", "stack"), + #("requests_scripts", "stack"), + #("requests_other", "stack"), + ], +}) +

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