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

[Monitoring] Improve indices loading against larger metricbeat-* indices #79190

Merged
merged 4 commits into from
Oct 8, 2020
Merged

[Monitoring] Improve indices loading against larger metricbeat-* indices #79190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f3fa1d
Improve indices loading against larger metricbeat-* indices
chrisronline Oct 1, 2020
e937df9
Merge remote-tracking branch 'elastic/master' into monitoring/inner_h…
chrisronline Oct 1, 2020
284139f
Merge remote-tracking branch 'elastic/master' into monitoring/inner_h…
chrisronline Oct 8, 2020
2d2348c
PR feedback
chrisronline Oct 8, 2020
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
3 changes: 2 additions & 1 deletion x-pack/plugins/monitoring/public/views/base_eui_table_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ export class MonitoringViewBaseEuiTableController extends MonitoringViewBaseCont
});
};

this.updateData();
// For pages where we do not fetch immediately, we want to fetch after pagination is applied
args.fetchDataImmediately === false && this.updateData();
}

setPagination(page) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/lib/apm/get_apm_info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export async function getApmInfo(req, apmIndexPattern, { clusterUuid, apmUuid, s
inner_hits: {
name: 'first_hit',
size: 1,
sort: { 'beats_stats.timestamp': 'asc' },
sort: { 'beats_stats.timestamp': { order: 'asc', unmapped_type: 'long' } },
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/lib/apm/get_apms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export async function getApms(req, apmIndexPattern, clusterUuid) {
inner_hits: {
name: 'earliest',
size: 1,
sort: [{ 'beats_stats.timestamp': 'asc' }],
sort: [{ 'beats_stats.timestamp': { order: 'asc', unmapped_type: 'long' } }],
},
},
sort: [
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/lib/beats/get_beat_summary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export async function getBeatSummary(
inner_hits: {
name: 'first_hit',
size: 1,
sort: { 'beats_stats.timestamp': 'asc' },
sort: { 'beats_stats.timestamp': { order: 'asc', unmapped_type: 'long' } },
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function buildGetIndicesQuery(
inner_hits: {
name: 'earliest',
size: 1,
sort: [{ timestamp: 'asc' }],
sort: [{ timestamp: { order: 'asc', unmapped_type: 'long' } }],
},
},
sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function buildRequest(req, config, esIndexPattern) {
field: 'ccr_stats.follower_index',
inner_hits: {
name: 'by_shard',
sort: [{ timestamp: 'desc' }],
sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],
size: maxBucketSize,
collapse: {
field: 'ccr_stats.shard_id',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ async function getCcrStat(req, esIndexPattern, filters) {
inner_hits: {
name: 'oldest',
size: 1,
sort: [{ timestamp: 'asc' }],
sort: [{ timestamp: { order: 'asc', unmapped_type: 'long' } }],
},
},
},
Expand Down