Skip to content

Commit 320618f

Browse files
committed
fix typing and crashing problems
1 parent 5381830 commit 320618f

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

x-pack/legacy/plugins/oss_telemetry/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export const ossTelemetry: LegacyPluginInitializer = kibana => {
3131
taskManager: server.plugins.task_manager,
3232
__LEGACY: {
3333
config: server.config(),
34-
xpackMainStatus: server.plugins.xpack_main.status.plugin,
34+
xpackMainStatus: ((server.plugins.xpack_main as unknown) as { status: any }).status
35+
.plugin,
3536
telemetry: server.usage,
3637
},
3738
});

x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ import { getUsageCollector } from './get_usage_collector';
99
import { OssTelemetrySetupDependencies } from '../../../plugin';
1010

1111
export function registerVisualizationsCollector(
12-
{
13-
makeUsageCollector,
14-
register,
15-
}: OssTelemetrySetupDependencies['__LEGACY']['telemetry']['collectorSet'],
12+
collectorSet: OssTelemetrySetupDependencies['__LEGACY']['telemetry']['collectorSet'],
1613
taskManager: TaskManagerPluginSetupContract | undefined
1714
): void {
18-
const collector = makeUsageCollector(getUsageCollector(taskManager));
19-
register(collector);
15+
const collector = collectorSet.makeUsageCollector(getUsageCollector(taskManager));
16+
collectorSet.register(collector);
2017
}

x-pack/legacy/plugins/xpack_main/xpack_main.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ import { Feature, FeatureWithAllOrReadPrivileges } from '../../../plugins/featur
99
import { XPackInfo, XPackInfoOptions } from './server/lib/xpack_info';
1010
export { XPackFeature } from './server/lib/xpack_info';
1111

12-
export type XPackStatus = any;
13-
1412
export interface XPackMainPlugin {
1513
info: XPackInfo;
16-
status: XPackStatus;
1714
createXPackInfo(options: XPackInfoOptions): XPackInfo;
1815
getFeatures(): Feature[];
1916
registerFeature(feature: FeatureWithAllOrReadPrivileges): void;

0 commit comments

Comments
 (0)