Skip to content

Commit 4358a01

Browse files
phillipbphillipb
committed
Add new config for filebeat index name (#56920)
1 parent f02608c commit 4358a01

9 files changed

Lines changed: 32 additions & 23 deletions

File tree

‎x-pack/legacy/plugins/monitoring/common/constants.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ export const INDEX_ALERTS = '.monitoring-alerts-6,.monitoring-alerts-7' + INDEX_
159159
export const INDEX_PATTERN_ELASTICSEARCH =
160160
'.monitoring-es-6-*,.monitoring-es-7-*' + INDEX_PATTERN_ELASTICSEARCH_NEW;
161161

162-
export const INDEX_PATTERN_FILEBEAT = 'filebeat-*';
163-
164162
// This is the unique token that exists in monitoring indices collected by metricbeat
165163
export const METRICBEAT_INDEX_NAME_UNIQUE_TOKEN = '-mb-';
166164

‎x-pack/legacy/plugins/monitoring/config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export const config = Joi => {
1818
enabled: Joi.boolean().default(true),
1919
ui: Joi.object({
2020
enabled: Joi.boolean().default(true),
21+
logs: Joi.object({
22+
index: Joi.string().default('filebeat-*'),
23+
}).default(),
2124
ccs: Joi.object({
2225
enabled: Joi.boolean().default(true),
2326
}).default(),

‎x-pack/legacy/plugins/monitoring/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export const monitoring = kibana =>
5151
'monitoring.cluster_alerts.email_notifications.email_address',
5252
'monitoring.ui.ccs.enabled',
5353
'monitoring.ui.elasticsearch.logFetchCount',
54+
'monitoring.ui.logs.index',
5455
];
5556

5657
const serverConfig = server.config();

‎x-pack/legacy/plugins/monitoring/server/lib/logs/init_infra_source.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
*/
66

77
import { prefixIndexPattern } from '../ccs_utils';
8-
import { INDEX_PATTERN_FILEBEAT, INFRA_SOURCE_ID } from '../../../common/constants';
8+
import { INFRA_SOURCE_ID } from '../../../common/constants';
99

1010
export const initInfraSource = (config, infraPlugin) => {
1111
if (infraPlugin) {
12-
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
12+
const filebeatIndexPattern = prefixIndexPattern(
13+
config,
14+
config.get('monitoring.ui.logs.index'),
15+
'*'
16+
);
1317
infraPlugin.defineInternalSourceConfiguration(INFRA_SOURCE_ID, {
1418
name: 'Elastic Stack Logs',
1519
logAlias: filebeatIndexPattern,

‎x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/cluster.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_fro
99
import { handleError } from '../../../../lib/errors';
1010
import { getIndexPatterns } from '../../../../lib/cluster/get_index_patterns';
1111
import { verifyCcsAvailability } from '../../../../lib/elasticsearch/verify_ccs_availability';
12-
import { INDEX_PATTERN_FILEBEAT } from '../../../../../common/constants';
1312

1413
export function clusterRoute(server) {
1514
/*
@@ -37,9 +36,10 @@ export function clusterRoute(server) {
3736
},
3837
handler: async req => {
3938
await verifyCcsAvailability(req);
39+
const config = server.config();
4040

4141
const indexPatterns = getIndexPatterns(server, {
42-
filebeatIndexPattern: INDEX_PATTERN_FILEBEAT,
42+
filebeatIndexPattern: config.get('monitoring.ui.logs.index'),
4343
});
4444
const options = {
4545
clusterUuid: req.params.clusterUuid,

‎x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/clusters.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_fro
99
import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
1010
import { verifyCcsAvailability } from '../../../../lib/elasticsearch/verify_ccs_availability';
1111
import { handleError } from '../../../../lib/errors';
12-
import { INDEX_PATTERN_FILEBEAT } from '../../../../../common/constants';
1312
import { getIndexPatterns } from '../../../../lib/cluster/get_index_patterns';
1413

1514
export function clustersRoute(server) {
@@ -34,6 +33,7 @@ export function clustersRoute(server) {
3433
},
3534
},
3635
handler: async req => {
36+
const config = server.config();
3737
let clusters = [];
3838

3939
// NOTE using try/catch because checkMonitoringAuth is expected to throw
@@ -43,7 +43,7 @@ export function clustersRoute(server) {
4343
await verifyMonitoringAuth(req);
4444
await verifyCcsAvailability(req);
4545
const indexPatterns = getIndexPatterns(server, {
46-
filebeatIndexPattern: INDEX_PATTERN_FILEBEAT,
46+
filebeatIndexPattern: config.get('monitoring.ui.logs.index'),
4747
});
4848
clusters = await getClustersFromRequest(req, indexPatterns, {
4949
codePaths: req.payload.codePaths,

‎x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ import { getShardAllocation, getShardStats } from '../../../../lib/elasticsearch
1313
import { handleError } from '../../../../lib/errors/handle_error';
1414
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
1515
import { metricSet } from './metric_set_index_detail';
16-
import {
17-
INDEX_PATTERN_ELASTICSEARCH,
18-
INDEX_PATTERN_FILEBEAT,
19-
} from '../../../../../common/constants';
16+
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
2017
import { getLogs } from '../../../../lib/logs/get_logs';
2118

2219
const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSet;
@@ -50,7 +47,11 @@ export function esIndexRoute(server) {
5047
const start = req.payload.timeRange.min;
5148
const end = req.payload.timeRange.max;
5249
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
53-
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, ccs);
50+
const filebeatIndexPattern = prefixIndexPattern(
51+
config,
52+
config.get('monitoring.ui.logs.index'),
53+
ccs
54+
);
5455
const isAdvanced = req.payload.is_advanced;
5556
const metricSet = isAdvanced ? metricSetAdvanced : metricSetOverview;
5657

‎x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ import { getMetrics } from '../../../../lib/details/get_metrics';
1313
import { handleError } from '../../../../lib/errors/handle_error';
1414
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
1515
import { metricSets } from './metric_set_node_detail';
16-
import {
17-
INDEX_PATTERN_ELASTICSEARCH,
18-
INDEX_PATTERN_FILEBEAT,
19-
} from '../../../../../common/constants';
16+
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
2017
import { getLogs } from '../../../../lib/logs/get_logs';
2118

2219
const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSets;
@@ -51,7 +48,11 @@ export function esNodeRoute(server) {
5148
const start = req.payload.timeRange.min;
5249
const end = req.payload.timeRange.max;
5350
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
54-
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
51+
const filebeatIndexPattern = prefixIndexPattern(
52+
config,
53+
config.get('monitoring.ui.logs.index'),
54+
'*'
55+
);
5556
const isAdvanced = req.payload.is_advanced;
5657

5758
let metricSet;

‎x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ import { getMetrics } from '../../../../lib/details/get_metrics';
1212
import { handleError } from '../../../../lib/errors/handle_error';
1313
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
1414
import { metricSet } from './metric_set_overview';
15-
import {
16-
INDEX_PATTERN_ELASTICSEARCH,
17-
INDEX_PATTERN_FILEBEAT,
18-
} from '../../../../../common/constants';
15+
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
1916
import { getLogs } from '../../../../lib/logs';
2017
import { getIndicesUnassignedShardStats } from '../../../../lib/elasticsearch/shards/get_indices_unassigned_shard_stats';
2118

@@ -42,7 +39,11 @@ export function esOverviewRoute(server) {
4239
const ccs = req.payload.ccs;
4340
const clusterUuid = req.params.clusterUuid;
4441
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
45-
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
42+
const filebeatIndexPattern = prefixIndexPattern(
43+
config,
44+
config.get('monitoring.ui.logs.index'),
45+
'*'
46+
);
4647

4748
const start = req.payload.timeRange.min;
4849
const end = req.payload.timeRange.max;

0 commit comments

Comments
 (0)