Skip to content

Commit

Permalink
[Security Solution] Fixes some misconfigured settings (#85056)
Browse files Browse the repository at this point in the history
* Remove nonexistent paths from our API tests config

These paths (or rather their absence) breaks the functional_tests_server script.

An analogous problem for cases was fixed in #79127.

* Remove duplicated context from logger

This context is already provided to the logger by kibana; adding it a
second time leads to duplicated log tags, e.g.:

```
server    log   [12:36:07.138] [debug][plugins][plugins][securitySolution][securitySolution] ...
```

This is now fixed:

```
server    log   [12:41:52.112] [debug][plugins][securitySolution] ...
```
  • Loading branch information
rylnd committed Dec 4, 2020
1 parent b6a6a30 commit 918dbb1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S

constructor(context: PluginInitializerContext) {
this.context = context;
this.logger = context.logger.get('plugins', APP_ID);
this.logger = context.logger.get();
this.config$ = createConfig$(context);
this.appClientFactory = new AppClientFactory();
// Cache up to three artifacts with a max retention of 5 mins each
Expand Down
5 changes: 0 additions & 5 deletions x-pack/test/detection_engine_api_integration/common/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/

import path from 'path';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
import { services } from './services';
Expand Down Expand Up @@ -71,10 +70,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
`--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
'--xpack.eventLog.logEntries=true',
...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions')}`,
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'task_manager')}`,
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'aad')}`,
...(ssl
? [
`--elasticsearch.hosts=${servers.elasticsearch.protocol}://${servers.elasticsearch.hostname}:${servers.elasticsearch.port}`,
Expand Down

0 comments on commit 918dbb1

Please sign in to comment.