@elastic/synthetics 1.0.0 → 1.2.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/cli.js +5 -5
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +2 -2
- package/dist/common_types.d.ts.map +1 -1
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +1 -0
- package/dist/core/runner.js.map +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +6 -5
- package/dist/generator/index.js.map +1 -1
- package/dist/helpers.d.ts +3 -2
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +7 -3
- package/dist/helpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/options.d.ts +3 -1
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +20 -7
- package/dist/options.js.map +1 -1
- package/dist/plugins/browser-console.d.ts.map +1 -1
- package/dist/plugins/browser-console.js +3 -3
- package/dist/plugins/browser-console.js.map +1 -1
- package/dist/push/index.d.ts +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +8 -13
- package/dist/push/index.js.map +1 -1
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +10 -1
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/utils.d.ts +14 -0
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/push/utils.js +29 -1
- package/dist/push/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/cli.ts +15 -9
- package/src/common_types.ts +2 -2
- package/src/core/runner.ts +1 -0
- package/src/generator/index.ts +8 -10
- package/src/helpers.ts +7 -3
- package/src/index.ts +1 -0
- package/src/options.ts +25 -8
- package/src/plugins/browser-console.ts +4 -3
- package/src/push/index.ts +14 -18
- package/src/push/monitor.ts +11 -2
- package/src/push/utils.ts +31 -0
package/dist/push/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EAAqB,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EAAqB,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C,oBAAY,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,oBAAY,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,QAAQ,EAAE,OAAO,EAAE,mBASnD;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,4BA6B1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBAoErB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,WA8BrB;AAED,eAAO,MAAM,gBAAgB,WAAY,aAAa;;;;CAWrD,CAAC;AAEF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,kDA+B7C"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -33,6 +33,7 @@ const bundler_1 = require("./bundler");
|
|
|
33
33
|
const helpers_1 = require("../helpers");
|
|
34
34
|
const public_locations_1 = require("../locations/public-locations");
|
|
35
35
|
const monitor_1 = require("../dsl/monitor");
|
|
36
|
+
const utils_1 = require("./utils");
|
|
36
37
|
// Allowed extensions for lightweight monitor files
|
|
37
38
|
const ALLOWED_LW_EXTENSIONS = ['.yml', '.yaml'];
|
|
38
39
|
function translateLocation(locations) {
|
|
@@ -197,13 +198,21 @@ function buildMonitorFromYaml(config, options) {
|
|
|
197
198
|
const privateLocations = config['private_locations'] || options.privateLocations;
|
|
198
199
|
delete config['private_locations'];
|
|
199
200
|
const alertConfig = (0, exports.parseAlertConfig)(config);
|
|
200
|
-
|
|
201
|
+
const mon = new monitor_1.Monitor({
|
|
201
202
|
locations: options.locations,
|
|
202
203
|
...config,
|
|
203
204
|
privateLocations,
|
|
204
205
|
schedule: schedule || options.schedule,
|
|
205
206
|
alert: alertConfig,
|
|
206
207
|
});
|
|
208
|
+
/**
|
|
209
|
+
* Params support is only available for lighweight monitors
|
|
210
|
+
* post 8.7.2 stack
|
|
211
|
+
*/
|
|
212
|
+
if ((0, utils_1.isParamOptionSupported)(options.kibanaVersion)) {
|
|
213
|
+
mon.config.params = options.params;
|
|
214
|
+
}
|
|
215
|
+
return mon;
|
|
207
216
|
}
|
|
208
217
|
exports.buildMonitorFromYaml = buildMonitorFromYaml;
|
|
209
218
|
const parseAlertConfig = (config) => {
|
package/dist/push/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAkD;AAClD,+BAAqC;AACrC,+BAAoE;AACpE,yCAAyC;AACzC,uCAAoC;AACpC,wCAA8E;AAC9E,oEAA6D;AAC7D,4CAA2E;
|
|
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
|
@@ -23,9 +23,23 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import { PushOptions } from '../common_types';
|
|
26
|
+
import { Monitor } from '../dsl/monitor';
|
|
26
27
|
export declare function logDiff<T extends Set<string>>(newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
27
28
|
export declare function getChunks(arr: any[], size: number): any[];
|
|
28
29
|
declare type Operation = 'status' | 'bulk_get' | 'bulk_update' | 'bulk_delete' | 'legacy' | 'location';
|
|
29
30
|
export declare function generateURL(options: PushOptions, operation: Operation): string;
|
|
31
|
+
/**
|
|
32
|
+
* Bulk API is supported for push monitors only from 8.6.0 and above
|
|
33
|
+
*/
|
|
34
|
+
export declare function isBulkAPISupported(version: number): any;
|
|
35
|
+
/**
|
|
36
|
+
* Lightweight monitors are supported only from 8.5.0 and above
|
|
37
|
+
*/
|
|
38
|
+
export declare function isLightweightMonitorSupported(monitors: Monitor[], options: PushOptions): boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Lighweight monitor param options are supported only from
|
|
41
|
+
* 8.7.2 and above
|
|
42
|
+
*/
|
|
43
|
+
export declare function isParamOptionSupported(version: number): any;
|
|
30
44
|
export {};
|
|
31
45
|
//# sourceMappingURL=utils.d.ts.map
|
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;
|
|
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,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,SAMjD;AAED,aAAK,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,OAEjD;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,WAAW,WAOrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,OAErD"}
|
package/dist/push/utils.js
CHANGED
|
@@ -23,8 +23,12 @@
|
|
|
23
23
|
* THE SOFTWARE.
|
|
24
24
|
*
|
|
25
25
|
*/
|
|
26
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
27
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
28
|
+
};
|
|
26
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.generateURL = exports.getChunks = exports.logDiff = void 0;
|
|
30
|
+
exports.isParamOptionSupported = exports.isLightweightMonitorSupported = exports.isBulkAPISupported = exports.generateURL = exports.getChunks = exports.logDiff = void 0;
|
|
31
|
+
const semver_1 = __importDefault(require("semver"));
|
|
28
32
|
const helpers_1 = require("../helpers");
|
|
29
33
|
const colors_1 = require("kleur/colors");
|
|
30
34
|
function logDiff(newIDs, changedIDs, removedIDs, unchangedIDs) {
|
|
@@ -61,4 +65,28 @@ function generateURL(options, operation) {
|
|
|
61
65
|
}
|
|
62
66
|
}
|
|
63
67
|
exports.generateURL = generateURL;
|
|
68
|
+
/**
|
|
69
|
+
* Bulk API is supported for push monitors only from 8.6.0 and above
|
|
70
|
+
*/
|
|
71
|
+
function isBulkAPISupported(version) {
|
|
72
|
+
return semver_1.default.satisfies(version, '>=8.6.0');
|
|
73
|
+
}
|
|
74
|
+
exports.isBulkAPISupported = isBulkAPISupported;
|
|
75
|
+
/**
|
|
76
|
+
* Lightweight monitors are supported only from 8.5.0 and above
|
|
77
|
+
*/
|
|
78
|
+
function isLightweightMonitorSupported(monitors, options) {
|
|
79
|
+
const version = options.kibanaVersion;
|
|
80
|
+
return (semver_1.default.satisfies(version, '<8.5.0') &&
|
|
81
|
+
monitors.some(monitor => monitor.type !== 'browser'));
|
|
82
|
+
}
|
|
83
|
+
exports.isLightweightMonitorSupported = isLightweightMonitorSupported;
|
|
84
|
+
/**
|
|
85
|
+
* Lighweight monitor param options are supported only from
|
|
86
|
+
* 8.7.2 and above
|
|
87
|
+
*/
|
|
88
|
+
function isParamOptionSupported(version) {
|
|
89
|
+
return semver_1.default.satisfies(version, '>=8.7.2');
|
|
90
|
+
}
|
|
91
|
+
exports.isParamOptionSupported = isParamOptionSupported;
|
|
64
92
|
//# sourceMappingURL=utils.js.map
|
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
|
|
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;QACd,IAAA,cAAK,EAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC;QAC/B,IAAA,eAAM,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACtC,IAAA,YAAG,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACnC,IAAA,aAAI,EAAC,aAAa,YAAY,CAAC,IAAI,GAAG,CAAC,CAC1C,CAAC;AACJ,CAAC;AAbD,0BAaC;AAED,SAAgB,SAAS,CAAC,GAAU,EAAE,IAAY;IAChD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE;QACzC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACrC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,8BAMC;AAUD,SAAgB,WAAW,CAAC,OAAoB,EAAE,SAAoB;IACpE,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,aAAa,CAAC;QAChD,KAAK,UAAU,CAAC;QAChB,KAAK,aAAa,CAAC;QACnB,KAAK,aAAa;YAChB,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,2BAA2B,OAAO,CAAC,EAAE,WAAW,CAAC;QACnF,KAAK,QAAQ;YACX,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,0CAA0C,CAAC;QAC7E,KAAK,UAAU;YACb,OAAO,GAAG,GAAG,oCAAoC,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;AACH,CAAC;AAhBD,kCAgBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC;AAFD,gDAEC;AAED;;GAEG;AACH,SAAgB,6BAA6B,CAC3C,QAAmB,EACnB,OAAoB;IAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IACtC,OAAO,CACL,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC;QACnC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CACrD,CAAC;AACJ,CAAC;AATD,sEASC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,OAAe;IACpD,OAAO,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC;AAFD,wDAEC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elastic/synthetics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "Elastic synthetic monitoring agent",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"kleur": "^4.1.5",
|
|
51
51
|
"micromatch": "^4.0.5",
|
|
52
52
|
"pirates": "^4.0.5",
|
|
53
|
-
"playwright-chromium": "=1.
|
|
54
|
-
"playwright-core": "=1.
|
|
53
|
+
"playwright-chromium": "=1.35.0",
|
|
54
|
+
"playwright-core": "=1.35.0",
|
|
55
55
|
"semver": "^7.5.0",
|
|
56
56
|
"sharp": "^0.32.0",
|
|
57
57
|
"snakecase-keys": "^4.0.1",
|
package/src/cli.ts
CHANGED
|
@@ -56,6 +56,7 @@ import { Generator } from './generator';
|
|
|
56
56
|
import { error } from './helpers';
|
|
57
57
|
import { LocationsMap } from './locations/public-locations';
|
|
58
58
|
import { createLightweightMonitors } from './push/monitor';
|
|
59
|
+
import { getVersion } from './push/kibana_api';
|
|
59
60
|
|
|
60
61
|
/* eslint-disable-next-line @typescript-eslint/no-var-requires */
|
|
61
62
|
const { name, version } = require('../package.json');
|
|
@@ -87,9 +88,10 @@ program
|
|
|
87
88
|
'Enable capabilities through feature flags'
|
|
88
89
|
)
|
|
89
90
|
.addOption(
|
|
90
|
-
new Option(
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
new Option(
|
|
92
|
+
'--screenshots [flag]',
|
|
93
|
+
'take screenshots at end of each step'
|
|
94
|
+
).choices(['on', 'off', 'only-on-failure'])
|
|
93
95
|
)
|
|
94
96
|
.option(
|
|
95
97
|
'--dry-run',
|
|
@@ -132,7 +134,7 @@ program
|
|
|
132
134
|
.action(async (cliArgs: CliArgs) => {
|
|
133
135
|
const tearDown = await globalSetup(cliArgs, program.args);
|
|
134
136
|
try {
|
|
135
|
-
const options = normalizeOptions(cliArgs);
|
|
137
|
+
const options = normalizeOptions(cliArgs, 'run');
|
|
136
138
|
const results = await run(options);
|
|
137
139
|
/**
|
|
138
140
|
* Exit with error status if any journey fails
|
|
@@ -203,17 +205,21 @@ program
|
|
|
203
205
|
]);
|
|
204
206
|
try {
|
|
205
207
|
const settings = await loadSettings();
|
|
206
|
-
const options = normalizeOptions(
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
208
|
+
const options = normalizeOptions(
|
|
209
|
+
{
|
|
210
|
+
...program.opts(),
|
|
211
|
+
...settings,
|
|
212
|
+
...cmdOpts,
|
|
213
|
+
},
|
|
214
|
+
'push'
|
|
215
|
+
) as PushOptions;
|
|
211
216
|
validateSettings(options);
|
|
212
217
|
await catchIncorrectSettings(settings, options);
|
|
213
218
|
const monitors = runner.buildMonitors(options);
|
|
214
219
|
if ((options as CliArgs).throttling == null) {
|
|
215
220
|
warnIfThrottled(monitors);
|
|
216
221
|
}
|
|
222
|
+
options.kibanaVersion = await getVersion(options);
|
|
217
223
|
monitors.push(...(await createLightweightMonitors(workDir, options)));
|
|
218
224
|
await push(monitors, options);
|
|
219
225
|
} catch (e) {
|
package/src/common_types.ts
CHANGED
|
@@ -206,7 +206,6 @@ type BaseArgs = {
|
|
|
206
206
|
outfd?: number;
|
|
207
207
|
wsEndpoint?: string;
|
|
208
208
|
pauseOnError?: boolean;
|
|
209
|
-
ignoreHttpsErrors?: boolean;
|
|
210
209
|
playwrightOptions?: PlaywrightOptions;
|
|
211
210
|
quietExitCode?: boolean;
|
|
212
211
|
throttling?: MonitorConfig['throttling'];
|
|
@@ -234,7 +233,6 @@ export type RunOptions = BaseArgs & {
|
|
|
234
233
|
trace?: boolean;
|
|
235
234
|
filmstrips?: boolean;
|
|
236
235
|
environment?: string;
|
|
237
|
-
playwrightOptions?: PlaywrightOptions;
|
|
238
236
|
networkConditions?: NetworkConditions;
|
|
239
237
|
reporter?: BuiltInReporterName | ReporterInstance;
|
|
240
238
|
};
|
|
@@ -244,6 +242,8 @@ export type PushOptions = Partial<ProjectSettings> & {
|
|
|
244
242
|
schedule?: MonitorConfig['schedule'];
|
|
245
243
|
locations?: MonitorConfig['locations'];
|
|
246
244
|
privateLocations?: MonitorConfig['privateLocations'];
|
|
245
|
+
params?: MonitorConfig['params'];
|
|
246
|
+
kibanaVersion?: number;
|
|
247
247
|
yes?: boolean;
|
|
248
248
|
pattern?: string;
|
|
249
249
|
match?: string;
|
package/src/core/runner.ts
CHANGED
package/src/generator/index.ts
CHANGED
|
@@ -29,11 +29,7 @@ import { bold, cyan, yellow } from 'kleur/colors';
|
|
|
29
29
|
import { join, relative, dirname, basename } from 'path';
|
|
30
30
|
// @ts-ignore-next-line: has no exported member 'Input'
|
|
31
31
|
import { prompt, Input } from 'enquirer';
|
|
32
|
-
import {
|
|
33
|
-
getMonitorManagementURL,
|
|
34
|
-
progress,
|
|
35
|
-
write as stdWrite,
|
|
36
|
-
} from '../helpers';
|
|
32
|
+
import { getProjectApiKeyURL, progress, write as stdWrite } from '../helpers';
|
|
37
33
|
import {
|
|
38
34
|
getPackageManager,
|
|
39
35
|
replaceTemplates,
|
|
@@ -109,7 +105,7 @@ export class Generator {
|
|
|
109
105
|
const auth = await new Input({
|
|
110
106
|
name: 'auth',
|
|
111
107
|
header: yellow(
|
|
112
|
-
`Generate API key from Kibana ${
|
|
108
|
+
`Generate API key from Kibana ${getProjectApiKeyURL(url)}`
|
|
113
109
|
),
|
|
114
110
|
required: true,
|
|
115
111
|
message: 'What is your API key',
|
|
@@ -137,12 +133,9 @@ export class Generator {
|
|
|
137
133
|
type: 'select',
|
|
138
134
|
name: 'schedule',
|
|
139
135
|
message: 'Set default schedule in minutes for all monitors',
|
|
140
|
-
initial:
|
|
136
|
+
initial: '10', // set default schedule to 10 minutes
|
|
141
137
|
choices: ALLOWED_SCHEDULES.map(String),
|
|
142
138
|
required: true,
|
|
143
|
-
result(value) {
|
|
144
|
-
return Number(value) as any;
|
|
145
|
-
},
|
|
146
139
|
},
|
|
147
140
|
{
|
|
148
141
|
type: 'input',
|
|
@@ -160,6 +153,11 @@ export class Generator {
|
|
|
160
153
|
|
|
161
154
|
// Split and group private and public locations from the answered list.
|
|
162
155
|
const answers = await prompt<PromptOptions>(monitorQues);
|
|
156
|
+
// Casting the schedule value via the result() prompt option from enquirer
|
|
157
|
+
// causes a misbehaviour in certain circumstances. That's why we perform
|
|
158
|
+
// the casting here. Please see https://github.com/elastic/synthetics/pull/771#issuecomment-1551519148 for more context
|
|
159
|
+
answers.schedule = Number(answers.schedule);
|
|
160
|
+
|
|
163
161
|
const { locations, privateLocations } = groupLocations(answers.locations);
|
|
164
162
|
return { ...answers, url, locations, privateLocations };
|
|
165
163
|
}
|
package/src/helpers.ts
CHANGED
|
@@ -389,12 +389,16 @@ export function warn(message: string) {
|
|
|
389
389
|
write(bold(yellow(`${symbols['warning']} ${message}`)));
|
|
390
390
|
}
|
|
391
391
|
|
|
392
|
-
export function removeTrailingSlash(url
|
|
392
|
+
export function removeTrailingSlash(url = '') {
|
|
393
393
|
return url.replace(/\/+$/, '');
|
|
394
394
|
}
|
|
395
395
|
|
|
396
|
-
export function getMonitorManagementURL(url) {
|
|
397
|
-
return removeTrailingSlash(url) + '/app/
|
|
396
|
+
export function getMonitorManagementURL(url: string) {
|
|
397
|
+
return removeTrailingSlash(url) + '/app/synthetics/monitors';
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
export function getProjectApiKeyURL(url: string) {
|
|
401
|
+
return removeTrailingSlash(url) + '/app/synthetics/settings/api-keys';
|
|
398
402
|
}
|
|
399
403
|
|
|
400
404
|
/**
|
package/src/index.ts
CHANGED
package/src/options.ts
CHANGED
|
@@ -29,7 +29,12 @@ import { readConfig } from './config';
|
|
|
29
29
|
import type { CliArgs, RunOptions } from './common_types';
|
|
30
30
|
import { THROTTLING_WARNING_MSG, warn } from './helpers';
|
|
31
31
|
|
|
32
|
-
|
|
32
|
+
type Mode = 'run' | 'push';
|
|
33
|
+
|
|
34
|
+
export function normalizeOptions(
|
|
35
|
+
cliArgs: CliArgs,
|
|
36
|
+
mode: Mode = 'run'
|
|
37
|
+
): RunOptions {
|
|
33
38
|
const options: RunOptions = {
|
|
34
39
|
...cliArgs,
|
|
35
40
|
environment: process.env['NODE_ENV'] || 'development',
|
|
@@ -107,14 +112,26 @@ export function normalizeOptions(cliArgs: CliArgs): RunOptions {
|
|
|
107
112
|
};
|
|
108
113
|
|
|
109
114
|
/**
|
|
110
|
-
*
|
|
115
|
+
* Merge default options based on the mode of operation whether we are running tests locally
|
|
116
|
+
* or pushing the project monitors
|
|
111
117
|
*/
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
+
switch (mode) {
|
|
119
|
+
case 'run':
|
|
120
|
+
options.screenshots = cliArgs.screenshots ?? 'on';
|
|
121
|
+
break;
|
|
122
|
+
case 'push':
|
|
123
|
+
/**
|
|
124
|
+
* Merge the default monitor config from synthetics.config.ts file
|
|
125
|
+
* with the CLI options passed via push command
|
|
126
|
+
*/
|
|
127
|
+
const monitor = config.monitor;
|
|
128
|
+
options.screenshots = options.screenshots ?? monitor?.screenshot;
|
|
129
|
+
options.schedule = options.schedule ?? monitor?.schedule;
|
|
130
|
+
options.locations = options.locations ?? monitor?.locations;
|
|
131
|
+
options.privateLocations =
|
|
132
|
+
options.privateLocations ?? monitor?.privateLocations;
|
|
133
|
+
break;
|
|
134
|
+
}
|
|
118
135
|
|
|
119
136
|
return options;
|
|
120
137
|
}
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
|
|
26
|
+
import type { ConsoleMessage } from 'playwright-core';
|
|
26
27
|
import { BrowserMessage, Driver } from '../common_types';
|
|
27
28
|
import { log } from '../core/logger';
|
|
28
29
|
import { Step } from '../dsl';
|
|
@@ -36,7 +37,7 @@ export class BrowserConsole {
|
|
|
36
37
|
|
|
37
38
|
constructor(private driver: Driver) {}
|
|
38
39
|
|
|
39
|
-
private consoleEventListener = msg => {
|
|
40
|
+
private consoleEventListener = (msg: ConsoleMessage) => {
|
|
40
41
|
if (!this._currentStep) {
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
@@ -78,12 +79,12 @@ export class BrowserConsole {
|
|
|
78
79
|
|
|
79
80
|
start() {
|
|
80
81
|
log(`Plugins: started collecting console events`);
|
|
81
|
-
this.driver.
|
|
82
|
+
this.driver.context.on('console', this.consoleEventListener);
|
|
82
83
|
this.driver.page.on('pageerror', this.pageErrorEventListener);
|
|
83
84
|
}
|
|
84
85
|
|
|
85
86
|
stop() {
|
|
86
|
-
this.driver.
|
|
87
|
+
this.driver.context.off('console', this.consoleEventListener);
|
|
87
88
|
this.driver.page.off('pageerror', this.pageErrorEventListener);
|
|
88
89
|
log(`Plugins: stopped collecting console events`);
|
|
89
90
|
return this.messages;
|
package/src/push/index.ts
CHANGED
|
@@ -22,7 +22,6 @@
|
|
|
22
22
|
* THE SOFTWARE.
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
|
-
import semver from 'semver';
|
|
26
25
|
import { readFile, writeFile } from 'fs/promises';
|
|
27
26
|
import { prompt } from 'enquirer';
|
|
28
27
|
import { bold, grey } from 'kleur/colors';
|
|
@@ -50,11 +49,15 @@ import {
|
|
|
50
49
|
bulkDeleteMonitors,
|
|
51
50
|
bulkGetMonitors,
|
|
52
51
|
bulkPutMonitors,
|
|
53
|
-
getVersion,
|
|
54
52
|
createMonitorsLegacy,
|
|
55
53
|
CHUNK_SIZE,
|
|
56
54
|
} from './kibana_api';
|
|
57
|
-
import {
|
|
55
|
+
import {
|
|
56
|
+
getChunks,
|
|
57
|
+
isBulkAPISupported,
|
|
58
|
+
isLightweightMonitorSupported,
|
|
59
|
+
logDiff,
|
|
60
|
+
} from './utils';
|
|
58
61
|
|
|
59
62
|
export async function push(monitors: Monitor[], options: PushOptions) {
|
|
60
63
|
const duplicates = trackDuplicates(monitors);
|
|
@@ -63,10 +66,11 @@ export async function push(monitors: Monitor[], options: PushOptions) {
|
|
|
63
66
|
}
|
|
64
67
|
progress(`Pushing monitors for project: ${options.id}`);
|
|
65
68
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
69
|
+
/**
|
|
70
|
+
* Legacy API for kibana which does not support bulk operations
|
|
71
|
+
*/
|
|
72
|
+
if (!isBulkAPISupported(options.kibanaVersion)) {
|
|
73
|
+
return await pushLegacy(monitors, options);
|
|
70
74
|
}
|
|
71
75
|
|
|
72
76
|
const local = getLocalMonitors(monitors);
|
|
@@ -245,18 +249,10 @@ export async function catchIncorrectSettings(
|
|
|
245
249
|
}
|
|
246
250
|
}
|
|
247
251
|
|
|
248
|
-
export async function pushLegacy(
|
|
249
|
-
monitors
|
|
250
|
-
options: PushOptions,
|
|
251
|
-
version: number
|
|
252
|
-
) {
|
|
253
|
-
const noLightWeightSupport = semver.satisfies(version, '<8.5.0');
|
|
254
|
-
if (
|
|
255
|
-
noLightWeightSupport &&
|
|
256
|
-
monitors.some(monitor => monitor.type !== 'browser')
|
|
257
|
-
) {
|
|
252
|
+
export async function pushLegacy(monitors: Monitor[], options: PushOptions) {
|
|
253
|
+
if (isLightweightMonitorSupported(monitors, options)) {
|
|
258
254
|
throw error(
|
|
259
|
-
`Aborted: Lightweight monitors are not supported in ${
|
|
255
|
+
`Aborted: Lightweight monitors are not supported in ${options.kibanaVersion}. Please upgrade to 8.5.0 or above.`
|
|
260
256
|
);
|
|
261
257
|
}
|
|
262
258
|
|
package/src/push/monitor.ts
CHANGED
|
@@ -32,6 +32,7 @@ import { SYNTHETICS_PATH, totalist, indent, warn, isMatch } from '../helpers';
|
|
|
32
32
|
import { LocationsMap } from '../locations/public-locations';
|
|
33
33
|
import { ALLOWED_SCHEDULES, Monitor, MonitorConfig } from '../dsl/monitor';
|
|
34
34
|
import { PushOptions } from '../common_types';
|
|
35
|
+
import { isParamOptionSupported } from './utils';
|
|
35
36
|
|
|
36
37
|
// Allowed extensions for lightweight monitor files
|
|
37
38
|
const ALLOWED_LW_EXTENSIONS = ['.yml', '.yaml'];
|
|
@@ -235,14 +236,22 @@ export function buildMonitorFromYaml(
|
|
|
235
236
|
delete config['private_locations'];
|
|
236
237
|
|
|
237
238
|
const alertConfig = parseAlertConfig(config);
|
|
238
|
-
|
|
239
|
-
return new Monitor({
|
|
239
|
+
const mon = new Monitor({
|
|
240
240
|
locations: options.locations,
|
|
241
241
|
...config,
|
|
242
242
|
privateLocations,
|
|
243
243
|
schedule: schedule || options.schedule,
|
|
244
244
|
alert: alertConfig,
|
|
245
245
|
});
|
|
246
|
+
|
|
247
|
+
/**
|
|
248
|
+
* Params support is only available for lighweight monitors
|
|
249
|
+
* post 8.7.2 stack
|
|
250
|
+
*/
|
|
251
|
+
if (isParamOptionSupported(options.kibanaVersion)) {
|
|
252
|
+
mon.config.params = options.params;
|
|
253
|
+
}
|
|
254
|
+
return mon;
|
|
246
255
|
}
|
|
247
256
|
|
|
248
257
|
export const parseAlertConfig = (config: MonitorConfig) => {
|
package/src/push/utils.ts
CHANGED
|
@@ -23,9 +23,11 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
|
|
26
|
+
import semver from 'semver';
|
|
26
27
|
import { progress, removeTrailingSlash } from '../helpers';
|
|
27
28
|
import { green, red, grey, yellow } from 'kleur/colors';
|
|
28
29
|
import { PushOptions } from '../common_types';
|
|
30
|
+
import { Monitor } from '../dsl/monitor';
|
|
29
31
|
|
|
30
32
|
export function logDiff<T extends Set<string>>(
|
|
31
33
|
newIDs: T,
|
|
@@ -75,3 +77,32 @@ export function generateURL(options: PushOptions, operation: Operation) {
|
|
|
75
77
|
throw new Error('Invalid operation');
|
|
76
78
|
}
|
|
77
79
|
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Bulk API is supported for push monitors only from 8.6.0 and above
|
|
83
|
+
*/
|
|
84
|
+
export function isBulkAPISupported(version: number) {
|
|
85
|
+
return semver.satisfies(version, '>=8.6.0');
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Lightweight monitors are supported only from 8.5.0 and above
|
|
90
|
+
*/
|
|
91
|
+
export function isLightweightMonitorSupported(
|
|
92
|
+
monitors: Monitor[],
|
|
93
|
+
options: PushOptions
|
|
94
|
+
) {
|
|
95
|
+
const version = options.kibanaVersion;
|
|
96
|
+
return (
|
|
97
|
+
semver.satisfies(version, '<8.5.0') &&
|
|
98
|
+
monitors.some(monitor => monitor.type !== 'browser')
|
|
99
|
+
);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* Lighweight monitor param options are supported only from
|
|
104
|
+
* 8.7.2 and above
|
|
105
|
+
*/
|
|
106
|
+
export function isParamOptionSupported(version: number) {
|
|
107
|
+
return semver.satisfies(version, '>=8.7.2');
|
|
108
|
+
}
|