Skip to content

[7.7] [Uptime] Remove hard coded value for monitor states histograms (#64396) #64897

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

Closed
wants to merge 2 commits into from
Closed

[7.7] [Uptime] Remove hard coded value for monitor states histograms (#64396) #64897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf99fe6
[Uptime] Remove hard coded value for monitor states histograms (#64396)
shahzad31 Apr 30, 2020
af43716
revert
shahzad31 Apr 30, 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
7 changes: 0 additions & 7 deletions x-pack/legacy/plugins/uptime/common/constants/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,3 @@ export const QUERY = {
'error.type',
],
};

export const STATES = {
// Number of results returned for a states query
LEGACY_STATES_QUERY_SIZE: 10,
// The maximum number of monitors that should be supported
MAX_MONITORS: 35000,
};
27 changes: 10 additions & 17 deletions x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

import { get, sortBy } from 'lodash';
import { QueryContext } from './query_context';
import { getHistogramIntervalFormatted } from '../../helper';
import { STATES } from '../../../../../../legacy/plugins/uptime/common/constants';
import { QUERY } from '../../../../common/constants';
import {
MonitorSummary,
SummaryHistogram,
Check,
Histogram,
MonitorSummary,
CursorDirection,
SortOrder,
} from '../../../../../../legacy/plugins/uptime/common/graphql/types';
} from '../../../../common/runtime_types';
import { MonitorEnricher } from './fetch_page';

export const enrichMonitorGroups: MonitorEnricher = async (
Expand Down Expand Up @@ -251,11 +250,8 @@ export const enrichMonitorGroups: MonitorEnricher = async (
const summaries: MonitorSummary[] = monitorBuckets.map((monitor: any) => {
const monitorId = get<string>(monitor, 'key.monitor_id');
monitorIds.push(monitorId);
let state = get<any>(monitor, 'state.value');
state = {
...state,
timestamp: state['@timestamp'],
};
const state: any = monitor.state?.value;
state.timestamp = state['@timestamp'];
const { checks } = state;
if (checks) {
state.checks = sortBy<SortChecks, Check>(checks, checksSortBy);
Expand Down Expand Up @@ -290,7 +286,7 @@ export const enrichMonitorGroups: MonitorEnricher = async (
const getHistogramForMonitors = async (
queryContext: QueryContext,
monitorIds: string[]
): Promise<{ [key: string]: SummaryHistogram }> => {
): Promise<{ [key: string]: Histogram }> => {
const params = {
index: queryContext.heartbeatIndices,
body: {
Expand Down Expand Up @@ -318,16 +314,13 @@ const getHistogramForMonitors = async (
by_id: {
terms: {
field: 'monitor.id',
size: STATES.LEGACY_STATES_QUERY_SIZE,
size: queryContext.size,
},
aggs: {
histogram: {
date_histogram: {
auto_date_histogram: {
field: '@timestamp',
fixed_interval: getHistogramIntervalFormatted(
queryContext.dateRangeStart,
queryContext.dateRangeEnd
),
buckets: QUERY.DEFAULT_BUCKET_COUNT,
missing: 0,
},
aggs: {
Expand Down