@elastic/synthetics 1.9.1 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dsl/monitor.d.ts +1 -1
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +1 -1
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +4 -3
- package/dist/push/index.js.map +1 -1
- package/dist/push/monitor.d.ts +1 -1
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +14 -4
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/utils.d.ts +1 -1
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/push/utils.js.map +1 -1
- package/package.json +4 -4
- package/src/dsl/monitor.ts +1 -1
- package/src/push/index.ts +6 -6
- package/src/push/monitor.ts +15 -5
- package/src/push/utils.ts +5 -5
package/dist/dsl/monitor.d.ts
CHANGED
|
@@ -26,7 +26,7 @@ import { ThrottlingOptions, Location, ScreenshotOptions, Params, PlaywrightOptio
|
|
|
26
26
|
import { LocationsMap } from '../locations/public-locations';
|
|
27
27
|
export type SyntheticsLocationsType = keyof typeof LocationsMap;
|
|
28
28
|
export declare const SyntheticsLocations: ("japan" | "india" | "singapore" | "australia_east" | "united_kingdom" | "germany" | "canada_east" | "brazil" | "us_east" | "us_west")[];
|
|
29
|
-
export declare const ALLOWED_SCHEDULES: readonly [1, 3, 5, 10, 15, 20, 30, 60, 120, 240];
|
|
29
|
+
export declare const ALLOWED_SCHEDULES: readonly [1, 2, 3, 5, 10, 15, 20, 30, 60, 120, 240];
|
|
30
30
|
export interface AlertConfig {
|
|
31
31
|
status?: {
|
|
32
32
|
enabled: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,MAAM,EACN,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,YAAY,CAAC;AAChE,eAAO,MAAM,mBAAmB,0IAEF,CAAC;AAC/B,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,MAAM,EACN,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG,MAAM,OAAO,YAAY,CAAC;AAChE,eAAO,MAAM,mBAAmB,0IAEF,CAAC;AAC/B,eAAO,MAAM,iBAAiB,qDAEpB,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE;QACP,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,uBAAuB,EAAE,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC;IACzC,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,qBAAa,OAAO;IAIC,MAAM,EAAE,aAAa;IAHxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;gBACH,MAAM,GAAE,aAAkB;IAC7C;;;OAGG;IACH,MAAM,CAAC,UAAU,GAAE,aAAkB;IAWrC,IAAI,IAAI,WAEP;IAED,SAAS,CAAC,MAAM,EAAE,QAAQ;IAI1B;;;OAGG;IACH,UAAU,CAAC,OAAO,SAAK;IAIvB;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa;IAI/B;;OAEG;IACH,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;IASxD;;;;;;OAMG;IACH,IAAI,IAAI,MAAM;IASd,QAAQ;CAiBT"}
|
package/dist/dsl/monitor.js
CHANGED
|
@@ -35,7 +35,7 @@ const helpers_1 = require("../helpers");
|
|
|
35
35
|
const public_locations_1 = require("../locations/public-locations");
|
|
36
36
|
exports.SyntheticsLocations = Object.keys(public_locations_1.LocationsMap);
|
|
37
37
|
exports.ALLOWED_SCHEDULES = [
|
|
38
|
-
1, 3, 5, 10, 15, 20, 30, 60, 120, 240,
|
|
38
|
+
1, 2, 3, 5, 10, 15, 20, 30, 60, 120, 240,
|
|
39
39
|
];
|
|
40
40
|
class Monitor {
|
|
41
41
|
config;
|
package/dist/dsl/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,mCAAoC;AACpC,0DAA8B;AAC9B,yCAAyC;AAQzC,wCAA6C;AAC7C,oEAA6D;AAGhD,QAAA,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAC5C,+BAAY,CACgB,CAAC;AAClB,QAAA,iBAAiB,GAAG;IAC/B,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/push/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAqB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAY5D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAiBpE,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAqB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAY5D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAiBpE,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBA+DnE;AAoCD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,UAU1D;AAID,wBAAsB,YAAY,CAAC,UAAU,KAAA,EAAE,aAAa,UAAQ,4BAkBnE;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,iBAI1B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,QA4BjD;AAoBD,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,WAAW,iBA0BrB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBA8BzE;AAGD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,QAKlD"}
|
package/dist/push/index.js
CHANGED
|
@@ -48,14 +48,15 @@ async function push(monitors, options) {
|
|
|
48
48
|
return await pushLegacy(monitors, options);
|
|
49
49
|
}
|
|
50
50
|
const { monitors: remote } = await (0, kibana_api_1.bulkGetMonitors)(options);
|
|
51
|
-
(0, helpers_1.progress)(`
|
|
51
|
+
(0, helpers_1.progress)(`preparing ${monitors.length} monitors`);
|
|
52
52
|
const schemas = await (0, monitor_1.buildMonitorSchema)(monitors, true);
|
|
53
53
|
const local = (0, monitor_1.getLocalMonitors)(schemas);
|
|
54
54
|
const { newIDs, changedIDs, removedIDs, unchangedIDs } = (0, monitor_1.diffMonitors)(local, remote);
|
|
55
55
|
(0, utils_1.logDiff)(newIDs, changedIDs, removedIDs, unchangedIDs);
|
|
56
56
|
const updatedMonitors = new Set([...changedIDs, ...newIDs]);
|
|
57
57
|
if (updatedMonitors.size > 0) {
|
|
58
|
-
const
|
|
58
|
+
const updatedMonSchemas = schemas.filter(s => updatedMonitors.has(s.id));
|
|
59
|
+
const chunks = (0, utils_1.getChunks)(updatedMonSchemas, kibana_api_1.CHUNK_SIZE);
|
|
59
60
|
for (const chunk of chunks) {
|
|
60
61
|
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkPutMonitors)(options, chunk), `creating or updating ${chunk.length} monitors`);
|
|
61
62
|
}
|
|
@@ -216,7 +217,7 @@ async function pushLegacy(monitors, options) {
|
|
|
216
217
|
}
|
|
217
218
|
let schemas = [];
|
|
218
219
|
if (monitors.length > 0) {
|
|
219
|
-
(0, helpers_1.progress)(`
|
|
220
|
+
(0, helpers_1.progress)(`preparing ${monitors.length} monitors`);
|
|
220
221
|
schemas = await (0, monitor_1.buildMonitorSchema)(monitors, false);
|
|
221
222
|
const chunks = (0, utils_1.getChunks)(schemas, 10);
|
|
222
223
|
for (const chunk of chunks) {
|
package/dist/push/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,0CAAkD;AAClD,uCAAkC;AAClC,yCAA0C;AAC1C,uCAKmB;AACnB,4CAA4D;AAC5D,wCAUoB;AAEpB,sCAA6D;AAC7D,6CAMsB;AACtB,mCAKiB;AACjB,2CAAqC;AAE9B,KAAK,UAAU,IAAI,CAAC,QAAmB,EAAE,OAAoB;IAClE,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE;QACvB,MAAM,IAAA,eAAK,EAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;KAC/C;IACD,IAAA,kBAAQ,EACN,yBAAyB,OAAO,CAAC,EAAE,wBAAwB,OAAO,CAAC,KAAK,SAAS,CAClF,CAAC;IAEF;;OAEG;IACH,IAAI,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC9C,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5C;IAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,4BAAe,EAAC,OAAO,CAAC,CAAC;IAE5D,IAAA,kBAAQ,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}
|
package/dist/push/monitor.d.ts
CHANGED
|
@@ -49,6 +49,6 @@ export declare const parseAlertConfig: (config: MonitorConfig, gConfig?: AlertCo
|
|
|
49
49
|
export declare function getAlertKeyValue(key: 'status' | 'tls', config: MonitorConfig, alertConfig?: AlertConfig): {
|
|
50
50
|
enabled: boolean;
|
|
51
51
|
};
|
|
52
|
-
export declare function parseSchedule(schedule: string): 1 | 3 | 5 | 20 | 10 | 15 | 30 | 60 | 120 | 240;
|
|
52
|
+
export declare function parseSchedule(schedule: string): 1 | 2 | 3 | 5 | 20 | 10 | 15 | 30 | 60 | 120 | 240 | "10s" | "30s";
|
|
53
53
|
export {};
|
|
54
54
|
//# sourceMappingURL=monitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,cAAM,gBAAgB;IAEpB,MAAM,cAAqB;IAE3B,UAAU,cAAqB;IAE/B,UAAU,cAAqB;IAE/B,YAAY,cAAqB;CAClC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,EAAE,aAAa,EAAE,GACtB,gBAAgB,CAiClB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,mBASxD;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,4BAsC1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBA+ErB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,cAAM,gBAAgB;IAEpB,MAAM,cAAqB;IAE3B,UAAU,cAAqB;IAE/B,UAAU,cAAqB;IAE/B,YAAY,cAAqB;CAClC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,EAAE,aAAa,EAAE,GACtB,gBAAgB,CAiClB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,mBASxD;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,4BAsC1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBA+ErB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,WAqCrB;AAUD,eAAO,MAAM,gBAAgB,WACnB,aAAa,YACX,WAAW,OAatB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,QAAQ,GAAG,KAAK,EACrB,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,WAAW,GACxB;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CA4BtB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,sEAoC7C"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -235,7 +235,7 @@ function buildMonitorFromYaml(config, options) {
|
|
|
235
235
|
return mon;
|
|
236
236
|
}
|
|
237
237
|
exports.buildMonitorFromYaml = buildMonitorFromYaml;
|
|
238
|
-
// Deletes
|
|
238
|
+
// Deletes unnecessary fields from the lightweight monitor config
|
|
239
239
|
// that is not supported by the Kibana API
|
|
240
240
|
function normalizeConfig(config) {
|
|
241
241
|
delete config['private_locations'];
|
|
@@ -293,6 +293,7 @@ function parseSchedule(schedule) {
|
|
|
293
293
|
// split between non-digit (\D) and a digit (\d)
|
|
294
294
|
const durations = duration.split(/(?<=\D)(?=\d)/g);
|
|
295
295
|
let minutes = 0;
|
|
296
|
+
let seconds = 0;
|
|
296
297
|
for (const dur of durations) {
|
|
297
298
|
// split between a digit and non-digit
|
|
298
299
|
const [value, format] = dur.split(/(?<=\d)(?=\D)/g);
|
|
@@ -300,7 +301,12 @@ function parseSchedule(schedule) {
|
|
|
300
301
|
const scheduleValue = parseInt(value, 10);
|
|
301
302
|
switch (format) {
|
|
302
303
|
case 's':
|
|
303
|
-
|
|
304
|
+
if (scheduleValue < 60) {
|
|
305
|
+
seconds += scheduleValue;
|
|
306
|
+
}
|
|
307
|
+
else {
|
|
308
|
+
minutes += Math.round(scheduleValue / 60);
|
|
309
|
+
}
|
|
304
310
|
break;
|
|
305
311
|
case 'm':
|
|
306
312
|
minutes += scheduleValue;
|
|
@@ -313,12 +319,16 @@ function parseSchedule(schedule) {
|
|
|
313
319
|
break;
|
|
314
320
|
}
|
|
315
321
|
}
|
|
316
|
-
return nearestSchedule(minutes);
|
|
322
|
+
return nearestSchedule(minutes, seconds);
|
|
317
323
|
}
|
|
318
324
|
exports.parseSchedule = parseSchedule;
|
|
319
325
|
// Find the nearest schedule that is supported by the platform
|
|
320
326
|
// from the parsed schedule value
|
|
321
|
-
function nearestSchedule(minutes) {
|
|
327
|
+
function nearestSchedule(minutes, seconds) {
|
|
328
|
+
if (seconds > 0 && minutes === 0) {
|
|
329
|
+
// we allow only 10 and 30 seconds, return the nearest one
|
|
330
|
+
return seconds < 20 ? '10s' : '30s';
|
|
331
|
+
}
|
|
322
332
|
let nearest = monitor_1.ALLOWED_SCHEDULES[0];
|
|
323
333
|
let prev = Math.abs(nearest - minutes);
|
|
324
334
|
for (let i = 1; i < monitor_1.ALLOWED_SCHEDULES.length; i++) {
|
package/dist/push/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/push/utils.d.ts
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
import { PushOptions } from '../common_types';
|
|
26
26
|
import { Monitor } from '../dsl/monitor';
|
|
27
27
|
export declare function logDiff<T extends Set<string>>(newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
28
|
-
export declare function getChunks(arr:
|
|
28
|
+
export declare function getChunks<T>(arr: Array<T>, size: number): Array<T[]>;
|
|
29
29
|
type Operation = 'status' | 'bulk_get' | 'bulk_update' | 'bulk_delete' | 'legacy' | 'location';
|
|
30
30
|
export declare function generateURL(options: PushOptions, operation: Operation): string;
|
|
31
31
|
/**
|
package/dist/push/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAC3C,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,CAAC,QAShB;AAED,wBAAgB,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAC3C,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,CAAC,QAShB;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,CAMpE;AAED,KAAK,SAAS,GACV,QAAQ,GACR,UAAU,GACV,aAAa,GACb,aAAa,GACb,QAAQ,GACR,UAAU,CAAC;AAEf,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,UAgBrE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,WAEjD;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,WAAW,WAOrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,WAErD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,SAAM,UAUhE"}
|
package/dist/push/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,oDAA4B;AAC5B,wCAA2D;AAC3D,yCAAwD;AAIxD,SAAgB,OAAO,CACrB,MAAS,EACT,UAAa,EACb,UAAa,EACb,YAAe;IAEf,IAAA,kBAAQ,EACN,gBAAgB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elastic/synthetics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.0",
|
|
4
4
|
"description": "Elastic synthetic monitoring agent",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -61,9 +61,9 @@
|
|
|
61
61
|
"kleur": "^4.1.5",
|
|
62
62
|
"micromatch": "^4.0.5",
|
|
63
63
|
"pirates": "^4.0.5",
|
|
64
|
-
"playwright": "=1.
|
|
65
|
-
"playwright-chromium": "=1.
|
|
66
|
-
"playwright-core": "=1.
|
|
64
|
+
"playwright": "=1.45.1",
|
|
65
|
+
"playwright-chromium": "=1.45.1",
|
|
66
|
+
"playwright-core": "=1.45.1",
|
|
67
67
|
"semver": "^7.5.4",
|
|
68
68
|
"sharp": "^0.32.6",
|
|
69
69
|
"snakecase-keys": "^4.0.1",
|
package/src/dsl/monitor.ts
CHANGED
|
@@ -41,7 +41,7 @@ export const SyntheticsLocations = Object.keys(
|
|
|
41
41
|
LocationsMap
|
|
42
42
|
) as SyntheticsLocationsType[];
|
|
43
43
|
export const ALLOWED_SCHEDULES = [
|
|
44
|
-
1, 3, 5, 10, 15, 20, 30, 60, 120, 240,
|
|
44
|
+
1, 2, 3, 5, 10, 15, 20, 30, 60, 120, 240,
|
|
45
45
|
] as const;
|
|
46
46
|
|
|
47
47
|
export interface AlertConfig {
|
package/src/push/index.ts
CHANGED
|
@@ -78,7 +78,7 @@ export async function push(monitors: Monitor[], options: PushOptions) {
|
|
|
78
78
|
|
|
79
79
|
const { monitors: remote } = await bulkGetMonitors(options);
|
|
80
80
|
|
|
81
|
-
progress(`
|
|
81
|
+
progress(`preparing ${monitors.length} monitors`);
|
|
82
82
|
const schemas = await buildMonitorSchema(monitors, true);
|
|
83
83
|
const local = getLocalMonitors(schemas);
|
|
84
84
|
|
|
@@ -90,7 +90,8 @@ export async function push(monitors: Monitor[], options: PushOptions) {
|
|
|
90
90
|
|
|
91
91
|
const updatedMonitors = new Set<string>([...changedIDs, ...newIDs]);
|
|
92
92
|
if (updatedMonitors.size > 0) {
|
|
93
|
-
const
|
|
93
|
+
const updatedMonSchemas = schemas.filter(s => updatedMonitors.has(s.id));
|
|
94
|
+
const chunks = getChunks(updatedMonSchemas, CHUNK_SIZE);
|
|
94
95
|
for (const chunk of chunks) {
|
|
95
96
|
await liveProgress(
|
|
96
97
|
bulkPutMonitors(options, chunk),
|
|
@@ -217,9 +218,8 @@ export function validateSettings(opts: PushOptions) {
|
|
|
217
218
|
- CLI '--schedule <mins>'
|
|
218
219
|
- Config file 'monitors.schedule' field`;
|
|
219
220
|
} else if (opts.schedule && !ALLOWED_SCHEDULES.includes(opts.schedule)) {
|
|
220
|
-
reason = `Set default schedule(${
|
|
221
|
-
|
|
222
|
-
}) to one of the allowed values - ${ALLOWED_SCHEDULES.join(',')}`;
|
|
221
|
+
reason = `Set default schedule(${opts.schedule
|
|
222
|
+
}) to one of the allowed values - ${ALLOWED_SCHEDULES.join(',')}`;
|
|
223
223
|
}
|
|
224
224
|
|
|
225
225
|
if (!reason) return;
|
|
@@ -288,7 +288,7 @@ export async function pushLegacy(monitors: Monitor[], options: PushOptions) {
|
|
|
288
288
|
|
|
289
289
|
let schemas: MonitorSchema[] = [];
|
|
290
290
|
if (monitors.length > 0) {
|
|
291
|
-
progress(`
|
|
291
|
+
progress(`preparing ${monitors.length} monitors`);
|
|
292
292
|
schemas = await buildMonitorSchema(monitors, false);
|
|
293
293
|
const chunks = getChunks(schemas, 10);
|
|
294
294
|
for (const chunk of chunks) {
|
package/src/push/monitor.ts
CHANGED
|
@@ -271,7 +271,8 @@ export function buildMonitorFromYaml(
|
|
|
271
271
|
...normalizeConfig(config),
|
|
272
272
|
retestOnFailure,
|
|
273
273
|
privateLocations,
|
|
274
|
-
schedule:
|
|
274
|
+
schedule:
|
|
275
|
+
(schedule as typeof ALLOWED_SCHEDULES[number]) || options.schedule,
|
|
275
276
|
alert: alertConfig,
|
|
276
277
|
});
|
|
277
278
|
|
|
@@ -285,7 +286,7 @@ export function buildMonitorFromYaml(
|
|
|
285
286
|
return mon;
|
|
286
287
|
}
|
|
287
288
|
|
|
288
|
-
// Deletes
|
|
289
|
+
// Deletes unnecessary fields from the lightweight monitor config
|
|
289
290
|
// that is not supported by the Kibana API
|
|
290
291
|
function normalizeConfig(config: MonitorConfig) {
|
|
291
292
|
delete config['private_locations'];
|
|
@@ -354,6 +355,7 @@ export function parseSchedule(schedule: string) {
|
|
|
354
355
|
// split between non-digit (\D) and a digit (\d)
|
|
355
356
|
const durations = duration.split(/(?<=\D)(?=\d)/g);
|
|
356
357
|
let minutes = 0;
|
|
358
|
+
let seconds = 0;
|
|
357
359
|
for (const dur of durations) {
|
|
358
360
|
// split between a digit and non-digit
|
|
359
361
|
const [value, format] = dur.split(/(?<=\d)(?=\D)/g);
|
|
@@ -361,7 +363,11 @@ export function parseSchedule(schedule: string) {
|
|
|
361
363
|
const scheduleValue = parseInt(value, 10);
|
|
362
364
|
switch (format) {
|
|
363
365
|
case 's':
|
|
364
|
-
|
|
366
|
+
if (scheduleValue < 60) {
|
|
367
|
+
seconds += scheduleValue;
|
|
368
|
+
} else {
|
|
369
|
+
minutes += Math.round(scheduleValue / 60);
|
|
370
|
+
}
|
|
365
371
|
break;
|
|
366
372
|
case 'm':
|
|
367
373
|
minutes += scheduleValue;
|
|
@@ -374,12 +380,16 @@ export function parseSchedule(schedule: string) {
|
|
|
374
380
|
break;
|
|
375
381
|
}
|
|
376
382
|
}
|
|
377
|
-
return nearestSchedule(minutes);
|
|
383
|
+
return nearestSchedule(minutes, seconds);
|
|
378
384
|
}
|
|
379
385
|
|
|
380
386
|
// Find the nearest schedule that is supported by the platform
|
|
381
387
|
// from the parsed schedule value
|
|
382
|
-
function nearestSchedule(minutes) {
|
|
388
|
+
function nearestSchedule(minutes: number, seconds: number) {
|
|
389
|
+
if (seconds > 0 && minutes === 0) {
|
|
390
|
+
// we allow only 10 and 30 seconds, return the nearest one
|
|
391
|
+
return seconds < 20 ? '10s' : '30s';
|
|
392
|
+
}
|
|
383
393
|
let nearest: typeof ALLOWED_SCHEDULES[number] = ALLOWED_SCHEDULES[0];
|
|
384
394
|
let prev = Math.abs(nearest - minutes);
|
|
385
395
|
for (let i = 1; i < ALLOWED_SCHEDULES.length; i++) {
|
package/src/push/utils.ts
CHANGED
|
@@ -37,14 +37,14 @@ export function logDiff<T extends Set<string>>(
|
|
|
37
37
|
) {
|
|
38
38
|
progress(
|
|
39
39
|
'Monitor Diff: ' +
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
green(`Added(${newIDs.size}) `) +
|
|
41
|
+
yellow(`Updated(${changedIDs.size}) `) +
|
|
42
|
+
red(`Removed(${removedIDs.size}) `) +
|
|
43
|
+
grey(`Unchanged(${unchangedIDs.size})`)
|
|
44
44
|
);
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
export function getChunks(arr:
|
|
47
|
+
export function getChunks<T>(arr: Array<T>, size: number): Array<T[]> {
|
|
48
48
|
const chunks = [];
|
|
49
49
|
for (let i = 0; i < arr.length; i += size) {
|
|
50
50
|
chunks.push(arr.slice(i, i + size));
|