From 6dbb7be0675a352da55b1fa8628b8d4b9cd8cceb Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 11 Apr 2018 08:27:16 -0700 Subject: [PATCH] Rename croneval This commit renames croneval to elasticsearch-croneval --- .../docs/en/watcher/trigger/schedule/cron.asciidoc | 12 ++++++------ .../main/bin/{croneval => elasticsearch-croneval} | 0 .../bin/{croneval.bat => elasticsearch-croneval.bat} | 0 .../src/test/resources/packaging/tests/10_basic.bats | 2 +- .../src/test/resources/packaging/utils/xpack.bash | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename x-pack/plugin/watcher/src/main/bin/{croneval => elasticsearch-croneval} (100%) rename x-pack/plugin/watcher/src/main/bin/{croneval.bat => elasticsearch-croneval.bat} (100%) diff --git a/x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc b/x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc index 2b0b412e3d2..c24668a688d 100644 --- a/x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc +++ b/x-pack/docs/en/watcher/trigger/schedule/cron.asciidoc @@ -12,7 +12,7 @@ WARNING: While `cron` triggers are super powerful, we recommend using one of the other schedule types if you can, as they are much more straightforward to configure. If you use `cron`, construct your `cron` expressions with care to be sure you are actually setting the schedule - you want. You can use the <> tool to validate + you want. You can use the <> tool to validate your cron expressions and see what the resulting trigger times will be. ===== Cron Expressions @@ -211,18 +211,18 @@ minute during the weekend: [[croneval]] ===== Verifying Cron Expressions -{xpack} ships with a `croneval` command line tool that you can use to verify that +{xpack} ships with a `elasticsearch-croneval` command line tool that you can use to verify that your cron expressions are valid and produce the expected results. This tool is provided in the `$ES_HOME/bin/x-pack` directory. -To verify a cron expression, simply pass it in as a parameter to `croneval`: +To verify a cron expression, simply pass it in as a parameter to `elasticsearch-croneval`: [source,bash] -------------------------------------------------- -bin/x-pack/croneval "0 0/1 * * * ?" +bin/elasticsearch-croneval "0 0/1 * * * ?" -------------------------------------------------- -If the cron expression is valid, `croneval` displays the next 10 times that the +If the cron expression is valid, `elasticsearch-croneval` displays the next 10 times that the schedule will be triggered. You can specify the `-c` option to control how many future trigger times are @@ -230,5 +230,5 @@ displayed. For example, the following command displays the next 20 trigger times [source,bash] -------------------------------------------------- -bin/x-pack/croneval "0 0/1 * * * ?" -c 20 +bin/elasticsearch-croneval "0 0/1 * * * ?" -c 20 -------------------------------------------------- diff --git a/x-pack/plugin/watcher/src/main/bin/croneval b/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval similarity index 100% rename from x-pack/plugin/watcher/src/main/bin/croneval rename to x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval diff --git a/x-pack/plugin/watcher/src/main/bin/croneval.bat b/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat similarity index 100% rename from x-pack/plugin/watcher/src/main/bin/croneval.bat rename to x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval.bat diff --git a/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats b/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats index 1c0ce83aaf5..796f4509607 100644 --- a/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats +++ b/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats @@ -36,7 +36,7 @@ setup() { } @test "[X-PACK] verify croneval works" { - run $ESHOME/bin/croneval "0 0 20 ? * MON-THU" -c 2 + run $ESHOME/bin/elasticsearch-croneval "0 0 20 ? * MON-THU" -c 2 [ "$status" -eq 0 ] [[ "$output" == *"Valid!"* ]] || { echo "Expected output message to contain [Valid!] but found: $output" diff --git a/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash b/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash index 1b1b9892c78..d20e5acb080 100644 --- a/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash +++ b/x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash @@ -18,8 +18,8 @@ verify_xpack_installation() { 'elasticsearch-certgen.bat' 'elasticsearch-certutil' 'elasticsearch-certutil.bat' - 'croneval' - 'croneval.bat' + 'elasticsearch-croneval' + 'elasticsearch-croneval.bat' 'migrate' 'migrate.bat' 'saml-metadata'