honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Marvel: Fix compilation problem 

Original commit: elastic/x-pack-elasticsearch@4db33fc6ab
This commit is contained in:
Alexander Reelsen 2016-01-29 15:12:18 +01:00
parent 8635d264ae
commit 7147354525
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java
View File

@ -28,7 +28,6 @@ import org.elasticsearch.marvel.shield.MarvelShieldIntegration;
import org.elasticsearch.marvel.shield.MarvelShieldModule; import org.elasticsearch.marvel.shield.MarvelShieldModule;
import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.shield.authz.AuthorizationModule; import org.elasticsearch.shield.authz.AuthorizationModule;
import org.elasticsearch.tribe.TribeService;
import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackPlugin;
import java.util.ArrayList; import java.util.ArrayList;
@ -46,6 +45,7 @@ public class MarvelPlugin extends Plugin {
public static final String ENABLED = NAME + ".enabled"; public static final String ENABLED = NAME + ".enabled";
public static final Setting<String> INDEX_MARVEL_VERSION_SETTING = new Setting<>("index.marvel.plugin.version", "", Function.identity(), false, Setting.Scope.INDEX); public static final Setting<String> INDEX_MARVEL_VERSION_SETTING = new Setting<>("index.marvel.plugin.version", "", Function.identity(), false, Setting.Scope.INDEX);
public static final Setting<String> INDEX_MARVEL_TEMPLATE_VERSION_SETTING = new Setting<>("index.marvel.template.version", "", Function.identity(), false, Setting.Scope.INDEX); public static final Setting<String> INDEX_MARVEL_TEMPLATE_VERSION_SETTING = new Setting<>("index.marvel.template.version", "", Function.identity(), false, Setting.Scope.INDEX);
private static final String TRIBE_NAME_SETTING = "tribe.name";
private final Settings settings; private final Settings settings;
private final boolean enabled; private final boolean enabled;
@ -118,7 +118,7 @@ public class MarvelPlugin extends Plugin {
} }
static boolean isTribeClientNode(Settings settings) { static boolean isTribeClientNode(Settings settings) {
String tribeName = settings.get(TribeService.TRIBE_NAME); String tribeName = settings.get(TRIBE_NAME_SETTING);
if (tribeName != null) { if (tribeName != null) {
logger.trace("detecting tribe client node [{}]", tribeName); logger.trace("detecting tribe client node [{}]", tribeName);
return true; return true;