maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Maps] add settings to maps telemetry (#50161)

Browse source
This commit is contained in:
Nathan Reese 2019-11-12 10:25:58 -07:00 committed by GitHub
parent 253a10696c
commit aa638895ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
View file

@ -32,7 +32,7 @@ function getUniqueLayerCounts(layerCountsList, mapsCount) {
}, {});
}
export function buildMapsTelemetry(savedObjects) {
export function buildMapsTelemetry(savedObjects, settings) {
const layerLists = savedObjects
.map(savedMapObject =>
JSON.parse(savedMapObject.attributes.layerListJSON));
@ -57,7 +57,8 @@ export function buildMapsTelemetry(savedObjects) {
const dataSourcesCountSum = _.sum(dataSourcesCount);
const layersCountSum = _.sum(layersCount);
const mapsTelem = {
return {
settings,
// Total count of maps
mapsTotalCount: mapsCount,
// Time of capture
@ -85,7 +86,6 @@ export function buildMapsTelemetry(savedObjects) {
}
}
};
return mapsTelem;
}
async function getSavedObjects(savedObjectsClient) {
@ -98,7 +98,10 @@ async function getSavedObjects(savedObjectsClient) {
export async function getMapsTelemetry(server, callCluster) {
const savedObjectsClient = getSavedObjectsClient(server, callCluster);
const savedObjects = await getSavedObjects(savedObjectsClient);
const mapsTelemetry = buildMapsTelemetry(savedObjects);
const settings = {
showMapVisualizationTypes: server.config().get('xpack.maps.showMapVisualizationTypes')
};
const mapsTelemetry = buildMapsTelemetry(savedObjects, settings);
return await savedObjectsClient.create('maps-telemetry',
mapsTelemetry, {

100
x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.test.js
View file

@ -10,79 +10,87 @@ import { buildMapsTelemetry } from './maps_telemetry';
describe('buildMapsTelemetry', () => {
const settings = { showMapVisualizationTypes: false };
test('returns zeroed telemetry data when there are no saved objects',
async () => {
const gisMaps = [];
const result = buildMapsTelemetry(gisMaps);
const result = buildMapsTelemetry(gisMaps, settings);
expect(result).toMatchObject({
'attributesPerMap': {
'dataSourcesCount': {
'avg': 0,
'max': 0,
'min': 0
attributesPerMap: {
dataSourcesCount: {
avg: 0,
max: 0,
min: 0
},
'emsVectorLayersCount': {},
'layerTypesCount': {},
'layersCount': {
'avg': 0,
'max': 0,
'min': 0
emsVectorLayersCount: {},
layerTypesCount: {},
layersCount: {
avg: 0,
max: 0,
min: 0
}
},
'mapsTotalCount': 0
mapsTotalCount: 0,
settings: {
showMapVisualizationTypes: false
}
});
});
test('returns expected telemetry data from saved objects', async () => {
const gisMaps = savedObjectsPayload.saved_objects;
const result = buildMapsTelemetry(gisMaps);
const result = buildMapsTelemetry(gisMaps, settings);
expect(result).toMatchObject({
'attributesPerMap': {
'dataSourcesCount': {
'avg': 2.6666666666666665,
'max': 3,
'min': 2
attributesPerMap: {
dataSourcesCount: {
avg: 2.6666666666666665,
max: 3,
min: 2
},
'emsVectorLayersCount': {
'canada_provinces': {
'avg': 0.3333333333333333,
'max': 1,
'min': 1
emsVectorLayersCount: {
canada_provinces: {
avg: 0.3333333333333333,
max: 1,
min: 1
},
'france_departments': {
'avg': 0.3333333333333333,
'max': 1,
'min': 1
france_departments: {
avg: 0.3333333333333333,
max: 1,
min: 1
},
'italy_provinces': {
'avg': 0.3333333333333333,
'max': 1,
'min': 1
italy_provinces: {
avg: 0.3333333333333333,
max: 1,
min: 1
}
},
'layerTypesCount': {
'TILE': {
'avg': 1,
'max': 1,
'min': 1
layerTypesCount: {
TILE: {
avg: 1,
max: 1,
min: 1
},
'VECTOR': {
'avg': 1.6666666666666667,
'max': 2,
'min': 1
VECTOR: {
avg: 1.6666666666666667,
max: 2,
min: 1
}
},
'layersCount': {
'avg': 2.6666666666666665,
'max': 3,
'min': 2
layersCount: {
avg: 2.6666666666666665,
max: 3,
min: 2
}
},
'mapsTotalCount': 3
mapsTotalCount: 3,
settings: {
showMapVisualizationTypes: false
}
});
});
});