From 58e20d7caa8be5c8a43f1ae11d6461e5ffef9a1c Mon Sep 17 00:00:00 2001 From: Mihir Soni Date: Wed, 7 Apr 2021 23:10:29 +0000 Subject: [PATCH] [PURIFY][BUILD] Removes most of x-pack referneces Signed-off-by: Mihir Soni --- Jenkinsfile | 2 +- README.md | 2 +- .../parse_opensearch_log.test.js.snap | 4 +- .../src/utils/parse_opensearch_log.test.js | 4 +- .../x-pack/baz/opensearch_dashboards.json | 4 - .../mock_repo/x-pack/baz/public/index.ts | 21 -- .../basic_optimization.test.ts.snap | 30 -- .../basic_optimization.test.ts | 26 +- .../src/node/node_auto_tranpilation.ts | 3 - .../src/optimizer/get_plugin_bundles.test.ts | 21 -- .../src/optimizer/get_plugin_bundles.ts | 7 +- packages/osd-pm/dist/index.js | 1 - packages/osd-pm/src/cli.ts | 1 - packages/osd-spec-to-console/README.md | 1 - packages/osd-telemetry-tools/GUIDELINE.md | 2 +- packages/osd-telemetry-tools/README.md | 2 +- .../src/tools/tasks/parse_configs_task.ts | 3 +- src/cli_plugin/install/index.js | 4 +- src/cli_plugin/install/install.js | 3 - src/cli_plugin/lib/error_if_x_pack.js | 48 --- src/cli_plugin/lib/error_if_x_pack.test.js | 50 --- src/cli_plugin/lib/is_oss.js | 25 -- src/cli_plugin/lib/is_oss.test.js | 28 -- src/cli_plugin/remove/remove.js | 3 - src/core/CONVENTIONS.md | 6 +- .../config/deprecation/core_deprecations.ts | 7 - .../service/lib/search_dsl/query_params.ts | 4 +- src/dev/build/args.test.ts | 2 +- src/dev/ci_setup/setup.sh | 1 - src/dev/ci_setup/setup_env.sh | 1 - src/dev/i18n/README.md | 3 +- .../form/__snapshots__/form.test.tsx.snap | 308 ------------------ .../components/form/form.test.tsx | 13 +- .../search/__snapshots__/search.test.tsx.snap | 4 - .../components/search/search.test.tsx | 2 +- .../management_app/lib/get_aria_name.test.ts | 1 - .../management_app/lib/get_aria_name.ts | 2 +- src/plugins/data/README.md | 1 - .../collectors/application_usage/schema.ts | 37 --- .../server/collectors/ui_metric/schema.ts | 37 --- .../get_local_stats.test.ts | 2 +- 41 files changed, 26 insertions(+), 700 deletions(-) delete mode 100644 packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/opensearch_dashboards.json delete mode 100644 packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts delete mode 100644 src/cli_plugin/lib/error_if_x_pack.js delete mode 100644 src/cli_plugin/lib/error_if_x_pack.test.js delete mode 100644 src/cli_plugin/lib/is_oss.js delete mode 100644 src/cli_plugin/lib/is_oss.test.js diff --git a/Jenkinsfile b/Jenkinsfile index c058c1789363..c221237aeb93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { stage('bootstrap') { echo "Bootstrap here" sh 'yarn osd bootstrap' - sh 'node scripts/build_opensearch_dashboards_platform_plugins --oss --no-examples --workers 10' + sh 'node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers 10' } } } diff --git a/README.md b/README.md index 780cdb2e69da..b60ac08db7ba 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Or To run Dashboards with OpenSearch * Run ```yarn osd bootstrap``` in the OpenSearch Dashboards directory -* While OpenSearch is running locally, run ```yarn start --oss``` +* While OpenSearch is running locally, run ```yarn start``` * You can now navigate to ```http://localhost:5601``` where Dashboards runs by default ## How you can help diff --git a/packages/osd-opensearch/src/utils/__snapshots__/parse_opensearch_log.test.js.snap b/packages/osd-opensearch/src/utils/__snapshots__/parse_opensearch_log.test.js.snap index c037115bb364..303e743289ee 100644 --- a/packages/osd-opensearch/src/utils/__snapshots__/parse_opensearch_log.test.js.snap +++ b/packages/osd-opensearch/src/utils/__snapshots__/parse_opensearch_log.test.js.snap @@ -17,8 +17,8 @@ Caused by: java.net.BindException: Address already in use exports[`parses data containing exception 3`] = `"[o.e.g.GatewayService] [qEfPPg8] recovered [0] indices into cluster_state"`; -exports[`parses multiple lines 1`] = `"[o.e.p.PluginsService] [qEfPPg8] loaded plugin [x-pack-security]"`; +exports[`parses multiple lines 1`] = `"[o.e.p.PluginsService] [qEfPPg8] loaded plugin [osd-security]"`; -exports[`parses multiple lines 2`] = `"[o.e.p.PluginsService] [qEfPPg8] loaded plugin [x-pack-watcher]"`; +exports[`parses multiple lines 2`] = `"[o.e.p.PluginsService] [qEfPPg8] loaded plugin [osd-watcher]"`; exports[`parses single line 1`] = `"[o.e.p.PluginsService] [qEfPPg8] loaded module [lang-expression]"`; diff --git a/packages/osd-opensearch/src/utils/parse_opensearch_log.test.js b/packages/osd-opensearch/src/utils/parse_opensearch_log.test.js index 9aa5856100dd..f0fa8bd93b42 100644 --- a/packages/osd-opensearch/src/utils/parse_opensearch_log.test.js +++ b/packages/osd-opensearch/src/utils/parse_opensearch_log.test.js @@ -32,8 +32,8 @@ test('parses single line', () => { test('parses multiple lines', () => { const data = dedent(` - [2018-02-23T10:13:40,405][INFO ][o.e.p.PluginsService ] [qEfPPg8] loaded plugin [x-pack-security] - [2018-02-23T10:13:40,405][INFO ][o.e.p.PluginsService ] [qEfPPg8] loaded plugin [x-pack-watcher] + [2018-02-23T10:13:40,405][INFO ][o.e.p.PluginsService ] [qEfPPg8] loaded plugin [osd-security] + [2018-02-23T10:13:40,405][INFO ][o.e.p.PluginsService ] [qEfPPg8] loaded plugin [osd-watcher] `); const lines = parseOpenSearchLog(data); diff --git a/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/opensearch_dashboards.json b/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/opensearch_dashboards.json deleted file mode 100644 index 10602d2e7981..000000000000 --- a/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/opensearch_dashboards.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "id": "baz", - "ui": true -} diff --git a/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts b/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts deleted file mode 100644 index 7313de07be04..000000000000 --- a/packages/osd-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -// eslint-disable-next-line no-console -console.log('plugin in an x-pack dir'); diff --git a/packages/osd-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap b/packages/osd-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap index 17490eeadb4e..06f75b8981d6 100644 --- a/packages/osd-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap +++ b/packages/osd-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap @@ -35,24 +35,6 @@ OptimizerConfig { "sourceRoot": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo, "type": "plugin", }, - Bundle { - "banner": "/*! 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. */ -", - "cache": BundleCache { - "path": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/target/public/.osd-optimizer-cache, - "state": undefined, - }, - "contextDir": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz, - "id": "baz", - "manifestPath": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/opensearch_dashboards.json, - "outputDir": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/target/public, - "publicDirNames": Array [ - "public", - ], - "sourceRoot": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo, - "type": "plugin", - }, ], "cache": true, "dist": false, @@ -81,13 +63,6 @@ OptimizerConfig { "isUiPlugin": false, "manifestPath": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/nested/baz/opensearch_dashboards.json, }, - Object { - "directory": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz, - "extraPublicDirs": Array [], - "id": "baz", - "isUiPlugin": true, - "manifestPath": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/opensearch_dashboards.json, - }, ], "profileWebpack": false, "repoRoot": /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo, @@ -101,11 +76,6 @@ OptimizerConfig { exports[`prepares assets for distribution: bar bundle 1`] = `"(function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{enumerable:true,get:getter})}};__webpack_require__.r=function(exports){if(typeof Symbol!==\\"undefined\\"&&Symbol.toStringTag){Object.defineProperty(exports,Symbol.toStringTag,{value:\\"Module\\"})}Object.defineProperty(exports,\\"__esModule\\",{value:true})};__webpack_require__.t=function(value,mode){if(mode&1)value=__webpack_require__(value);if(mode&8)return value;if(mode&4&&typeof value===\\"object\\"&&value&&value.__esModule)return value;var ns=Object.create(null);__webpack_require__.r(ns);Object.defineProperty(ns,\\"default\\",{enumerable:true,value:value});if(mode&2&&typeof value!=\\"string\\")for(var key in value)__webpack_require__.d(ns,key,function(key){return value[key]}.bind(null,key));return ns};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module[\\"default\\"]}:function getModuleExports(){return module};__webpack_require__.d(getter,\\"a\\",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p=\\"\\";return __webpack_require__(__webpack_require__.s=3)})([function(module,exports,__webpack_require__){\\"use strict\\";var isOldIE=function isOldIE(){var memo;return function memorize(){if(typeof memo===\\"undefined\\"){memo=Boolean(window&&document&&document.all&&!window.atob)}return memo}}();var getTarget=function getTarget(){var memo={};return function memorize(target){if(typeof memo[target]===\\"undefined\\"){var styleTarget=document.querySelector(target);if(window.HTMLIFrameElement&&styleTarget instanceof window.HTMLIFrameElement){try{styleTarget=styleTarget.contentDocument.head}catch(e){styleTarget=null}}memo[target]=styleTarget}return memo[target]}}();var stylesInDom=[];function getIndexByIdentifier(identifier){var result=-1;for(var i=0;i { it('builds expected bundles, saves bundle counts to metadata', async () => { const config = OptimizerConfig.create({ repoRoot: MOCK_REPO_DIR, - pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')], + pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')], maxWorkerCount: 1, dist: false, }); @@ -111,7 +111,7 @@ it('builds expected bundles, saves bundle counts to metadata', async () => { (msg.event?.type === 'bundle cached' || msg.event?.type === 'bundle not cached') && msg.state.phase === 'initializing' ); - assert('produce three bundle cache events while initializing', bundleCacheStates.length === 3); + assert('produce two bundle cache events while initializing', bundleCacheStates.length === 2); const initializedStates = msgs.filter((msg) => msg.state.phase === 'initialized'); assert('produce at least one initialized event', initializedStates.length >= 1); @@ -126,7 +126,7 @@ it('builds expected bundles, saves bundle counts to metadata', async () => { ); const bundleNotCachedEvents = msgs.filter((msg) => msg.event?.type === 'bundle not cached'); - assert('produce three "bundle not cached" events', bundleNotCachedEvents.length === 3); + assert('produce two "bundle not cached" events', bundleNotCachedEvents.length === 2); const successStates = msgs.filter((msg) => msg.state.phase === 'success'); assert( @@ -185,26 +185,12 @@ it('builds expected bundles, saves bundle counts to metadata', async () => { /packages/osd-ui-shared-deps/public_path_module_creator.js, ] `); - - const baz = config.bundles.find((b) => b.id === 'baz')!; - expect(baz).toBeTruthy(); - baz.cache.refresh(); - expect(baz.cache.getModuleCount()).toBe(3); - - expect(baz.cache.getReferencedFiles()).toMatchInlineSnapshot(` - Array [ - /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/opensearch_dashboards.json, - /packages/osd-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/public/index.ts, - /packages/osd-optimizer/target/worker/entry_point_creator.js, - /packages/osd-ui-shared-deps/public_path_module_creator.js, - ] - `); }); it('uses cache on second run and exist cleanly', async () => { const config = OptimizerConfig.create({ repoRoot: MOCK_REPO_DIR, - pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')], + pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')], maxWorkerCount: 1, dist: false, }); @@ -225,7 +211,6 @@ it('uses cache on second run and exist cleanly', async () => { "initializing", "initializing", "initializing", - "initializing", "initialized", "success", ] @@ -235,7 +220,7 @@ it('uses cache on second run and exist cleanly', async () => { it('prepares assets for distribution', async () => { const config = OptimizerConfig.create({ repoRoot: MOCK_REPO_DIR, - pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')], + pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')], maxWorkerCount: 1, dist: true, }); @@ -248,7 +233,6 @@ it('prepares assets for distribution', async () => { 'foo async bundle' ); expectFileMatchesSnapshotWithCompression('plugins/bar/target/public/bar.plugin.js', 'bar bundle'); - expectFileMatchesSnapshotWithCompression('x-pack/baz/target/public/baz.plugin.js', 'baz bundle'); }); /** diff --git a/packages/osd-optimizer/src/node/node_auto_tranpilation.ts b/packages/osd-optimizer/src/node/node_auto_tranpilation.ts index 246cd9ccc1e0..1e3ef8503780 100644 --- a/packages/osd-optimizer/src/node/node_auto_tranpilation.ts +++ b/packages/osd-optimizer/src/node/node_auto_tranpilation.ts @@ -53,9 +53,6 @@ const IGNORE_PATTERNS = [ // is `x-pack` and `b` is not `node_modules` /[\/\\]node_modules[\/\\](?!x-pack[\/\\](?!node_modules)([^\/\\]+))([^\/\\]+[\/\\][^\/\\]+)/, - // ignore paths matching `/canvas/canvas_plugin/` - /[\/\\]canvas[\/\\]canvas_plugin[\/\\]/, - // ignore any path in the packages, unless it is in the package's // root `src` directory, in any test or __tests__ directory, or it // ends with .test.js, .test.ts, or .test.tsx diff --git a/packages/osd-optimizer/src/optimizer/get_plugin_bundles.test.ts b/packages/osd-optimizer/src/optimizer/get_plugin_bundles.test.ts index ac18b66c4a63..0a5b14cc6b3f 100644 --- a/packages/osd-optimizer/src/optimizer/get_plugin_bundles.test.ts +++ b/packages/osd-optimizer/src/optimizer/get_plugin_bundles.test.ts @@ -50,13 +50,6 @@ it('returns a bundle for core and each plugin', () => { extraPublicDirs: [], manifestPath: '/outside/of/repo/plugins/baz/opensearch_dashboards.json', }, - { - directory: '/repo/x-pack/plugins/box', - id: 'box', - isUiPlugin: true, - extraPublicDirs: [], - manifestPath: '/repo/x-pack/plugins/box/opensearch_dashboards.json', - }, ], '/repo', '/output' @@ -87,20 +80,6 @@ it('returns a bundle for core and each plugin', () => { "sourceRoot": , "type": "plugin", }, - Object { - "banner": "/*! 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. */ - ", - "contextDir": /x-pack/plugins/box, - "id": "box", - "manifestPath": /x-pack/plugins/box/opensearch_dashboards.json, - "outputDir": /x-pack/plugins/box/target/public, - "publicDirNames": Array [ - "public", - ], - "sourceRoot": , - "type": "plugin", - }, ] `); }); diff --git a/packages/osd-optimizer/src/optimizer/get_plugin_bundles.ts b/packages/osd-optimizer/src/optimizer/get_plugin_bundles.ts index 27367d0ec3df..a68d9e7ffbda 100644 --- a/packages/osd-optimizer/src/optimizer/get_plugin_bundles.ts +++ b/packages/osd-optimizer/src/optimizer/get_plugin_bundles.ts @@ -28,8 +28,6 @@ export function getPluginBundles( repoRoot: string, outputRoot: string ) { - const xpackDirSlash = Path.resolve(repoRoot, 'x-pack') + Path.sep; - return plugins .filter((p) => p.isUiPlugin) .map( @@ -46,10 +44,7 @@ export function getPluginBundles( 'target/public' ), manifestPath: p.manifestPath, - banner: p.directory.startsWith(xpackDirSlash) - ? `/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.\n` + - ` * Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */\n` - : undefined, + banner: undefined, }) ); } diff --git a/packages/osd-pm/dist/index.js b/packages/osd-pm/dist/index.js index e5b1fcd9a61e..0228db79f723 100644 --- a/packages/osd-pm/dist/index.js +++ b/packages/osd-pm/dist/index.js @@ -193,7 +193,6 @@ function help() { -e, --exclude Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e opensearch-dashboards -e @osd/pm'. -i, --include Include only specified projects. If left unspecified, it defaults to including all projects. - --oss Do not include the x-pack when running command. --skip-opensearch-dashboards-plugins Filter all plugins in ./plugins and ../opensearch-dashboards-extra when running command. --no-cache Disable the bootstrap cache --verbose Set log level to verbose diff --git a/packages/osd-pm/src/cli.ts b/packages/osd-pm/src/cli.ts index 81ce3a86b5e0..94c38a1f0e1b 100644 --- a/packages/osd-pm/src/cli.ts +++ b/packages/osd-pm/src/cli.ts @@ -44,7 +44,6 @@ function help() { -e, --exclude Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e opensearch-dashboards -e @osd/pm'. -i, --include Include only specified projects. If left unspecified, it defaults to including all projects. - --oss Do not include the x-pack when running command. --skip-opensearch-dashboards-plugins Filter all plugins in ./plugins and ../opensearch-dashboards-extra when running command. --no-cache Disable the bootstrap cache --verbose Set log level to verbose diff --git a/packages/osd-spec-to-console/README.md b/packages/osd-spec-to-console/README.md index d1ed5dd72ea4..11c6570c96ce 100644 --- a/packages/osd-spec-to-console/README.md +++ b/packages/osd-spec-to-console/README.md @@ -18,7 +18,6 @@ git pull --depth=1 origin master ### Usage -You need to run the command twice: once for the **OSS** specs and once for the **X-Pack** specs At the root of the OpenSearch Dashboards repository, run the following commands: ```sh diff --git a/packages/osd-telemetry-tools/GUIDELINE.md b/packages/osd-telemetry-tools/GUIDELINE.md index 3e58804a7b32..e4cf80d47ef6 100644 --- a/packages/osd-telemetry-tools/GUIDELINE.md +++ b/packages/osd-telemetry-tools/GUIDELINE.md @@ -28,7 +28,7 @@ node scripts/telemetry_check.js --path=.ts ### 1. Update the telemetryrc file -Make sure your collector is not excluded in the `telemetryrc.json` files (located at the root of the OpenSearch Dashboards project, and another on in the `x-pack` dir). +Make sure your collector is not excluded in the `telemetryrc.json` file located at the root of the OpenSearch Dashboards project. ```s [ diff --git a/packages/osd-telemetry-tools/README.md b/packages/osd-telemetry-tools/README.md index b36227c04701..131e0592bbe3 100644 --- a/packages/osd-telemetry-tools/README.md +++ b/packages/osd-telemetry-tools/README.md @@ -71,7 +71,7 @@ What will not be caught by the validator: * Fields in the schema that are never collected. If you are trying to report a field from OpenSearch but that value is never stored in OpenSearch, the check will not be able to detect if that field is ever collected in the first palce. It is advised to add unit/functional tests to check that all the fields are being reported as expected. -The tool looks for `.telemetryrc.json` files in the root of the project and in the `x-pack` dir for its runtime configurations. +The tool looks for `.telemetryrc.json` files in the root of the project for its runtime configurations. Currently auto-fixer (`--fix`) can automatically fix the json files with the following errors: diff --git a/packages/osd-telemetry-tools/src/tools/tasks/parse_configs_task.ts b/packages/osd-telemetry-tools/src/tools/tasks/parse_configs_task.ts index cafb830ce330..87b63cb67fe1 100644 --- a/packages/osd-telemetry-tools/src/tools/tasks/parse_configs_task.ts +++ b/packages/osd-telemetry-tools/src/tools/tasks/parse_configs_task.ts @@ -23,9 +23,8 @@ import { TaskContext } from './task_context'; export function parseConfigsTask() { const opensearchDashboardsRoot = process.cwd(); - const xpackRoot = path.join(opensearchDashboardsRoot, 'x-pack'); - const configRoots = [opensearchDashboardsRoot, xpackRoot]; + const configRoots = [opensearchDashboardsRoot]; return configRoots.map((configRoot) => ({ task: async (context: TaskContext) => { diff --git a/src/cli_plugin/install/index.js b/src/cli_plugin/install/index.js index 1ee3c81e2151..a0edfce6dc2f 100644 --- a/src/cli_plugin/install/index.js +++ b/src/cli_plugin/install/index.js @@ -54,8 +54,8 @@ export function installCommand(program) { .description( 'install a plugin', `Common examples: - install file:///Path/to/my/x-pack.zip - install https://path.to/my/x-pack.zip` + install file:///Path/to/my/plugin-example.zip + install https://path.to/my/plugin-example.zip` ) .action(processCommand); } diff --git a/src/cli_plugin/install/install.js b/src/cli_plugin/install/install.js index cc76f0bb940d..338cea7c0e8a 100644 --- a/src/cli_plugin/install/install.js +++ b/src/cli_plugin/install/install.js @@ -27,15 +27,12 @@ import { download } from './download'; import { cleanPrevious, cleanArtifacts } from './cleanup'; import { extract, getPackData } from './pack'; import { renamePlugin } from './rename'; -import { errorIfXPackInstall } from '../lib/error_if_x_pack'; import { existingInstall, assertVersion } from './opensearch_dashboards'; const mkdir = promisify(Fs.mkdir); export async function install(settings, logger) { try { - errorIfXPackInstall(settings, logger); - await cleanPrevious(settings, logger); await mkdir(settings.workingPath, { recursive: true }); diff --git a/src/cli_plugin/lib/error_if_x_pack.js b/src/cli_plugin/lib/error_if_x_pack.js deleted file mode 100644 index 6f0ca4aba412..000000000000 --- a/src/cli_plugin/lib/error_if_x_pack.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { isOss } from './is_oss'; - -function isXPack(plugin) { - return /x-pack/.test(plugin); -} - -export function errorIfXPackInstall(settings) { - if (isXPack(settings.plugin)) { - if (isOss()) { - throw new Error( - 'You are using the OSS-only distribution of OpenSearch Dashboards. ' + - 'As of version 6.3+ X-Pack is bundled in the standard distribution of this software by default; ' + - 'consequently it is no longer available as a plugin. Please use the standard distribution of OpenSearch Dashboards to use X-Pack features.' - ); - } else { - throw new Error( - 'OpenSearch Dashboards now contains X-Pack by default, there is no longer any need to install it as it is already present.' - ); - } - } -} - -export function errorIfXPackRemove(settings) { - if (isXPack(settings.plugin) && !isOss()) { - throw new Error( - 'You are using the standard distribution of OpenSearch Dashboards. Please install the OSS-only distribution to remove X-Pack features.' - ); - } -} diff --git a/src/cli_plugin/lib/error_if_x_pack.test.js b/src/cli_plugin/lib/error_if_x_pack.test.js deleted file mode 100644 index a3d6c08001c2..000000000000 --- a/src/cli_plugin/lib/error_if_x_pack.test.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { errorIfXPackInstall, errorIfXPackRemove } from './error_if_x_pack'; - -describe('error_if_xpack', () => { - it('should error on install if x-pack by name', () => { - expect(() => errorIfXPackInstall({ plugin: 'x-pack' })).toThrow(); - }); - - it('should error on install if x-pack by url', () => { - expect(() => - errorIfXPackInstall({ - plugin: 'http://localhost/x-pack/x-pack-7.0.0-alpha1-SNAPSHOT.zip', - }) - ).toThrow(); - }); - - it('should not error on install if not x-pack', () => { - expect(() => - errorIfXPackInstall({ - plugin: 'foo', - }) - ).not.toThrow(); - }); - - it('should error on remove if x-pack', () => { - expect(() => errorIfXPackRemove({ plugin: 'x-pack' })).not.toThrow(); - }); - - it('should not error on remove if not x-pack', () => { - expect(() => errorIfXPackRemove({ plugin: 'bar' })).not.toThrow(); - }); -}); diff --git a/src/cli_plugin/lib/is_oss.js b/src/cli_plugin/lib/is_oss.js deleted file mode 100644 index 53f19a41228d..000000000000 --- a/src/cli_plugin/lib/is_oss.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import fs from 'fs'; -import path from 'path'; - -export function isOss() { - return !fs.existsSync(path.resolve(__dirname, '../../../x-pack')); -} diff --git a/src/cli_plugin/lib/is_oss.test.js b/src/cli_plugin/lib/is_oss.test.js deleted file mode 100644 index 955c6d9d4e4a..000000000000 --- a/src/cli_plugin/lib/is_oss.test.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { isOss } from './is_oss'; - -describe('is_oss', () => { - describe('x-pack installed', () => { - it('should return true', () => { - expect(isOss()).toEqual(true); - }); - }); -}); diff --git a/src/cli_plugin/remove/remove.js b/src/cli_plugin/remove/remove.js index 0c218301242b..8e79d5f48562 100644 --- a/src/cli_plugin/remove/remove.js +++ b/src/cli_plugin/remove/remove.js @@ -21,15 +21,12 @@ import { statSync } from 'fs'; import del from 'del'; -import { errorIfXPackRemove } from '../lib/error_if_x_pack'; - export function remove(settings, logger) { try { let stat; try { stat = statSync(settings.pluginPath); } catch (e) { - errorIfXPackRemove(settings, logger); throw new Error(`Plugin [${settings.plugin}] is not installed`); } diff --git a/src/core/CONVENTIONS.md b/src/core/CONVENTIONS.md index 39bf54e09268..86b1d71103a5 100644 --- a/src/core/CONVENTIONS.md +++ b/src/core/CONVENTIONS.md @@ -19,13 +19,9 @@ Definition of done for a feature: - has been verified manually by at least one reviewer - can be used by first & third party plugins - there is no contradiction between client and server API -- works for OSS version +- works for version - works with and without a `server.basePath` configured - cannot crash the OpenSearch Dashboards server when it fails -- works for the commercial version with a license - - for a logged-in user - - for anonymous user - - compatible with Spaces - has unit & integration tests for public contracts - has functional tests for user scenarios - uses standard tooling: diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts index e1a6b38aec7b..2d762c790b95 100644 --- a/src/core/server/config/deprecation/core_deprecations.ts +++ b/src/core/server/config/deprecation/core_deprecations.ts @@ -139,13 +139,6 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({ unusedFromRoot('optimize.workers'), unusedFromRoot('optimize.profile'), unusedFromRoot('optimize.validateSyntaxOfNodeModules'), - renameFromRoot('xpack.xpack_main.telemetry.config', 'telemetry.config'), - renameFromRoot('xpack.xpack_main.telemetry.url', 'telemetry.url'), - renameFromRoot('xpack.xpack_main.telemetry.enabled', 'telemetry.enabled'), - renameFromRoot('xpack.telemetry.enabled', 'telemetry.enabled'), - renameFromRoot('xpack.telemetry.config', 'telemetry.config'), - renameFromRoot('xpack.telemetry.banner', 'telemetry.banner'), - renameFromRoot('xpack.telemetry.url', 'telemetry.url'), renameFromRoot('cpu.cgroup.path.override', 'ops.cGroupOverrides.cpuPath'), renameFromRoot('cpuacct.cgroup.path.override', 'ops.cGroupOverrides.cpuAcctPath'), unusedFromRoot('opensearch.preserveHost'), diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts index 359fa7eac20c..9c0888738d44 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts @@ -162,9 +162,9 @@ export function getClauseForReference(reference: HasReferenceQueryParams) { // // Additionally, we treat the `*` namespace as the `default` namespace. // In the Default Distribution, the `*` is automatically expanded to include all available namespaces. -// However, the OSS distribution (and certain configurations of the Default Distribution) can allow the `*` +// However, the distribution (and certain configurations of the Default Distribution) can allow the `*` // to pass through to the SO Repository, and eventually to this module. When this happens, we translate to `default`, -// since that is consistent with how a single-namespace search behaves in the OSS distribution. Leaving the wildcard in place +// since that is consistent with how a single-namespace search behaves in the distribution. Leaving the wildcard in place // would result in no results being returned, as the wildcard is treated as a literal, and not _actually_ as a wildcard. // We had a good discussion around the tradeoffs here: https://github.com/elastic/kibana/pull/67644#discussion_r441055716 const normalizeNamespaces = (namespacesToNormalize?: string[]) => diff --git a/src/dev/build/args.test.ts b/src/dev/build/args.test.ts index b7948e413916..5849b3f5658b 100644 --- a/src/dev/build/args.test.ts +++ b/src/dev/build/args.test.ts @@ -33,7 +33,7 @@ it('renders help if `--help` passed', () => { `); }); -it('build default and oss dist for current platform, without packages, by default', () => { +it('build dist for current platform, without packages, by default', () => { expect(readCliArgs(['node', 'scripts/build'])).toMatchInlineSnapshot(` Object { "buildOptions": Object { diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 3c05902e2728..6010fd70ce69 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -5,7 +5,6 @@ set -e source src/dev/ci_setup/setup_env.sh true echo " -- OPENSEARCH_DASHBOARDS_DIR='$OPENSEARCH_DASHBOARDS_DIR'" -echo " -- XPACK_DIR='$XPACK_DIR'" echo " -- PARENT_DIR='$PARENT_DIR'" echo " -- OPENSEARCH_DASHBOARDS_PKG_BRANCH='$OPENSEARCH_DASHBOARDS_PKG_BRANCH'" echo " -- TEST_OPENSEARCH_SNAPSHOT_VERSION='$TEST_OPENSEARCH_SNAPSHOT_VERSION'" diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh index 90c94dbfdb74..9e5daae23daa 100644 --- a/src/dev/ci_setup/setup_env.sh +++ b/src/dev/ci_setup/setup_env.sh @@ -36,7 +36,6 @@ fi export OPENSEARCH_DASHBOARDS_DIR="$dir" -export XPACK_DIR="$OPENSEARCH_DASHBOARDS_DIR/x-pack" parentDir="$(cd "$OPENSEARCH_DASHBOARDS_DIR/.."; pwd)" export PARENT_DIR="$parentDir" diff --git a/src/dev/i18n/README.md b/src/dev/i18n/README.md index 8bb713b7b1b3..4a9e3f45eff0 100644 --- a/src/dev/i18n/README.md +++ b/src/dev/i18n/README.md @@ -168,8 +168,7 @@ node scripts/i18n_integrate --source path/to/locale.json * `--source` path to the JSON file with translations that should be integrated. * `--target` defines a single path to the JSON file where translations should be integrated to, path mappings from -[.i18nrc.json](../../../.i18nrc.json) are ignored in this case. It's currently used for integrating of OpenSearch Dashboards built-in -translations that are located in a single JSON file within `x-pack/translations` plugin. +[.i18nrc.json](../../../.i18nrc.json) are ignored in this case. It's currently used for integrating of OpenSearch Dashboards built-in. * `--dry-run` tells the tool to exit after verification phase and not write translations to the disk. * `--ignore-incompatible` specifies whether tool should ignore incompatible translations. It may be useful when the code base you're integrating translations to has changed and some default messages switched to ICU structure that is incompatible with the one used in corresponding translation. diff --git a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap index ebebf49c5213..645cc92d443f 100644 --- a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap +++ b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap @@ -185,83 +185,6 @@ exports[`Form should not render no settings message when instructed not to 1`] = - - - - - -

