diff options
| author | Stephane Gamard <stephane.gamard@sonarsource.com> | 2014-10-14 14:33:38 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@sonarsource.com> | 2014-10-15 09:48:03 +0200 |
| commit | 390b84dc29bd0f6d6b4726ffff80f72535419f54 (patch) | |
| tree | 5e277f4989b888ad7479bc2423fca37bb0f4a51e /server/sonar-search | |
| parent | 9f2a2354c1c59a4381053b59680e28733c44cf14 (diff) | |
| download | sonarqube-390b84dc29bd0f6d6b4726ffff80f72535419f54.tar.gz sonarqube-390b84dc29bd0f6d6b4726ffff80f72535419f54.zip | |
update ES settings
Diffstat (limited to 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 6 | ||||
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index 0a46070f4fb..d8d692b6c1c 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -62,12 +62,6 @@ public class SearchServer implements Monitored { } } } - - node.client().admin().indices() - .preparePutTemplate("default") - .setTemplate("*") - .addMapping("_default_", "{\"dynamic\": \"strict\"}") - .get(); } @Override diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java index c1c7d564002..9f05dfe3538 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java @@ -168,7 +168,6 @@ class SearchSettings { ProcessConstants.CLUSTER_MASTER, ProcessConstants.CLUSTER_MASTER_HOST)); } } - builder.put("index.number_of_replicas", replicationFactor); builder.put("cluster.name", clusterName); builder.put("cluster.routing.allocation.awareness.attributes", "rack_id"); @@ -182,6 +181,8 @@ class SearchSettings { // Enable marvel's index creation builder.put("action.auto_create_index", ".marvel-*"); + // Only marvel on sq's indices + builder.put("marvel.agent.indices", "issues,logs,rules"); // If we're collecting indexing data send them to the Marvel host(s) if (!marvels.isEmpty()) { String hosts = StringUtils.join(marvels, ","); |