Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: Fix loading custom css files in local/

by Mathias Kettner

Module: check_mk Branch: master Commit: f8b022b749b1bed9ccf6f2ea0748549b21b866bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8b022b749b1be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 2 14:16:16 2015 +0200 Fix loading custom css files in local/ --- web/htdocs/htmllib.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4d75dd1..958bc6a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -802,7 +802,9 @@ class html: # Load all specified style sheets and all user style sheets in htdocs/css for css in [ "check_mk", "graphs" ] + stylesheets + [ 'ie' ]: if defaults.omd_root: - if os.path.exists(defaults.omd_root + "/share/check_mk/web/htdocs/" + css + ".css"): + rel_path = "/share/check_mk/web/htdocs/" + css + ".css" + if os.path.exists(defaults.omd_root + rel_path) or \ + os.path.exists(defaults.omd_root + "/local" + rel_path): fname = '%s-%s.css' % (css, defaults.check_mk_version) else: continue

9 years

Check_MK Git: check_mk: Updated bug entries #2336

by Mathias Kettner

Module: check_mk Branch: master Commit: d76822c29ed93c10c786665f6d3192c7f06f6b2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d76822c29ed93c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 2 11:05:29 2015 +0200 Updated bug entries #2336 --- .bugs/2336 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2336 b/.bugs/2336 new file mode 100644 index 0000000..97611b8 --- /dev/null +++ b/.bugs/2336 @@ -0,0 +1,9 @@ +Title: Master Control should be renamed in order to make things clearer +Component: multisite +State: open +Date: 2015-06-02 11:04:37 +Targetversion: future +Class: nastiness + +The Event Console and other components are not controlled hereby. If +you disable notifications then EC notifications stay enabled.

9 years

Check_MK Git: check_mk: Cleaned up treasures a bit

by Mathias Kettner

Module: check_mk Branch: master Commit: cfebad310293883b23dcca83169a2e54a655ad96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfebad31029388… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 2 10:36:29 2015 +0200 Cleaned up treasures a bit --- doc/treasures/check_curl | 6 +-- doc/treasures/localchecks/check_bi_local.py | 3 ++ doc/treasures/migrate_rrd.sh | 31 ----------- doc/treasures/multisite_to_mrpe | 12 ++--- doc/treasures/{webapps => }/open_ticket.py | 0 doc/treasures/win_if_check.bat | 77 --------------------------- doc/treasures/workplace/screenrc | 14 ----- doc/treasures/workplace/vimrc | 74 ------------------------- doc/treasures/zombies.mk | 2 +- 9 files changed, 13 insertions(+), 206 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfebad3102…

9 years

Check_MK Git: check_mk: Fixed minify/ optimize make targets in case of missing tools

by Lars Michelsen

Module: check_mk Branch: master Commit: 32dec30e6289d5cc105a9904a3ec1cfdcf7ec2bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32dec30e6289d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 10:12:53 2015 +0200 Fixed minify/optimize make targets in case of missing tools --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb1696b..ecfc10a 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ optimize-images: mv $$F.opt $$F; \ done ; \ else \ - echo "Missing pngcrush, not optimizing images!" ; \ + echo "Missing pngcrush, not optimizing images! (run \"make setup\" to fix this)" ; \ fi minify-js: @@ -218,7 +218,7 @@ minify-js: fi ; \ done ; \ else \ - echo "Missing slimit, not minifying javascript files!" ; \ + echo "Missing slimit, not minifying javascript files! (run \"make setup\" to fix this)" ; \ fi clean:

9 years

