Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new config for logging index name #56920

Merged
merged 1 commit into from
Feb 7, 2020
Merged

Add new config for logging index name #56920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions x-pack/legacy/plugins/monitoring/common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,6 @@ export const INDEX_ALERTS = '.monitoring-alerts-6,.monitoring-alerts-7' + INDEX_
export const INDEX_PATTERN_ELASTICSEARCH =
'.monitoring-es-6-*,.monitoring-es-7-*' + INDEX_PATTERN_ELASTICSEARCH_NEW;

export const INDEX_PATTERN_FILEBEAT = 'filebeat-*';

// This is the unique token that exists in monitoring indices collected by metricbeat
export const METRICBEAT_INDEX_NAME_UNIQUE_TOKEN = '-mb-';

Expand Down
3 changes: 3 additions & 0 deletions x-pack/legacy/plugins/monitoring/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ export const config = Joi => {
enabled: Joi.boolean().default(true),
ui: Joi.object({
enabled: Joi.boolean().default(true),
logs: Joi.object({
index: Joi.string().default('filebeat-*'),
}).default(),
ccs: Joi.object({
enabled: Joi.boolean().default(true),
}).default(),
Expand Down
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/monitoring/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const monitoring = kibana =>
'monitoring.cluster_alerts.email_notifications.email_address',
'monitoring.ui.ccs.enabled',
'monitoring.ui.elasticsearch.logFetchCount',
'monitoring.ui.logs.index',
];

const serverConfig = server.config();
Expand Down
8 changes: 6 additions & 2 deletions x-pack/legacy/plugins/monitoring/server/lib/logs/init_infra_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
*/

import { prefixIndexPattern } from '../ccs_utils';
import { INDEX_PATTERN_FILEBEAT, INFRA_SOURCE_ID } from '../../../common/constants';
import { INFRA_SOURCE_ID } from '../../../common/constants';

export const initInfraSource = (config, infraPlugin) => {
if (infraPlugin) {
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
const filebeatIndexPattern = prefixIndexPattern(
config,
config.get('monitoring.ui.logs.index'),
'*'
);
infraPlugin.defineInternalSourceConfiguration(INFRA_SOURCE_ID, {
name: 'Elastic Stack Logs',
logAlias: filebeatIndexPattern,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_fro
import { handleError } from '../../../../lib/errors';
import { getIndexPatterns } from '../../../../lib/cluster/get_index_patterns';
import { verifyCcsAvailability } from '../../../../lib/elasticsearch/verify_ccs_availability';
import { INDEX_PATTERN_FILEBEAT } from '../../../../../common/constants';

export function clusterRoute(server) {
/*
Expand Down Expand Up @@ -37,9 +36,10 @@ export function clusterRoute(server) {
},
handler: async req => {
await verifyCcsAvailability(req);
const config = server.config();

const indexPatterns = getIndexPatterns(server, {
filebeatIndexPattern: INDEX_PATTERN_FILEBEAT,
filebeatIndexPattern: config.get('monitoring.ui.logs.index'),
});
const options = {
clusterUuid: req.params.clusterUuid,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_fro
import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
import { verifyCcsAvailability } from '../../../../lib/elasticsearch/verify_ccs_availability';
import { handleError } from '../../../../lib/errors';
import { INDEX_PATTERN_FILEBEAT } from '../../../../../common/constants';
import { getIndexPatterns } from '../../../../lib/cluster/get_index_patterns';

export function clustersRoute(server) {
Expand All @@ -34,6 +33,7 @@ export function clustersRoute(server) {
},
},
handler: async req => {
const config = server.config();
let clusters = [];

// NOTE using try/catch because checkMonitoringAuth is expected to throw
Expand All @@ -43,7 +43,7 @@ export function clustersRoute(server) {
await verifyMonitoringAuth(req);
await verifyCcsAvailability(req);
const indexPatterns = getIndexPatterns(server, {
filebeatIndexPattern: INDEX_PATTERN_FILEBEAT,
filebeatIndexPattern: config.get('monitoring.ui.logs.index'),
});
clusters = await getClustersFromRequest(req, indexPatterns, {
codePaths: req.payload.codePaths,
Expand Down
11 changes: 6 additions & 5 deletions x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import { getShardAllocation, getShardStats } from '../../../../lib/elasticsearch
import { handleError } from '../../../../lib/errors/handle_error';
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
import { metricSet } from './metric_set_index_detail';
import {
INDEX_PATTERN_ELASTICSEARCH,
INDEX_PATTERN_FILEBEAT,
} from '../../../../../common/constants';
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
import { getLogs } from '../../../../lib/logs/get_logs';

const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSet;
Expand Down Expand Up @@ -50,7 +47,11 @@ export function esIndexRoute(server) {
const start = req.payload.timeRange.min;
const end = req.payload.timeRange.max;
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, ccs);
const filebeatIndexPattern = prefixIndexPattern(
config,
config.get('monitoring.ui.logs.index'),
ccs
);
const isAdvanced = req.payload.is_advanced;
const metricSet = isAdvanced ? metricSetAdvanced : metricSetOverview;

Expand Down
11 changes: 6 additions & 5 deletions x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import { getMetrics } from '../../../../lib/details/get_metrics';
import { handleError } from '../../../../lib/errors/handle_error';
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
import { metricSets } from './metric_set_node_detail';
import {
INDEX_PATTERN_ELASTICSEARCH,
INDEX_PATTERN_FILEBEAT,
} from '../../../../../common/constants';
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
import { getLogs } from '../../../../lib/logs/get_logs';

const { advanced: metricSetAdvanced, overview: metricSetOverview } = metricSets;
Expand Down Expand Up @@ -51,7 +48,11 @@ export function esNodeRoute(server) {
const start = req.payload.timeRange.min;
const end = req.payload.timeRange.max;
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
const filebeatIndexPattern = prefixIndexPattern(
config,
config.get('monitoring.ui.logs.index'),
'*'
);
const isAdvanced = req.payload.is_advanced;

let metricSet;
Expand Down
11 changes: 6 additions & 5 deletions x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ import { getMetrics } from '../../../../lib/details/get_metrics';
import { handleError } from '../../../../lib/errors/handle_error';
import { prefixIndexPattern } from '../../../../lib/ccs_utils';
import { metricSet } from './metric_set_overview';
import {
INDEX_PATTERN_ELASTICSEARCH,
INDEX_PATTERN_FILEBEAT,
} from '../../../../../common/constants';
import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../../common/constants';
import { getLogs } from '../../../../lib/logs';
import { getIndicesUnassignedShardStats } from '../../../../lib/elasticsearch/shards/get_indices_unassigned_shard_stats';

Expand All @@ -42,7 +39,11 @@ export function esOverviewRoute(server) {
const ccs = req.payload.ccs;
const clusterUuid = req.params.clusterUuid;
const esIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_ELASTICSEARCH, ccs);
const filebeatIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_FILEBEAT, '*');
const filebeatIndexPattern = prefixIndexPattern(
config,
config.get('monitoring.ui.logs.index'),
'*'
);

const start = req.payload.timeRange.min;
const end = req.payload.timeRange.max;
Expand Down