From 36dc4ff3b5f67a1bb8fd5321367cf60601ae2f4b Mon Sep 17 00:00:00 2001 From: Colm O hEigeartaigh Date: Thu, 1 Feb 2018 14:19:58 +0000 Subject: [PATCH] EAGLE-1078 - Remove references to the "incubator" from the source --- .../src/main/resources/ALERT_DEFAULT_TEMPLATE.vm | 4 ++-- .../src/main/resources/ALERT_INLINED_TEMPLATE.vm | 2 +- eagle-examples/eagle-cassandra-example/bin/init.sh | 4 ++-- eagle-external/eagle-docker/README.md | 12 ++++++------ .../src/main/resources/JobReportTemplate.vm | 4 ++-- eagle-server/src/main/webapp/app/dev/index.html | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_DEFAULT_TEMPLATE.vm b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_DEFAULT_TEMPLATE.vm index 3926cc8397..7d94e6d661 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_DEFAULT_TEMPLATE.vm +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_DEFAULT_TEMPLATE.vm @@ -290,7 +290,7 @@ -

Powered by Apache Eagle (version: $alert["version"])

+

Powered by Apache Eagle (version: $alert["version"])

@@ -298,4 +298,4 @@ - \ No newline at end of file + diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_INLINED_TEMPLATE.vm b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_INLINED_TEMPLATE.vm index 70013c3809..483c60d222 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_INLINED_TEMPLATE.vm +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_INLINED_TEMPLATE.vm @@ -242,7 +242,7 @@ - Powered by Apache Eagle (version: $alert["version"]) diff --git a/eagle-examples/eagle-cassandra-example/bin/init.sh b/eagle-examples/eagle-cassandra-example/bin/init.sh index ec98c3e216..e0c503074e 100755 --- a/eagle-examples/eagle-cassandra-example/bin/init.sh +++ b/eagle-examples/eagle-cassandra-example/bin/init.sh @@ -227,7 +227,7 @@ curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Conten "description": "Alert[cf_ customer_details_and_ ks_ dg_keyspace_policy]", "policyDef": "{\"expression\":\"from cassandraQueryLogStream[(cf == \\\"customer_details\\\") and (ks == \\\"dg_keyspace\\\")] select * insert into outputStream;\",\"type\":\"siddhiCEPEngine\"}", "dedupeDef": "{\"alertDedupIntervalMin\": 10,\"emailDedupIntervalMin\": 10}", - "notificationDef": "[{\"sender\":\"no-reply@eagle.incubator.apache.org\",\"recipients\":\"no-reply@eagle.incubator.apache.org\",\"subject\":\"Alert[cf_ customer_details_and_ ks_ dg_keyspace_policy]\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]", + "notificationDef": "[{\"sender\":\"no-reply@eagle.apache.org\",\"recipients\":\"no-reply@eagle.apache.org\",\"subject\":\"Alert[cf_ customer_details_and_ ks_ dg_keyspace_policy]\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]", "remediationDef": "", "enabled": true, "owner": "admin", @@ -275,4 +275,4 @@ curl -silent -u ${EAGLE_SERVICE_USER}:${EAGLE_SERVICE_PASSWD} -X POST -H 'Conten ## Finished echo "" -echo "Done." \ No newline at end of file +echo "Done." diff --git a/eagle-external/eagle-docker/README.md b/eagle-external/eagle-docker/README.md index 37253c7ad2..df8da020fb 100644 --- a/eagle-external/eagle-docker/README.md +++ b/eagle-external/eagle-docker/README.md @@ -43,8 +43,8 @@ The fastest way to get started with Eagle is to run with [docker](https://github docker run -p 9099:9099 -p 8080:8080 -p 8744:8744 -p 2181:2181 -p 2888:2888 -p 6667:6667 -p 60020:60020 \ -p 60030:60030 -p 60010:60010 -d --dns 127.0.0.1 --entrypoint /usr/local/serf/bin/start-serf-agent.sh \ - -e KEYCHAIN= --env EAGLE_SERVER_HOST=server.eagle.incubator.apache.org --name sandbox \ - -h server.eagle.incubator.apache.org --privileged=true apacheeagle/sandbox:latest \ + -e KEYCHAIN= --env EAGLE_SERVER_HOST=server.eagle.apache.org --name sandbox \ + -h server.eagle.apache.org --privileged=true apacheeagle/sandbox:latest \ --tag ambari-server=true docker run -it --rm -e EXPECTED_HOST_COUNT=1 -e BLUEPRINT=hdp-singlenode-eagle --link sandbox:ambariserver\ --entrypoint /bin/sh apacheeagle/sandbox:latest -c /tmp/install-cluster.sh @@ -52,8 +52,8 @@ The fastest way to get started with Eagle is to run with [docker](https://github * Build eagle docker image from source code with [eagle-docker](eagle-external/eagle-docker): - git clone https://github.com/apache/incubator-eagle.git - cd incubator-eagle && ./eagle-docker boot + git clone https://github.com/apache/eagle.git + cd eagle && ./eagle-docker boot ## Usage ## Basic usage of the entry script of eagle-docker: [bin/eagle-docker.sh](bin/eagle-docker.sh) @@ -115,8 +115,8 @@ Basic usage of the entry script of eagle-docker: [bin/eagle-docker.sh](bin/eagle * Storm UI: `http://{{container_ip}}:8744` ## Get Help -The fastest way to get response from eagle community is to send email to the mail list [dev@eagle.incubator.apache.org](mailto:dev@eagle.incubator.apache.org), -and remember to subscribe our mail list via [dev-subscribe@eagle.incubator.apache.org](mailto:dev-subscribe@eagle.incubator.apache.org) +The fastest way to get response from eagle community is to send email to the mail list [dev@eagle.apache.org](mailto:dev@eagle.apache.org), +and remember to subscribe our mail list via [dev-subscribe@eagle.apache.org](mailto:dev-subscribe@eagle.apache.org) ## FAQ [https://cwiki.apache.org/confluence/display/EAG/FAQ#FAQ-EagleDocker](https://cwiki.apache.org/confluence/display/EAG/FAQ#FAQ-EagleDocker) diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/JobReportTemplate.vm b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/JobReportTemplate.vm index c878d6ee37..34879a38e2 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/JobReportTemplate.vm +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/JobReportTemplate.vm @@ -402,7 +402,7 @@ - Powered by Apache Eagle (version: $version) @@ -416,4 +416,4 @@ - \ No newline at end of file + diff --git a/eagle-server/src/main/webapp/app/dev/index.html b/eagle-server/src/main/webapp/app/dev/index.html index 24e80c1ff2..51bb3a76cc 100644 --- a/eagle-server/src/main/webapp/app/dev/index.html +++ b/eagle-server/src/main/webapp/app/dev/index.html @@ -248,8 +248,8 @@

Apache Eagle - Home / - Community / + Home / + Community / FAQ