forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Monitoring] Ensure we use existing Elasticsearch config (elastic#68389)
* Ensure we use existing Elasticsearch config * Use separate type for this to ensure custom properties work * PR suggestions * PR feedback * PR feedback * Fix type issues * PR feedback
- Loading branch information
1 parent
9601b3e
commit 28c0b2b
Showing
5 changed files
with
212 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
| import { createConfig, configSchema } from './config'; | ||
| jest.mock('fs', () => ({ | ||
| ...jest.requireActual('fs'), | ||
| readFileSync: jest.fn().mockImplementation((path: string) => `contents-of-${path}`), | ||
| })); | ||
|
|
||
| describe('config schema', () => { | ||
| it('generates proper defaults', () => { | ||
| expect(configSchema.validate({})).toMatchInlineSnapshot(` | ||
| Object { | ||
| "agent": Object { | ||
| "interval": "10s", | ||
| }, | ||
| "cluster_alerts": Object { | ||
| "email_notifications": Object { | ||
| "email_address": "", | ||
| "enabled": true, | ||
| }, | ||
| "enabled": true, | ||
| }, | ||
| "elasticsearch": Object { | ||
| "apiVersion": "master", | ||
| "customHeaders": Object {}, | ||
| "healthCheck": Object { | ||
| "delay": "PT2.5S", | ||
| }, | ||
| "ignoreVersionMismatch": false, | ||
| "logFetchCount": 10, | ||
| "logQueries": false, | ||
| "pingTimeout": "PT30S", | ||
| "preserveHost": true, | ||
| "requestHeadersWhitelist": Array [ | ||
| "authorization", | ||
| ], | ||
| "requestTimeout": "PT30S", | ||
| "shardTimeout": "PT30S", | ||
| "sniffInterval": false, | ||
| "sniffOnConnectionFault": false, | ||
| "sniffOnStart": false, | ||
| "ssl": Object { | ||
| "alwaysPresentCertificate": false, | ||
| "keystore": Object {}, | ||
| "truststore": Object {}, | ||
| "verificationMode": "full", | ||
| }, | ||
| "startupTimeout": "PT5S", | ||
| }, | ||
| "enabled": true, | ||
| "kibana": Object { | ||
| "collection": Object { | ||
| "enabled": true, | ||
| "interval": 10000, | ||
| }, | ||
| }, | ||
| "licensing": Object { | ||
| "api_polling_frequency": "PT30S", | ||
| }, | ||
| "tests": Object { | ||
| "cloud_detector": Object { | ||
| "enabled": true, | ||
| }, | ||
| }, | ||
| "ui": Object { | ||
| "ccs": Object { | ||
| "enabled": true, | ||
| }, | ||
| "container": Object { | ||
| "elasticsearch": Object { | ||
| "enabled": false, | ||
| }, | ||
| "logstash": Object { | ||
| "enabled": false, | ||
| }, | ||
| }, | ||
| "elasticsearch": Object { | ||
| "apiVersion": "master", | ||
| "customHeaders": Object {}, | ||
| "healthCheck": Object { | ||
| "delay": "PT2.5S", | ||
| }, | ||
| "ignoreVersionMismatch": false, | ||
| "logFetchCount": 10, | ||
| "logQueries": false, | ||
| "pingTimeout": "PT30S", | ||
| "preserveHost": true, | ||
| "requestHeadersWhitelist": Array [ | ||
| "authorization", | ||
| ], | ||
| "requestTimeout": "PT30S", | ||
| "shardTimeout": "PT30S", | ||
| "sniffInterval": false, | ||
| "sniffOnConnectionFault": false, | ||
| "sniffOnStart": false, | ||
| "ssl": Object { | ||
| "alwaysPresentCertificate": false, | ||
| "keystore": Object {}, | ||
| "truststore": Object {}, | ||
| "verificationMode": "full", | ||
| }, | ||
| "startupTimeout": "PT5S", | ||
| }, | ||
| "enabled": true, | ||
| "logs": Object { | ||
| "index": "filebeat-*", | ||
| }, | ||
| "max_bucket_size": 10000, | ||
| "min_interval_seconds": 10, | ||
| "show_license_expiration": true, | ||
| }, | ||
| } | ||
| `); | ||
| }); | ||
| }); | ||
|
|
||
| describe('createConfig()', () => { | ||
| it('should wrap in Elasticsearch config', async () => { | ||
| const config = createConfig( | ||
| configSchema.validate({ | ||
| elasticsearch: { | ||
| hosts: 'http://localhost:9200', | ||
| }, | ||
| ui: { | ||
| elasticsearch: { | ||
| hosts: 'http://localhost:9200', | ||
| }, | ||
| }, | ||
| }) | ||
| ); | ||
| expect(config.elasticsearch.hosts).toEqual(['http://localhost:9200']); | ||
| expect(config.ui.elasticsearch.hosts).toEqual(['http://localhost:9200']); | ||
| }); | ||
|
|
||
| it('should attempt to read PEM files', async () => { | ||
| const ssl = { | ||
| certificate: 'packages/kbn-dev-utils/certs/elasticsearch.crt', | ||
| key: 'packages/kbn-dev-utils/certs/elasticsearch.key', | ||
| certificateAuthorities: 'packages/kbn-dev-utils/certs/ca.crt', | ||
| }; | ||
| const config = createConfig( | ||
| configSchema.validate({ | ||
| elasticsearch: { | ||
| ssl, | ||
| }, | ||
| ui: { | ||
| elasticsearch: { | ||
| ssl, | ||
| }, | ||
| }, | ||
| }) | ||
| ); | ||
| const expected = expect.objectContaining({ | ||
| certificate: 'contents-of-packages/kbn-dev-utils/certs/elasticsearch.crt', | ||
| key: 'contents-of-packages/kbn-dev-utils/certs/elasticsearch.key', | ||
| certificateAuthorities: ['contents-of-packages/kbn-dev-utils/certs/ca.crt'], | ||
| }); | ||
| expect(config.elasticsearch.ssl).toEqual(expected); | ||
| expect(config.ui.elasticsearch.ssl).toEqual(expected); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.