maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Monitoring] Fix logging when Monitoring reinitializes with HUP signal (#22464)

Browse source
This commit is contained in:
Tim Sullivan 2018-08-29 11:33:27 -07:00 committed by GitHub
parent 5fd01d913e
commit 10e88ab6b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/monitoring/init.js
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG, } from './common/constants';
import { LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG } from './common/constants';
import { requireUIRoutes } from './server/routes';
import { instantiateClient } from './server/es_client/instantiate_client';
import { initMonitoringXpackInfo } from './server/init_monitoring_xpack_info';

16
x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js
View file

@ -4,7 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { KIBANA_STATS_TYPE_MONITORING } from '../../../common/constants';
import {
LOGGING_TAG,
KIBANA_MONITORING_LOGGING_TAG,
KIBANA_STATS_TYPE_MONITORING,
} from '../../../common/constants';
import { opsBuffer } from './ops_buffer';
/*
@ -34,11 +38,17 @@ export function getOpsStatsCollector(server) {
// `process` is a NodeJS global, and is always available without using require/import
process.on('SIGHUP', () => {
this.log.info('Re-initializing Kibana Monitoring due to SIGHUP');
server.log(
['info', LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG],
'Re-initializing Kibana Monitoring due to SIGHUP'
);
setTimeout(() => {
stop();
start();
this.log.info('Re-initialized Kibana Monitoring due to SIGHUP');
server.log(
['info', LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG],
'Re-initialized Kibana Monitoring due to SIGHUP'
);
}, 5 * 1000); // wait 5 seconds to avoid race condition with reloading logging configuration
});