@elastic/synthetics 1.3.0 → 1.4.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 +20 -11
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +39 -38
- package/dist/common_types.d.ts.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/core/runner.d.ts +4 -4
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/transform.d.ts +62 -2
- package/dist/core/transform.d.ts.map +1 -1
- package/dist/dsl/journey.d.ts +4 -4
- package/dist/dsl/journey.d.ts.map +1 -1
- package/dist/dsl/journey.js +0 -1
- package/dist/dsl/journey.js.map +1 -1
- package/dist/dsl/monitor.d.ts +4 -3
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +1 -0
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/formatter/javascript.d.ts +6 -6
- package/dist/formatter/javascript.d.ts.map +1 -1
- package/dist/generator/index.d.ts +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +1 -1
- package/dist/generator/index.js.map +1 -1
- package/dist/helpers.d.ts +1 -1
- package/dist/helpers.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/locations/index.d.ts +13 -5
- package/dist/locations/index.d.ts.map +1 -1
- package/dist/locations/index.js +30 -14
- package/dist/locations/index.js.map +1 -1
- package/dist/options.d.ts +3 -1
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +8 -0
- package/dist/options.js.map +1 -1
- package/dist/plugins/plugin-manager.d.ts +3 -3
- package/dist/plugins/plugin-manager.d.ts.map +1 -1
- package/dist/plugins/tracing.d.ts +1 -1
- package/dist/plugins/tracing.d.ts.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 +7 -6
- package/dist/push/index.js.map +1 -1
- package/dist/push/kibana_api.d.ts +5 -5
- package/dist/push/kibana_api.d.ts.map +1 -1
- package/dist/push/monitor.d.ts +3 -3
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +12 -7
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/request.d.ts +2 -2
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/utils.d.ts +3 -3
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/reporters/index.d.ts +3 -3
- package/dist/reporters/index.d.ts.map +1 -1
- package/dist/reporters/json.d.ts +5 -5
- package/dist/reporters/json.d.ts.map +1 -1
- package/dist/sdk/trace-processor.d.ts +4 -4
- package/dist/sdk/trace-processor.d.ts.map +1 -1
- package/package.json +8 -7
- package/src/cli.ts +20 -19
- package/src/common_types.ts +2 -1
- package/src/dsl/journey.ts +0 -1
- package/src/dsl/monitor.ts +1 -0
- package/src/generator/index.ts +2 -1
- package/src/index.ts +2 -0
- package/src/locations/index.ts +37 -12
- package/src/options.ts +13 -0
- package/src/push/index.ts +9 -6
- package/src/push/kibana_api.ts +1 -1
- package/src/push/monitor.ts +13 -7
- package/src/push/utils.ts +2 -2
|
@@ -23,19 +23,19 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import { JavaScriptLanguageGenerator } from 'playwright-core/lib/server/recorder/javascript';
|
|
26
|
-
export
|
|
26
|
+
export type Step = {
|
|
27
27
|
actions: ActionInContext[];
|
|
28
28
|
name?: string;
|
|
29
29
|
};
|
|
30
|
-
export
|
|
31
|
-
export
|
|
30
|
+
export type Steps = Step[];
|
|
31
|
+
export type FrameDescription = {
|
|
32
32
|
pageAlias: string;
|
|
33
33
|
isMainFrame?: boolean;
|
|
34
34
|
url: string;
|
|
35
35
|
name?: string;
|
|
36
36
|
selectorsChain?: string[];
|
|
37
37
|
};
|
|
38
|
-
export
|
|
38
|
+
export type ActionInContext = {
|
|
39
39
|
frameName?: string;
|
|
40
40
|
action: Action;
|
|
41
41
|
committed?: boolean;
|
|
@@ -45,7 +45,7 @@ export declare type ActionInContext = {
|
|
|
45
45
|
isOpen?: boolean;
|
|
46
46
|
isSoftDeleted?: boolean;
|
|
47
47
|
};
|
|
48
|
-
export
|
|
48
|
+
export type Action = {
|
|
49
49
|
name: string;
|
|
50
50
|
selector?: string;
|
|
51
51
|
url?: string;
|
|
@@ -61,7 +61,7 @@ export declare type Action = {
|
|
|
61
61
|
files?: string[];
|
|
62
62
|
options?: string[];
|
|
63
63
|
};
|
|
64
|
-
export
|
|
64
|
+
export type Signal = {
|
|
65
65
|
name: string;
|
|
66
66
|
url?: string;
|
|
67
67
|
isAsync?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../src/formatter/javascript.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EACL,2BAA2B,EAE5B,MAAM,gDAAgD,CAAC;AAExD,
|
|
1
|
+
{"version":3,"file":"javascript.d.ts","sourceRoot":"","sources":["../../src/formatter/javascript.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EACL,2BAA2B,EAE5B,MAAM,gDAAgD,CAAC;AAExD,MAAM,MAAM,IAAI,GAAG;IACjB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;AAG3B,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AA8CF,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,SAAM,GAAG,MAAM,CAStD;AA8BD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,UAgCzC;AAED,qBAAa,mBAAoB,SAAQ,2BAA2B;IAKtD,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,WAAW,CAAW;gBAEV,SAAS,EAAE,OAAO;IAOtC;;;;OAIG;IACH,cAAc,CAAC,eAAe,EAAE,eAAe;IA8E/C,SAAS,CAAC,eAAe,EAAE,eAAe;IAa1C,iBAAiB,CAAC,IAAI,EAAE,MAAM;IAO9B,eAAe;IAUf,cAAc;IASd,cAAc;IAId;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM;IA8BvC,mBAAmB;IAQnB,YAAY,CAAC,OAAO,EAAE,MAAM;IAI5B,gBAAgB;IAIhB;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE;CAYxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKvD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKvD,KAAK,aAAa,GAAG,eAAe,GAAG;IACrC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,gBAAgB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAGF,eAAO,MAAM,kBAAkB,UAO9B,CAAC;AACF,eAAO,MAAM,WAAW,yBAAyB,CAAC;AAElD,qBAAa,SAAS;IAED,UAAU,EAAE,MAAM;IADrC,UAAU,SAAS;gBACA,UAAU,EAAE,MAAM;IAE/B,SAAS;IAWT,SAAS;IAwFT,KAAK,CAAC,OAAO,EAAE,aAAa;IA2B5B,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAQ;IAkBlE,OAAO;IA0BP,YAAY;IAyBZ,cAAc;IAgBpB,MAAM;IAoBA,KAAK;CASZ"}
|
package/dist/generator/index.js
CHANGED
|
@@ -90,7 +90,7 @@ class Generator {
|
|
|
90
90
|
message: 'What is your API key',
|
|
91
91
|
}).run();
|
|
92
92
|
const allLocations = await (0, locations_1.getLocations)({ url, auth });
|
|
93
|
-
const locChoices = (0, locations_1.formatLocations)(allLocations);
|
|
93
|
+
const { allLocations: locChoices } = (0, locations_1.formatLocations)(allLocations);
|
|
94
94
|
if (locChoices.length === 0) {
|
|
95
95
|
throw 'Follow the docs to set up your first private locations - https://www.elastic.co/guide/en/observability/current/uptime-set-up-choose-agent.html#private-locations';
|
|
96
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,iDAAyC;AACzC,2BAAgC;AAChC,0CAAyD;AACzD,yCAAkD;AAClD,+BAAyD;AACzD,uDAAuD;AACvD,uCAAyC;AACzC,wCAA8E;AAC9E,mCAKiB;AACjB,4CAA6E;AAC7E,4CAAmD;AAGnD,oEAAoE;AACpE,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAQ7D,uBAAuB;AACV,QAAA,kBAAkB,GAAG;IAChC,6BAA6B;IAC7B,sCAAsC;IACtC,sCAAsC;IACtC,2BAA2B;IAC3B,sCAAsC;IACtC,WAAW;CACZ,CAAC;AACW,QAAA,WAAW,GAAG,sBAAsB,CAAC;AAElD,MAAa,SAAS;IAED;IADnB,UAAU,GAAG,KAAK,CAAC;IACnB,YAAmB,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;IAAG,CAAC;IAEzC,KAAK,CAAC,SAAS;QACb,IAAA,kBAAQ,EACN,uCACE,IAAA,eAAQ,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,GAC9C,GAAG,CACJ,CAAC;QACF,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAChC,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC9B;IACH,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;YAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SAC/C;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAsB;YACpD,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAI,gBAAK,CAAC;YAC1B,MAAM,EAAE,OAAO;gBACb,CAAC,CAAC,IAAA,eAAM,EACJ,kGAAkG,CACnG;gBACH,CAAC,CAAC,EAAE;YACN,OAAO,EAAE,OAAO;gBACd,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,yCAAyC;YAC7C,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI;YACd,MAAM,CAAC,KAAK;gBACV,OAAO,OAAO,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACrD,CAAC;SACF,CAAC,CAAC,GAAG,EAAE,CAAC;QAET,MAAM,IAAI,GAAG,MAAM,IAAI,gBAAK,CAAC;YAC3B,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAA,eAAM,EACZ,gCAAgC,IAAA,6BAAmB,EAAC,GAAG,CAAC,EAAE,CAC3D;YACD,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,sBAAsB;SAChC,CAAC,CAAC,GAAG,EAAE,CAAC;QAET,MAAM,YAAY,GAAG,MAAM,IAAA,wBAAY,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAA,2BAAe,EAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers.d.ts
CHANGED
|
@@ -68,7 +68,7 @@ export declare function isFile(filePath: any): boolean;
|
|
|
68
68
|
* package.json file to check if the user is invoking our script
|
|
69
69
|
* from an NPM project.
|
|
70
70
|
*/
|
|
71
|
-
export declare function findPkgJsonByTraversing(resolvePath: any, cwd: any):
|
|
71
|
+
export declare function findPkgJsonByTraversing(resolvePath: any, cwd: any): string;
|
|
72
72
|
/**
|
|
73
73
|
* Modified version of `totalist` package that handles the symlink issue
|
|
74
74
|
* and avoids infinite recursion
|
package/dist/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAKxB,wBAAgB,IAAI,SAAK;AAEzB,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAQ,UAEhD;AAOD,eAAO,MAAM,OAAO;;;;;;CAMnB,CAAC;AAEF,wBAAgB,gBAAgB,WAE/B;AAED,wBAAgB,gBAAgB,WAE/B;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,WAGrC;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,UAE5C;AAMD,wBAAgB,YAAY,WAE3B;AAED;;GAEG;AACH,wBAAgB,GAAG,WAElB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAC/B,IAAI,EAAE,SAAS,mBAIhB;AAED,wBAAgB,cAAc,CAAC,GAAG,KAAA,kBAMjC;AAED,wBAAgB,WAAW,CAAC,IAAI,KAAA,WAE/B;AAED,wBAAgB,MAAM,CAAC,QAAQ,KAAA,WAE9B;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,KAAA,EAAE,GAAG,KAAA,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export { expect } from './core/expect';
|
|
|
35
35
|
* Export all the driver related types to be consumed
|
|
36
36
|
* and used by suites
|
|
37
37
|
*/
|
|
38
|
-
export type { Page, ChromiumBrowser, ChromiumBrowserContext, CDPSession, APIRequestContext, } from 'playwright-chromium';
|
|
38
|
+
export type { Page, ChromiumBrowser, ChromiumBrowserContext, CDPSession, APIRequestContext, devices, } from 'playwright-chromium';
|
|
39
39
|
/**
|
|
40
40
|
* Export the types necessary to write custom reporters
|
|
41
41
|
*/
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU;;GAE5C;AAED;;GAEG;AACH,OAAO,EACL,OAAO,EACP,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,MAAM,EACN,KAAK,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU;;GAE5C;AAED;;GAEG;AACH,OAAO,EACL,OAAO,EACP,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,MAAM,EACN,KAAK,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC;;;GAGG;AACH,YAAY,EACV,IAAI,EACJ,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,OAAO,GACR,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,YAAY,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,YAAY,EACV,MAAM,EACN,eAAe,EACf,gBAAgB,EAChB,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,GACZ,MAAM,wBAAwB,CAAC"}
|
|
@@ -22,24 +22,32 @@
|
|
|
22
22
|
* THE SOFTWARE.
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
|
-
export
|
|
25
|
+
export type LocationCmdOptions = {
|
|
26
26
|
auth: string;
|
|
27
27
|
url: string;
|
|
28
28
|
};
|
|
29
|
-
|
|
29
|
+
type LocationMetadata = {
|
|
30
30
|
id: string;
|
|
31
31
|
label: string;
|
|
32
32
|
isServiceManaged: boolean;
|
|
33
33
|
};
|
|
34
|
-
export
|
|
34
|
+
export type LocationAPIResponse = {
|
|
35
35
|
locations: Array<LocationMetadata>;
|
|
36
36
|
};
|
|
37
|
+
export declare const PRIVATE_KEYWORD = "(private)";
|
|
37
38
|
export declare function getLocations(options: LocationCmdOptions): Promise<LocationMetadata[]>;
|
|
38
|
-
export declare function formatLocations(locations: Array<LocationMetadata>):
|
|
39
|
+
export declare function formatLocations(locations: Array<LocationMetadata>): {
|
|
40
|
+
publicLocations: string[];
|
|
41
|
+
privateLocations: string[];
|
|
42
|
+
allLocations: string[];
|
|
43
|
+
};
|
|
39
44
|
export declare function groupLocations(locations: Array<string>): {
|
|
40
45
|
locations: any[];
|
|
41
46
|
privateLocations: any[];
|
|
42
47
|
};
|
|
43
|
-
export declare function renderLocations(
|
|
48
|
+
export declare function renderLocations({ publicLocations, privateLocations, }: {
|
|
49
|
+
privateLocations?: Array<string>;
|
|
50
|
+
publicLocations: Array<string>;
|
|
51
|
+
}): void;
|
|
44
52
|
export {};
|
|
45
53
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C,wBAAsB,YAAY,CAAC,OAAO,EAAE,kBAAkB,+BAO7D;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC;;;;EAqBjE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;;;EAUtD;AAED,wBAAgB,eAAe,CAAC,EAC9B,eAAe,EACf,gBAAqB,GACtB,EAAE;IACD,gBAAgB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAChC,QAuBA"}
|
package/dist/locations/index.js
CHANGED
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
*
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.renderLocations = exports.groupLocations = exports.formatLocations = exports.getLocations = void 0;
|
|
27
|
+
exports.renderLocations = exports.groupLocations = exports.formatLocations = exports.getLocations = exports.PRIVATE_KEYWORD = void 0;
|
|
28
28
|
const request_1 = require("../push/request");
|
|
29
29
|
const helpers_1 = require("../helpers");
|
|
30
30
|
const utils_1 = require("../push/utils");
|
|
31
|
-
|
|
31
|
+
exports.PRIVATE_KEYWORD = '(private)';
|
|
32
32
|
async function getLocations(options) {
|
|
33
33
|
const resp = await (0, request_1.sendReqAndHandleError)({
|
|
34
34
|
url: (0, utils_1.generateURL)(options, 'location'),
|
|
@@ -39,26 +39,31 @@ async function getLocations(options) {
|
|
|
39
39
|
}
|
|
40
40
|
exports.getLocations = getLocations;
|
|
41
41
|
function formatLocations(locations) {
|
|
42
|
-
const
|
|
42
|
+
const publicLocations = [];
|
|
43
|
+
const privateLocations = [];
|
|
43
44
|
for (const location of locations) {
|
|
44
45
|
let name = location.label;
|
|
45
46
|
if (location.isServiceManaged) {
|
|
46
47
|
[, name] = name.includes('-') ? name.split('-') : [, name];
|
|
47
48
|
name = name.toLowerCase().trim().split(' ').join('_');
|
|
49
|
+
publicLocations.push(name);
|
|
48
50
|
}
|
|
49
51
|
else {
|
|
50
|
-
name
|
|
52
|
+
privateLocations.push(name);
|
|
51
53
|
}
|
|
52
|
-
formatted.push(name);
|
|
53
54
|
}
|
|
54
|
-
return
|
|
55
|
+
return {
|
|
56
|
+
publicLocations,
|
|
57
|
+
privateLocations,
|
|
58
|
+
allLocations: publicLocations.concat(privateLocations.map(loc => `${loc} ${exports.PRIVATE_KEYWORD}`)),
|
|
59
|
+
};
|
|
55
60
|
}
|
|
56
61
|
exports.formatLocations = formatLocations;
|
|
57
62
|
function groupLocations(locations) {
|
|
58
63
|
const grouped = { locations: [], privateLocations: [] };
|
|
59
64
|
for (const loc of locations) {
|
|
60
|
-
if (loc.includes(PRIVATE_KEYWORD)) {
|
|
61
|
-
grouped.privateLocations.push(loc.replace(PRIVATE_KEYWORD, ''));
|
|
65
|
+
if (loc.includes(exports.PRIVATE_KEYWORD)) {
|
|
66
|
+
grouped.privateLocations.push(loc.replace(exports.PRIVATE_KEYWORD, '').trim());
|
|
62
67
|
}
|
|
63
68
|
else {
|
|
64
69
|
grouped.locations.push(loc);
|
|
@@ -67,13 +72,24 @@ function groupLocations(locations) {
|
|
|
67
72
|
return grouped;
|
|
68
73
|
}
|
|
69
74
|
exports.groupLocations = groupLocations;
|
|
70
|
-
function renderLocations(
|
|
71
|
-
let outer = '
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
inner
|
|
75
|
+
function renderLocations({ publicLocations, privateLocations = [], }) {
|
|
76
|
+
let outer = '';
|
|
77
|
+
if (publicLocations.length) {
|
|
78
|
+
outer = 'Public locations: \n';
|
|
79
|
+
let inner = '';
|
|
80
|
+
for (const location of publicLocations) {
|
|
81
|
+
inner += `* ${location}\n`;
|
|
82
|
+
}
|
|
83
|
+
outer += (0, helpers_1.indent)(inner);
|
|
84
|
+
}
|
|
85
|
+
if (privateLocations.length > 0) {
|
|
86
|
+
outer += '\nPrivate locations: \n';
|
|
87
|
+
let privateInner = '';
|
|
88
|
+
for (const location of privateLocations) {
|
|
89
|
+
privateInner += `* ${location}\n`;
|
|
90
|
+
}
|
|
91
|
+
outer += (0, helpers_1.indent)(privateInner);
|
|
75
92
|
}
|
|
76
|
-
outer += (0, helpers_1.indent)(inner);
|
|
77
93
|
outer += `\nSet default location for monitors via
|
|
78
94
|
- Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field
|
|
79
95
|
- Monitor API 'monitor.use({ locations: ["japan"], privateLocations: ["custom-location"] }')`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,6CAAwD;AACxD,wCAA2C;AAC3C,yCAA4C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,6CAAwD;AACxD,wCAA2C;AAC3C,yCAA4C;AAiB/B,QAAA,eAAe,GAAG,WAAW,CAAC;AAEpC,KAAK,UAAU,YAAY,CAAC,OAA2B;IAC5D,MAAM,IAAI,GAAG,MAAM,IAAA,+BAAqB,EAAsB;QAC5D,GAAG,EAAE,IAAA,mBAAW,EAAC,OAAO,EAAE,UAAU,CAAC;QACrC,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,SAAS,CAAC;AACxB,CAAC;AAPD,oCAOC;AAED,SAAgB,eAAe,CAAC,SAAkC;IAChE,MAAM,eAAe,GAAkB,EAAE,CAAC;IAC1C,MAAM,gBAAgB,GAAkB,EAAE,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC1B,IAAI,QAAQ,CAAC,gBAAgB,EAAE;YAC7B,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;aAAM;YACL,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;KACF;IAED,OAAO;QACL,eAAe;QACf,gBAAgB;QAChB,YAAY,EAAE,eAAe,CAAC,MAAM,CAClC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,uBAAe,EAAE,CAAC,CACzD;KACF,CAAC;AACJ,CAAC;AArBD,0CAqBC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;IACxD,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAC3B,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAe,CAAC,EAAE;YACjC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAe,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACxE;aAAM;YACL,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAVD,wCAUC;AAED,SAAgB,eAAe,CAAC,EAC9B,eAAe,EACf,gBAAgB,GAAG,EAAE,GAItB;IACC,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,KAAK,GAAG,sBAAsB,CAAC;QAC/B,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;YACtC,KAAK,IAAI,KAAK,QAAQ,IAAI,CAAC;SAC5B;QACD,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;KACxB;IACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,KAAK,IAAI,yBAAyB,CAAC;QACnC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;YACvC,YAAY,IAAI,KAAK,QAAQ,IAAI,CAAC;SACnC;QACD,KAAK,IAAI,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAC;KAC/B;IACD,KAAK,IAAI;;+FAEoF,CAAC;IAE9F,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;AACf,CAAC;AA7BD,0CA6BC"}
|
package/dist/options.d.ts
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import type { CliArgs, PushOptions, RunOptions } from './common_types';
|
|
26
|
-
|
|
26
|
+
type Mode = 'run' | 'push';
|
|
27
27
|
export declare function normalizeOptions(cliArgs: CliArgs, mode?: Mode): RunOptions;
|
|
28
28
|
export declare function validatePushOptions(opts: PushOptions): void;
|
|
29
29
|
/**
|
|
@@ -35,6 +35,8 @@ export declare function validatePushOptions(opts: PushOptions): void;
|
|
|
35
35
|
*/
|
|
36
36
|
export declare function parseThrottling(): void;
|
|
37
37
|
export declare function getCommonCommandOpts(): {
|
|
38
|
+
auth: import("commander").Option;
|
|
39
|
+
authMandatory: import("commander").Option;
|
|
38
40
|
params: import("commander").Option;
|
|
39
41
|
playwrightOpts: import("commander").Option;
|
|
40
42
|
pattern: import("commander").Option;
|
package/dist/options.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGvE,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGvE,KAAK,IAAI,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3B,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,IAAY,GACjB,UAAU,CAwGZ;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,QAMpD;AAWD;;;;;;GAMG;AACH,wBAAgB,eAAe,SAE9B;AAED,wBAAgB,oBAAoB;;;;;;EAmCnC"}
|
package/dist/options.js
CHANGED
|
@@ -93,6 +93,7 @@ function normalizeOptions(cliArgs, mode = 'run') {
|
|
|
93
93
|
const playwrightOpts = (0, deepmerge_1.default)(config.playwrightOptions, cliArgs.playwrightOptions || {});
|
|
94
94
|
options.playwrightOptions = {
|
|
95
95
|
...playwrightOpts,
|
|
96
|
+
headless: cliArgs.headless ?? playwrightOpts?.headless,
|
|
96
97
|
chromiumSandbox: cliArgs.sandbox ?? playwrightOpts?.chromiumSandbox,
|
|
97
98
|
ignoreHTTPSErrors: cliArgs.ignoreHttpsErrors ?? playwrightOpts?.ignoreHTTPSErrors,
|
|
98
99
|
};
|
|
@@ -157,7 +158,14 @@ function getCommonCommandOpts() {
|
|
|
157
158
|
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.');
|
|
158
159
|
playwrightOpts.argParser(JSON.parse);
|
|
159
160
|
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)$/)');
|
|
161
|
+
const apiDocsLink = 'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).';
|
|
162
|
+
const auth = (0, commander_1.createOption)('--auth <auth>', apiDocsLink).env('SYNTHETICS_API_KEY');
|
|
163
|
+
const authMandatory = (0, commander_1.createOption)('--auth <auth>', apiDocsLink)
|
|
164
|
+
.env('SYNTHETICS_API_KEY')
|
|
165
|
+
.makeOptionMandatory(true);
|
|
160
166
|
return {
|
|
167
|
+
auth,
|
|
168
|
+
authMandatory,
|
|
161
169
|
params,
|
|
162
170
|
playwrightOpts,
|
|
163
171
|
pattern,
|
package/dist/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
import { PluginOutput, Driver } from '../common_types';
|
|
26
26
|
import { BrowserConsole, NetworkManager, PerformanceManager, Tracing, TraceOptions } from './';
|
|
27
27
|
import { Step } from '../dsl';
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
type PluginType = 'network' | 'trace' | 'performance' | 'browserconsole';
|
|
29
|
+
type Plugin = NetworkManager | Tracing | PerformanceManager | BrowserConsole;
|
|
30
|
+
type PluginOptions = TraceOptions;
|
|
31
31
|
export declare class PluginManager {
|
|
32
32
|
private driver;
|
|
33
33
|
protected plugins: Map<PluginType, Plugin>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-manager.d.ts","sourceRoot":"","sources":["../../src/plugins/plugin-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,OAAO,EACP,YAAY,EACb,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,
|
|
1
|
+
{"version":3,"file":"plugin-manager.d.ts","sourceRoot":"","sources":["../../src/plugins/plugin-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,OAAO,EACP,YAAY,EACb,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,KAAK,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,aAAa,GAAG,gBAAgB,CAAC;AACzE,KAAK,MAAM,GAAG,cAAc,GAAG,OAAO,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAC7E,KAAK,aAAa,GAAG,YAAY,CAAC;AAElC,qBAAa,aAAa;IAQZ,OAAO,CAAC,MAAM;IAP1B,SAAS,CAAC,OAAO,0BAAiC;IAC3C,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAKpC;gBACkB,MAAM,EAAE,MAAM;IAElC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa;IAoBjD,WAAW,CAAC,OAAO,EAAE,aAAa;IAMlC,aAAa;IAMP,IAAI,CAAC,IAAI,EAAE,UAAU;IAQrB,KAAK,CAAC,IAAI,EAAE,UAAU;IAM5B,GAAG,CAAC,IAAI,EAAE,UAAU;IAIpB,MAAM,CAAC,IAAI,EAAE,IAAI;IAKX,MAAM;CAWb"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKvD,
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKvD,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,qBAAa,OAAO;IACN,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,OAAO;gBAA/B,MAAM,EAAE,MAAM,EAAU,OAAO,EAAE,YAAY;IAE3D,KAAK;IAmCL,IAAI;CA2BX"}
|
package/dist/push/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Monitor } from '../dsl/monitor';
|
|
|
2
2
|
import type { PushOptions, ProjectSettings } from '../common_types';
|
|
3
3
|
export declare function push(monitors: Monitor[], options: PushOptions): Promise<void>;
|
|
4
4
|
export declare function formatDuplicateError(monitors: Set<Monitor>): string;
|
|
5
|
-
export declare function loadSettings(): Promise<ProjectSettings>;
|
|
5
|
+
export declare function loadSettings(ignoreMissing?: boolean): Promise<ProjectSettings>;
|
|
6
6
|
export declare function validatePush(opts: PushOptions, settings: ProjectSettings): Promise<void>;
|
|
7
7
|
export declare function validateSettings(opts: PushOptions): void;
|
|
8
8
|
export declare function catchIncorrectSettings(settings: ProjectSettings, options: PushOptions): Promise<void>;
|
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;AAgBpE,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;AAgBpE,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBAmDnE;AAoCD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,UAU1D;AAID,wBAAsB,YAAY,CAAC,aAAa,UAAQ,4BAevD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,iBAI1B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,QA6BjD;AAgBD,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,WAAW,iBA0BrB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBA2BzE;AAGD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,QAKlD"}
|
package/dist/push/index.js
CHANGED
|
@@ -46,15 +46,14 @@ async function push(monitors, options) {
|
|
|
46
46
|
if (!(0, utils_1.isBulkAPISupported)(options.kibanaVersion)) {
|
|
47
47
|
return await pushLegacy(monitors, options);
|
|
48
48
|
}
|
|
49
|
-
const local = (0, monitor_1.getLocalMonitors)(monitors);
|
|
50
49
|
const { monitors: remote } = await (0, kibana_api_1.bulkGetMonitors)(options);
|
|
50
|
+
(0, helpers_1.progress)(`bundling ${monitors.length} monitors`);
|
|
51
|
+
const schemas = await (0, monitor_1.buildMonitorSchema)(monitors, true);
|
|
52
|
+
const local = (0, monitor_1.getLocalMonitors)(schemas);
|
|
51
53
|
const { newIDs, changedIDs, removedIDs, unchangedIDs } = (0, monitor_1.diffMonitors)(local, remote);
|
|
52
54
|
(0, utils_1.logDiff)(newIDs, changedIDs, removedIDs, unchangedIDs);
|
|
53
55
|
const updatedMonitors = new Set([...changedIDs, ...newIDs]);
|
|
54
56
|
if (updatedMonitors.size > 0) {
|
|
55
|
-
const toBundle = monitors.filter(m => updatedMonitors.has(m.config.id));
|
|
56
|
-
(0, helpers_1.progress)(`bundling ${toBundle.length} monitors`);
|
|
57
|
-
const schemas = await (0, monitor_1.buildMonitorSchema)(toBundle, true);
|
|
58
57
|
const chunks = (0, utils_1.getChunks)(schemas, kibana_api_1.CHUNK_SIZE);
|
|
59
58
|
for (const chunk of chunks) {
|
|
60
59
|
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkPutMonitors)(options, chunk), `creating or updating ${chunk.length} monitors`);
|
|
@@ -116,7 +115,7 @@ function formatDuplicateError(monitors) {
|
|
|
116
115
|
}
|
|
117
116
|
exports.formatDuplicateError = formatDuplicateError;
|
|
118
117
|
const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
|
|
119
|
-
async function loadSettings() {
|
|
118
|
+
async function loadSettings(ignoreMissing = false) {
|
|
120
119
|
try {
|
|
121
120
|
const config = await (0, config_1.readConfig)(process.env['NODE_ENV'] || 'development');
|
|
122
121
|
// Missing config file, fake throw to capture as missing file
|
|
@@ -126,9 +125,11 @@ async function loadSettings() {
|
|
|
126
125
|
return config.project || {};
|
|
127
126
|
}
|
|
128
127
|
catch (e) {
|
|
129
|
-
|
|
128
|
+
if (!ignoreMissing) {
|
|
129
|
+
throw (0, helpers_1.error)(`Aborted (missing synthetics config file), Project not set up correctly.
|
|
130
130
|
|
|
131
131
|
${INSTALLATION_HELP}`);
|
|
132
|
+
}
|
|
132
133
|
}
|
|
133
134
|
}
|
|
134
135
|
exports.loadSettings = loadSettings;
|
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;AAEV,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,EAAC,iCAAiC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAExD;;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,
|
|
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;AAEV,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,EAAC,iCAAiC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAExD;;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,YAAY,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;IAExC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAA,sBAAkB,EACzE,KAAK,EACL,MAAM,CACP,CAAC;IACF,IAAA,eAAO,EAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACpE,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;QAC5B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,uBAAU,CAAC,CAAC;QAC9C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,IAAA,sBAAY,EAChB,IAAA,4BAAe,EAAC,OAAO,EAAE,KAAK,CAAC,EAC/B,wBAAwB,KAAK,CAAC,MAAM,WAAW,CAChD,CAAC;SACH;KACF;IAED,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE;QACvB,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE;YACzD,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;SACvC;QACD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,uBAAU,CAAC,CAAC;QAC7D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,IAAA,sBAAY,EAChB,IAAA,+BAAkB,EAAC,OAAO,EAAE,KAAK,CAAC,EAClC,YAAY,KAAK,CAAC,MAAM,WAAW,CACpC,CAAC;SACH;KACF;IAED,IAAA,cAAI,EAAC,WAAW,IAAA,aAAI,EAAC,IAAA,iCAAuB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;AAChE,CAAC;AAnDD,oBAmDC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAAoB;IACxD,IAAA,eAAK,EAAC,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAyB;QACzD,IAAI,EAAE,SAAS;QACf,IAAI;YACF,IAAI,OAAO,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC;gBACjD,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,+GAA+G;QACxH,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAA,cAAI,EAAC,sBAAsB,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAAmB;IAC1C,MAAM,UAAU,GAAyB,IAAI,GAAG,EAAE,CAAC;IACnD,MAAM,UAAU,GAAiB,IAAI,GAAG,EAAE,CAAC;IAC3C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACtB,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB;QACD,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;KAC7B;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAsB;IACzD,IAAI,KAAK,GAAG,IAAA,aAAI,EAAC,qCAAqC,CAAC,CAAC;IAExD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QACnC,KAAK,IAAI,KAAK,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;KAC9E;IACD,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,oDAUC;AAED,MAAM,iBAAiB,GAAG,6EAA6E,CAAC;AAEjG,KAAK,UAAU,YAAY,CAAC,aAAa,GAAG,KAAK;IACtD,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,aAAa,CAAC,CAAC;QAC1E,6DAA6D;QAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,MAAM,EAAE,CAAC;SACV;QACD,OAAO,MAAM,CAAC,OAAO,IAAK,EAAsB,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAA,eAAK,EAAC;;EAEhB,iBAAiB,EAAE,CAAC,CAAC;SAClB;KACF;AACH,CAAC;AAfD,oCAeC;AAEM,KAAK,UAAU,YAAY,CAChC,IAAiB,EACjB,QAAyB;IAEzB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAND,oCAMC;AAED,SAAgB,gBAAgB,CAAC,IAAiB;IAChD,MAAM,OAAO,GAAG,+CAA+C,CAAC;IAEhE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;QACZ,MAAM,GAAG;;mCAEsB,CAAC;KACjC;SAAM,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;QACpD,MAAM,GAAG;;yEAE4D,CAAC;KACvE;SAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QACzB,MAAM,GAAG;;0CAE6B,CAAC;KACxC;SAAM,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,2BAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACtE,MAAM,GAAG,wBACP,IAAI,CAAC,QACP,oCAAoC,2BAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KACnE;IAED,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,IAAA,eAAK,EAAC,GAAG,OAAO;;EAEtB,MAAM;;EAEN,iBAAiB,EAAE,CAAC,CAAC;AACvB,CAAC;AA7BD,4CA6BC;AAED,KAAK,UAAU,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAChE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,UAAU,GAAG,MAAM,IAAA,6BAAoB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACxD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAA,cAAI,EAAC,0CAA0C,UAAU,EAAE,CAAC,CAAC;KACpE;IACD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAClC,QAAQ,QAAQ,GAAG,EACnB,QAAQ,QAAQ,GAAG,CACpB,CAAC;IACF,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,QAAyB,EACzB,OAAoB;IAEpB,IAAI,QAAQ,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC5B,IAAI,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,EAAE;QAC7C,yDAAyD;QACzD,IAAA,eAAK,EAAC,EAAE,CAAC,CAAC;QACV,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAwB;YAClD,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,UAAU;YAChB,IAAI;gBACF,IAAI,OAAO,CAAC,GAAG,EAAE;oBACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC;oBACjD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,EAAE,mCAAmC,QAAQ,CAAC,EAAE,gEAAgE,OAAO,CAAC,EAAE,6EAA6E;YAC9M,OAAO,EAAE,KAAK;SACf,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAA,cAAI,EAAC,sBAAsB,CAAC,CAAC;SACpC;KACF;IACD,IAAI,QAAQ,EAAE;QACZ,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;KACjD;AACH,CAAC;AA5BD,wDA4BC;AAEM,KAAK,UAAU,UAAU,CAAC,QAAmB,EAAE,OAAoB;IACxE,IAAI,IAAA,qCAA6B,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;QACpD,MAAM,IAAA,eAAK,EACT,sDAAsD,OAAO,CAAC,aAAa,qCAAqC,CACjH,CAAC;KACH;IAED,IAAI,OAAO,GAAoB,EAAE,CAAC;IAClC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,IAAA,kBAAQ,EAAC,YAAY,QAAQ,CAAC,MAAM,WAAW,CAAC,CAAC;QACjD,OAAO,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,IAAA,sBAAY,EAChB,IAAA,iCAAoB,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAClE,wBAAwB,KAAK,CAAC,MAAM,WAAW,CAChD,CAAC;SACH;KACF;SAAM;QACL,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;KACvC;IACD,MAAM,IAAA,sBAAY,EAChB,IAAA,iCAAoB,EAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAC5D,6BAA6B,CAC9B,CAAC;IAEF,IAAA,cAAI,EAAC,WAAW,IAAA,aAAI,EAAC,IAAA,iCAAuB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;AAChE,CAAC;AA3BD,gCA2BC;AAED,oFAAoF;AACpF,SAAgB,eAAe,CAAC,QAAmB;IACjD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;IAC9E,IAAI,SAAS,EAAE;QACb,IAAA,cAAI,EAAC,gCAAsB,CAAC,CAAC;KAC9B;AACH,CAAC;AALD,0CAKC"}
|
|
@@ -26,24 +26,24 @@ import { PushOptions } from '../common_types';
|
|
|
26
26
|
import { MonitorHashID, MonitorSchema } from './monitor';
|
|
27
27
|
import { APIMonitorError } from './request';
|
|
28
28
|
export declare const CHUNK_SIZE = 100;
|
|
29
|
-
export
|
|
29
|
+
export type PutResponse = {
|
|
30
30
|
createdMonitors: string[];
|
|
31
31
|
updatedMonitors: string[];
|
|
32
32
|
failedMonitors: APIMonitorError[];
|
|
33
33
|
};
|
|
34
34
|
export declare function bulkPutMonitors(options: PushOptions, schemas: MonitorSchema[]): Promise<PutResponse>;
|
|
35
|
-
export
|
|
35
|
+
export type GetResponse = {
|
|
36
36
|
total: number;
|
|
37
37
|
monitors: MonitorHashID[];
|
|
38
38
|
after_key?: string;
|
|
39
39
|
};
|
|
40
40
|
export declare function bulkGetMonitors(options: PushOptions): Promise<GetResponse>;
|
|
41
|
-
export
|
|
41
|
+
export type DeleteResponse = {
|
|
42
42
|
deleted_monitors: string[];
|
|
43
43
|
};
|
|
44
44
|
export declare function bulkDeleteMonitors(options: PushOptions, monitorIDs: string[]): Promise<DeleteResponse>;
|
|
45
|
-
export declare function getVersion(options: PushOptions): Promise<
|
|
46
|
-
export
|
|
45
|
+
export declare function getVersion(options: PushOptions): Promise<string>;
|
|
46
|
+
export type LegacyAPISchema = {
|
|
47
47
|
project: string;
|
|
48
48
|
keep_stale: boolean;
|
|
49
49
|
monitors: MonitorSchema[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,
|
|
1
|
+
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,eAAe,EAAE,CAAC;CACnC,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,aAAa,EAAE,wBAazB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAkBtB;AAmBD,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAAE,2BAQrB;AAQD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,mBAOpD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,SAAS,EACT,OAAO,GACR,EAAE;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;CACtB,iBAoCA"}
|
package/dist/push/monitor.d.ts
CHANGED
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
*/
|
|
25
25
|
import { AlertConfig, Monitor, MonitorConfig } from '../dsl/monitor';
|
|
26
26
|
import { PushOptions } from '../common_types';
|
|
27
|
-
export
|
|
27
|
+
export type MonitorSchema = Omit<MonitorConfig, 'locations'> & {
|
|
28
28
|
locations: string[];
|
|
29
29
|
content?: string;
|
|
30
30
|
filter?: Monitor['filter'];
|
|
31
31
|
hash?: string;
|
|
32
32
|
};
|
|
33
|
-
export
|
|
33
|
+
export type MonitorHashID = {
|
|
34
34
|
journey_id?: string;
|
|
35
35
|
hash?: string;
|
|
36
36
|
};
|
|
@@ -41,7 +41,7 @@ declare class RemoteDiffResult {
|
|
|
41
41
|
unchangedIDs: Set<string>;
|
|
42
42
|
}
|
|
43
43
|
export declare function diffMonitors(local: MonitorHashID[], remote: MonitorHashID[]): RemoteDiffResult;
|
|
44
|
-
export declare function getLocalMonitors(
|
|
44
|
+
export declare function getLocalMonitors(schemas: MonitorSchema[]): MonitorHashID[];
|
|
45
45
|
export declare function buildMonitorSchema(monitors: Monitor[], isV2: boolean): Promise<MonitorSchema[]>;
|
|
46
46
|
export declare function createLightweightMonitors(workDir: string, options: PushOptions): Promise<Monitor[]>;
|
|
47
47
|
export declare function buildMonitorFromYaml(config: MonitorConfig, options: PushOptions): Monitor;
|
|
@@ -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,
|
|
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,4BAmC1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBAgErB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,WAgCrB;AAED,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
|
@@ -86,12 +86,12 @@ function diffMonitors(local, remote) {
|
|
|
86
86
|
return result;
|
|
87
87
|
}
|
|
88
88
|
exports.diffMonitors = diffMonitors;
|
|
89
|
-
function getLocalMonitors(
|
|
89
|
+
function getLocalMonitors(schemas) {
|
|
90
90
|
const data = [];
|
|
91
|
-
for (const
|
|
91
|
+
for (const schema of schemas) {
|
|
92
92
|
data.push({
|
|
93
|
-
journey_id:
|
|
94
|
-
hash:
|
|
93
|
+
journey_id: schema.id,
|
|
94
|
+
hash: schema.hash,
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
return data;
|
|
@@ -112,14 +112,19 @@ async function buildMonitorSchema(monitors, isV2) {
|
|
|
112
112
|
...config,
|
|
113
113
|
locations: translateLocation(config.locations),
|
|
114
114
|
};
|
|
115
|
-
if (isV2) {
|
|
116
|
-
schema.hash = monitor.hash();
|
|
117
|
-
}
|
|
118
115
|
if (type === 'browser') {
|
|
119
116
|
const outPath = (0, path_1.join)(bundlePath, config.name + '.zip');
|
|
120
117
|
const content = await bundler.build(source.file, outPath);
|
|
118
|
+
monitor.setContent(content);
|
|
121
119
|
Object.assign(schema, { content, filter });
|
|
122
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Generate hash only after the bundled content is created
|
|
123
|
+
* to capture code changes in imported files
|
|
124
|
+
*/
|
|
125
|
+
if (isV2) {
|
|
126
|
+
schema.hash = monitor.hash();
|
|
127
|
+
}
|
|
123
128
|
schemas.push(schema);
|
|
124
129
|
}
|
|
125
130
|
await (0, promises_1.rm)(bundlePath, { recursive: true });
|