github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removing deprecated xpack.monitoring.report_stats setting (#30017)

Browse source 
* Removing deprecated xpack.monitoring.report_stats setting

* Remove from docs

* Update check in xpack_main plugin to not look at monitoring settings any more
This commit is contained in:
Shaunak Kashyap 2019-02-04 19:37:32 -08:00 • committed by GitHub
parent 908b387236
commit 7b68b89ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/settings/monitoring-settings.asciidoc
View file

@ -54,9 +54,6 @@ Specifies the password that {kib} uses for authentication when it retrieves data
from the monitoring cluster. If not set, {kib} uses the value of the
`elasticsearch.password` setting.
`xpack.monitoring.report_stats`::
deprecated[6.3.0, Use `xpack.xpack_main.telemetry.enabled` instead.]
`xpack.xpack_main.telemetry.enabled`::
Set to `true` (default) to send cluster statistics to Elastic. Reporting your
cluster statistics helps us improve your user experience. Your data is never

1
x-pack/plugins/monitoring/config.js
View file

@ -47,7 +47,6 @@ export const config = (Joi) => {
max_bucket_size: Joi.number().default(10000),
min_interval_seconds: Joi.number().default(10),
show_license_expiration: Joi.boolean().default(true),
report_stats: Joi.boolean().default(true),
agent: Joi.object({
interval: Joi.string().regex(/[\d\.]+[yMwdhms]/).default('10s')
}).default(),

8
x-pack/plugins/monitoring/deprecations.js
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { get, has } from 'lodash';
import { get } from 'lodash';
import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY } from './common/constants';
/**
@ -17,12 +17,6 @@ import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY } from './common/constants';
*/
export const deprecations = () => {
return [
(settings, log) => {
if (has(settings, 'report_stats')) {
log('Config key "xpack.monitoring.report_stats" is deprecated and will be removed in 7.0. ' +
'Use "xpack.xpack_main.telemetry.enabled" instead.');
}
},
(settings, log) => {
const clusterAlertsEnabled = get(settings, 'cluster_alerts.enabled');
const emailNotificationsEnabled = clusterAlertsEnabled && get(settings, 'cluster_alerts.email_notifications.enabled');

10
x-pack/plugins/xpack_main/index.js
View file

@ -33,15 +33,7 @@ export { callClusterFactory } from './server/lib/call_cluster_factory';
* @param {Object} config Kibana configuration object.
*/
function isTelemetryEnabled(config) {
const enabled = config.get('xpack.xpack_main.telemetry.enabled');
// Remove deprecated 'report_stats' in 7.0
if (enabled) {
// if xpack.monitoring.enabled is false, then report_stats cannot be defined
return !config.get('xpack.monitoring.enabled') || config.get('xpack.monitoring.report_stats');
}
return enabled;
return config.get('xpack.xpack_main.telemetry.enabled');
}
export const xpackMain = (kibana) => {