diff --git a/docs/reference/migration/migrate_7_0/settings.asciidoc b/docs/reference/migration/migrate_7_0/settings.asciidoc index 0bfa869e8e4..0346b01050d 100644 --- a/docs/reference/migration/migrate_7_0/settings.asciidoc +++ b/docs/reference/migration/migrate_7_0/settings.asciidoc @@ -296,9 +296,11 @@ In Elasticsearch 7.8.0, the following settings no longer have any effect, and have been deprecated: * `xpack.ilm.enabled` +* `xpack.monitoring.enabled` -In other words, even if `xpack.ilm.enabled` is set to `false`, the ILM APIs -will be available. +Previously, these settings could be set to `false` in order to disable the +feature's APIs in a cluster. As of 7.8.0, these basic license features are +always enabled for the {default-dist}. If you have disabled ILM so that you can use another tool to manage Watcher indices, the newly introduced `xpack.watcher.use_ilm_index_management` setting @@ -308,7 +310,6 @@ Additionally, the following settings have been deprecated: * `xpack.enrich.enabled` * `xpack.flattened.enabled` -* `xpack.monitoring.enabled` * `xpack.rollup.enabled` * `xpack.slm.enabled` * `xpack.sql.enabled` @@ -316,4 +317,4 @@ Additionally, the following settings have been deprecated: * `xpack.vectors.enabled` In future releases, it will not be possible to disable the APIs for Enrichment, -Flattened mappings, Monitoring, Rollup, SLM, SQL, Transforms, and Vectors. +Flattened mappings, Rollup, SLM, SQL, Transforms, and Vectors. diff --git a/docs/reference/monitoring/collecting-monitoring-data.asciidoc b/docs/reference/monitoring/collecting-monitoring-data.asciidoc index 7df96fbfddd..b293dd982e3 100644 --- a/docs/reference/monitoring/collecting-monitoring-data.asciidoc +++ b/docs/reference/monitoring/collecting-monitoring-data.asciidoc @@ -30,10 +30,6 @@ To learn about monitoring in general, see <>. . Configure your cluster to collect monitoring data: -.. Verify that the deprecated `xpack.monitoring.enabled` setting is not set to -`false` on any node in the cluster. For more information, see -<>. - .. Verify that the `xpack.monitoring.elasticsearch.collection.enabled` setting is `true`, which is its default value, on each node in the cluster. + diff --git a/docs/reference/monitoring/esms.asciidoc b/docs/reference/monitoring/esms.asciidoc index 31b57203f00..c3969488215 100644 --- a/docs/reference/monitoring/esms.asciidoc +++ b/docs/reference/monitoring/esms.asciidoc @@ -118,8 +118,6 @@ Add the following setting in the {kib} configuration file (`kibana.yml`): xpack.monitoring.kibana.collection.enabled: false ---------------------------------- -Leave the `xpack.monitoring.enabled` set to its default value (`true`). - For more information, see {kibana-ref}/monitoring-settings-kb.html[Monitoring settings in {kib}]. -- diff --git a/docs/reference/settings/monitoring-settings.asciidoc b/docs/reference/settings/monitoring-settings.asciidoc index 35043979da1..4fda4b2bde8 100644 --- a/docs/reference/settings/monitoring-settings.asciidoc +++ b/docs/reference/settings/monitoring-settings.asciidoc @@ -28,12 +28,7 @@ For more information, see <>. `xpack.monitoring.enabled`:: deprecated:[7.8.0,Basic License features should always be enabled] + -Set to `true` (default) to enable {es} {monitoring} for {es} on the node. -+ --- -NOTE: To enable data collection, you must also set `xpack.monitoring.collection.enabled` -to `true`. Its default value is `false`. --- +This deprecated setting has no effect. [float] [[monitoring-collection-settings]] diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java index b0c2c6adea3..b420bd94726 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java @@ -45,7 +45,6 @@ public abstract class CcrSingleNodeTestCase extends ESSingleNodeTestCase { protected Settings nodeSettings() { Settings.Builder builder = Settings.builder(); builder.put(XPackSettings.SECURITY_ENABLED.getKey(), false); - builder.put(XPackSettings.MONITORING_ENABLED.getKey(), false); builder.put(XPackSettings.WATCHER_ENABLED.getKey(), false); builder.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false); builder.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java index c23bca145e6..afb635f6497 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java @@ -61,7 +61,12 @@ public class XPackSettings { /** Setting for enabling or disabling security. Defaults to true. */ public static final Setting SECURITY_ENABLED = Setting.boolSetting("xpack.security.enabled", true, Setting.Property.NodeScope); - /** Setting for enabling or disabling monitoring. */ + /** + * Setting for enabling or disabling monitoring. + *

