From 7147354525647a32d12c9e41d79f25eec58fbc92 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Fri, 29 Jan 2016 15:12:18 +0100 Subject: [PATCH] Marvel: Fix compilation problem Original commit: elastic/x-pack-elasticsearch@4db33fc6ab1d59789a90bf2d62c129207184e43f --- .../src/main/java/org/elasticsearch/marvel/MarvelPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java index 168c7e0d445..1ef382fd569 100644 --- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java +++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java @@ -28,7 +28,6 @@ import org.elasticsearch.marvel.shield.MarvelShieldIntegration; import org.elasticsearch.marvel.shield.MarvelShieldModule; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.shield.authz.AuthorizationModule; -import org.elasticsearch.tribe.TribeService; import org.elasticsearch.xpack.XPackPlugin; import java.util.ArrayList; @@ -46,6 +45,7 @@ public class MarvelPlugin extends Plugin { public static final String ENABLED = NAME + ".enabled"; public static final Setting INDEX_MARVEL_VERSION_SETTING = new Setting<>("index.marvel.plugin.version", "", Function.identity(), false, Setting.Scope.INDEX); public static final Setting 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 boolean enabled; @@ -118,7 +118,7 @@ public class MarvelPlugin extends Plugin { } static boolean isTribeClientNode(Settings settings) { - String tribeName = settings.get(TribeService.TRIBE_NAME); + String tribeName = settings.get(TRIBE_NAME_SETTING); if (tribeName != null) { logger.trace("detecting tribe client node [{}]", tribeName); return true;