Repository: eagle Updated Branches: refs/heads/master e256503d3 -> 6b8ed3361
EAGLE-1078 - Remove references to the "incubator" from the source remove "incubator" words https://issues.apache.org/jira/browse/EAGLE-1078 Author: @coheigea [email protected] Reviewer: @yonzhang2012 [email protected] Closes: #981 Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/6b8ed336 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/6b8ed336 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/6b8ed336 Branch: refs/heads/master Commit: 6b8ed3361130d16dbb679fa37b10049d7be6b121 Parents: e256503 Author: yonzhang <[email protected]> Authored: Thu Feb 1 15:04:44 2018 -0800 Committer: yonzhang <[email protected]> Committed: Thu Feb 1 15:04:44 2018 -0800 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_DEFAULT_TEMPLATE.vm ---------------------------------------------------------------------- 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 3926cc8..7d94e6d 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 @@ <tr> <!-- Copyright --> <td align="center"> - <p><i>Powered by <a href="http://eagle.incubator.apache.org";>Apache Eagle</a> (version: $alert["version"])</i></p> + <p><i>Powered by <a href="http://eagle.apache.org";>Apache Eagle</a> (version: $alert["version"])</i></p> </td> </tr> </table> @@ -298,4 +298,4 @@ </tr> </table> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/ALERT_INLINED_TEMPLATE.vm ---------------------------------------------------------------------- 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 70013c3..483c60d 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 @@ <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"> - Powered by <a href="http://eagle.incubator.apache.org"; + Powered by <a href="http://eagle.apache.org"; style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Apache Eagle</a> (version: $alert["version"]) </td> http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-examples/eagle-cassandra-example/bin/init.sh ---------------------------------------------------------------------- diff --git a/eagle-examples/eagle-cassandra-example/bin/init.sh b/eagle-examples/eagle-cassandra-example/bin/init.sh index ec98c3e..e0c5030 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\":\"[email protected]\",\"recipients\":\"[email protected]\",\"subject\":\"Alert[cf_ customer_details_and_ ks_ dg_keyspace_policy]\",\"flavor\":\"email\",\"id\":\"email_1\",\"tplFileName\":\"\"}]", + "notificationDef": "[{\"sender\":\"[email protected]\",\"recipients\":\"[email protected]\",\"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." http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-external/eagle-docker/README.md ---------------------------------------------------------------------- diff --git a/eagle-external/eagle-docker/README.md b/eagle-external/eagle-docker/README.md index 37253c7..df8da02 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 [[email protected]](mailto:[email protected]), -and remember to subscribe our mail list via [[email protected]](mailto:[email protected]) +The fastest way to get response from eagle community is to send email to the mail list [[email protected]](mailto:[email protected]), +and remember to subscribe our mail list via [[email protected]](mailto:[email protected]) ## FAQ [https://cwiki.apache.org/confluence/display/EAG/FAQ#FAQ-EagleDocker](https://cwiki.apache.org/confluence/display/EAG/FAQ#FAQ-EagleDocker) http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-jpm/eagle-jpm-mr-history/src/main/resources/JobReportTemplate.vm ---------------------------------------------------------------------- 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 c878d6e..34879a3 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 @@ <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"> - Powered by <a href="http://eagle.incubator.apache.org"; + Powered by <a href="http://eagle.apache.org"; style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Apache Eagle</a> (version: $version) </td> @@ -416,4 +416,4 @@ </tr> </table> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/eagle/blob/6b8ed336/eagle-server/src/main/webapp/app/dev/index.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/index.html b/eagle-server/src/main/webapp/app/dev/index.html index 24e80c1..51bb3a7 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 @@ </div> <strong> Apache Eagle - <a target="_blank" href="https://eagle.incubator.apache.org/";>Home</a> / - <a target="_blank" href="https://eagle.incubator.apache.org/docs/community.html";>Community</a> / + <a target="_blank" href="https://eagle.apache.org/";>Home</a> / + <a target="_blank" href="https://eagle.apache.org/docs/community.html";>Community</a> / <a target="_blank" href="https://cwiki.apache.org/confluence/display/EAG/FAQ";>FAQ</a> </strong> </footer>