+ * This setting is now a no-op: setting it to false is permitted, but does nothing. + */ + @Deprecated // since = "7.8.0" public static final Setting MONITORING_ENABLED = Setting.boolSetting("xpack.monitoring.enabled", true, Property.NodeScope, Property.Deprecated); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java index ebf65afbd6d..8284efa2ccd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java @@ -32,9 +32,8 @@ public class MonitoringFeatureSetUsage extends XPackFeatureSet.Usage { } } - public MonitoringFeatureSetUsage(boolean available, boolean enabled, - boolean collectionEnabled, Map exporters) { - super(XPackField.MONITORING, available, enabled); + public MonitoringFeatureSetUsage(boolean available, boolean collectionEnabled, Map exporters) { + super(XPackField.MONITORING, available, true); this.exporters = exporters; this.collectionEnabled = collectionEnabled; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java index 6ccd27e5670..c00ca29da26 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java @@ -37,7 +37,6 @@ public class LicensesManagerServiceTests extends ESSingleNodeTestCase { return Settings.builder() .put(super.nodeSettings()) .put(XPackSettings.SECURITY_ENABLED.getKey(), false) - .put(XPackSettings.MONITORING_ENABLED.getKey(), false) .put(XPackSettings.WATCHER_ENABLED.getKey(), false) .put(XPackSettings.GRAPH_ENABLED.getKey(), false) .put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false) diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/AbstractEqlIntegTestCase.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/AbstractEqlIntegTestCase.java index e30c7d3782b..180eef39e31 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/AbstractEqlIntegTestCase.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/AbstractEqlIntegTestCase.java @@ -25,7 +25,6 @@ public abstract class AbstractEqlIntegTestCase extends ESIntegTestCase { protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal)); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); - settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false); diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java index 4b61ad59b62..684febd19bf 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java @@ -98,7 +98,6 @@ public class IndexLifecycleInitialisationTests extends ESIntegTestCase { settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); - settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); settings.put(LifecycleSettings.LIFECYCLE_POLL_INTERVAL, "1s"); diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleInitialisationTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleInitialisationTests.java index d2ec43274fe..339b6570f1f 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleInitialisationTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleInitialisationTests.java @@ -47,7 +47,6 @@ public class SnapshotLifecycleInitialisationTests extends ESSingleNodeTestCase { settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); - settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); settings.put(Environment.PATH_REPO_SETTING.getKey(), repositoryLocation); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlSingleNodeTestCase.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlSingleNodeTestCase.java index 7243be63068..de2316948ff 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlSingleNodeTestCase.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlSingleNodeTestCase.java @@ -44,7 +44,6 @@ public abstract class MlSingleNodeTestCase extends ESSingleNodeTestCase { newSettings.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial"); // Disable security otherwise delete-by-query action fails to get authorized newSettings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); - newSettings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); newSettings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); // Disable ILM history index so that the tests don't have to clean it up newSettings.put(LifecycleSettings.LIFECYCLE_HISTORY_INDEX_ENABLED_SETTING.getKey(), false); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AnnotationIndexIT.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AnnotationIndexIT.java index 84a2ebac574..317369be9da 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AnnotationIndexIT.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AnnotationIndexIT.java @@ -26,7 +26,6 @@ public class AnnotationIndexIT extends MlSingleNodeTestCase { protected Settings nodeSettings() { Settings.Builder newSettings = Settings.builder(); newSettings.put(super.nodeSettings()); - newSettings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); newSettings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); newSettings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); return newSettings.build(); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java index d31d83dc2af..a0e38af629b 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java @@ -95,7 +95,6 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase { settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); settings.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial"); settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); - settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); settings.put(LifecycleSettings.LIFECYCLE_HISTORY_INDEX_ENABLED_SETTING.getKey(), false); return settings.build(); diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java index 035ac57bacb..3ffcd5d0587 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/Monitoring.java @@ -34,7 +34,6 @@ import org.elasticsearch.script.ScriptService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.watcher.ResourceWatcherService; import org.elasticsearch.xpack.core.XPackPlugin; -import org.elasticsearch.xpack.core.XPackSettings; import org.elasticsearch.xpack.core.monitoring.MonitoringField; import org.elasticsearch.xpack.core.monitoring.action.MonitoringBulkAction; import org.elasticsearch.xpack.core.ssl.SSLService; @@ -66,7 +65,6 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.elasticsearch.common.settings.Setting.boolSetting; @@ -85,7 +83,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin true, Setting.Property.Dynamic, Setting.Property.NodeScope, Setting.Property.Deprecated); protected final Settings settings; - private final boolean enabled; private final boolean transportClientMode; private Exporters exporters; @@ -93,7 +90,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin public Monitoring(Settings settings) { this.settings = settings; this.transportClientMode = XPackPlugin.transportClientMode(settings); - this.enabled = XPackSettings.MONITORING_ENABLED.get(settings); } // overridable by tests @@ -101,10 +97,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); } protected LicenseService getLicenseService() { return XPackPlugin.getSharedLicenseService(); } - boolean isEnabled() { - return enabled; - } - boolean isTransportClient() { return transportClientMode; } @@ -114,7 +106,7 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin List modules = new ArrayList<>(); modules.add(b -> { XPackPlugin.bindFeatureSet(b, MonitoringFeatureSet.class); - if (transportClientMode || enabled == false) { + if (transportClientMode) { b.bind(MonitoringService.class).toProvider(Providers.of(null)); b.bind(Exporters.class).toProvider(Providers.of(null)); } @@ -129,10 +121,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver expressionResolver, Supplier repositoriesServiceSupplier) { - if (enabled == false) { - return Collections.emptyList(); - } - final ClusterSettings clusterSettings = clusterService.getClusterSettings(); final CleanerService cleanerService = new CleanerService(settings, clusterSettings, threadPool, getLicenseState()); final SSLService dynamicSSLService = getSslService().createDynamicSSLService(); @@ -161,9 +149,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin @Override public List> getActions() { - if (false == enabled) { - return emptyList(); - } return singletonList(new ActionHandler<>(MonitoringBulkAction.INSTANCE, TransportMonitoringBulkAction.class)); } @@ -171,9 +156,6 @@ public class Monitoring extends Plugin implements ActionPlugin, ReloadablePlugin public List getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier nodesInCluster) { - if (false == enabled) { - return emptyList(); - } return singletonList(new RestMonitoringBulkAction()); } diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java index 161864b68bc..e4dd52b227b 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSet.java @@ -8,11 +8,9 @@ package org.elasticsearch.xpack.monitoring; import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.xpack.core.XPackFeatureSet; import org.elasticsearch.xpack.core.XPackField; -import org.elasticsearch.xpack.core.XPackSettings; import org.elasticsearch.xpack.core.monitoring.MonitoringFeatureSetUsage; import org.elasticsearch.xpack.monitoring.exporter.Exporter; import org.elasticsearch.xpack.monitoring.exporter.Exporters; @@ -22,17 +20,14 @@ import java.util.Map; public class MonitoringFeatureSet implements XPackFeatureSet { - private final boolean enabled; private final MonitoringService monitoring; private final XPackLicenseState licenseState; private final Exporters exporters; @Inject - public MonitoringFeatureSet(Settings settings, - @Nullable MonitoringService monitoring, + public MonitoringFeatureSet(@Nullable MonitoringService monitoring, @Nullable XPackLicenseState licenseState, @Nullable Exporters exporters) { - this.enabled = XPackSettings.MONITORING_ENABLED.get(settings); this.monitoring = monitoring; this.licenseState = licenseState; this.exporters = exporters; @@ -50,7 +45,7 @@ public class MonitoringFeatureSet implements XPackFeatureSet { @Override public boolean enabled() { - return enabled; + return true; } @Override @@ -62,7 +57,7 @@ public class MonitoringFeatureSet implements XPackFeatureSet { public void usage(ActionListener listener) { final boolean collectionEnabled = monitoring != null && monitoring.isMonitoringActive(); - listener.onResponse(new MonitoringFeatureSetUsage(available(), enabled(), collectionEnabled, exportersUsage(exporters))); + listener.onResponse(new MonitoringFeatureSetUsage(available(), collectionEnabled, exportersUsage(exporters))); } static Map exportersUsage(Exporters exporters) { diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java index adf63de8556..c88b803caec 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringFeatureSetTests.java @@ -10,15 +10,12 @@ import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.yaml.ObjectPath; import org.elasticsearch.xpack.core.XPackFeatureSet; -import org.elasticsearch.xpack.core.XPackSettings; import org.elasticsearch.xpack.core.XPackFeatureSet.Usage; import org.elasticsearch.xpack.core.monitoring.MonitoringFeatureSetUsage; import org.elasticsearch.xpack.monitoring.exporter.Exporter; @@ -44,23 +41,19 @@ public class MonitoringFeatureSetTests extends ESTestCase { private final Exporters exporters = mock(Exporters.class); public void testAvailable() { - MonitoringFeatureSet featureSet = new MonitoringFeatureSet(Settings.EMPTY, monitoring, licenseState, exporters); + MonitoringFeatureSet featureSet = new MonitoringFeatureSet(monitoring, licenseState, exporters); boolean available = randomBoolean(); when(licenseState.isAllowed(XPackLicenseState.Feature.MONITORING)).thenReturn(available); assertThat(featureSet.available(), is(available)); } - public void testEnabledSetting() { - boolean enabled = randomBoolean(); - Settings.Builder settings = Settings.builder(); - settings.put("xpack.monitoring.enabled", enabled); - MonitoringFeatureSet featureSet = new MonitoringFeatureSet(settings.build(), monitoring, licenseState, exporters); - assertThat(featureSet.enabled(), is(enabled)); - assertSettingDeprecationsAndWarnings(new Setting[] { XPackSettings.MONITORING_ENABLED } ); + public void testMonitoringEnabledByDefault() { + MonitoringFeatureSet featureSet = new MonitoringFeatureSet(monitoring, licenseState, exporters); + assertThat(featureSet.enabled(), is(true)); } public void testEnabledDefault() { - MonitoringFeatureSet featureSet = new MonitoringFeatureSet(Settings.EMPTY, monitoring, licenseState, exporters); + MonitoringFeatureSet featureSet = new MonitoringFeatureSet(monitoring, licenseState, exporters); assertThat(featureSet.enabled(), is(true)); } @@ -100,7 +93,7 @@ public class MonitoringFeatureSetTests extends ESTestCase { when(exporters.getEnabledExporters()).thenReturn(exporterList); when(monitoring.isMonitoringActive()).thenReturn(collectionEnabled); - MonitoringFeatureSet featureSet = new MonitoringFeatureSet(Settings.EMPTY, monitoring, licenseState, exporters); + MonitoringFeatureSet featureSet = new MonitoringFeatureSet(monitoring, licenseState, exporters); PlainActionFuture future = new PlainActionFuture<>(); featureSet.usage(future); XPackFeatureSet.Usage monitoringUsage = future.get(); diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java deleted file mode 100644 index 6fb967c7978..00000000000 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringPluginClientTests.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ -package org.elasticsearch.xpack.monitoring; - -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; - -import static org.hamcrest.Matchers.is; - -public class MonitoringPluginClientTests extends ESTestCase { - - public void testModulesWithClientSettings() throws Exception { - Settings settings = Settings.builder() - .put("path.home", createTempDir()) - .put(Client.CLIENT_TYPE_SETTING_S.getKey(), TransportClient.CLIENT_TYPE) - .build(); - - Monitoring plugin = new Monitoring(settings); - assertThat(plugin.isEnabled(), is(true)); - assertThat(plugin.isTransportClient(), is(true)); - } - - public void testModulesWithNodeSettings() throws Exception { - // these settings mimic what ES does when running as a node... - Settings settings = Settings.builder() - .put("path.home", createTempDir()) - .put(Client.CLIENT_TYPE_SETTING_S.getKey(), "node") - .build(); - Monitoring plugin = new Monitoring(settings); - assertThat(plugin.isEnabled(), is(true)); - assertThat(plugin.isTransportClient(), is(false)); - } -} diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java index cc0bb1c59ba..cb7ef41a364 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsCollectorTests.java @@ -206,7 +206,7 @@ public class ClusterStatsCollectorTests extends BaseCollectorTestCase { .thenReturn(indices); final XPackUsageResponse xPackUsageResponse = new XPackUsageResponse( - singletonList(new MonitoringFeatureSetUsage(true, true, false, null))); + singletonList(new MonitoringFeatureSetUsage(true, false, null))); @SuppressWarnings("unchecked") final ActionFuture xPackUsageFuture = (ActionFuture) mock(ActionFuture.class); @@ -305,7 +305,7 @@ public class ClusterStatsCollectorTests extends BaseCollectorTestCase { when(client.admin()).thenReturn(adminClient); final XPackUsageResponse xPackUsageResponse = new XPackUsageResponse( - singletonList(new MonitoringFeatureSetUsage(true, true, false, null))); + singletonList(new MonitoringFeatureSetUsage(true, false, null))); @SuppressWarnings("unchecked") final ActionFuture xPackUsageFuture = (ActionFuture) mock(ActionFuture.class); when(client.execute(same(XPackUsageAction.INSTANCE), any(XPackUsageRequest.class))).thenReturn(xPackUsageFuture); diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java index 6e21730093c..7486f1f0bba 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java @@ -234,7 +234,7 @@ public class ClusterStatsMonitoringDocTests extends BaseMonitoringDocTestCase usages = singletonList(new MonitoringFeatureSetUsage(false, true, false, null)); + final List usages = singletonList(new MonitoringFeatureSetUsage(false, false, null)); final NodeInfo mockNodeInfo = mock(NodeInfo.class); when(mockNodeInfo.getVersion()).thenReturn(Version.V_6_0_0_alpha2); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java index 3d195d498fa..d72ed0d23cd 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecuritySettingsSource.java @@ -138,9 +138,8 @@ public class SecuritySettingsSource extends NodeConfigurationSource { .put(XPackSettings.SECURITY_ENABLED.getKey(), true) .put(NetworkModule.TRANSPORT_TYPE_KEY, randomBoolean() ? SecurityField.NAME4 : SecurityField.NIO) .put(NetworkModule.HTTP_TYPE_KEY, randomBoolean() ? SecurityField.NAME4 : SecurityField.NIO) - //TODO: for now isolate security tests from watcher & monitoring (randomize this later) + //TODO: for now isolate security tests from watcher (randomize this later) .put(XPackSettings.WATCHER_ENABLED.getKey(), false) - .put(XPackSettings.MONITORING_ENABLED.getKey(), false) .put(XPackSettings.AUDIT_ENABLED.getKey(), randomBoolean()) .put(LoggingAuditTrail.EMIT_HOST_ADDRESS_SETTING.getKey(), randomBoolean()) .put(LoggingAuditTrail.EMIT_HOST_NAME_SETTING.getKey(), randomBoolean()) diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/action/AbstractSqlIntegTestCase.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/action/AbstractSqlIntegTestCase.java index c741667ba9e..b430323a515 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/action/AbstractSqlIntegTestCase.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/action/AbstractSqlIntegTestCase.java @@ -23,7 +23,6 @@ public abstract class AbstractSqlIntegTestCase extends ESIntegTestCase { protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal)); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); - settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), false); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index c6c52c825de..48a44197514 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -110,7 +110,6 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase protected Settings nodeSettings(int nodeOrdinal) { return Settings.builder() .put(super.nodeSettings(nodeOrdinal)) - .put(XPackSettings.MONITORING_ENABLED.getKey(), false) .put(XPackSettings.SECURITY_ENABLED.getKey(), false) .put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial") // we do this by default in core, but for watcher this isn't needed and only adds noise. diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java index 9492e50048d..ac9ee533432 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java @@ -60,7 +60,6 @@ public class RejectedExecutionTests extends AbstractWatcherIntegrationTestCase { return Settings.builder() .put(super.nodeSettings(nodeOrdinal)) - .put(XPackSettings.MONITORING_ENABLED.getKey(), false) .put(XPackSettings.SECURITY_ENABLED.getKey(), false) .put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial") .put("thread_pool.write.size", 1)