Check_MK Git: check_mk: Fixed minify/ optimize make targets in case of missing tools

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a2528882481edcec8f34d58290b317ae668a871 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a2528882481ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 10:10:52 2015 +0200 Fixed minify/optimize make targets in case of missing tools --- Makefile | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index fbaf00a..cb1696b 100644 --- a/Makefile +++ b/Makefile @@ -194,24 +194,32 @@ healspaces: @sed -ri 's/[[:space:]]+$$//g' $(HEAL_SPACES_IN) optimize-images: - @for F in web/htdocs/images/*.png web/htdocs/images/icons/*.png; do \ - echo "Optimizing $$F..." ; \ - pngcrush -q -rem alla -brute $$F $$F.opt ; \ - mv $$F.opt $$F; \ - done + @if type pngcrush >/dev/null 2>&1; then \ + for F in web/htdocs/images/*.png web/htdocs/images/icons/*.png; do \ + echo "Optimizing $$F..." ; \ + pngcrush -q -rem alla -brute $$F $$F.opt ; \ + mv $$F.opt $$F; \ + done ; \ + else \ + echo "Missing pngcrush, not optimizing images!" ; \ + fi 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 + @if type slimit >/dev/null 2>&1; then \ + 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 ; \ + else \ + echo "Missing slimit, not minifying javascript files!" ; \ + fi clean: rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \

9 years

Check_MK Git: check_mk: #2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well

by Goetz Golla

Module: check_mk Branch: master Commit: b46e9c0c072d51656031e1bd97a59833e853e926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b46e9c0c072d51… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jun 2 09:30:26 2015 +0200 #2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well --- .werks/2117 | 9 ++++ ChangeLog | 1 + agents/check_mk_agent.linux | 26 +++------ checkman/postfix_mailq | 35 ++++-------- checks/postfix_mailq | 98 +++++++++++++++++++++++++--------- checks/qmail_stats | 29 ++++++---- web/plugins/metrics/check_mk.py | 37 +++++++++++++ web/plugins/wato/check_parameters.py | 40 ++++++++++---- 8 files changed, 187 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b46e9c0c07…

9 years

Check_MK Git: check_mk: Converted non png image to png

by Lars Michelsen

Module: check_mk Branch: master Commit: dd22a7ca33c8d80ee2ba1c51597999cd5090aa5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd22a7ca33c8d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 2 09:21:58 2015 +0200 Converted non png image to png --- web/htdocs/images/dashlet_url.png | Bin 1038 -> 813 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/dashlet_url.png b/web/htdocs/images/dashlet_url.png index d317683..a52ae0d 100644 Binary files a/web/htdocs/images/dashlet_url.png and b/web/htdocs/images/dashlet_url.png differ

9 years

Check_MK Git: check_mk: Revert "pfsense_counter: New check for monitoring various global counters of pfSense firewalls"

by Mathias Kettner

Module: check_mk Branch: master Commit: 3a1d31443498fbcacb6e17c40048b1b5564ef466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a1d31443498fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 17:56:33 2015 +0200 Revert "pfsense_counter: New check for monitoring various global counters of pfSense firewalls" This reverts commit 016c2632c1e1718463fad3a7c2cbc14d0496537a. --- checks/pfsense_counter | 117 ---------------------------------- web/plugins/wato/check_parameters.py | 115 ++++++++++++++++----------------- 2 files changed, 54 insertions(+), 178 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a1d314434…

9 years

Check_MK Git: check_mk: #2324 FIX Add icon for those checks that cannot be rescheduled

by Mathias Kettner

Module: check_mk Branch: master Commit: 641aded187da6f1539a6da8c05c4f1b0e8b15d40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=641aded187da6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 1 16:52:42 2015 +0200 #2324 FIX Add icon for those checks that cannot be rescheduled The newest version of Check_MK (when using CMC) detects data that originates from an agent cache. In such a case a rescheduling of the check is pointless an the icon for doing that had been removed. In order to reduce confusion amongst the users a replacement icon has been added instead with an explanatory text. --- .werks/2324 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/images/icon_cannot_reschedule.png | Bin 0 -> 3393 bytes web/plugins/icons/builtin.py | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2324 b/.werks/2324 new file mode 100644 index 0000000..d109da5 --- /dev/null +++ b/.werks/2324 @@ -0,0 +1,13 @@ +Title: Add icon for those checks that cannot be rescheduled +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433170272 + +The newest version of Check_MK (when using CMC) detects data that originates +from an agent cache. In such a case a rescheduling of the check is pointless an +the icon for doing that had been removed. In order to reduce confusion amongst +the users a replacement icon has been added instead with an explanatory text. diff --git a/ChangeLog b/ChangeLog index 9037835..cfb5709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Multisite: * 2260 Improved load time of Check_MK GUI... + * 2324 FIX: Add icon for those checks that cannot be rescheduled... 1.2.7i1: diff --git a/web/htdocs/images/icon_cannot_reschedule.png b/web/htdocs/images/icon_cannot_reschedule.png new file mode 100644 index 0000000..f598c0d Binary files /dev/null and b/web/htdocs/images/icon_cannot_reschedule.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 5091506..9ed722f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -133,7 +133,7 @@ multisite_icons_and_actions['icon_image'] = { def paint_reschedule(what, row, tags, host_custom_vars): if what == "service" and row["service_cached_at"]: - return # No reschedule when agent caches the data anyway + return "cannot_reschedule", _("This service is based on cached agent data and cannot be rescheduled"), None # Reschedule button if (row[what + "_active_checks_enabled"] == 1

9 years

Check_MK Git: check_mk: pfsense_counter: New check for monitoring various global counters of pfSense firewalls

by Konstantin Büttner

Module: check_mk Branch: master Commit: 016c2632c1e1718463fad3a7c2cbc14d0496537a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=016c2632c1e171… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 1 16:51:17 2015 +0200 pfsense_counter: New check for monitoring various global counters of pfSense firewalls --- checks/pfsense_counter | 117 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 115 +++++++++++++++++---------------- 2 files changed, 178 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=016c2632c1…

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