elastic · chrisronline · Jan 28, 2020 · Jan 28, 2020
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
@@ -119,6 +119,56 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot('xpack.telemetry.config', 'telemetry.config'),
   renameFromRoot('xpack.telemetry.banner', 'telemetry.banner'),
   renameFromRoot('xpack.telemetry.url', 'telemetry.url'),
+  // Monitoring renames
+  // TODO: Remove these from here once the monitoring plugin is migrated to NP
+  renameFromRoot('xpack.monitoring.enabled', 'monitoring.enabled'),
+  renameFromRoot('xpack.monitoring.ui.enabled', 'monitoring.ui.enabled'),
+  renameFromRoot(
+    'xpack.monitoring.kibana.collection.enabled',
+    'monitoring.kibana.collection.enabled'
+  ),
+  renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size'),
+  renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds'),
+  renameFromRoot(
+    'xpack.monitoring.show_license_expiration',
+    'monitoring.ui.show_license_expiration'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.ui.container.elasticsearch.enabled',
+    'monitoring.ui.container.elasticsearch.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.ui.container.logstash.enabled',
+    'monitoring.ui.container.logstash.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.tests.cloud_detector.enabled',
+    'monitoring.tests.cloud_detector.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.kibana.collection.interval',
+    'monitoring.kibana.collection.interval'
+  ),
+  renameFromRoot('xpack.monitoring.elasticsearch.hosts', 'monitoring.ui.elasticsearch.hosts'),
+  renameFromRoot('xpack.monitoring.elasticsearch.username', 'monitoring.ui.elasticsearch.username'),
+  renameFromRoot('xpack.monitoring.elasticsearch.password', 'monitoring.ui.elasticsearch.password'),
+  renameFromRoot(
+    'xpack.monitoring.xpack_api_polling_frequency_millis',
+    'monitoring.xpack_api_polling_frequency_millis'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.cluster_alerts.email_notifications.enabled',
+    'monitoring.cluster_alerts.email_notifications.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.cluster_alerts.email_notifications.email_address',
+    'monitoring.cluster_alerts.email_notifications.email_address'
+  ),
+  renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled'),
+  renameFromRoot(
+    'xpack.monitoring.elasticsearch.logFetchCount',
+    'monitoring.ui.elasticsearch.logFetchCount'
+  ),
   configPathDeprecation,
   dataPathDeprecation,
   rewriteBasePathDeprecation,

