Skip to content

Commit

Permalink
[Upgrade Assistant] Deletes telemetry saved object type (elastic#151116)
Browse files Browse the repository at this point in the history
## Summary
Fixes elastic#64547 
Follow up to elastic#150878 and
elastic#151014

This PR removes the saved object type `upgrade-assistant-telemetry` from
the Upgrade Assistant plugin because it seems to not be used for
telemetry or UA functionality. There is a telemetry object to track UA
deprecation logging in this
[file](https://github.com/elastic/kibana/blob/main/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json#L13628),
I don't think that a saved object is needed for that.

---------

Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
2 people authored and bmorelli25 committed Mar 10, 2023
1 parent 325630b commit 1c738c9
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 134 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ export const REMOVED_TYPES: string[] = [
'maps-telemetry',
// Deprecated, no longer used since 8.7 https://github.com/elastic/kibana/pull/148530
'csp_rule',
// Removed in 8.8 https://github.com/elastic/kibana/pull/151116
'upgrade-assistant-telemetry',
].sort();

export const excludeUnusedTypesQuery: QueryDslQueryContainer = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ describe('createInitialState', () => {
"type": "ui-counter",
},
},
Object {
"term": Object {
"type": "upgrade-assistant-telemetry",
},
},
],
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ describe('checking migration metadata changes on all registered SO types', () =>
"ui-metric": "410a8ad28e0f44b161c960ff0ce950c712b17c52",
"upgrade-assistant-ml-upgrade-operation": "d8816e5ce32649e7a3a43e2c406c632319ff84bb",
"upgrade-assistant-reindex-operation": "09ac8ed9c9acf7e8ece8eafe47d7019ea1472144",
"upgrade-assistant-telemetry": "12bcbfc4e4ce64d2ca7c24f9acccd331a2bd2ab6",
"uptime-dynamic-settings": "9a63ce80904a04be114749e426882dc3ff011137",
"uptime-synthetics-api-key": "599319bedbfa287e8761e1ba49d536417a33fa13",
"url": "2422b3cbe0af71f7a9c2e228e19a972e759c56d4",
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/upgrade_assistant/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@

export const API_BASE_PATH = '/api/upgrade_assistant';

// Telemetry constants
export const UPGRADE_ASSISTANT_TELEMETRY = 'upgrade-assistant-telemetry';

/**
* This is the repository where Cloud stores its backup snapshots.
*/
Expand Down
7 changes: 1 addition & 6 deletions x-pack/plugins/upgrade_assistant/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ import { registerUpgradeAssistantUsageCollector } from './lib/telemetry';
import { versionService } from './lib/version';
import { createReindexWorker } from './routes/reindex_indices';
import { registerRoutes } from './routes/register_routes';
import {
telemetrySavedObjectType,
reindexOperationSavedObjectType,
mlSavedObjectType,
} from './saved_object_types';
import { reindexOperationSavedObjectType, mlSavedObjectType } from './saved_object_types';
import { handleEsError } from './shared_imports';
import { RouteDependencies } from './types';
import type { UpgradeAssistantConfig } from './config';
Expand Down Expand Up @@ -88,7 +84,6 @@ export class UpgradeAssistantServerPlugin implements Plugin {
this.licensing = licensing;

savedObjects.registerType(reindexOperationSavedObjectType);
savedObjects.registerType(telemetrySavedObjectType);
savedObjects.registerType(mlSavedObjectType);

features.registerElasticsearchFeature({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
*/

export { reindexOperationSavedObjectType } from './reindex_operation_saved_object_type';
export { telemetrySavedObjectType } from './telemetry_saved_object_type';
export { mlSavedObjectType } from './ml_upgrade_operation_saved_object_type';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 1c738c9

Please sign in to comment.