[checkmk-commits] Cleanup: Moved active checks from doc/treasures to top level dir

Module: check_mk Branch: master Commit: 0fa079cd860f38d963481d9548598d1893c6173a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa079cd860f38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 19:00:08 2016 +0100 Cleanup: Moved active checks from doc/treasures to top level dir Change-Id: Ia335c8ebf3ee13da76f0ecef8698d95417c8dc54 --- Makefile | 3 ++- {doc/treasures/active_checks => active_checks}/.f12 | 0 {doc/treasures/active_checks => active_checks}/.gitignore | 0 {doc/treasures/active_checks => active_checks}/Makefile | 0 {doc/treasures/active_checks => active_checks}/check_bi_aggr | 0 {doc/treasures/active_checks => active_checks}/check_cpu_peaks | 0 {doc/treasures/active_checks => active_checks}/check_form_submit | 0 {doc/treasures/active_checks => active_checks}/check_mail | 0 {doc/treasures/active_checks => active_checks}/check_mail_loop | 0 {doc/treasures/active_checks => active_checks}/check_mailboxes | 0 {doc/treasures/active_checks => active_checks}/check_mkevents.cc | 0 {doc/treasures/active_checks => active_checks}/check_mkevents.py | 0 {doc/treasures/active_checks => active_checks}/check_notify_count | 0 {doc/treasures/active_checks => active_checks}/check_sql | 0 {doc/treasures/active_checks => active_checks}/check_traceroute | 0 {doc/treasures/active_checks => active_checks}/check_uniserv | 0 scripts/setup.sh | 3 +++ tests/general/test_find_debug_print.py | 2 +- tests/general/test_permissions.py | 2 +- tests/pylint/test_pylint_misc.py | 2 +- 20 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5f18586..36b142a 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \ - bin/mkeventd bin/*.c doc/treasures/active_checks/* \ + bin/mkeventd bin/*.c active_checks/* \ check_mk_templates.cfg \ agents/check_mk_*agent* agents/*.c \ $$(find agents/cfg_examples -type f) \ @@ -113,6 +113,7 @@ dist: mk-livestatus tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks $$(cd .werks ; ls [0-9]*) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) + tar czf $(DISTNAME)/active_checks.tar.gz $(TAROPTS) -C active_checks $$(cd active_checks ; ls) 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) diff --git a/doc/treasures/active_checks/.f12 b/active_checks/.f12 similarity index 100% rename from doc/treasures/active_checks/.f12 rename to active_checks/.f12 diff --git a/doc/treasures/active_checks/.gitignore b/active_checks/.gitignore similarity index 100% rename from doc/treasures/active_checks/.gitignore rename to active_checks/.gitignore diff --git a/doc/treasures/active_checks/Makefile b/active_checks/Makefile similarity index 100% rename from doc/treasures/active_checks/Makefile rename to active_checks/Makefile diff --git a/doc/treasures/active_checks/check_bi_aggr b/active_checks/check_bi_aggr similarity index 100% rename from doc/treasures/active_checks/check_bi_aggr rename to active_checks/check_bi_aggr diff --git a/doc/treasures/active_checks/check_cpu_peaks b/active_checks/check_cpu_peaks similarity index 100% rename from doc/treasures/active_checks/check_cpu_peaks rename to active_checks/check_cpu_peaks diff --git a/doc/treasures/active_checks/check_form_submit b/active_checks/check_form_submit similarity index 100% rename from doc/treasures/active_checks/check_form_submit rename to active_checks/check_form_submit diff --git a/doc/treasures/active_checks/check_mail b/active_checks/check_mail similarity index 100% rename from doc/treasures/active_checks/check_mail rename to active_checks/check_mail diff --git a/doc/treasures/active_checks/check_mail_loop b/active_checks/check_mail_loop similarity index 100% rename from doc/treasures/active_checks/check_mail_loop rename to active_checks/check_mail_loop diff --git a/doc/treasures/active_checks/check_mailboxes b/active_checks/check_mailboxes similarity index 100% rename from doc/treasures/active_checks/check_mailboxes rename to active_checks/check_mailboxes diff --git a/doc/treasures/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc similarity index 100% rename from doc/treasures/active_checks/check_mkevents.cc rename to active_checks/check_mkevents.cc diff --git a/doc/treasures/active_checks/check_mkevents.py b/active_checks/check_mkevents.py similarity index 100% rename from doc/treasures/active_checks/check_mkevents.py rename to active_checks/check_mkevents.py diff --git a/doc/treasures/active_checks/check_notify_count b/active_checks/check_notify_count similarity index 100% rename from doc/treasures/active_checks/check_notify_count rename to active_checks/check_notify_count diff --git a/doc/treasures/active_checks/check_sql b/active_checks/check_sql similarity index 100% rename from doc/treasures/active_checks/check_sql rename to active_checks/check_sql diff --git a/doc/treasures/active_checks/check_traceroute b/active_checks/check_traceroute similarity index 100% rename from doc/treasures/active_checks/check_traceroute rename to active_checks/check_traceroute diff --git a/doc/treasures/active_checks/check_uniserv b/active_checks/check_uniserv similarity index 100% rename from doc/treasures/active_checks/check_uniserv rename to active_checks/check_uniserv diff --git a/scripts/setup.sh b/scripts/setup.sh index e088bb8..1c8ca37 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -478,6 +478,7 @@ modulesdir=$sharedir/modules web_dir=$sharedir/web localedir=$sharedir/locale agentsdir=$sharedir/agents +activechecksdir=${check_icmp_pathr%/*} if [ -z "$YES" ] then @@ -749,6 +750,8 @@ do mkdir -p $DESTDIR$localedir && mkdir -p $DESTDIR$checksdir && tar xzf $SRCDIR/checks.tar.gz -C $DESTDIR$checksdir && + mkdir -p $DESTDIR$activechecksdir && + tar xzf $SRCDIR/active_checks.tar.gz -C $DESTDIR$activechecksdir && mkdir -p $DESTDIR$notificationsdir && tar xzf $SRCDIR/notifications.tar.gz -C $DESTDIR$notificationsdir && mkdir -p $DESTDIR$inventorydir && diff --git a/tests/general/test_find_debug_print.py b/tests/general/test_find_debug_print.py index 9725bd4..293bc94 100644 --- a/tests/general/test_find_debug_print.py +++ b/tests/general/test_find_debug_print.py @@ -12,7 +12,7 @@ check_paths = [ "checks", "inventory", "notifications", - "doc/treasures/active_checks", + "active_checks", # CMC specific "agents/bakery", # TODO: Update all agent plugins to use sys.stdout.write instead of print diff --git a/tests/general/test_permissions.py b/tests/general/test_permissions.py index 4fea257..0d54475 100644 --- a/tests/general/test_permissions.py +++ b/tests/general/test_permissions.py @@ -13,7 +13,7 @@ def is_not_executable(path): permissions = [ # globbing pattern check function, excludes - ('doc/treasures/active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), + ('active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), ('agents/special/*', is_executable, []), ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), ('agents/plugins/*', is_executable, ['README']), diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index ede344e..642ab72 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -15,7 +15,7 @@ def test_pylint_misc(): "bin", "notifications", "agents/plugins", - "doc/treasures/active_checks", + "active_checks", "../cmc/agents/plugins", "../cmc/bin", "../cmc/misc",