-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BEAM-5107] Add support for ES-6.x to ElasticsearchIO
- Loading branch information
Dat Tran
committed
Sep 6, 2018
1 parent
2e13877
commit 5da843e
Showing
16 changed files
with
565 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * License); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an AS IS BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| apply plugin: org.apache.beam.gradle.BeamModulePlugin | ||
| applyJavaNature() | ||
| provideIntegrationTestingDependencies() | ||
| enableJavaPerformanceTesting() | ||
|
|
||
| description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 6.x" | ||
| ext.summary = "Tests of ElasticsearchIO on Elasticsearch 6.x" | ||
|
|
||
| test { | ||
| // needed for ESIntegTestCase | ||
| systemProperty "tests.security.manager", "false" | ||
| } | ||
|
|
||
| def jna_version = "4.1.0" | ||
| def log4j_version = "2.6.2" | ||
| def elastic_search_version = "6.4.0" | ||
|
|
||
| configurations.all { | ||
| resolutionStrategy { | ||
| // Make sure the log4j versions for api and core match instead of taking the default | ||
| // Gradle rule of using the latest. | ||
| force "org.apache.logging.log4j:log4j-api:$log4j_version" | ||
| force "org.apache.logging.log4j:log4j-core:$log4j_version" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| testCompile project(path: ":beam-sdks-java-io-elasticsearch-tests-common", configuration: "shadowTest") | ||
| testCompile "org.elasticsearch.test:framework:$elastic_search_version" | ||
| testCompile "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" | ||
| testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.5.2" | ||
| testCompile "org.elasticsearch:elasticsearch:$elastic_search_version" | ||
|
|
||
| testCompile project(path: ":beam-sdks-java-core", configuration: "shadow") | ||
| testCompile project(path: ":beam-sdks-java-io-elasticsearch", configuration: "shadow") | ||
| testCompile project(path: ":beam-sdks-java-io-common", configuration: "shadowTest") | ||
| testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") | ||
| testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" | ||
| testCompile "org.apache.logging.log4j:log4j-api:$log4j_version" | ||
| testCompile library.java.slf4j_api | ||
| testCompile "net.java.dev.jna:jna:$jna_version" | ||
| testCompile library.java.hamcrest_core | ||
| testCompile library.java.hamcrest_library | ||
| testCompile library.java.slf4j_jdk14 | ||
| testCompile library.java.commons_io_1x | ||
| testCompile library.java.junit | ||
| testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version" | ||
| } |
24 changes: 24 additions & 0 deletions
24
...ava/io/elasticsearch-tests/elasticsearch-tests-6/src/test/contrib/create_elk_container.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/bin/sh | ||
| ################################################################################ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| ################################################################################ | ||
|
|
||
| #Create an ELK (Elasticsearch Logstash Kibana) container for ES v6.4.0 and compatible Logstash and Kibana versions, | ||
| #bind then on host ports, allow shell access to container and mount current directory on /home/$USER inside the container | ||
|
|
||
| docker create -p 5601:5601 -p 9200:9200 -p 5044:5044 -p 5000:5000 -p 9300:9300 -it -v $(pwd):/home/$USER/ --name elk-6.4.0 sebp/elk:640 |
Oops, something went wrong.