@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
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,wCAAqE;AACrE,oEAA6D;AAC7D,4CAKwB;AAExB,mCAAiD;AAEjD,mDAAmD;AACnD,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAgBhD,SAAS,iBAAiB,CAAC,SAAsC;IAC/D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,+BAAY,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,gBAAgB;IACpB,8CAA8C;IAC9C,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3B,uDAAuD;IACvD,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,iDAAiD;IACjD,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,sDAAsD;IACtD,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;CAClC;AAED,SAAgB,YAAY,CAC1B,KAAsB,EACtB,MAAuB;IAEvB,MAAM,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACtC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxD,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE;QAC1B,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KAC3D;IACD,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE;QAC3B,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KAC5D;IAED,0BAA0B;IAC1B,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,qBAAqB,EAAE;QACxD,yDAAyD;QACzD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,UAAU,GAAG,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,UAAU,IAAI,SAAS,EAAE;gBAC3B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAChC;iBAAM,IAAI,UAAU,KAAK,SAAS,EAAE;gBACnC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC;SACF;QACD,yDAAyD;QACzD,mDAAmD;QACnD,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACxC;IAED,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,sBAAsB,EAAE;QACzC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAC3B;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,oCAoCC;AAED,SAAgB,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/push/request.d.ts
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import type { Dispatcher } from 'undici';
|
|
26
|
-
export
|
|
26
|
+
export type APIRequestOptions = {
|
|
27
27
|
url: string;
|
|
28
28
|
method: Dispatcher.HttpMethod;
|
|
29
29
|
auth: string;
|
|
@@ -33,7 +33,7 @@ export declare function sendRequest(options: APIRequestOptions): Promise<Dispatc
|
|
|
33
33
|
export declare function sendReqAndHandleError<T>(options: APIRequestOptions): Promise<T>;
|
|
34
34
|
export declare function handleError(statusCode: number, url: string, body: Dispatcher.ResponseData['body']): Promise<Dispatcher.ResponseData['body']>;
|
|
35
35
|
export declare function ok(statusCode: number): boolean;
|
|
36
|
-
export
|
|
36
|
+
export type APIMonitorError = {
|
|
37
37
|
id?: string;
|
|
38
38
|
reason: string;
|
|
39
39
|
details: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAsB,WAAW,CAAC,OAAO,EAAE,iBAAiB,oCAY3D;AAED,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,CAAC,CAAC,CAGZ;AAKD,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,GACpC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAkB1C;AAED,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAM/D;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,UAShB;AAcD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG7D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG5D"}
|
package/dist/push/utils.d.ts
CHANGED
|
@@ -26,12 +26,12 @@ import { PushOptions } from '../common_types';
|
|
|
26
26
|
import { Monitor } from '../dsl/monitor';
|
|
27
27
|
export declare function logDiff<T extends Set<string>>(newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
28
28
|
export declare function getChunks(arr: any[], size: number): any[];
|
|
29
|
-
|
|
29
|
+
type Operation = 'status' | 'bulk_get' | 'bulk_update' | 'bulk_delete' | 'legacy' | 'location';
|
|
30
30
|
export declare function generateURL(options: PushOptions, operation: Operation): string;
|
|
31
31
|
/**
|
|
32
32
|
* Bulk API is supported for push monitors only from 8.6.0 and above
|
|
33
33
|
*/
|
|
34
|
-
export declare function isBulkAPISupported(version:
|
|
34
|
+
export declare function isBulkAPISupported(version: string): boolean;
|
|
35
35
|
/**
|
|
36
36
|
* Lightweight monitors are supported only from 8.5.0 and above
|
|
37
37
|
*/
|
|
@@ -40,6 +40,6 @@ export declare function isLightweightMonitorSupported(monitors: Monitor[], optio
|
|
|
40
40
|
* Lighweight monitor param options are supported only from
|
|
41
41
|
* 8.7.2 and above
|
|
42
42
|
*/
|
|
43
|
-
export declare function isParamOptionSupported(version:
|
|
43
|
+
export declare function isParamOptionSupported(version: string): boolean;
|
|
44
44
|
export {};
|
|
45
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;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,
|
|
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,KAAK,SAAS,GACV,QAAQ,GACR,UAAU,GACV,aAAa,GACb,aAAa,GACb,QAAQ,GACR,UAAU,CAAC;AAEf,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,UAgBrE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,WAEjD;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,WAAW,WAOrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,WAErD"}
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
*/
|
|
25
25
|
import { Journey, Step } from '../dsl';
|
|
26
26
|
import { StartEvent, JourneyEndResult, JourneyStartResult, StepEndResult } from '../common_types';
|
|
27
|
-
export
|
|
27
|
+
export type ReporterOptions = {
|
|
28
28
|
fd?: number;
|
|
29
29
|
colors?: boolean;
|
|
30
30
|
};
|
|
31
|
-
export
|
|
32
|
-
export
|
|
31
|
+
export type BuiltInReporterName = 'default' | 'json' | 'junit';
|
|
32
|
+
export type ReporterInstance = new (opts: ReporterOptions) => Reporter;
|
|
33
33
|
export declare const reporters: {
|
|
34
34
|
[key in BuiltInReporterName]: ReporterInstance;
|
|
35
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AAEzB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAChE,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAC/D,MAAM,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE,eAAe,KAAK,QAAQ,CAAC;AACvE,eAAO,MAAM,SAAS,EAAE;KACrB,GAAG,IAAI,mBAAmB,GAAG,gBAAgB;CAK/C,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,iBAAiB,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACjD,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IACtE,YAAY,CAAC,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,gBAAgB,GACvB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,KAAK,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC"}
|
package/dist/reporters/json.d.ts
CHANGED
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
import BaseReporter from './base';
|
|
27
27
|
import { Journey, Step } from '../dsl';
|
|
28
28
|
import { NetworkInfo, NetworkConditions, TraceOutput, StatusValue, PerfMetrics, Screenshot, StartEvent, JourneyStartResult, StepEndResult, JourneyEndResult, PageMetrics } from '../common_types';
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
type OutputType = 'synthetics/metadata' | 'journey/register' | 'journey/start' | 'screenshot/block' | 'step/screenshot_ref' | 'step/screenshot' | 'step/metrics' | 'step/filmstrips' | 'step/end' | 'journey/network_info' | 'journey/browserconsole' | 'journey/end';
|
|
30
|
+
type Payload = {
|
|
31
31
|
source?: string;
|
|
32
32
|
start?: number;
|
|
33
33
|
end?: number;
|
|
@@ -39,7 +39,7 @@ declare type Payload = {
|
|
|
39
39
|
index?: number;
|
|
40
40
|
network_conditions?: NetworkConditions;
|
|
41
41
|
};
|
|
42
|
-
|
|
42
|
+
type OutputFields = {
|
|
43
43
|
type: OutputType;
|
|
44
44
|
_id?: string;
|
|
45
45
|
journey?: Journey;
|
|
@@ -56,11 +56,11 @@ declare type OutputFields = {
|
|
|
56
56
|
blob?: string;
|
|
57
57
|
blob_mime?: string;
|
|
58
58
|
};
|
|
59
|
-
|
|
59
|
+
type ScreenshotBlob = {
|
|
60
60
|
blob: string;
|
|
61
61
|
id: string;
|
|
62
62
|
};
|
|
63
|
-
|
|
63
|
+
type ScreenshotReference = {
|
|
64
64
|
width: number;
|
|
65
65
|
height: number;
|
|
66
66
|
blocks: Array<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;AAMH,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EACL,WAAW,EAEX,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAKzB,
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ import { PerfMetrics } from '../common_types';
|
|
|
28
28
|
* Trace Event Format
|
|
29
29
|
* https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU
|
|
30
30
|
*/
|
|
31
|
-
export
|
|
31
|
+
export type TraceEvent = {
|
|
32
32
|
name: string;
|
|
33
33
|
cat: string;
|
|
34
34
|
pid: number;
|
|
@@ -56,7 +56,7 @@ export declare type TraceEvent = {
|
|
|
56
56
|
/**
|
|
57
57
|
* Exported data from Lighthouse trace processor
|
|
58
58
|
*/
|
|
59
|
-
|
|
59
|
+
type LHTraceTime = {
|
|
60
60
|
timeOrigin: number;
|
|
61
61
|
firstPaint: number;
|
|
62
62
|
firstContentfulPaint: number;
|
|
@@ -66,7 +66,7 @@ declare type LHTraceTime = {
|
|
|
66
66
|
load: number;
|
|
67
67
|
traceEnd: number;
|
|
68
68
|
};
|
|
69
|
-
export
|
|
69
|
+
export type LHProcessedNavigation = {
|
|
70
70
|
domContentLoadedEvt: TraceEvent;
|
|
71
71
|
firstContentfulPaintEvt: TraceEvent;
|
|
72
72
|
largestContentfulPaintEvt: TraceEvent;
|
|
@@ -75,7 +75,7 @@ export declare type LHProcessedNavigation = {
|
|
|
75
75
|
timings: LHTraceTime;
|
|
76
76
|
lcpInvalidated: boolean;
|
|
77
77
|
};
|
|
78
|
-
export
|
|
78
|
+
export type LHProcessedTrace = {
|
|
79
79
|
processEvents: Array<TraceEvent>;
|
|
80
80
|
frameEvents: Array<TraceEvent>;
|
|
81
81
|
mainThreadEvents: Array<TraceEvent>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-processor.d.ts","sourceRoot":"","sources":["../../src/sdk/trace-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,wBAAwB,MAAM,sBAAsB,CAAC;AAM5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAK9C;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"trace-processor.d.ts","sourceRoot":"","sources":["../../src/sdk/trace-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,wBAAwB,MAAM,sBAAsB,CAAC;AAM5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAK9C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,EAAE,MAAM,CAAC;IAEZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE;YACJ,gBAAgB,EAAE,OAAO,CAAC;YAC1B,aAAa,EAAE,OAAO,CAAC;YACvB,gBAAgB,EAAE,MAAM,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC;YACd,oBAAoB,EAAE,MAAM,CAAC;SAC9B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC7B,CAAC;IACF;;;;;OAKG;IACH,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B,EAAE,MAAM,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,mBAAmB,EAAE,UAAU,CAAC;IAChC,uBAAuB,EAAE,UAAU,CAAC;IACpC,yBAAyB,EAAE,UAAU,CAAC;IACtC,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,cAAe,SAAQ,wBAAwB;WAC1C,4BAA4B,CAAC,KAAK,KAAA;IASlD,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC;;;;;;;CAwBnD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elastic/synthetics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "Elastic synthetic monitoring agent",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -44,20 +44,19 @@
|
|
|
44
44
|
"commander": "^10.0.1",
|
|
45
45
|
"deepmerge": "^4.3.1",
|
|
46
46
|
"enquirer": "^2.3.6",
|
|
47
|
-
"esbuild": "^0.
|
|
47
|
+
"esbuild": "^0.18.11",
|
|
48
48
|
"expect": "^28.1.3",
|
|
49
49
|
"http-proxy": "^1.18.1",
|
|
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.37.0",
|
|
54
|
+
"playwright-core": "=1.37.0",
|
|
55
55
|
"semver": "^7.5.2",
|
|
56
56
|
"sharp": "^0.32.0",
|
|
57
57
|
"snakecase-keys": "^4.0.1",
|
|
58
58
|
"sonic-boom": "^3.3.0",
|
|
59
59
|
"source-map-support": "^0.5.21",
|
|
60
|
-
"typescript": "^4.8.4",
|
|
61
60
|
"undici": "^5.21.2",
|
|
62
61
|
"yaml": "^2.2.2"
|
|
63
62
|
},
|
|
@@ -66,17 +65,19 @@
|
|
|
66
65
|
"@types/micromatch": "^4.0.2",
|
|
67
66
|
"@types/node": "^16.11.59",
|
|
68
67
|
"@types/sharp": "^0.28.6",
|
|
68
|
+
"@types/semver": "^7",
|
|
69
69
|
"@typescript-eslint/eslint-plugin": "^5.38.0",
|
|
70
70
|
"@typescript-eslint/parser": "^5.38.0",
|
|
71
71
|
"eslint": "^8.23.1",
|
|
72
72
|
"husky": "^4.3.6",
|
|
73
73
|
"is-positive": "3.1.0",
|
|
74
|
-
"jest": "^
|
|
74
|
+
"jest": "^29.6.1",
|
|
75
75
|
"jest-junit": "^15.0.0",
|
|
76
76
|
"lint-staged": "^10.5.3",
|
|
77
77
|
"prettier": "^2.7.1",
|
|
78
78
|
"rimraf": "^3.0.2",
|
|
79
|
-
"ts-jest": "^
|
|
79
|
+
"ts-jest": "^29.1.1",
|
|
80
|
+
"typescript": "^5.1.6",
|
|
80
81
|
"unzipper": "^0.10.11"
|
|
81
82
|
},
|
|
82
83
|
"engines": {
|
package/src/cli.ts
CHANGED
|
@@ -51,11 +51,13 @@ import { error } from './helpers';
|
|
|
51
51
|
import { LocationsMap } from './locations/public-locations';
|
|
52
52
|
import { createLightweightMonitors } from './push/monitor';
|
|
53
53
|
import { getVersion } from './push/kibana_api';
|
|
54
|
+
import { installTransform } from './core/transform';
|
|
54
55
|
|
|
55
56
|
/* eslint-disable-next-line @typescript-eslint/no-var-requires */
|
|
56
57
|
const { name, version } = require('../package.json');
|
|
57
58
|
|
|
58
|
-
const { params, pattern, playwrightOpts } =
|
|
59
|
+
const { params, pattern, playwrightOpts, auth, authMandatory } =
|
|
60
|
+
getCommonCommandOpts();
|
|
59
61
|
|
|
60
62
|
program
|
|
61
63
|
.name(`npx ${name}`)
|
|
@@ -78,8 +80,9 @@ program
|
|
|
78
80
|
)
|
|
79
81
|
.option('--inline', 'Run inline journeys from heartbeat')
|
|
80
82
|
.option('-r, --require <modules...>', 'module(s) to preload')
|
|
81
|
-
.option('--sandbox', 'enable chromium
|
|
83
|
+
.option('--sandbox', 'enable chromium sand-boxing')
|
|
82
84
|
.option('--rich-events', 'Mimics a heartbeat run')
|
|
85
|
+
.option('--no-headless', 'run browser in head-full mode')
|
|
83
86
|
.option(
|
|
84
87
|
'--capability <features...>',
|
|
85
88
|
'Enable capabilities through feature flags'
|
|
@@ -157,14 +160,6 @@ program
|
|
|
157
160
|
.description(
|
|
158
161
|
'Push all journeys in the current directory to create monitors within the Kibana monitor management UI'
|
|
159
162
|
)
|
|
160
|
-
.addOption(
|
|
161
|
-
new Option(
|
|
162
|
-
'--auth <auth>',
|
|
163
|
-
'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).'
|
|
164
|
-
)
|
|
165
|
-
.env('SYNTHETICS_API_KEY')
|
|
166
|
-
.makeOptionMandatory(true)
|
|
167
|
-
)
|
|
168
163
|
.option(
|
|
169
164
|
'--schedule <time-in-minutes>',
|
|
170
165
|
"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.",
|
|
@@ -190,6 +185,7 @@ program
|
|
|
190
185
|
'the target Kibana spaces for the pushed monitors — spaces help you organise pushed monitors.'
|
|
191
186
|
)
|
|
192
187
|
.option('-y, --yes', 'skip all questions and run non-interactively')
|
|
188
|
+
.addOption(authMandatory)
|
|
193
189
|
.addOption(pattern)
|
|
194
190
|
.addOption(params)
|
|
195
191
|
.addOption(playwrightOpts)
|
|
@@ -245,21 +241,26 @@ program
|
|
|
245
241
|
`List all locations to run the synthetics monitors. Pass optional '--url' and '--auth' to list private locations.`
|
|
246
242
|
)
|
|
247
243
|
.option('--url <url>', 'Kibana URL to fetch all public and private locations')
|
|
248
|
-
.
|
|
249
|
-
'--auth <auth>',
|
|
250
|
-
'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).'
|
|
251
|
-
)
|
|
244
|
+
.addOption(auth)
|
|
252
245
|
.action(async (cmdOpts: LocationCmdOptions) => {
|
|
246
|
+
const revert = installTransform();
|
|
247
|
+
const url = cmdOpts.url ?? (await loadSettings(true))?.url;
|
|
248
|
+
|
|
253
249
|
try {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
250
|
+
if (url && cmdOpts.auth) {
|
|
251
|
+
const allLocations = await getLocations({
|
|
252
|
+
url,
|
|
253
|
+
auth: cmdOpts.auth,
|
|
254
|
+
});
|
|
255
|
+
renderLocations(formatLocations(allLocations));
|
|
256
|
+
} else {
|
|
257
|
+
renderLocations({ publicLocations: Object.keys(LocationsMap) });
|
|
258
258
|
}
|
|
259
|
-
renderLocations(locations);
|
|
260
259
|
} catch (e) {
|
|
261
260
|
e && error(e);
|
|
262
261
|
process.exit(1);
|
|
262
|
+
} finally {
|
|
263
|
+
revert();
|
|
263
264
|
}
|
|
264
265
|
});
|
|
265
266
|
|
package/src/common_types.ts
CHANGED
|
@@ -223,6 +223,7 @@ export type CliArgs = BaseArgs & {
|
|
|
223
223
|
require?: Array<string>;
|
|
224
224
|
sandbox?: boolean;
|
|
225
225
|
richEvents?: boolean;
|
|
226
|
+
headless?: boolean;
|
|
226
227
|
capability?: Array<string>;
|
|
227
228
|
ignoreHttpsErrors?: boolean;
|
|
228
229
|
};
|
|
@@ -241,7 +242,7 @@ export type RunOptions = BaseArgs & {
|
|
|
241
242
|
export type PushOptions = Partial<ProjectSettings> &
|
|
242
243
|
Partial<BaseArgs> & {
|
|
243
244
|
auth: string;
|
|
244
|
-
kibanaVersion?:
|
|
245
|
+
kibanaVersion?: string;
|
|
245
246
|
yes?: boolean;
|
|
246
247
|
};
|
|
247
248
|
|
package/src/dsl/journey.ts
CHANGED
package/src/dsl/monitor.ts
CHANGED
package/src/generator/index.ts
CHANGED
|
@@ -112,7 +112,8 @@ export class Generator {
|
|
|
112
112
|
}).run();
|
|
113
113
|
|
|
114
114
|
const allLocations = await getLocations({ url, auth });
|
|
115
|
-
const locChoices = formatLocations(allLocations);
|
|
115
|
+
const { allLocations: locChoices } = formatLocations(allLocations);
|
|
116
|
+
|
|
116
117
|
if (locChoices.length === 0) {
|
|
117
118
|
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';
|
|
118
119
|
}
|
package/src/index.ts
CHANGED
|
@@ -43,6 +43,7 @@ export {
|
|
|
43
43
|
after,
|
|
44
44
|
} from './core';
|
|
45
45
|
export { expect } from './core/expect';
|
|
46
|
+
|
|
46
47
|
/**
|
|
47
48
|
* Export all the driver related types to be consumed
|
|
48
49
|
* and used by suites
|
|
@@ -53,6 +54,7 @@ export type {
|
|
|
53
54
|
ChromiumBrowserContext,
|
|
54
55
|
CDPSession,
|
|
55
56
|
APIRequestContext,
|
|
57
|
+
devices,
|
|
56
58
|
} from 'playwright-chromium';
|
|
57
59
|
|
|
58
60
|
/**
|
package/src/locations/index.ts
CHANGED
|
@@ -42,7 +42,7 @@ export type LocationAPIResponse = {
|
|
|
42
42
|
locations: Array<LocationMetadata>;
|
|
43
43
|
};
|
|
44
44
|
|
|
45
|
-
const PRIVATE_KEYWORD = '(private)';
|
|
45
|
+
export const PRIVATE_KEYWORD = '(private)';
|
|
46
46
|
|
|
47
47
|
export async function getLocations(options: LocationCmdOptions) {
|
|
48
48
|
const resp = await sendReqAndHandleError<LocationAPIResponse>({
|
|
@@ -54,25 +54,33 @@ export async function getLocations(options: LocationCmdOptions) {
|
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
export function formatLocations(locations: Array<LocationMetadata>) {
|
|
57
|
-
const
|
|
57
|
+
const publicLocations: Array<string> = [];
|
|
58
|
+
const privateLocations: Array<string> = [];
|
|
58
59
|
for (const location of locations) {
|
|
59
60
|
let name = location.label;
|
|
60
61
|
if (location.isServiceManaged) {
|
|
61
62
|
[, name] = name.includes('-') ? name.split('-') : [, name];
|
|
62
63
|
name = name.toLowerCase().trim().split(' ').join('_');
|
|
64
|
+
publicLocations.push(name);
|
|
63
65
|
} else {
|
|
64
|
-
name
|
|
66
|
+
privateLocations.push(name);
|
|
65
67
|
}
|
|
66
|
-
formatted.push(name);
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
+
|
|
70
|
+
return {
|
|
71
|
+
publicLocations,
|
|
72
|
+
privateLocations,
|
|
73
|
+
allLocations: publicLocations.concat(
|
|
74
|
+
privateLocations.map(loc => `${loc} ${PRIVATE_KEYWORD}`)
|
|
75
|
+
),
|
|
76
|
+
};
|
|
69
77
|
}
|
|
70
78
|
|
|
71
79
|
export function groupLocations(locations: Array<string>) {
|
|
72
80
|
const grouped = { locations: [], privateLocations: [] };
|
|
73
81
|
for (const loc of locations) {
|
|
74
82
|
if (loc.includes(PRIVATE_KEYWORD)) {
|
|
75
|
-
grouped.privateLocations.push(loc.replace(PRIVATE_KEYWORD, ''));
|
|
83
|
+
grouped.privateLocations.push(loc.replace(PRIVATE_KEYWORD, '').trim());
|
|
76
84
|
} else {
|
|
77
85
|
grouped.locations.push(loc);
|
|
78
86
|
}
|
|
@@ -80,13 +88,30 @@ export function groupLocations(locations: Array<string>) {
|
|
|
80
88
|
return grouped;
|
|
81
89
|
}
|
|
82
90
|
|
|
83
|
-
export function renderLocations(
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
91
|
+
export function renderLocations({
|
|
92
|
+
publicLocations,
|
|
93
|
+
privateLocations = [],
|
|
94
|
+
}: {
|
|
95
|
+
privateLocations?: Array<string>;
|
|
96
|
+
publicLocations: Array<string>;
|
|
97
|
+
}) {
|
|
98
|
+
let outer = '';
|
|
99
|
+
if (publicLocations.length) {
|
|
100
|
+
outer = 'Public locations: \n';
|
|
101
|
+
let inner = '';
|
|
102
|
+
for (const location of publicLocations) {
|
|
103
|
+
inner += `* ${location}\n`;
|
|
104
|
+
}
|
|
105
|
+
outer += indent(inner);
|
|
106
|
+
}
|
|
107
|
+
if (privateLocations.length > 0) {
|
|
108
|
+
outer += '\nPrivate locations: \n';
|
|
109
|
+
let privateInner = '';
|
|
110
|
+
for (const location of privateLocations) {
|
|
111
|
+
privateInner += `* ${location}\n`;
|
|
112
|
+
}
|
|
113
|
+
outer += indent(privateInner);
|
|
88
114
|
}
|
|
89
|
-
outer += indent(inner);
|
|
90
115
|
outer += `\nSet default location for monitors via
|
|
91
116
|
- Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field
|
|
92
117
|
- Monitor API 'monitor.use({ locations: ["japan"], privateLocations: ["custom-location"] }')`;
|
package/src/options.ts
CHANGED
|
@@ -106,6 +106,7 @@ export function normalizeOptions(
|
|
|
106
106
|
);
|
|
107
107
|
options.playwrightOptions = {
|
|
108
108
|
...playwrightOpts,
|
|
109
|
+
headless: cliArgs.headless ?? playwrightOpts?.headless,
|
|
109
110
|
chromiumSandbox: cliArgs.sandbox ?? playwrightOpts?.chromiumSandbox,
|
|
110
111
|
ignoreHTTPSErrors:
|
|
111
112
|
cliArgs.ignoreHttpsErrors ?? playwrightOpts?.ignoreHTTPSErrors,
|
|
@@ -185,7 +186,19 @@ export function getCommonCommandOpts() {
|
|
|
185
186
|
'RegExp pattern to match journey/monitor files that are different from the default (ex: /*.journey.(ts|js)$/)'
|
|
186
187
|
);
|
|
187
188
|
|
|
189
|
+
const apiDocsLink =
|
|
190
|
+
'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).';
|
|
191
|
+
const auth = createOption('--auth <auth>', apiDocsLink).env(
|
|
192
|
+
'SYNTHETICS_API_KEY'
|
|
193
|
+
);
|
|
194
|
+
|
|
195
|
+
const authMandatory = createOption('--auth <auth>', apiDocsLink)
|
|
196
|
+
.env('SYNTHETICS_API_KEY')
|
|
197
|
+
.makeOptionMandatory(true);
|
|
198
|
+
|
|
188
199
|
return {
|
|
200
|
+
auth,
|
|
201
|
+
authMandatory,
|
|
189
202
|
params,
|
|
190
203
|
playwrightOpts,
|
|
191
204
|
pattern,
|
package/src/push/index.ts
CHANGED
|
@@ -73,8 +73,12 @@ export async function push(monitors: Monitor[], options: PushOptions) {
|
|
|
73
73
|
return await pushLegacy(monitors, options);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
const local = getLocalMonitors(monitors);
|
|
77
76
|
const { monitors: remote } = await bulkGetMonitors(options);
|
|
77
|
+
|
|
78
|
+
progress(`bundling ${monitors.length} monitors`);
|
|
79
|
+
const schemas = await buildMonitorSchema(monitors, true);
|
|
80
|
+
const local = getLocalMonitors(schemas);
|
|
81
|
+
|
|
78
82
|
const { newIDs, changedIDs, removedIDs, unchangedIDs } = diffMonitorHashIDs(
|
|
79
83
|
local,
|
|
80
84
|
remote
|
|
@@ -83,9 +87,6 @@ export async function push(monitors: Monitor[], options: PushOptions) {
|
|
|
83
87
|
|
|
84
88
|
const updatedMonitors = new Set<string>([...changedIDs, ...newIDs]);
|
|
85
89
|
if (updatedMonitors.size > 0) {
|
|
86
|
-
const toBundle = monitors.filter(m => updatedMonitors.has(m.config.id));
|
|
87
|
-
progress(`bundling ${toBundle.length} monitors`);
|
|
88
|
-
const schemas = await buildMonitorSchema(toBundle, true);
|
|
89
90
|
const chunks = getChunks(schemas, CHUNK_SIZE);
|
|
90
91
|
for (const chunk of chunks) {
|
|
91
92
|
await liveProgress(
|
|
@@ -159,7 +160,7 @@ export function formatDuplicateError(monitors: Set<Monitor>) {
|
|
|
159
160
|
|
|
160
161
|
const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
|
|
161
162
|
|
|
162
|
-
export async function loadSettings() {
|
|
163
|
+
export async function loadSettings(ignoreMissing = false) {
|
|
163
164
|
try {
|
|
164
165
|
const config = await readConfig(process.env['NODE_ENV'] || 'development');
|
|
165
166
|
// Missing config file, fake throw to capture as missing file
|
|
@@ -168,9 +169,11 @@ export async function loadSettings() {
|
|
|
168
169
|
}
|
|
169
170
|
return config.project || ({} as ProjectSettings);
|
|
170
171
|
} catch (e) {
|
|
171
|
-
|
|
172
|
+
if (!ignoreMissing) {
|
|
173
|
+
throw error(`Aborted (missing synthetics config file), Project not set up correctly.
|
|
172
174
|
|
|
173
175
|
${INSTALLATION_HELP}`);
|
|
176
|
+
}
|
|
174
177
|
}
|
|
175
178
|
}
|
|
176
179
|
|
package/src/push/kibana_api.ts
CHANGED
package/src/push/monitor.ts
CHANGED
|
@@ -110,12 +110,12 @@ export function diffMonitors(
|
|
|
110
110
|
return result;
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
export function getLocalMonitors(
|
|
113
|
+
export function getLocalMonitors(schemas: MonitorSchema[]) {
|
|
114
114
|
const data: MonitorHashID[] = [];
|
|
115
|
-
for (const
|
|
115
|
+
for (const schema of schemas) {
|
|
116
116
|
data.push({
|
|
117
|
-
journey_id:
|
|
118
|
-
hash:
|
|
117
|
+
journey_id: schema.id,
|
|
118
|
+
hash: schema.hash,
|
|
119
119
|
});
|
|
120
120
|
}
|
|
121
121
|
return data;
|
|
@@ -137,14 +137,20 @@ export async function buildMonitorSchema(monitors: Monitor[], isV2: boolean) {
|
|
|
137
137
|
...config,
|
|
138
138
|
locations: translateLocation(config.locations),
|
|
139
139
|
};
|
|
140
|
-
|
|
141
|
-
schema.hash = monitor.hash();
|
|
142
|
-
}
|
|
140
|
+
|
|
143
141
|
if (type === 'browser') {
|
|
144
142
|
const outPath = join(bundlePath, config.name + '.zip');
|
|
145
143
|
const content = await bundler.build(source.file, outPath);
|
|
144
|
+
monitor.setContent(content);
|
|
146
145
|
Object.assign(schema, { content, filter });
|
|
147
146
|
}
|
|
147
|
+
/**
|
|
148
|
+
* Generate hash only after the bundled content is created
|
|
149
|
+
* to capture code changes in imported files
|
|
150
|
+
*/
|
|
151
|
+
if (isV2) {
|
|
152
|
+
schema.hash = monitor.hash();
|
|
153
|
+
}
|
|
148
154
|
schemas.push(schema);
|
|
149
155
|
}
|
|
150
156
|
|