Skip to content

Commit

Permalink
fixes linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ogupte committed Oct 12, 2021
1 parent d9d27b8 commit 7965f99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export async function getApmIndexSettings({
>;

return apmIndices.map((configurationName) => ({
configurationName: configurationName,
configurationName,
defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml
savedValue: apmIndicesSavedObject[configurationName], // value saved via Saved Objects service
}));
Expand Down
12 changes: 1 addition & 11 deletions x-pack/plugins/apm/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ import { isEmpty, mapValues } from 'lodash';
import { SavedObjectsClient } from '../../../../src/core/server';
import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
import { Dataset } from '../../rule_registry/server';
import { /*APMConfig,*/ APMConfig, APM_SERVER_FEATURE_ID } from '.';
// import { getFullPathConfigs } from './index';
import { APMConfig, APM_SERVER_FEATURE_ID } from '.';
import { UI_SETTINGS } from '../../../../src/plugins/data/common';
import { APM_FEATURE, registerFeaturesUsage } from './feature';
import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
Expand Down Expand Up @@ -73,30 +72,21 @@ export class APMPlugin
) {
this.logger = this.initContext.logger.get();
const config$ = this.initContext.config.create<APMConfig>();
// const mergedConfig$ = config$.pipe(
// map((apmConfig) => getFullPathConfigs(apmConfig))
// );

core.savedObjects.registerType(apmIndices);
core.savedObjects.registerType(apmTelemetry);
core.savedObjects.registerType(apmServerSettings);

// const currentConfig = getFullPathConfigs(
// this.initContext.config.get<APMConfig>()
// );
// this.currentConfig = currentConfig;
const currentConfig = this.initContext.config.get<APMConfig>();
this.currentConfig = currentConfig;

if (
plugins.taskManager &&
plugins.usageCollection &&
currentConfig.telemetryCollectionEnabled
// currentConfig['xpack.apm.telemetryCollectionEnabled']
) {
createApmTelemetry({
core,
// config$: mergedConfig$,
config$,
usageCollector: plugins.usageCollection,
taskManager: plugins.taskManager,
Expand Down

0 comments on commit 7965f99

Please sign in to comment.