Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('fetchCCReadExceptions', () => {
await fetchCCRReadExceptions(esClient, 1643306331418, 1643309869056, 10000);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.ccr-*,metrics-elasticsearch.ccr-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.ccr-*,metrics-elasticsearch.stack_monitoring.ccr-*',
filter_path: ['aggregations.remote_clusters.buckets'],
body: {
size: 0,
Expand Down Expand Up @@ -79,7 +79,7 @@ describe('fetchCCReadExceptions', () => {
should: [
{ term: { type: 'ccr_stats' } },
{ term: { 'metricset.name': 'ccr' } },
{ term: { 'data_stream.dataset': 'elasticsearch.ccr' } },
{ term: { 'data_stream.dataset': 'elasticsearch.stack_monitoring.ccr' } },
],
minimum_should_match: 1,
},
Expand Down Expand Up @@ -137,6 +137,6 @@ describe('fetchCCReadExceptions', () => {
await fetchCCRReadExceptions(esClient, 1643306331418, 1643309869056, 10000);

// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.ccr-*');
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.ccr-*');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ElasticsearchClient } from '@kbn/core/server';
import { get } from 'lodash';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
import { CCRReadExceptionsStats } from '../../../common/types/alerts';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';

Expand Down Expand Up @@ -63,7 +63,7 @@ export async function fetchCCRReadExceptions(
minimum_should_match: 1,
},
},
createDatasetFilter('ccr_stats', 'ccr', 'elasticsearch.ccr'),
createDatasetFilter('ccr_stats', 'ccr', getElasticsearchDataset('ccr')),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('fetchClusterHealth', () => {
]);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
filter_path: [
'hits.hits._source.cluster_state.status',
'hits.hits._source.elasticsearch.cluster.stats.status',
Expand All @@ -81,7 +81,11 @@ describe('fetchClusterHealth', () => {
should: [
{ term: { type: 'cluster_stats' } },
{ term: { 'metricset.name': 'cluster_stats' } },
{ term: { 'data_stream.dataset': 'elasticsearch.cluster_stats' } },
{
term: {
'data_stream.dataset': 'elasticsearch.stack_monitoring.cluster_stats',
},
},
],
minimum_should_match: 1,
},
Expand All @@ -108,6 +112,8 @@ describe('fetchClusterHealth', () => {
await fetchClusterHealth(esClient, [{ clusterUuid: '1', clusterName: 'foo1' }]);

// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
expect(params.index).toBe(
'.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { AlertCluster, AlertClusterHealth } from '../../../common/types/alerts';
import { ElasticsearchSource } from '../../../common/types/es';
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';

export async function fetchClusterHealth(
Expand Down Expand Up @@ -50,7 +50,11 @@ export async function fetchClusterHealth(
cluster_uuid: clusters.map((cluster) => cluster.clusterUuid),
},
},
createDatasetFilter('cluster_stats', 'cluster_stats', 'elasticsearch.cluster_stats'),
createDatasetFilter(
'cluster_stats',
'cluster_stats',
getElasticsearchDataset('cluster_stats')
),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('fetchClusters', () => {
await fetchClusters(esClient);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
filter_path: [
'hits.hits._source.cluster_settings.cluster.metadata.display_name',
'hits.hits._source.cluster_uuid',
Expand All @@ -101,7 +101,11 @@ describe('fetchClusters', () => {
should: [
{ term: { type: 'cluster_stats' } },
{ term: { 'metricset.name': 'cluster_stats' } },
{ term: { 'data_stream.dataset': 'elasticsearch.cluster_stats' } },
{
term: {
'data_stream.dataset': 'elasticsearch.stack_monitoring.cluster_stats',
},
},
],
minimum_should_match: 1,
},
Expand All @@ -125,6 +129,8 @@ describe('fetchClusters', () => {
});
await fetchClusters(esClient);
// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
expect(params.index).toBe(
'.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
);
});
});
8 changes: 6 additions & 2 deletions x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { ElasticsearchClient } from '@kbn/core/server';
import { get } from 'lodash';
import { AlertCluster } from '../../../common/types/alerts';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
Expand Down Expand Up @@ -44,7 +44,11 @@ export async function fetchClusters(
query: {
bool: {
filter: [
createDatasetFilter('cluster_stats', 'cluster_stats', 'elasticsearch.cluster_stats'),
createDatasetFilter(
'cluster_stats',
'cluster_stats',
getElasticsearchDataset('cluster_stats')
),
{
range: rangeFilter,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ describe('fetchCpuUsageNodeStats', () => {
await fetchCpuUsageNodeStats(esClient, clusters, startMs, endMs, size, filterQuery);
expect(params).toStrictEqual({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
filter_path: ['aggregations'],
body: {
size: 0,
Expand All @@ -227,7 +227,9 @@ describe('fetchCpuUsageNodeStats', () => {
should: [
{ term: { type: 'node_stats' } },
{ term: { 'metricset.name': 'node_stats' } },
{ term: { 'data_stream.dataset': 'elasticsearch.node_stats' } },
{
term: { 'data_stream.dataset': 'elasticsearch.stack_monitoring.node_stats' },
},
],
minimum_should_match: 1,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import moment from 'moment';
import { NORMALIZED_DERIVATIVE_UNIT } from '../../../common/constants';
import { AlertCluster, AlertCpuUsageNodeStats } from '../../../common/types/alerts';
import { createDatasetFilter } from './create_dataset_query_filter';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';

Expand Down Expand Up @@ -58,7 +58,7 @@ export async function fetchCpuUsageNodeStats(
cluster_uuid: clusters.map((cluster) => cluster.clusterUuid),
},
},
createDatasetFilter('node_stats', 'node_stats', 'elasticsearch.node_stats'),
createDatasetFilter('node_stats', 'node_stats', getElasticsearchDataset('node_stats')),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe('fetchDiskUsageNodeStats', () => {
await fetchDiskUsageNodeStats(esClient, clusters, duration, size);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
filter_path: ['aggregations'],
body: {
size: 0,
Expand All @@ -102,7 +102,9 @@ describe('fetchDiskUsageNodeStats', () => {
should: [
{ term: { type: 'node_stats' } },
{ term: { 'metricset.name': 'node_stats' } },
{ term: { 'data_stream.dataset': 'elasticsearch.node_stats' } },
{
term: { 'data_stream.dataset': 'elasticsearch.stack_monitoring.node_stats' },
},
],
minimum_should_match: 1,
},
Expand Down Expand Up @@ -150,6 +152,8 @@ describe('fetchDiskUsageNodeStats', () => {
});
await fetchDiskUsageNodeStats(esClient, clusters, duration, size);
// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.node_stats-*');
expect(params.index).toBe(
'.monitoring-es-*,metrics-elasticsearch.stack_monitoring.node_stats-*'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { AlertCluster, AlertDiskUsageNodeStats } from '../../../common/types/ale
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';

export async function fetchDiskUsageNodeStats(
esClient: ElasticsearchClient,
Expand Down Expand Up @@ -40,7 +40,7 @@ export async function fetchDiskUsageNodeStats(
cluster_uuid: clustersIds,
},
},
createDatasetFilter('node_stats', 'node_stats', 'elasticsearch.node_stats'),
createDatasetFilter('node_stats', 'node_stats', getElasticsearchDataset('node_stats')),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('fetchElasticsearchVersions', () => {
await fetchElasticsearchVersions(esClient, clusters, size);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
filter_path: [
'hits.hits._source.cluster_stats.nodes.versions',
'hits.hits._source.elasticsearch.cluster.stats.nodes.versions',
Expand All @@ -87,7 +87,11 @@ describe('fetchElasticsearchVersions', () => {
should: [
{ term: { type: 'cluster_stats' } },
{ term: { 'metricset.name': 'cluster_stats' } },
{ term: { 'data_stream.dataset': 'elasticsearch.cluster_stats' } },
{
term: {
'data_stream.dataset': 'elasticsearch.stack_monitoring.cluster_stats',
},
},
],
minimum_should_match: 1,
},
Expand All @@ -110,6 +114,8 @@ describe('fetchElasticsearchVersions', () => {
});
await fetchElasticsearchVersions(esClient, clusters, size);
// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
expect(params.index).toBe(
'.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ElasticsearchSource } from '../../../common/types/es';
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';

export async function fetchElasticsearchVersions(
esClient: ElasticsearchClient,
Expand Down Expand Up @@ -51,7 +51,11 @@ export async function fetchElasticsearchVersions(
cluster_uuid: clusters.map((cluster) => cluster.clusterUuid),
},
},
createDatasetFilter('cluster_stats', 'cluster_stats', 'elasticsearch.cluster_stats'),
createDatasetFilter(
'cluster_stats',
'cluster_stats',
getElasticsearchDataset('cluster_stats')
),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ describe('fetchIndexShardSize', () => {
await fetchIndexShardSize(esClient, clusters, threshold, shardIndexPatterns, size);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.index-*,metrics-elasticsearch.index-*',
'*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.index-*,metrics-elasticsearch.stack_monitoring.index-*',
filter_path: ['aggregations.clusters.buckets'],
body: {
size: 0,
Expand All @@ -162,7 +162,7 @@ describe('fetchIndexShardSize', () => {
should: [
{ term: { type: 'index_stats' } },
{ term: { 'metricset.name': 'index' } },
{ term: { 'data_stream.dataset': 'elasticsearch.index' } },
{ term: { 'data_stream.dataset': 'elasticsearch.stack_monitoring.index' } },
],
minimum_should_match: 1,
},
Expand Down Expand Up @@ -211,6 +211,6 @@ describe('fetchIndexShardSize', () => {
});
await fetchIndexShardSize(esClient, clusters, threshold, shardIndexPatterns, size);
// @ts-ignore
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.index-*');
expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.index-*');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ESGlobPatterns, RegExPatterns } from '../../../common/es_glob_patterns'
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getElasticsearchDataset } from '../cluster/get_index_patterns';

type TopHitType = ElasticsearchResponseHit & {
_source: { index_stats?: Partial<ElasticsearchIndexStats> };
Expand Down Expand Up @@ -50,7 +50,7 @@ export async function fetchIndexShardSize(
query: {
bool: {
filter: [
createDatasetFilter('index_stats', 'index', 'elasticsearch.index'),
createDatasetFilter('index_stats', 'index', getElasticsearchDataset('index')),
{
range: {
timestamp: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe('fetchKibanaVersions', () => {
await fetchKibanaVersions(esClient, clusters, size);
expect(esClient.search).toHaveBeenCalledWith({
index:
'*:.monitoring-kibana-*,.monitoring-kibana-*,*:metrics-kibana.stats-*,metrics-kibana.stats-*',
'*:.monitoring-kibana-*,.monitoring-kibana-*,*:metrics-kibana.stack_monitoring.stats-*,metrics-kibana.stack_monitoring.stats-*',
filter_path: ['aggregations'],
body: {
size: 0,
Expand All @@ -103,7 +103,7 @@ describe('fetchKibanaVersions', () => {
should: [
{ term: { type: 'kibana_stats' } },
{ term: { 'metricset.name': 'stats' } },
{ term: { 'data_stream.dataset': 'kibana.stats' } },
{ term: { 'data_stream.dataset': 'kibana.stack_monitoring.stats' } },
],
minimum_should_match: 1,
},
Expand Down Expand Up @@ -146,6 +146,6 @@ describe('fetchKibanaVersions', () => {
});
await fetchKibanaVersions(esClient, clusters, size);
// @ts-ignore
expect(params.index).toBe('.monitoring-kibana-*,metrics-kibana.stats-*');
expect(params.index).toBe('.monitoring-kibana-*,metrics-kibana.stack_monitoring.stats-*');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
import { createDatasetFilter } from './create_dataset_query_filter';
import { Globals } from '../../static_globals';
import { CCS_REMOTE_PATTERN } from '../../../common/constants';
import { getNewIndexPatterns } from '../cluster/get_index_patterns';
import { getNewIndexPatterns, getKibanaDataset } from '../cluster/get_index_patterns';

interface ESAggResponse {
key: string;
Expand Down Expand Up @@ -41,7 +41,7 @@ export async function fetchKibanaVersions(
cluster_uuid: clusters.map((cluster) => cluster.clusterUuid),
},
},
createDatasetFilter('kibana_stats', 'stats', 'kibana.stats'),
createDatasetFilter('kibana_stats', 'stats', getKibanaDataset('stats')),
{
range: {
timestamp: {
Expand Down
Loading