- X-pack -

- - - - - - - - , - "settingsCount": 9, - } - } - /> - - - - - - - - - `; @@ -451,83 +374,6 @@ exports[`Form should render no settings message when there are no settings 1`] = - - - - - -

- X-pack -

- - - - - - - - , - "settingsCount": 9, - } - } - /> - - - - - - - - - `; @@ -717,83 +563,6 @@ exports[`Form should render normally 1`] = ` - - - - - -

- X-pack -

- - - - - - - - , - "settingsCount": 9, - } - } - /> - - - - - - - - - `; @@ -983,83 +752,6 @@ exports[`Form should render read-only when saving is disabled 1`] = ` - - - - - -

- X-pack -

- - - - - - - - , - "settingsCount": 9, - } - } - /> - - - - - - - - - `; diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx index a691af4a22be..8775fb2d7062 100644 --- a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx +++ b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx @@ -102,23 +102,12 @@ const settings = { defVal: ['test'], }, ], - 'x-pack': [ - { - ...defaults, - name: 'xpack:test:setting', - ariaName: 'xpack test setting', - displayName: 'X-Pack test setting', - category: ['x-pack'], - description: 'bar', - }, - ], }; -const categories = ['general', 'dashboard', 'hiddenCategory', 'x-pack']; +const categories = ['general', 'dashboard', 'hiddenCategory']; const categoryCounts = { general: 2, dashboard: 1, - 'x-pack': 10, }; const save = jest.fn((changes: SettingsChanges) => Promise.resolve([true])); diff --git a/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap index 24f8729cafee..e6635f8baadf 100644 --- a/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap +++ b/src/plugins/advanced_settings/public/management_app/components/search/__snapshots__/search.test.tsx.snap @@ -29,10 +29,6 @@ exports[`Search should render normally 1`] = ` "name": "HiddenCategory", "value": "hiddenCategory", }, - Object { - "name": "X-pack", - "value": "x-pack", - }, ], "type": "field_value_selection", }, diff --git a/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx b/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx index 01f54cce6031..72098adbe2de 100644 --- a/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx +++ b/src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx @@ -26,7 +26,7 @@ import { Query } from '@elastic/eui'; import { Search } from './search'; const query = Query.parse(''); -const categories = ['general', 'dashboard', 'hiddenCategory', 'x-pack']; +const categories = ['general', 'dashboard', 'hiddenCategory']; describe('Search', () => { it('should render normally', async () => { diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts index 5c7532772a36..7db771175d4a 100644 --- a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts +++ b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.test.ts @@ -24,7 +24,6 @@ describe('Settings', function () { describe('Advanced', function () { describe('getAriaName(name)', function () { it('should return a space delimited lower-case string with no special characters', function () { - expect(getAriaName('xPack:defaultAdminEmail')).to.be('x pack default admin email'); expect(getAriaName('doc_table:highlight')).to.be('doc table highlight'); expect(getAriaName('foo')).to.be('foo'); }); diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts index c33ac6abafb5..699d5f6b49b3 100644 --- a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts +++ b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts @@ -24,7 +24,7 @@ import { words } from 'lodash'; * @returns {string} a space delimited, lowercase string with * special characters removed. * - * Example: 'xPack:fooBar:foo_bar_baz' -> 'x pack foo bar foo bar baz' + * Example: 'doc_table:highlight' -> 'doc table highlight' */ export function getAriaName(name?: string) { return words(name || '') diff --git a/src/plugins/data/README.md b/src/plugins/data/README.md index 3d33046fbf0e..383fd80a11d1 100644 --- a/src/plugins/data/README.md +++ b/src/plugins/data/README.md @@ -11,7 +11,6 @@ It is wired into the `TopNavMenu` component, but can be used independently. ### Fetch Query Suggestions The `getQuerySuggestions` function helps to construct a query. -DQL suggestion functions are registered in X-Pack, so this API does not return results in OSS. ```.ts diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts index 1c80f7b48ce1..11b4ca39da9f 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/application_usage/schema.ts @@ -60,41 +60,4 @@ export const applicationUsageSchema = { short_url_redirect: commonSchema, // It's a forward app so we'll likely never report it timeline: commonSchema, visualize: commonSchema, - - // X-Pack - apm: commonSchema, - csm: commonSchema, - canvas: commonSchema, - dashboard_mode: commonSchema, // It's a forward app so we'll likely never report it - enterpriseSearch: commonSchema, - appSearch: commonSchema, - workplaceSearch: commonSchema, - graph: commonSchema, - logs: commonSchema, - metrics: commonSchema, - infra: commonSchema, // It's a forward app so we'll likely never report it - ingestManager: commonSchema, - lens: commonSchema, - maps: commonSchema, - ml: commonSchema, - monitoring: commonSchema, - 'observability-overview': commonSchema, - security_account: commonSchema, - security_access_agreement: commonSchema, - security_capture_url: commonSchema, // It's a forward app so we'll likely never report it - security_logged_out: commonSchema, - security_login: commonSchema, - security_logout: commonSchema, - security_overwritten_session: commonSchema, - securitySolution: commonSchema, // It's a forward app so we'll likely never report it - 'securitySolution:overview': commonSchema, - 'securitySolution:detections': commonSchema, - 'securitySolution:hosts': commonSchema, - 'securitySolution:network': commonSchema, - 'securitySolution:timelines': commonSchema, - 'securitySolution:case': commonSchema, - 'securitySolution:administration': commonSchema, - siem: commonSchema, - space_selector: commonSchema, - uptime: commonSchema, }; diff --git a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts index 3f9896857729..a469ca0c890d 100644 --- a/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts +++ b/src/plugins/opensearch_dashboards_usage_collection/server/collectors/ui_metric/schema.ts @@ -40,43 +40,6 @@ const uiMetricFromDataPluginSchema: MakeSchemaFrom = { short_url_redirect: commonSchema, // It's a forward app so we'll likely never report it timeline: commonSchema, visualize: commonSchema, - - // X-Pack - apm: commonSchema, - csm: commonSchema, - canvas: commonSchema, - dashboard_mode: commonSchema, // It's a forward app so we'll likely never report it - enterpriseSearch: commonSchema, - appSearch: commonSchema, - workplaceSearch: commonSchema, - graph: commonSchema, - logs: commonSchema, - metrics: commonSchema, - infra: commonSchema, // It's a forward app so we'll likely never report it - ingestManager: commonSchema, - lens: commonSchema, - maps: commonSchema, - ml: commonSchema, - monitoring: commonSchema, - 'observability-overview': commonSchema, - security_account: commonSchema, - security_access_agreement: commonSchema, - security_capture_url: commonSchema, // It's a forward app so we'll likely never report it - security_logged_out: commonSchema, - security_login: commonSchema, - security_logout: commonSchema, - security_overwritten_session: commonSchema, - securitySolution: commonSchema, - 'securitySolution:overview': commonSchema, - 'securitySolution:detections': commonSchema, - 'securitySolution:hosts': commonSchema, - 'securitySolution:network': commonSchema, - 'securitySolution:timelines': commonSchema, - 'securitySolution:case': commonSchema, - 'securitySolution:administration': commonSchema, - siem: commonSchema, - space_selector: commonSchema, - uptime: commonSchema, }; // TODO: Find a way to retrieve it automatically diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts index 12ae670014af..b10b0107b950 100644 --- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts +++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts @@ -182,7 +182,7 @@ describe.skip('get_local_stats', () => { }; describe.skip('handleLocalStats', () => { - it('returns expected object without xpack or OpenSearch Dashboards data', () => { + it('returns expected object without OpenSearch Dashboards data', () => { const result = handleLocalStats( clusterInfo, clusterStatsWithNodesUsage,