honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-03 17:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to elasticsearch 1.3.0

Browse Source 
Closes #89.
(cherry picked from commit d65a970)
This commit is contained in:
Igor Motov 2014-05-28 21:28:17 +02:00 committed by David Pilato
parent d322b10488
commit 6fd4945860
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -4,9 +4,10 @@ AWS Cloud Plugin for Elasticsearch
The Amazon Web Service (AWS) Cloud plugin allows to use [AWS API](https://github.com/aws/aws-sdk-java) The Amazon Web Service (AWS) Cloud plugin allows to use [AWS API](https://github.com/aws/aws-sdk-java)
for the unicast discovery mechanism and add S3 repositories. for the unicast discovery mechanism and add S3 repositories.
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-aws/2.0.0.RC1`. In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-aws/2.1.1`.
* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/master). * For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/master).
* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.3).
* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.2). * For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.2).
* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.1). * For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.1).
* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.0). * For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-aws/tree/es-1.0).
@ -84,7 +85,7 @@ The S3 repository is using S3 to store snapshots. The S3 repository can be creat
$ curl -XPUT 'http://localhost:9200/_snapshot/my_s3_repository' -d '{ $ curl -XPUT 'http://localhost:9200/_snapshot/my_s3_repository' -d '{
"type": "s3", "type": "s3",
"settings": { "settings": {
"bucket": "my-bucket-name", "bucket": "my_bucket_name",
"region": "us-west" "region": "us-west"
} }
}' }'
@ -206,7 +207,7 @@ cloud:
repositories: repositories:
s3: s3:
bucket: "bucket-name" bucket: "bucket_name"
region: "us-west-2" region: "us-west-2"
private-bucket: private-bucket:
bucket: <bucket not accessible by default key> bucket: <bucket not accessible by default key>

10
src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java
View File

@ -20,6 +20,9 @@
package org.elasticsearch.cloud.aws; package org.elasticsearch.cloud.aws;
import com.carrotsearch.randomizedtesting.annotations.TestGroup; import com.carrotsearch.randomizedtesting.annotations.TestGroup;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.ElasticsearchIntegrationTest;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
@ -62,4 +65,11 @@ public abstract class AbstractAwsTest extends ElasticsearchIntegrationTest {
*/ */
public static final String SYSPROP_AWS = "tests.aws"; public static final String SYSPROP_AWS = "tests.aws";
@Override
protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.builder()
.put(super.nodeSettings(nodeOrdinal))
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
.build();
}
} }