diff --git a/x-pack/legacy/plugins/monitoring/config.js b/x-pack/legacy/plugins/monitoring/config.js
@@ -15,12 +15,12 @@ export const config = Joi => {
   const DEFAULT_REQUEST_HEADERS = ['authorization'];
 
   return Joi.object({
-    ccs: Joi.object({
-      enabled: Joi.boolean().default(true),
-    }).default(),
     enabled: Joi.boolean().default(true),
     ui: Joi.object({
       enabled: Joi.boolean().default(true),
+      ccs: Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default(),
       container: Joi.object({
         elasticsearch: Joi.object({
           enabled: Joi.boolean().default(false),
@@ -29,6 +29,51 @@ export const config = Joi => {
           enabled: Joi.boolean().default(false),
         }).default(),
       }).default(),
+      max_bucket_size: Joi.number().default(10000),
+      min_interval_seconds: Joi.number().default(10),
+      show_license_expiration: Joi.boolean().default(true),
+      elasticsearch: Joi.object({
+        customHeaders: Joi.object().default({}),
+        logQueries: Joi.boolean().default(false),
+        requestHeadersWhitelist: Joi.array()
+          .items()
+          .single()
+          .default(DEFAULT_REQUEST_HEADERS),
+        sniffOnStart: Joi.boolean().default(false),
+        sniffInterval: Joi.number()
+          .allow(false)
+          .default(false),
+        sniffOnConnectionFault: Joi.boolean().default(false),
+        hosts: Joi.array()
+          .items(Joi.string().uri({ scheme: ['http', 'https'] }))
+          .single(), // if empty, use Kibana's connection config
+        username: Joi.string(),
+        password: Joi.string(),
+        requestTimeout: Joi.number().default(30000),
+        pingTimeout: Joi.number().default(30000),
+        ssl: Joi.object({
+          verificationMode: Joi.string()
+            .valid('none', 'certificate', 'full')
+            .default('full'),
+          certificateAuthorities: Joi.array()
+            .single()
+            .items(Joi.string()),
+          certificate: Joi.string(),
+          key: Joi.string(),
+          keyPassphrase: Joi.string(),
+          keystore: Joi.object({
+            path: Joi.string(),
+            password: Joi.string(),
+          }).default(),
+          truststore: Joi.object({
+            path: Joi.string(),
+            password: Joi.string(),
+          }).default(),
+          alwaysPresentCertificate: Joi.boolean().default(false),
+        }).default(),
+        apiVersion: Joi.string().default('master'),
+        logFetchCount: Joi.number().default(10),
+      }).default(),
     }).default(),
     kibana: Joi.object({
       collection: Joi.object({
@@ -46,56 +91,11 @@ export const config = Joi => {
     xpack_api_polling_frequency_millis: Joi.number().default(
       XPACK_INFO_API_DEFAULT_POLL_FREQUENCY_IN_MILLIS
     ),
-    max_bucket_size: Joi.number().default(10000),
-    min_interval_seconds: Joi.number().default(10),
-    show_license_expiration: Joi.boolean().default(true),
     agent: Joi.object({
       interval: Joi.string()
         .regex(/[\d\.]+[yMwdhms]/)
         .default('10s'),
     }).default(),
-    elasticsearch: Joi.object({
-      customHeaders: Joi.object().default({}),
-      logQueries: Joi.boolean().default(false),
-      requestHeadersWhitelist: Joi.array()
-        .items()
-        .single()
-        .default(DEFAULT_REQUEST_HEADERS),
-      sniffOnStart: Joi.boolean().default(false),
-      sniffInterval: Joi.number()
-        .allow(false)
-        .default(false),
-      sniffOnConnectionFault: Joi.boolean().default(false),
-      hosts: Joi.array()
-        .items(Joi.string().uri({ scheme: ['http', 'https'] }))
-        .single(), // if empty, use Kibana's connection config
-      username: Joi.string(),
-      password: Joi.string(),
-      requestTimeout: Joi.number().default(30000),
-      pingTimeout: Joi.number().default(30000),
-      ssl: Joi.object({
-        verificationMode: Joi.string()
-          .valid('none', 'certificate', 'full')
-          .default('full'),
-        certificateAuthorities: Joi.array()
-          .single()
-          .items(Joi.string()),
-        certificate: Joi.string(),
-        key: Joi.string(),
-        keyPassphrase: Joi.string(),
-        keystore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        truststore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        alwaysPresentCertificate: Joi.boolean().default(false),
-      }).default(),
-      apiVersion: Joi.string().default('master'),
-      logFetchCount: Joi.number().default(10),
-    }).default(),
     tests: Joi.object({
       cloud_detector: Joi.object({
         enabled: Joi.boolean().default(true),

diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
@@ -20,32 +20,32 @@ export const monitoring = kibana =>
   new kibana.Plugin({
     require: ['kibana', 'elasticsearch', 'xpack_main'],
     id: 'monitoring',
-    configPrefix: 'xpack.monitoring',
+    configPrefix: 'monitoring',
     publicDir: resolve(__dirname, 'public'),
     init(server) {
       const configs = [
-        'xpack.monitoring.ui.enabled',
-        'xpack.monitoring.kibana.collection.enabled',
-        'xpack.monitoring.max_bucket_size',
-        'xpack.monitoring.min_interval_seconds',
+        'monitoring.ui.enabled',
+        'monitoring.kibana.collection.enabled',
+        'monitoring.ui.max_bucket_size',
+        'monitoring.ui.min_interval_seconds',
         'kibana.index',
         'pkg.version',
-        'xpack.monitoring.show_license_expiration',
-        'xpack.monitoring.ui.container.elasticsearch.enabled',
-        'xpack.monitoring.ui.container.logstash.enabled',
-        'xpack.monitoring.tests.cloud_detector.enabled',
-        'xpack.monitoring.kibana.collection.interval',
-        'xpack.monitoring.elasticsearch.hosts',
-        'xpack.monitoring.elasticsearch',
-        'xpack.monitoring.xpack_api_polling_frequency_millis',
+        'monitoring.ui.show_license_expiration',
+        'monitoring.ui.container.elasticsearch.enabled',
+        'monitoring.ui.container.logstash.enabled',
+        'monitoring.tests.cloud_detector.enabled',
+        'monitoring.kibana.collection.interval',
+        'monitoring.ui.elasticsearch.hosts',
+        'monitoring.ui.elasticsearch',
+        'monitoring.xpack_api_polling_frequency_millis',
         'server.uuid',
         'server.name',
         'server.host',
         'server.port',
-        'xpack.monitoring.cluster_alerts.email_notifications.enabled',
-        'xpack.monitoring.cluster_alerts.email_notifications.email_address',
-        'xpack.monitoring.ccs.enabled',
-        'xpack.monitoring.elasticsearch.logFetchCount',
+        'monitoring.cluster_alerts.email_notifications.enabled',
+        'monitoring.cluster_alerts.email_notifications.email_address',
+        'monitoring.ui.ccs.enabled',
+        'monitoring.ui.elasticsearch.logFetchCount',
       ];
 
       const serverConfig = server.config();

diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
@@ -157,7 +157,7 @@ export function alertsClusterSearch(req, alertsIndex, cluster, checkLicense, opt
 
   if (prodLicenseInfo.clusterAlerts.enabled) {
     const config = req.server.config();
-    const size = options.size || config.get('xpack.monitoring.max_bucket_size');
+    const size = options.size || config.get('monitoring.ui.max_bucket_size');
 
     const params = {
       index: alertsIndex,

diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
@@ -19,7 +19,7 @@ export function verifyMonitoringLicense(server) {
   const config = server.config();
 
   // if cluster alerts are enabled, then ensure that we can use it according to the license
-  if (config.get('xpack.monitoring.cluster_alerts.enabled')) {
+  if (config.get('monitoring.cluster_alerts.enabled')) {
     const xpackInfo = get(server.plugins.monitoring, 'info');
     if (xpackInfo) {
       const monitoringCluster = xpackInfo.feature('monitoring').getLicenseCheckResults();

diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js b/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
@@ -11,8 +11,8 @@ import { exposeClient, hasMonitoringCluster } from '../instantiate_client';
 
 function getMockServerFromConnectionUrl(monitoringClusterUrl) {
   const server = {
-    xpack: {
-      monitoring: {
+    monitoring: {
+      ui: {
         elasticsearch: {
           hosts: monitoringClusterUrl ? [monitoringClusterUrl] : [],
           username: 'monitoring-user-internal-test',
@@ -27,7 +27,7 @@ function getMockServerFromConnectionUrl(monitoringClusterUrl) {
   };
 
   return {
-    elasticsearchConfig: server.xpack.monitoring.elasticsearch,
+    elasticsearchConfig: server.monitoring.ui.elasticsearch,
     elasticsearchPlugin: {
       getCluster: sinon
         .stub()

diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
@@ -168,14 +168,14 @@ describe('throws when config is invalid', () => {
   it('throws if key and keystore.path are both specified', () => {
     const value = { ssl: { key: 'foo', keystore: { path: 'bar' } } };
     expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [xpack.monitoring.elasticsearch].ssl]: cannot use [key] when [keystore.path] is specified"`
+      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [key] when [keystore.path] is specified"`
     );
   });
 
   it('throws if certificate and keystore.path are both specified', () => {
     const value = { ssl: { certificate: 'foo', keystore: { path: 'bar' } } };
     expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [xpack.monitoring.elasticsearch].ssl]: cannot use [certificate] when [keystore.path] is specified"`
+      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [certificate] when [keystore.path] is specified"`
     );
   });
 });
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
@@ -7,7 +7,7 @@
 import { readFileSync } from 'fs';
 import { readPkcs12Truststore, readPkcs12Keystore } from '../../../../../../src/core/utils';
 
-const KEY = 'xpack.monitoring.elasticsearch';
+const KEY = 'monitoring.ui.elasticsearch';
 
 /*
  * Parse a config object's Elasticsearch configuration, reading any

diff --git a/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js b/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
@@ -15,7 +15,7 @@ export const initMonitoringXpackInfo = async ({ config, xpackMainPlugin, expose,
   const xpackInfo = hasMonitoringCluster(config)
     ? xpackMainPlugin.createXPackInfo({
         clusterSource: 'monitoring',
-        pollFrequencyInMillis: config.get('xpack.monitoring.xpack_api_polling_frequency_millis'),
+        pollFrequencyInMillis: config.get('monitoring.xpack_api_polling_frequency_millis'),
       })
     : xpackMainPlugin.info;
 

diff --git a/...ugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js b/...ugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
@@ -21,14 +21,10 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
   }) {
     const config = { get: sinon.stub() };
 
-    config.get
-      .withArgs('xpack.monitoring.cluster_alerts.email_notifications.enabled')
-      .returns(enabled);
+    config.get.withArgs('monitoring.cluster_alerts.email_notifications.enabled').returns(enabled);
 
     if (adminEmail) {
-      config.get
-        .withArgs(`xpack.monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`)
-        .returns(adminEmail);
+      config.get.withArgs(`monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`).returns(adminEmail);
     }
 
     config.get.withArgs('kibana.index').returns('.kibana');
@@ -74,7 +70,7 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
       resetDeprecationWarning();
     });
 
-    describe('xpack.monitoring.cluster_alerts.email_notifications.enabled = false', () => {
+    describe('monitoring.cluster_alerts.email_notifications.enabled = false', () => {
       it('returns null', async () => {
         const { config, callCluster, log } = setup({ enabled: false });
         expect(await getDefaultAdminEmail(config, callCluster, log)).to.be(null);
@@ -131,12 +127,12 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
     });
   });
 
-  describe('using xpack.monitoring.cluster_alerts.email_notifications.email_address', () => {
+  describe('using monitoring.cluster_alerts.email_notifications.email_address', () => {
     beforeEach(() => {
       resetDeprecationWarning();
     });
 
-    describe('xpack.monitoring.cluster_alerts.email_notifications.enabled = false', () => {
+    describe('monitoring.cluster_alerts.email_notifications.enabled = false', () => {
       it('returns null', async () => {
         const { config, callCluster, log } = setup({ enabled: false });
         expect(await getDefaultAdminEmail(config, callCluster, log)).to.be(null);

diff --git a/...k/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js b/...k/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
@@ -19,11 +19,11 @@ export function resetDeprecationWarning() {
  * If so, use uiSettings API to fetch the X-Pack default admin email
  */
 export async function getDefaultAdminEmail(config, callCluster, log) {
-  if (!config.get('xpack.monitoring.cluster_alerts.email_notifications.enabled')) {
+  if (!config.get('monitoring.cluster_alerts.email_notifications.enabled')) {
     return null;
   }
 
-  const emailAddressConfigKey = `xpack.monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`;
+  const emailAddressConfigKey = `monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`;
   const configuredEmailAddress = config.get(emailAddressConfigKey);
 
   if (configuredEmailAddress) {

diff --git a/...ck/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js b/...ck/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
@@ -17,7 +17,7 @@ export function opsBuffer({ config, log, getOSInfo }) {
   // determine the cloud service in the background
   const cloudDetector = new CloudDetector();
 
-  if (config.get('xpack.monitoring.tests.cloud_detector.enabled')) {
+  if (config.get('monitoring.tests.cloud_detector.enabled')) {
     cloudDetector.detectCloudService();
   }
 

diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
@@ -16,7 +16,7 @@ import { BulkUploader } from './bulk_uploader';
  * @param {Object} server HapiJS server instance
  */
 export function initBulkUploader({ config, ...params }) {
-  const interval = config.get('xpack.monitoring.kibana.collection.interval');
+  const interval = config.get('monitoring.kibana.collection.interval');
   return new BulkUploader({
     interval,
     config,