@elastic/synthetics 1.8.0 → 1.9.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 +11 -9
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +12 -3
- package/dist/common_types.d.ts.map +1 -1
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +12 -6
- package/dist/core/runner.js.map +1 -1
- package/dist/dsl/monitor.d.ts +4 -0
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +6 -0
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +22 -16
- package/dist/generator/index.js.map +1 -1
- package/dist/options.d.ts +11 -2
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +66 -59
- package/dist/options.js.map +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +14 -9
- package/dist/push/index.js.map +1 -1
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +9 -2
- package/dist/push/monitor.js.map +1 -1
- package/package.json +1 -1
- package/src/cli.ts +24 -13
- package/src/common_types.ts +13 -3
- package/src/core/runner.ts +17 -6
- package/src/dsl/monitor.ts +13 -1
- package/src/generator/index.ts +24 -20
- package/src/options.ts +81 -66
- package/src/push/index.ts +22 -9
- package/src/push/monitor.ts +12 -3
package/dist/options.js
CHANGED
|
@@ -27,64 +27,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
28
28
|
};
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
|
-
exports.getCommonCommandOpts = exports.parseThrottling = exports.
|
|
30
|
+
exports.getCommonCommandOpts = exports.parseThrottling = exports.getHeadlessFlag = exports.normalizeOptions = void 0;
|
|
31
31
|
const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
32
32
|
const commander_1 = require("commander");
|
|
33
33
|
const config_1 = require("./config");
|
|
34
34
|
const helpers_1 = require("./helpers");
|
|
35
|
+
/**
|
|
36
|
+
* Normalize the options passed via CLI and Synthetics config file
|
|
37
|
+
*
|
|
38
|
+
* Order of preference for options:
|
|
39
|
+
* 1. Local options configured via Runner API
|
|
40
|
+
* 2. CLI flags
|
|
41
|
+
* 3. Configuration file
|
|
42
|
+
*/
|
|
35
43
|
async function normalizeOptions(cliArgs, mode = 'run') {
|
|
44
|
+
/**
|
|
45
|
+
* Move filtering flags from the top level to filter object
|
|
46
|
+
* and delete the old keys
|
|
47
|
+
*/
|
|
48
|
+
const grepOpts = {
|
|
49
|
+
pattern: cliArgs.pattern,
|
|
50
|
+
tags: cliArgs.tags,
|
|
51
|
+
match: cliArgs.match,
|
|
52
|
+
};
|
|
53
|
+
delete cliArgs.pattern;
|
|
54
|
+
delete cliArgs.tags;
|
|
55
|
+
delete cliArgs.match;
|
|
36
56
|
const options = {
|
|
37
57
|
...cliArgs,
|
|
58
|
+
grepOpts,
|
|
38
59
|
environment: process.env['NODE_ENV'] || 'development',
|
|
39
60
|
};
|
|
40
61
|
/**
|
|
41
|
-
*
|
|
42
|
-
* eventually by the Synthetics UI.
|
|
43
|
-
*/
|
|
44
|
-
if (cliArgs.richEvents) {
|
|
45
|
-
options.reporter = cliArgs.reporter ?? 'json';
|
|
46
|
-
options.ssblocks = true;
|
|
47
|
-
options.network = true;
|
|
48
|
-
options.trace = true;
|
|
49
|
-
options.quietExitCode = true;
|
|
50
|
-
}
|
|
51
|
-
if (cliArgs.capability) {
|
|
52
|
-
const supportedCapabilities = [
|
|
53
|
-
'trace',
|
|
54
|
-
'network',
|
|
55
|
-
'filmstrips',
|
|
56
|
-
'metrics',
|
|
57
|
-
'ssblocks',
|
|
58
|
-
];
|
|
59
|
-
/**
|
|
60
|
-
* trace - record chrome trace events(LCP, FCP, CLS, etc.) for all journeys
|
|
61
|
-
* network - capture network information for all journeys
|
|
62
|
-
* filmstrips - record detailed filmstrips for all journeys
|
|
63
|
-
* metrics - capture performance metrics (DOM Nodes, Heap size, etc.) for each step
|
|
64
|
-
* ssblocks - Dedupes the screenshots in to blocks to save storage space
|
|
65
|
-
*/
|
|
66
|
-
for (const flag of cliArgs.capability) {
|
|
67
|
-
if (supportedCapabilities.includes(flag)) {
|
|
68
|
-
options[flag] = true;
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
console.warn(`Missing capability "${flag}", current supported capabilities are ${supportedCapabilities.join(', ')}`);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
/**
|
|
76
|
-
* Validate and read synthetics config file
|
|
77
|
-
* based on the environment
|
|
62
|
+
* Validate and read synthetics config file based on the environment
|
|
78
63
|
*/
|
|
79
64
|
const config = cliArgs.config || !cliArgs.inline
|
|
80
65
|
? await (0, config_1.readConfig)(options.environment, cliArgs.config)
|
|
81
66
|
: {};
|
|
82
|
-
/**
|
|
83
|
-
* Order of preference for options that are used while running are
|
|
84
|
-
* 1. Local options configured via Runner API
|
|
85
|
-
* 2. CLI flags
|
|
86
|
-
* 3. Configuration file
|
|
87
|
-
*/
|
|
88
67
|
options.params = Object.freeze((0, deepmerge_1.default)(config.params, cliArgs.params || {}));
|
|
89
68
|
/**
|
|
90
69
|
* Merge playwright options from CLI and Synthetics config
|
|
@@ -103,10 +82,44 @@ async function normalizeOptions(cliArgs, mode = 'run') {
|
|
|
103
82
|
*/
|
|
104
83
|
switch (mode) {
|
|
105
84
|
case 'run':
|
|
85
|
+
if (cliArgs.capability) {
|
|
86
|
+
const supportedCapabilities = [
|
|
87
|
+
'trace',
|
|
88
|
+
'network',
|
|
89
|
+
'filmstrips',
|
|
90
|
+
'metrics',
|
|
91
|
+
'ssblocks',
|
|
92
|
+
];
|
|
93
|
+
/**
|
|
94
|
+
* trace - record chrome trace events(LCP, FCP, CLS, etc.) for all journeys
|
|
95
|
+
* network - capture network information for all journeys
|
|
96
|
+
* filmstrips - record detailed filmstrips for all journeys
|
|
97
|
+
* metrics - capture performance metrics (DOM Nodes, Heap size, etc.) for each step
|
|
98
|
+
* ssblocks - Dedupes the screenshots in to blocks to save storage space
|
|
99
|
+
*/
|
|
100
|
+
for (const flag of cliArgs.capability) {
|
|
101
|
+
if (supportedCapabilities.includes(flag)) {
|
|
102
|
+
options[flag] = true;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
console.warn(`Missing capability "${flag}", current supported capabilities are ${supportedCapabilities.join(', ')}`);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Group all events that can be consumed by heartbeat and
|
|
111
|
+
* eventually by the Synthetics UI.
|
|
112
|
+
*/
|
|
113
|
+
if (cliArgs.richEvents) {
|
|
114
|
+
options.reporter = cliArgs.reporter ?? 'json';
|
|
115
|
+
options.ssblocks = true;
|
|
116
|
+
options.network = true;
|
|
117
|
+
options.trace = true;
|
|
118
|
+
options.quietExitCode = true;
|
|
119
|
+
}
|
|
106
120
|
options.screenshots = cliArgs.screenshots ?? 'on';
|
|
107
121
|
break;
|
|
108
122
|
case 'push':
|
|
109
|
-
validatePushOptions(options);
|
|
110
123
|
/**
|
|
111
124
|
* Merge the default monitor config from synthetics.config.ts file
|
|
112
125
|
* with the CLI options passed via push command
|
|
@@ -134,14 +147,6 @@ function getHeadlessFlag(cliHeadless, configHeadless) {
|
|
|
134
147
|
return configHeadless ?? true;
|
|
135
148
|
}
|
|
136
149
|
exports.getHeadlessFlag = getHeadlessFlag;
|
|
137
|
-
function validatePushOptions(opts) {
|
|
138
|
-
if (opts.tags || opts.match) {
|
|
139
|
-
throw (0, helpers_1.error)(`Aborted. Invalid CLI flags.
|
|
140
|
-
|
|
141
|
-
Tags and Match are not supported in push command.`);
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
exports.validatePushOptions = validatePushOptions;
|
|
145
150
|
/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
|
|
146
151
|
function toObject(value) {
|
|
147
152
|
const defaulVal = {};
|
|
@@ -162,17 +167,17 @@ function parseThrottling() {
|
|
|
162
167
|
}
|
|
163
168
|
exports.parseThrottling = parseThrottling;
|
|
164
169
|
function getCommonCommandOpts() {
|
|
165
|
-
const params = (0, commander_1.createOption)('-p, --params <jsonstring>', 'JSON object that
|
|
166
|
-
|
|
167
|
-
const
|
|
168
|
-
playwrightOpts.argParser(JSON.parse);
|
|
169
|
-
const pattern = (0, commander_1.createOption)('--pattern <pattern>', 'RegExp pattern to match journey/monitor files that are different from the default (ex: /*.journey.(ts|js)$/)');
|
|
170
|
+
const params = (0, commander_1.createOption)('-p, --params <jsonstring>', 'JSON object that defines any variables your tests require.').argParser(JSON.parse);
|
|
171
|
+
const playwrightOpts = (0, commander_1.createOption)('--playwright-options <jsonstring>', 'JSON object to pass in custom Playwright options for the agent. Options passed will be merged with Playwright options defined in your synthetics.config.js file.').argParser(JSON.parse);
|
|
172
|
+
const pattern = (0, commander_1.createOption)('--pattern <pattern>', 'RegExp pattern to match journey files in the current working directory (default: /*.journey.(ts|js)$/)');
|
|
170
173
|
const apiDocsLink = 'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).';
|
|
171
174
|
const auth = (0, commander_1.createOption)('--auth <auth>', apiDocsLink).env('SYNTHETICS_API_KEY');
|
|
172
175
|
const authMandatory = (0, commander_1.createOption)('--auth <auth>', apiDocsLink)
|
|
173
176
|
.env('SYNTHETICS_API_KEY')
|
|
174
177
|
.makeOptionMandatory(true);
|
|
175
|
-
const configOpt = (0, commander_1.createOption)('-c, --config <path>', 'configuration
|
|
178
|
+
const configOpt = (0, commander_1.createOption)('-c, --config <path>', 'path to the configuration file (default: synthetics.config.(js|ts))');
|
|
179
|
+
const tags = (0, commander_1.createOption)('--tags <name...>', 'run/push tests with the tag(s) matching a pattern');
|
|
180
|
+
const match = (0, commander_1.createOption)('--match <name>', 'run/push tests with a name or tags that matches a pattern');
|
|
176
181
|
return {
|
|
177
182
|
auth,
|
|
178
183
|
authMandatory,
|
|
@@ -180,6 +185,8 @@ function getCommonCommandOpts() {
|
|
|
180
185
|
playwrightOpts,
|
|
181
186
|
pattern,
|
|
182
187
|
configOpt,
|
|
188
|
+
tags,
|
|
189
|
+
match,
|
|
183
190
|
};
|
|
184
191
|
}
|
|
185
192
|
exports.getCommonCommandOpts = getCommonCommandOpts;
|
package/dist/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAC9B,yCAAyC;AACzC,qCAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAC9B,yCAAyC;AACzC,qCAAsC;AAEtC,uCAAyD;AAIzD;;;;;;;GAOG;AACI,KAAK,UAAU,gBAAgB,CACpC,OAAgB,EAChB,OAAa,KAAK;IAElB;;;OAGG;IACH,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;KACrB,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC;IACvB,OAAO,OAAO,CAAC,IAAI,CAAC;IACpB,OAAO,OAAO,CAAC,KAAK,CAAC;IAErB,MAAM,OAAO,GAAe;QAC1B,GAAG,OAAO;QACV,QAAQ;QACR,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,aAAa;KACtD,CAAC;IACF;;OAEG;IACH,MAAM,MAAM,GACV,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM;QAC/B,CAAC,CAAC,MAAM,IAAA,mBAAU,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC;QACvD,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAK,EAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;IAE3E;;;OAGG;IACH,MAAM,cAAc,GAAG,IAAA,mBAAK,EAC1B,MAAM,CAAC,iBAAiB,EACxB,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAChC,CAAC;IACF,OAAO,CAAC,iBAAiB,GAAG;QAC1B,GAAG,cAAc;QACjB,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,CAAC;QACrE,eAAe,EAAE,OAAO,CAAC,OAAO,IAAI,cAAc,EAAE,eAAe;QACnE,iBAAiB,EACf,OAAO,CAAC,iBAAiB,IAAI,cAAc,EAAE,iBAAiB;KACjE,CAAC;IAEF;;;OAGG;IACH,QAAQ,IAAI,EAAE;QACZ,KAAK,KAAK;YACR,IAAI,OAAO,CAAC,UAAU,EAAE;gBACtB,MAAM,qBAAqB,GAAG;oBAC5B,OAAO;oBACP,SAAS;oBACT,YAAY;oBACZ,SAAS;oBACT,UAAU;iBACX,CAAC;gBACF;;;;;;mBAMG;gBACH,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,UAAU,EAAE;oBACrC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACxC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;qBACtB;yBAAM;wBACL,OAAO,CAAC,IAAI,CACV,uBAAuB,IAAI,yCAAyC,qBAAqB,CAAC,IAAI,CAC5F,IAAI,CACL,EAAE,CACJ,CAAC;qBACH;iBACF;aACF;YAED;;;eAGG;YACH,IAAI,OAAO,CAAC,UAAU,EAAE;gBACtB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC;gBAC9C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACxB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;gBACvB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;gBACrB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;aAC9B;YAED,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC;YAClD,MAAM;QACR,KAAK,MAAM;YACT;;;eAGG;YACH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE;gBAC5C,kEAAkE;gBAClE,IAAI,GAAG,KAAK,YAAY,EAAE;oBACxB,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC1D,SAAS;iBACV;gBACD,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;aAC7C;YACD,MAAM;KACT;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAjHD,4CAiHC;AAED,SAAgB,eAAe,CAC7B,WAAoB,EACpB,cAAwB;IAExB,mEAAmE;IACnE,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,KAAK,CAAC;KACd;IACD,sBAAsB;IACtB,OAAO,cAAc,IAAI,IAAI,CAAC;AAChC,CAAC;AAVD,0CAUC;AAED,gEAAgE;AAChE,SAAS,QAAQ,CAAC,KAAoC;IACpD,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,KAAK,IAAI,SAAS,CAAC;AAC5B,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe;IAC7B,IAAA,cAAI,EAAC,gCAAsB,CAAC,CAAC;AAC/B,CAAC;AAFD,0CAEC;AAED,SAAgB,oBAAoB;IAClC,MAAM,MAAM,GAAG,IAAA,wBAAY,EACzB,2BAA2B,EAC3B,4DAA4D,CAC7D,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAExB,MAAM,cAAc,GAAG,IAAA,wBAAY,EACjC,mCAAmC,EACnC,kKAAkK,CACnK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAExB,MAAM,OAAO,GAAG,IAAA,wBAAY,EAC1B,qBAAqB,EACrB,wGAAwG,CACzG,CAAC;IAEF,MAAM,WAAW,GACf,sGAAsG,CAAC;IACzG,MAAM,IAAI,GAAG,IAAA,wBAAY,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC,GAAG,CACzD,oBAAoB,CACrB,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAAC,eAAe,EAAE,WAAW,CAAC;SAC7D,GAAG,CAAC,oBAAoB,CAAC;SACzB,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,SAAS,GAAG,IAAA,wBAAY,EAC5B,qBAAqB,EACrB,qEAAqE,CACtE,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,wBAAY,EACvB,kBAAkB,EAClB,mDAAmD,CACpD,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,wBAAY,EACxB,gBAAgB,EAChB,2DAA2D,CAC5D,CAAC;IAEF,OAAO;QACL,IAAI;QACJ,aAAa;QACb,MAAM;QACN,cAAc;QACd,OAAO;QACP,SAAS;QACT,IAAI;QACJ,KAAK;KACN,CAAC;AACJ,CAAC;AAlDD,oDAkDC"}
|
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;
|
|
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,iBA8DnE;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,QA6BjD;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
|
@@ -34,6 +34,7 @@ const helpers_1 = require("../helpers");
|
|
|
34
34
|
const config_1 = require("../config");
|
|
35
35
|
const kibana_api_1 = require("./kibana_api");
|
|
36
36
|
const utils_1 = require("./utils");
|
|
37
|
+
const logger_1 = require("../core/logger");
|
|
37
38
|
async function push(monitors, options) {
|
|
38
39
|
const duplicates = trackDuplicates(monitors);
|
|
39
40
|
if (duplicates.size > 0) {
|
|
@@ -60,8 +61,12 @@ async function push(monitors, options) {
|
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
if (removedIDs.size > 0) {
|
|
64
|
+
(0, logger_1.log)(`deleting monitor ids: ${Array.from(removedIDs.keys()).join(', ')}`);
|
|
63
65
|
if (updatedMonitors.size === 0 && unchangedIDs.size === 0) {
|
|
64
|
-
await
|
|
66
|
+
await confirmDelete(`Pushing without any monitors will delete all monitors associated with the project.\n Do you want to continue?`, options.yes);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
await confirmDelete(`Deleting ${removedIDs.size} monitors. Do you want to continue?`, options.yes);
|
|
65
70
|
}
|
|
66
71
|
const chunks = (0, utils_1.getChunks)(Array.from(removedIDs), kibana_api_1.CHUNK_SIZE);
|
|
67
72
|
for (const chunk of chunks) {
|
|
@@ -71,22 +76,22 @@ async function push(monitors, options) {
|
|
|
71
76
|
(0, helpers_1.done)(`Pushed: ${(0, colors_1.grey)((0, helpers_1.getMonitorManagementURL)(options.url))}`);
|
|
72
77
|
}
|
|
73
78
|
exports.push = push;
|
|
74
|
-
async function
|
|
75
|
-
(0,
|
|
76
|
-
const { deleteAll } = await (0, enquirer_1.prompt)({
|
|
79
|
+
async function confirmDelete(message, skip) {
|
|
80
|
+
const { deleteMonitors } = await (0, enquirer_1.prompt)({
|
|
77
81
|
type: 'confirm',
|
|
78
82
|
skip() {
|
|
79
|
-
|
|
83
|
+
(0, helpers_1.write)('');
|
|
84
|
+
if (skip || !process.stdout.isTTY) {
|
|
80
85
|
this.initial = process.env.TEST_OVERRIDE ?? true;
|
|
81
86
|
return true;
|
|
82
87
|
}
|
|
83
88
|
return false;
|
|
84
89
|
},
|
|
85
|
-
name: '
|
|
86
|
-
message
|
|
90
|
+
name: 'deleteMonitors',
|
|
91
|
+
message,
|
|
87
92
|
initial: false,
|
|
88
93
|
});
|
|
89
|
-
if (!
|
|
94
|
+
if (!deleteMonitors) {
|
|
90
95
|
throw (0, helpers_1.warn)('Push command Aborted');
|
|
91
96
|
}
|
|
92
97
|
}
|
|
@@ -219,7 +224,7 @@ async function pushLegacy(monitors, options) {
|
|
|
219
224
|
}
|
|
220
225
|
}
|
|
221
226
|
else {
|
|
222
|
-
await
|
|
227
|
+
await confirmDelete(`Pushing without any monitors will delete all monitors associated with the project.\n Do you want to continue?`, options.yes);
|
|
223
228
|
}
|
|
224
229
|
await (0, helpers_1.liveProgress)((0, kibana_api_1.createMonitorsLegacy)({ schemas, keepStale: false, options }), `deleting all stale monitors`);
|
|
225
230
|
(0, helpers_1.done)(`Pushed: ${(0, colors_1.grey)((0, helpers_1.getMonitorManagementURL)(options.url))}`);
|
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;
|
|
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,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,
|
|
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,WAoCrB;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,kDA+B7C"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -134,8 +134,8 @@ exports.buildMonitorSchema = buildMonitorSchema;
|
|
|
134
134
|
async function createLightweightMonitors(workDir, options) {
|
|
135
135
|
const lwFiles = new Set();
|
|
136
136
|
// Filter monitor files based on the provided pattern
|
|
137
|
-
const pattern = options.pattern
|
|
138
|
-
? new RegExp(options.pattern, 'i')
|
|
137
|
+
const pattern = options.grepOpts?.pattern
|
|
138
|
+
? new RegExp(options.grepOpts?.pattern, 'i')
|
|
139
139
|
: /.(yml|yaml)$/;
|
|
140
140
|
const ignore = /(node_modules|.github)/;
|
|
141
141
|
await (0, helpers_1.totalist)(workDir, (rel, abs) => {
|
|
@@ -180,7 +180,14 @@ async function createLightweightMonitors(workDir, options) {
|
|
|
180
180
|
}
|
|
181
181
|
const { line, col } = lineCounter.linePos(offsets[i]);
|
|
182
182
|
try {
|
|
183
|
+
/**
|
|
184
|
+
* Build the monitor object from the yaml config along with global configuration
|
|
185
|
+
* and perform the match based on the provided filters
|
|
186
|
+
*/
|
|
183
187
|
const mon = buildMonitorFromYaml(monitor, options);
|
|
188
|
+
if (!mon.isMatch(options.grepOpts?.match, options.grepOpts?.tags)) {
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
184
191
|
mon.setSource({ file, line, column: col });
|
|
185
192
|
monitors.push(mon);
|
|
186
193
|
}
|
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/package.json
CHANGED
package/src/cli.ts
CHANGED
|
@@ -56,30 +56,38 @@ import { installTransform } from './core/transform';
|
|
|
56
56
|
/* eslint-disable-next-line @typescript-eslint/no-var-requires */
|
|
57
57
|
const { name, version } = require('../package.json');
|
|
58
58
|
|
|
59
|
-
const {
|
|
60
|
-
|
|
59
|
+
const {
|
|
60
|
+
params,
|
|
61
|
+
pattern,
|
|
62
|
+
playwrightOpts,
|
|
63
|
+
auth,
|
|
64
|
+
authMandatory,
|
|
65
|
+
configOpt,
|
|
66
|
+
tags,
|
|
67
|
+
match,
|
|
68
|
+
} = getCommonCommandOpts();
|
|
61
69
|
|
|
62
70
|
program
|
|
63
71
|
.name(`npx ${name}`)
|
|
64
72
|
.usage('[options] [dir] [files] file')
|
|
65
73
|
.addOption(configOpt)
|
|
66
74
|
.addOption(pattern)
|
|
75
|
+
.addOption(tags)
|
|
76
|
+
.addOption(match)
|
|
67
77
|
.addOption(params)
|
|
68
|
-
.option('--tags <name...>', 'run tests with a tag that matches the glob')
|
|
69
|
-
.option(
|
|
70
|
-
'--match <name>',
|
|
71
|
-
'run tests with a name or tags that matches the glob'
|
|
72
|
-
)
|
|
73
78
|
.addOption(
|
|
74
79
|
new Option('--reporter <value>', `output reporter format`).choices(
|
|
75
80
|
Object.keys(reporters)
|
|
76
81
|
)
|
|
77
82
|
)
|
|
78
|
-
.option('--inline', '
|
|
83
|
+
.option('--inline', 'read journeys from stdin instead of reading from files')
|
|
79
84
|
.option('-r, --require <modules...>', 'module(s) to preload')
|
|
80
85
|
.option('--sandbox', 'enable chromium sand-boxing')
|
|
81
|
-
.option(
|
|
82
|
-
|
|
86
|
+
.option(
|
|
87
|
+
'--rich-events',
|
|
88
|
+
'preset flag used when running monitors directly via Heartbeat'
|
|
89
|
+
)
|
|
90
|
+
.option('--no-headless', 'run with the browser in headful mode')
|
|
83
91
|
.option(
|
|
84
92
|
'--capability <features...>',
|
|
85
93
|
'Enable capabilities through feature flags'
|
|
@@ -87,7 +95,7 @@ program
|
|
|
87
95
|
.addOption(
|
|
88
96
|
new Option(
|
|
89
97
|
'--screenshots [flag]',
|
|
90
|
-
'
|
|
98
|
+
'Control whether to capture screenshots at the end of each step'
|
|
91
99
|
).choices(['on', 'off', 'only-on-failure'])
|
|
92
100
|
)
|
|
93
101
|
.option(
|
|
@@ -157,6 +165,7 @@ program
|
|
|
157
165
|
.description(
|
|
158
166
|
'Push all journeys in the current directory to create monitors within the Kibana monitor management UI'
|
|
159
167
|
)
|
|
168
|
+
.addOption(authMandatory)
|
|
160
169
|
.option(
|
|
161
170
|
'--schedule <time-in-minutes>',
|
|
162
171
|
"schedule in minutes for the pushed monitors. Setting `10`, for example, configures monitors which don't have an interval defined to run every 10 minutes.",
|
|
@@ -172,7 +181,7 @@ program
|
|
|
172
181
|
'--private-locations <locations...>',
|
|
173
182
|
'default list of private locations from which your monitors will run.'
|
|
174
183
|
)
|
|
175
|
-
.option('--url <url>', 'Kibana URL to upload the monitors')
|
|
184
|
+
.option('--url <url>', 'Kibana URL to upload the project monitors')
|
|
176
185
|
.option(
|
|
177
186
|
'--id <id>',
|
|
178
187
|
'project id that will be used for logically grouping monitors'
|
|
@@ -182,8 +191,10 @@ program
|
|
|
182
191
|
'the target Kibana spaces for the pushed monitors — spaces help you organise pushed monitors.'
|
|
183
192
|
)
|
|
184
193
|
.option('-y, --yes', 'skip all questions and run non-interactively')
|
|
185
|
-
|
|
194
|
+
|
|
186
195
|
.addOption(pattern)
|
|
196
|
+
.addOption(tags)
|
|
197
|
+
.addOption(match)
|
|
187
198
|
.addOption(params)
|
|
188
199
|
.addOption(playwrightOpts)
|
|
189
200
|
.addOption(configOpt)
|
package/src/common_types.ts
CHANGED
|
@@ -200,14 +200,18 @@ export type ThrottlingOptions = {
|
|
|
200
200
|
latency?: number;
|
|
201
201
|
};
|
|
202
202
|
|
|
203
|
+
type GrepOptions = {
|
|
204
|
+
pattern?: string;
|
|
205
|
+
tags?: Array<string>;
|
|
206
|
+
match?: string;
|
|
207
|
+
};
|
|
208
|
+
|
|
203
209
|
type BaseArgs = {
|
|
204
210
|
params?: Params;
|
|
205
211
|
screenshots?: ScreenshotOptions;
|
|
206
212
|
dryRun?: boolean;
|
|
207
213
|
config?: string;
|
|
208
|
-
|
|
209
|
-
match?: string;
|
|
210
|
-
tags?: Array<string>;
|
|
214
|
+
auth?: string;
|
|
211
215
|
outfd?: number;
|
|
212
216
|
wsEndpoint?: string;
|
|
213
217
|
pauseOnError?: boolean;
|
|
@@ -220,6 +224,9 @@ type BaseArgs = {
|
|
|
220
224
|
};
|
|
221
225
|
|
|
222
226
|
export type CliArgs = BaseArgs & {
|
|
227
|
+
pattern?: string;
|
|
228
|
+
match?: string;
|
|
229
|
+
tags?: Array<string>;
|
|
223
230
|
reporter?: BuiltInReporterName;
|
|
224
231
|
inline?: boolean;
|
|
225
232
|
require?: Array<string>;
|
|
@@ -239,6 +246,7 @@ export type RunOptions = BaseArgs & {
|
|
|
239
246
|
environment?: string;
|
|
240
247
|
networkConditions?: NetworkConditions;
|
|
241
248
|
reporter?: BuiltInReporterName | ReporterInstance;
|
|
249
|
+
grepOpts?: GrepOptions;
|
|
242
250
|
};
|
|
243
251
|
|
|
244
252
|
export type PushOptions = Partial<ProjectSettings> &
|
|
@@ -246,9 +254,11 @@ export type PushOptions = Partial<ProjectSettings> &
|
|
|
246
254
|
auth: string;
|
|
247
255
|
kibanaVersion?: string;
|
|
248
256
|
yes?: boolean;
|
|
257
|
+
tags?: Array<string>;
|
|
249
258
|
alert?: AlertConfig;
|
|
250
259
|
retestOnFailure?: MonitorConfig['retestOnFailure'];
|
|
251
260
|
enabled?: boolean;
|
|
261
|
+
grepOpts?: GrepOptions;
|
|
252
262
|
};
|
|
253
263
|
|
|
254
264
|
export type ProjectSettings = {
|
package/src/core/runner.ts
CHANGED
|
@@ -404,8 +404,7 @@ export default class Runner {
|
|
|
404
404
|
|
|
405
405
|
buildMonitors(options: PushOptions) {
|
|
406
406
|
/**
|
|
407
|
-
* Update the global monitor configuration required for
|
|
408
|
-
* setting defaults
|
|
407
|
+
* Update the global monitor configuration required for setting defaults
|
|
409
408
|
*/
|
|
410
409
|
this.updateMonitor({
|
|
411
410
|
throttling: options.throttling,
|
|
@@ -430,11 +429,23 @@ export default class Runner {
|
|
|
430
429
|
);
|
|
431
430
|
}
|
|
432
431
|
/**
|
|
433
|
-
*
|
|
434
|
-
*
|
|
432
|
+
* Before pushing a browser monitor, three things need to be done:
|
|
433
|
+
*
|
|
434
|
+
* - execute callback `monitor.use` in particular to get monitor configurations
|
|
435
|
+
* - update the monitor config with global configuration
|
|
436
|
+
* - filter out monitors based on matched tags and name after applying both
|
|
437
|
+
* global and local monitor configurations
|
|
435
438
|
*/
|
|
436
439
|
journey.callback({ params: options.params } as any);
|
|
437
440
|
journey.monitor.update(this.monitor?.config);
|
|
441
|
+
if (
|
|
442
|
+
!journey.monitor.isMatch(
|
|
443
|
+
options.grepOpts?.match,
|
|
444
|
+
options.grepOpts?.tags
|
|
445
|
+
)
|
|
446
|
+
) {
|
|
447
|
+
continue;
|
|
448
|
+
}
|
|
438
449
|
journey.monitor.validate();
|
|
439
450
|
monitors.push(journey.monitor);
|
|
440
451
|
}
|
|
@@ -454,7 +465,7 @@ export default class Runner {
|
|
|
454
465
|
params: options.params,
|
|
455
466
|
}).catch(e => (this.hookError = e));
|
|
456
467
|
|
|
457
|
-
const { dryRun,
|
|
468
|
+
const { dryRun, grepOpts } = options;
|
|
458
469
|
/**
|
|
459
470
|
* Skip other journeys when using `.only`
|
|
460
471
|
*/
|
|
@@ -471,7 +482,7 @@ export default class Runner {
|
|
|
471
482
|
this.#reporter.onJourneyRegister?.(journey);
|
|
472
483
|
continue;
|
|
473
484
|
}
|
|
474
|
-
if (!journey.isMatch(match, tags) || journey.skip) {
|
|
485
|
+
if (!journey.isMatch(grepOpts?.match, grepOpts?.tags) || journey.skip) {
|
|
475
486
|
continue;
|
|
476
487
|
}
|
|
477
488
|
const journeyResult: JourneyResult = this.hookError
|
package/src/dsl/monitor.ts
CHANGED
|
@@ -33,7 +33,7 @@ import {
|
|
|
33
33
|
Params,
|
|
34
34
|
PlaywrightOptions,
|
|
35
35
|
} from '../common_types';
|
|
36
|
-
import { indent } from '../helpers';
|
|
36
|
+
import { indent, isMatch } from '../helpers';
|
|
37
37
|
import { LocationsMap } from '../locations/public-locations';
|
|
38
38
|
|
|
39
39
|
export type SyntheticsLocationsType = keyof typeof LocationsMap;
|
|
@@ -129,6 +129,18 @@ export class Monitor {
|
|
|
129
129
|
this.filter = filter;
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
+
/**
|
|
133
|
+
* Matches monitors based on the provided args. Proitize tags over match
|
|
134
|
+
*/
|
|
135
|
+
isMatch(matchPattern: string, tagsPattern: Array<string>) {
|
|
136
|
+
return isMatch(
|
|
137
|
+
this.config.tags,
|
|
138
|
+
this.config.name,
|
|
139
|
+
tagsPattern,
|
|
140
|
+
matchPattern
|
|
141
|
+
);
|
|
142
|
+
}
|
|
143
|
+
|
|
132
144
|
/**
|
|
133
145
|
* Hash is used to identify if the monitor has changed since the last time
|
|
134
146
|
* it was pushed to Kibana. Change is based on three factors:
|