Skip to content

[Uptime][Synthetics] fleet managed monitor telemetry #97502

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

Merged
dominiqueclarke merged 10 commits into from
May 4, 2021
Merged

[Uptime][Synthetics] fleet managed monitor telemetry #97502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
691564f
add fleet monitor telemetry
dominiqueclarke Apr 14, 2021
089ba79
Merge branch 'master' of github.com:elastic/kibana into feature/91062…
dominiqueclarke Apr 19, 2021
ffb6285
add changes to telemetry json file
dominiqueclarke Apr 19, 2021
5443fae
Merge branch 'master' of github.com:elastic/kibana into feature/91062…
dominiqueclarke Apr 20, 2021
9cfcfda
add functional tests
dominiqueclarke Apr 21, 2021
b3808ec
document telemetry fields
dominiqueclarke Apr 21, 2021
a8e2f7b
Merge branch 'master' into feature/91062-fleet-monitor-telemetry
kibanamachine Apr 23, 2021
92851d0
Merge branch 'master' into feature/91062-fleet-monitor-telemetry
kibanamachine Apr 26, 2021
a71365e
Merge branch 'master' into feature/91062-fleet-monitor-telemetry
kibanamachine Apr 27, 2021
40ee749
Merge branch 'master' into feature/91062-fleet-monitor-telemetry
kibanamachine May 3, 2021
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
77 changes: 69 additions & 8 deletions x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5405,35 +5405,59 @@
"monitor_name_stats": {
"properties": {
"avg_length": {
"type": "float"
"type": "float",
"_meta": {
"description": "This field represents the average length of monitor names"
Copy link
Copy Markdown
Contributor

@shahzad31 shahzad31 Apr 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much for adding theses additional descriptions

}
},
"max_length": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the max length of monitor names"
}
},
"min_length": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the min length of monitor names"
}
}
}
},
"monitor_page": {
"type": "long"
},
"no_of_unique_monitors": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the number of unique configured monitors"
}
},
"no_of_unique_observer_locations": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the number of unique monitor observer locations"
}
},
"observer_location_name_stats": {
"properties": {
"avg_length": {
"type": "float"
"type": "float",
"_meta": {
"description": "This field represents the average length of monitor observer location names"
}
},
"max_length": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the max length of monitor observer location names"
}
},
"min_length": {
"type": "long"
"type": "long",
"_meta": {
"description": "This field represents the min length of monitor observer location names"
}
}
}
},
Expand All @@ -5442,6 +5466,43 @@
},
"settings_page": {
"type": "long"
},
"fleet_monitor_name_stats": {
"properties": {
"avg_length": {
"type": "float",
"_meta": {
"description": "This field represents the average length of fleet managed monitor names"
}
},
"max_length": {
"type": "long",
"_meta": {
"description": "This field represents the max length of fleet managed monitor names"
}
},
"min_length": {
"type": "long",
"_meta": {
"description": "This field represents the min length of fleet managed monitor names"
}
}
}
},
"fleet_monitor_frequency": {
"type": "array",
"items": {
"type": "long",
"_meta": {
"description": "This field represents the average the monitor frequency of fleet managed monitors"
}
}
},
"fleet_no_of_unique_monitors": {
"type": "long",
"_meta": {
"description": "This field represents the number of unique configured fleet managed monitors"
}
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions .../uptime/server/lib/adapters/telemetry/__snapshots__/kibana_telemetry_adapter.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ describe('KibanaTelemetryAdapter', () => {
},
};
getSavedObjectsClient = () => {
return {};
return {
get: () => {},
};
};
collectorFetchContext = createCollectorFetchContextMock();
});
Expand Down
182 changes: 174 additions & 8 deletions x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,104 @@ export class KibanaTelemetryAdapter {
dateRangeStart: { type: 'array', items: { type: 'date' } },
monitor_frequency: { type: 'array', items: { type: 'long' } },
monitor_name_stats: {
avg_length: { type: 'float' },
max_length: { type: 'long' },
min_length: { type: 'long' },
avg_length: {
type: 'float',
_meta: {
description: 'This field represents the average length of monitor names',
},
},
max_length: {
type: 'long',
_meta: {
description: 'This field represents the max length of monitor names',
},
},
min_length: {
type: 'long',
_meta: {
description: 'This field represents the min length of monitor names',
},
},
},
monitor_page: { type: 'long' },
no_of_unique_monitors: { type: 'long' },
no_of_unique_observer_locations: { type: 'long' },
no_of_unique_monitors: {
type: 'long',
_meta: {
description: 'This field represents the number of unique configured monitors',
},
},
no_of_unique_observer_locations: {
type: 'long',
_meta: {
description:
'This field represents the number of unique monitor observer locations',
},
},
observer_location_name_stats: {
avg_length: { type: 'float' },
max_length: { type: 'long' },
min_length: { type: 'long' },
avg_length: {
type: 'float',
_meta: {
description:
'This field represents the average length of monitor observer location names',
},
},
max_length: {
type: 'long',
_meta: {
description:
'This field represents the max length of monitor observer location names',
},
},
min_length: {
type: 'long',
_meta: {
description:
'This field represents the min length of monitor observer location names',
},
},
},
overview_page: { type: 'long' },
settings_page: { type: 'long' },
fleet_monitor_name_stats: {
avg_length: {
type: 'float',
_meta: {
description:
'This field represents the average length of fleet managed monitor names',
},
},
max_length: {
type: 'long',
_meta: {
description:
'This field represents the max length of fleet managed monitor names',
},
},
min_length: {
type: 'long',
_meta: {
description:
'This field represents the min length of fleet managed monitor names',
},
},
},
fleet_monitor_frequency: {
type: 'array',
items: {
type: 'long',
_meta: {
description:
'This field represents the average the monitor frequency of fleet managed monitors',
},
},
},
fleet_no_of_unique_monitors: {
type: 'long',
_meta: {
description:
'This field represents the number of unique configured fleet managed monitors',
},
},
},
},
},
Expand All @@ -74,6 +158,7 @@ export class KibanaTelemetryAdapter {
if (savedObjectsClient) {
const uptimeEsClient = createUptimeESClient({ esClient, savedObjectsClient });
await this.countNoOfUniqueMonitorAndLocations(uptimeEsClient, savedObjectsClient);
await this.countNoOfUniqueFleetManagedMonitors(uptimeEsClient);
}
const report = this.getReport();
return { last_24_hours: { hits: { ...report } } };
Expand Down Expand Up @@ -218,6 +303,79 @@ export class KibanaTelemetryAdapter {
return bucket;
}

public static async countNoOfUniqueFleetManagedMonitors(callCluster: UptimeESClient) {
const params = {
index: 'synthetics-*',
body: {
query: {
bool: {
must: [
{
range: {
'@timestamp': {
gte: 'now-1d/d',
lt: 'now',
},
},
},
{
term: {
'monitor.fleet_managed': true,
},
},
],
},
},
size: 0,
aggs: {
unique_monitors: {
cardinality: {
field: 'monitor.id',
},
},
monitor_name: {
string_stats: {
field: 'monitor.name',
},
},
monitors: {
terms: {
field: 'monitor.id',
size: 1000,
},
aggs: {
docs: {
top_hits: {
size: 1,
_source: ['monitor.timespan'],
},
},
},
},
},
},
};

const { body: result } = await callCluster.search(params);

const numberOfUniqueMonitors: number = result?.aggregations?.unique_monitors?.value ?? 0;
const monitorNameStats = result?.aggregations?.monitor_name;
const uniqueMonitors: any = result?.aggregations?.monitors.buckets;

const bucketId = this.getBucketToIncrement();
const bucket = this.collector[bucketId];

bucket.fleet_no_of_unique_monitors = numberOfUniqueMonitors;
bucket.fleet_monitor_name_stats = {
min_length: monitorNameStats?.min_length ?? 0,
max_length: monitorNameStats?.max_length ?? 0,
avg_length: +(monitorNameStats?.avg_length?.toFixed(2) ?? 0),
};

bucket.fleet_monitor_frequency = this.getMonitorsFrequency(uniqueMonitors);
return bucket;
}

private static getMonitorsFrequency(uniqueMonitors = []) {
const frequencies: number[] = [];
uniqueMonitors
Expand Down Expand Up @@ -285,6 +443,14 @@ export class KibanaTelemetryAdapter {
dateRangeEnd: [],
autoRefreshEnabled: false,
autorefreshInterval: [],

fleet_no_of_unique_monitors: 0,
fleet_monitor_frequency: [],
fleet_monitor_name_stats: {
min_length: 0,
max_length: 0,
avg_length: 0,
},
};
}
return bucketId;
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,8 @@ export interface UptimeTelemetry {
dateRangeEnd: string[];
autorefreshInterval: number[];
autoRefreshEnabled: boolean;

fleet_no_of_unique_monitors: number;
fleet_monitor_frequency: number[];
fleet_monitor_name_stats: Stats;
}
1 change: 1 addition & 0 deletions x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const createLogPageViewRoute: UMRestApiRouteFactory = () => ({
uptimeEsClient,
savedObjectsClient
);
await KibanaTelemetryAdapter.countNoOfUniqueFleetManagedMonitors(uptimeEsClient);
return KibanaTelemetryAdapter.countPageView(pageView as PageViewParams);
},
});
Loading