diff --git a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts index ea7fe2ee5d9f2..af908bea7f4b1 100644 --- a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts +++ b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts @@ -18,7 +18,6 @@ */ import moment from 'moment'; -import { setCanTrackUiMetrics } from 'ui/ui_metric'; // @ts-ignore import { banners, toastNotifications } from 'ui/notify'; import { npStart } from 'ui/new_platform'; @@ -69,8 +68,6 @@ export function TelemetryOptInProvider($injector: any, chrome: any, sendOptInSta 'telemetryNotifyUserAboutOptInDefault' ) as boolean; - setCanTrackUiMetrics(currentOptInStatus); - const provider = { getBannerId: () => bannerId, getOptInBannerNoticeId: () => optInBannerNoticeId, @@ -116,7 +113,6 @@ export function TelemetryOptInProvider($injector: any, chrome: any, sendOptInSta if (!allowChangingOptInStatus) { return; } - setCanTrackUiMetrics(enabled); const $http = $injector.get('$http'); try { diff --git a/src/legacy/ui/public/ui_metric/index.ts b/src/legacy/ui/public/ui_metric/index.ts deleted file mode 100644 index ad43f27201ce4..0000000000000 --- a/src/legacy/ui/public/ui_metric/index.ts +++ /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. - */ - -let _canTrackUiMetrics = false; - -export function setCanTrackUiMetrics(flag: boolean) { - _canTrackUiMetrics = flag; -} - -export function getCanTrackUiMetrics(): boolean { - return _canTrackUiMetrics; -} diff --git a/test/api_integration/apis/index.js b/test/api_integration/apis/index.js index 7073e12363f6e..32117d4705055 100644 --- a/test/api_integration/apis/index.js +++ b/test/api_integration/apis/index.js @@ -19,20 +19,20 @@ export default function ({ loadTestFile }) { describe('apis', () => { - // loadTestFile(require.resolve('./core')); - // loadTestFile(require.resolve('./elasticsearch')); - // loadTestFile(require.resolve('./general')); - // loadTestFile(require.resolve('./home')); - // loadTestFile(require.resolve('./index_patterns')); - // loadTestFile(require.resolve('./kql_telemetry')); - // loadTestFile(require.resolve('./management')); - // loadTestFile(require.resolve('./saved_objects')); - // loadTestFile(require.resolve('./scripts')); - // loadTestFile(require.resolve('./shorten')); - // loadTestFile(require.resolve('./suggestions')); - // loadTestFile(require.resolve('./status')); - // loadTestFile(require.resolve('./stats')); + loadTestFile(require.resolve('./core')); + loadTestFile(require.resolve('./elasticsearch')); + loadTestFile(require.resolve('./general')); + loadTestFile(require.resolve('./home')); + loadTestFile(require.resolve('./index_patterns')); + loadTestFile(require.resolve('./kql_telemetry')); + loadTestFile(require.resolve('./management')); + loadTestFile(require.resolve('./saved_objects')); + loadTestFile(require.resolve('./scripts')); + loadTestFile(require.resolve('./shorten')); + loadTestFile(require.resolve('./suggestions')); + loadTestFile(require.resolve('./status')); + loadTestFile(require.resolve('./stats')); loadTestFile(require.resolve('./ui_metric')); - // loadTestFile(require.resolve('./core')); + loadTestFile(require.resolve('./core')); }); } diff --git a/x-pack/legacy/plugins/apm/cypress/ci/kibana.dev.yml b/x-pack/legacy/plugins/apm/cypress/ci/kibana.dev.yml index 900fb8d47cecf..a866de50c5fc0 100644 --- a/x-pack/legacy/plugins/apm/cypress/ci/kibana.dev.yml +++ b/x-pack/legacy/plugins/apm/cypress/ci/kibana.dev.yml @@ -22,7 +22,7 @@ table_vis.enabled: false tagcloud.enabled: false tile_map.enabled: false timelion.enabled: false -ui_metric.enabled: false +usageCollection.uiMetric.enabled: false vega.enabled: false xpack.actions.enabled: false xpack.alerting.enabled: false