empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Website: Fix storedError metric reporting in receive-usage-analytics.js (#11404)

Browse Source 
Changes:
- updated `receive-usage-analytics.js` to only try to send metrics for
`storedErrors` if the error objects are in [the format we
expect.](https://fleetdm.com/docs/using-fleet/usage-statistics#what-is-included-in-usage-statistics-in-fleet)
This commit is contained in:
Eric 2023-04-27 17:40:10 -05:00 committed by GitHub
parent 59eb2a5566
commit 1d022e76b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
website/api/controllers/webhooks/receive-usage-analytics.js vendored
View File

@ -197,25 +197,27 @@ module.exports = {
if(inputs.storedErrors.length > 0) {
// If inputs.storedErrors is not an empty array, we'll iterate through it to build custom metric for each object in the array
for(let error of inputs.storedErrors) {
// Create a new array of tags for this error
let errorTags = _.clone(baseMetricTags);
let errorLocation = 1;
// Create a tag for each error location
for(let location of error.loc) { // iterate throught the location array of this error
// Add the error's location as a custom tag (SNAKE_CASED)
errorTags.push(`error_location_${errorLocation}:${location.replace(/\s/gi, '_')}`);
errorLocation++;
}
//
let metricToAdd = {
metric: 'usage_statistics.stored_errors',
type: 3,
points: [{timestamp: metricsTimestampInSeconds, value: error.count}],
resources: [{name: inputs.anonymousIdentifier, type: 'fleet_instance'}],
tags: errorTags,
};
// Add the custom metric to the array of metrics to send to Datadog.
metricsToSendToDatadog.push(metricToAdd);
// Make sure every error object in the storedErrors array has a 'loc' array and a count.
if((error.loc && _.isArray(error.loc)) && error.count) {
// Create a new array of tags for this error
let errorTags = _.clone(baseMetricTags);
let errorLocation = 1;
// Create a tag for each error location
for(let location of error.loc) { // iterate throught the location array of this error
// Add the error's location as a custom tag (SNAKE_CASED)
errorTags.push(`error_location_${errorLocation}:${location.replace(/\s/gi, '_')}`);
errorLocation++;
}
let metricToAdd = {
metric: 'usage_statistics.stored_errors',
type: 3,
points: [{timestamp: metricsTimestampInSeconds, value: error.count}],
resources: [{name: inputs.anonymousIdentifier, type: 'fleet_instance'}],
tags: errorTags,
};
// Add the custom metric to the array of metrics to send to Datadog.
metricsToSendToDatadog.push(metricToAdd);
}//fi
}//∞
}//fi