Merge branch '7.x' into backport/7.x/pr-63093

Author: elasticmachine

.eslintrc.js

@@ -115,7 +115,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
         'react-hooks/rules-of-hooks': 'off',
@@ -732,7 +732,7 @@ module.exports = {
      * Lens overrides
      */
     {
-      files: ['x-pack/legacy/plugins/lens/**/*.{ts,tsx}', 'x-pack/plugins/lens/**/*.{ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
       },

.sass-lint.yml

@@ -8,9 +8,9 @@ files:
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/lens/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
-    - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:
   quotes:

x-pack/.i18nrc.json

@@ -21,7 +21,7 @@
     "xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
     "xpack.infra": "plugins/infra",
     "xpack.ingestManager": "plugins/ingest_manager",
-    "xpack.lens": "legacy/plugins/lens",
+    "xpack.lens": "plugins/lens",
     "xpack.licenseMgmt": "plugins/license_management",
     "xpack.licensing": "plugins/licensing",
     "xpack.logstash": ["plugins/logstash", "legacy/plugins/logstash"],

x-pack/index.js

@@ -29,7 +29,6 @@ import { uptime } from './legacy/plugins/uptime';
 import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
 import { actions } from './legacy/plugins/actions';
 import { alerting } from './legacy/plugins/alerting';
-import { lens } from './legacy/plugins/lens';
 import { ingestManager } from './legacy/plugins/ingest_manager';
 import { triggersActionsUI } from './legacy/plugins/triggers_actions_ui';
 
@@ -58,7 +57,6 @@ module.exports = function(kibana) {
     upgradeAssistant(kibana),
     uptime(kibana),
     encryptedSavedObjects(kibana),
-    lens(kibana),
     actions(kibana),
     alerting(kibana),
     ingestManager(kibana),