Skip to content

Commit

Permalink
Remove all tribe related code, comments and documentation (elastic/x-…
Browse files Browse the repository at this point in the history
  • Loading branch information
s1monw authored Jan 30, 2018
1 parent 5b7c38d commit 570411c
Show file tree
Hide file tree
Showing 34 changed files with 98 additions and 3,111 deletions.
7 changes: 0 additions & 7 deletions docs/en/ml/limitations.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ At this time, you cannot use cross cluster search in either the {ml} APIs or the
For more information about cross cluster search,
see {ref}/modules-cross-cluster-search.html[Cross Cluster Search].

[float]
=== {xpackml} features are not supported on tribe nodes

You cannot use {ml} features on tribe nodes. For more information about that
type of node, see
{ref}/modules-tribe.html[Tribe node].

[float]
=== Anomaly Explorer omissions and limitations
//See x-pack-elasticsearch/#844 and x-pack-kibana/#1461
Expand Down
1 change: 0 additions & 1 deletion docs/en/monitoring/configuring-monitoring.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ can also adjust how monitoring data is displayed. For more information, see
<<es-monitoring>>.

include::indices.asciidoc[]
include::tribe.asciidoc[]
include::{xes-repo-dir}/settings/monitoring-settings.asciidoc[]
40 changes: 0 additions & 40 deletions docs/en/monitoring/tribe.asciidoc

This file was deleted.

11 changes: 4 additions & 7 deletions docs/en/security/tribe-clients-integrations.asciidoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[[ccs-tribe-clients-integrations]]
== Cross Cluster Search, Tribe, Clients and Integrations
== Cross Cluster Search, Clients and Integrations

When using {ref}/modules-cross-cluster-search.html[Cross Cluster Search] or
{ref}/modules-tribe.html[Tribe Nodes] you need to take extra steps to secure
communications with the connected clusters.
When using {ref}/modules-cross-cluster-search.html[Cross Cluster Search]
you need to take extra steps to secure communications with the connected
clusters.

* <<cross-cluster-configuring, Cross Cluster Search and Security>>
* <<tribe-node-configuring, Tribe Nodes and Security>>

You will need to update the configuration for several clients to work with a
secured cluster:
Expand Down Expand Up @@ -34,8 +33,6 @@ or at least communicate with the cluster in a secured way:

include::tribe-clients-integrations/cross-cluster.asciidoc[]

include::tribe-clients-integrations/tribe.asciidoc[]

include::tribe-clients-integrations/java.asciidoc[]

include::tribe-clients-integrations/http.asciidoc[]
Expand Down
101 changes: 0 additions & 101 deletions docs/en/security/tribe-clients-integrations/tribe.asciidoc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class License implements ToXContentObject {
* <p>
* Note: The mode indicates features that should be made available, but it does not indicate whether the license is active!
*
* The id byte is used for ordering operation modes (used for merging license md in tribe node)
* The id byte is used for ordering operation modes
*/
public enum OperationMode {
MISSING((byte) 0),
Expand Down
18 changes: 4 additions & 14 deletions plugin/core/src/main/java/org/elasticsearch/license/Licensing.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@
import java.util.List;
import java.util.function.Supplier;

import static org.elasticsearch.xpack.core.XPackClientActionPlugin.isTribeNode;
import static org.elasticsearch.xpack.core.XPackPlugin.transportClientMode;

public class Licensing implements ActionPlugin {

public static final String NAME = "license";
protected final Settings settings;
private final boolean isTransportClient;
private final boolean isTribeNode;

// Until this is moved out to its own plugin (its currently in XPackPlugin.java, we need to make sure that any edits to this file
// are also carried out in XPackClientPlugin.java
Expand All @@ -60,15 +57,10 @@ public List<NamedXContentRegistry.Entry> getNamedXContent() {

public Licensing(Settings settings) {
this.settings = settings;
isTransportClient = transportClientMode(settings);
isTribeNode = isTribeNode(settings);
}

@Override
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
if (isTribeNode) {
return Collections.singletonList(new ActionHandler<>(GetLicenseAction.INSTANCE, TransportGetLicenseAction.class));
}
return Arrays.asList(new ActionHandler<>(PutLicenseAction.INSTANCE, TransportPutLicenseAction.class),
new ActionHandler<>(GetLicenseAction.INSTANCE, TransportGetLicenseAction.class),
new ActionHandler<>(DeleteLicenseAction.INSTANCE, TransportDeleteLicenseAction.class),
Expand All @@ -82,12 +74,10 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
Supplier<DiscoveryNodes> nodesInCluster) {
List<RestHandler> handlers = new ArrayList<>();
handlers.add(new RestGetLicenseAction(settings, restController));
if (false == isTribeNode) {
handlers.add(new RestPutLicenseAction(settings, restController));
handlers.add(new RestDeleteLicenseAction(settings, restController));
handlers.add(new RestGetTrialStatus(settings, restController));
handlers.add(new RestPostStartTrialLicense(settings, restController));
}
handlers.add(new RestPutLicenseAction(settings, restController));
handlers.add(new RestDeleteLicenseAction(settings, restController));
handlers.add(new RestGetTrialStatus(settings, restController));
handlers.add(new RestPostStartTrialLicense(settings, restController));
return handlers;
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ public class XPackSettings {
/** Setting for enabling or disabling security. Defaults to true. */
public static final Setting<Boolean> SECURITY_ENABLED = Setting.boolSetting("xpack.security.enabled", true, Setting.Property.NodeScope);

/** Setting for enabling or disabling monitoring. Defaults to true if not a tribe node. */
public static final Setting<Boolean> MONITORING_ENABLED = Setting.boolSetting("xpack.monitoring.enabled",
// By default, monitoring is disabled on tribe nodes
s -> String.valueOf(XPackClientActionPlugin.isTribeNode(s) == false && XPackClientActionPlugin.isTribeClientNode(s) == false),
/** Setting for enabling or disabling monitoring. */
public static final Setting<Boolean> MONITORING_ENABLED = Setting.boolSetting("xpack.monitoring.enabled", true,
Setting.Property.NodeScope);

/** Setting for enabling or disabling watcher. Defaults to true. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.elasticsearch.threadpool.FixedExecutorBuilder;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.watcher.ResourceWatcherService;
import org.elasticsearch.xpack.core.XPackClientActionPlugin;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.XPackSettings;
import org.elasticsearch.xpack.core.ml.MachineLearningField;
Expand Down Expand Up @@ -261,8 +260,6 @@ public class MachineLearning extends Plugin implements ActionPlugin, AnalysisPlu
private final Environment env;
private final boolean enabled;
private final boolean transportClientMode;
private final boolean tribeNode;
private final boolean tribeNodeClient;

private final SetOnce<AutodetectProcessManager> autodetectProcessManager = new SetOnce<>();
private final SetOnce<DatafeedManager> datafeedManager = new SetOnce<>();
Expand All @@ -272,8 +269,6 @@ public MachineLearning(Settings settings, Path configPath) {
this.enabled = XPackSettings.MACHINE_LEARNING_ENABLED.get(settings);
this.transportClientMode = XPackPlugin.transportClientMode(settings);
this.env = transportClientMode ? null : new Environment(settings, configPath);
this.tribeNode = XPackClientActionPlugin.isTribeNode(settings);
this.tribeNodeClient = XPackClientActionPlugin.isTribeClientNode(settings);
}

protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); }
Expand All @@ -299,7 +294,7 @@ public Settings additionalSettings() {
String maxOpenJobsPerNodeNodeAttrName = "node.attr." + MAX_OPEN_JOBS_NODE_ATTR;
String machineMemoryAttrName = "node.attr." + MACHINE_MEMORY_NODE_ATTR;

if (enabled == false || transportClientMode || tribeNode || tribeNodeClient) {
if (enabled == false || transportClientMode) {
disallowMlNodeAttributes(mlEnabledNodeAttrName, maxOpenJobsPerNodeNodeAttrName, machineMemoryAttrName);
return Settings.EMPTY;
}
Expand Down Expand Up @@ -384,7 +379,7 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
// this method can replace the entire contents of the overridden createComponents() method
private Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool,
NamedXContentRegistry xContentRegistry, Environment environment) {
if (enabled == false || transportClientMode || tribeNode || tribeNodeClient) {
if (enabled == false || transportClientMode) {
return emptyList();
}

Expand Down Expand Up @@ -449,7 +444,7 @@ private Collection<Object> createComponents(Client client, ClusterService cluste
}

public List<PersistentTasksExecutor<?>> createPersistentTasksExecutors(ClusterService clusterService) {
if (enabled == false || transportClientMode || tribeNode || tribeNodeClient) {
if (enabled == false || transportClientMode) {
return emptyList();
}

Expand All @@ -462,7 +457,7 @@ public List<PersistentTasksExecutor<?>> createPersistentTasksExecutors(ClusterSe
public Collection<Module> createGuiceModules() {
List<Module> modules = new ArrayList<>();

if (tribeNodeClient || transportClientMode) {
if (transportClientMode) {
return modules;
}

Expand All @@ -478,7 +473,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter,
IndexNameExpressionResolver indexNameExpressionResolver,
Supplier<DiscoveryNodes> nodesInCluster) {
if (false == enabled || tribeNodeClient || tribeNode) {
if (false == enabled) {
return emptyList();
}
return Arrays.asList(
Expand Down Expand Up @@ -528,7 +523,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC

@Override
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
if (false == enabled || tribeNodeClient || tribeNode) {
if (false == enabled) {
return emptyList();
}
return Arrays.asList(
Expand Down Expand Up @@ -587,7 +582,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
}
@Override
public List<ExecutorBuilder<?>> getExecutorBuilders(Settings settings) {
if (false == enabled || tribeNode || tribeNodeClient || transportClientMode) {
if (false == enabled || transportClientMode) {
return emptyList();
}
int maxNumberOfJobs = AutodetectProcessManager.MAX_OPEN_JOBS_PER_NODE.get(settings);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.elasticsearch.env.Environment;
import org.elasticsearch.license.XPackLicenseState;
import org.elasticsearch.plugins.Platforms;
import org.elasticsearch.xpack.core.XPackClientActionPlugin;
import org.elasticsearch.xpack.core.XPackFeatureSet;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.core.XPackSettings;
Expand Down Expand Up @@ -72,9 +71,8 @@ public MachineLearningFeatureSet(Environment environment, ClusterService cluster
Map<String, Object> nativeCodeInfo = NativeController.UNKNOWN_NATIVE_CODE_INFO;
// Don't try to get the native code version if ML is disabled - it causes too much controversy
// if ML has been disabled because of some OS incompatibility. Also don't try to get the native
// code version in the transport or tribe client - the controller process won't be running.
if (enabled && XPackPlugin.transportClientMode(environment.settings()) == false
&& XPackClientActionPlugin.isTribeClientNode(environment.settings()) == false) {
// code version in the transport client - the controller process won't be running.
if (enabled && XPackPlugin.transportClientMode(environment.settings()) == false) {
try {
if (isRunningOnMlPlatform(true)) {
NativeController nativeController = NativeControllerHolder.getNativeController(environment);
Expand Down
Loading

0 comments on commit 570411c

Please sign in to comment.