@elastic/synthetics 1.0.0-beta.33 → 1.0.0-beta.35

package/dist/push/index.js

@@ -25,27 +25,45 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.catchIncorrectSettings = exports.validateSettings = exports.loadSettings = exports.formatDuplicateError = exports.pushMonitors = exports.push = void 0;
-const path_1 = require("path");
-const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const enquirer_1 = require("enquirer");
 const colors_1 = require("kleur/colors");
 const request_1 = require("./request");
 const monitor_1 = require("./monitor");
 const helpers_1 = require("../helpers");
+const config_1 = require("../config");
 async function push(monitors, options) {
-    if (monitors.length === 0) {
-        throw 'No Monitors found';
-    }
-    const duplicates = trackDuplicates(monitors);
-    if (duplicates.size > 0) {
-        throw (0, helpers_1.error)(formatDuplicateError(duplicates));
+    let schemas = [];
+    if (monitors.length > 0) {
+        const duplicates = trackDuplicates(monitors);
+        if (duplicates.size > 0) {
+            throw (0, helpers_1.error)(formatDuplicateError(duplicates));
+        }
+        (0, helpers_1.progress)(`preparing all monitors`);
+        schemas = await (0, monitor_1.buildMonitorSchema)(monitors);
+        (0, helpers_1.progress)(`creating all monitors`);
+        for (const schema of schemas) {
+            await pushMonitors({ schemas: [schema], keepStale: true, options });
+        }
     }
-    (0, helpers_1.progress)(`preparing all monitors`);
-    const schemas = await (0, monitor_1.buildMonitorSchema)(monitors);
-    (0, helpers_1.progress)(`creating all monitors`);
-    for (const schema of schemas) {
-        await pushMonitors({ schemas: [schema], keepStale: true, options });
+    else {
+        (0, helpers_1.write)('');
+        const { deleteAll } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            skip() {
+                if (options.yes) {
+                    this.initial = process.env.TEST_OVERRIDE ?? true;
+                    return true;
+                }
+                return false;
+            },
+            name: 'deleteAll',
+            message: `Pushing without any monitors will delete all monitors associated with the project.\n Do you want to continue?`,
+            initial: false,
+        });
+        if (!deleteAll) {
+            throw (0, helpers_1.aborted)('Push command Aborted');
+        }
     }
     (0, helpers_1.progress)(`deleting all stale monitors`);
     await pushMonitors({ schemas, keepStale: false, options });
@@ -53,41 +71,36 @@ async function push(monitors, options) {
 }
 exports.push = push;
 async function pushMonitors({ schemas, keepStale, options, }) {
-    try {
-        const { body, statusCode } = await (0, monitor_1.createMonitors)(schemas, options, keepStale);
-        if (statusCode === 404) {
-            throw (0, request_1.formatNotFoundError)(await body.text());
-        }
-        if (!(0, request_1.ok)(statusCode)) {
-            const { error, message } = await body.json();
-            throw (0, request_1.formatAPIError)(statusCode, error, message);
-        }
-        body.setEncoding('utf-8');
-        for await (const data of body) {
-            // Its kind of hacky for now where Kibana streams the response by
-            // writing the data as NDJSON events (data can be interleaved), we
-            // distinguish the final data by checking if the event was a progress vs complete event
-            const chunks = (0, helpers_1.safeNDJSONParse)(data);
-            for (const chunk of chunks) {
-                if (typeof chunk === 'string') {
-                    // TODO: add progress back for all states once we get the fix
-                    // on kibana side
-                    keepStale && (0, helpers_1.apiProgress)(chunk);
-                    continue;
-                }
-                const { failedMonitors, failedStaleMonitors } = chunk;
-                if (failedMonitors && failedMonitors.length > 0) {
-                    throw (0, request_1.formatFailedMonitors)(failedMonitors);
-                }
-                if (failedStaleMonitors.length > 0) {
-                    (0, helpers_1.write)((0, colors_1.yellow)((0, request_1.formatStaleMonitors)(failedStaleMonitors)));
-                }
+    const { body, statusCode } = await (0, monitor_1.createMonitors)(schemas, options, keepStale);
+    if (statusCode === 404) {
+        throw (0, request_1.formatNotFoundError)(await body.text());
+    }
+    if (!(0, request_1.ok)(statusCode)) {
+        const { error, message } = await body.json();
+        throw (0, request_1.formatAPIError)(statusCode, error, message);
+    }
+    body.setEncoding('utf-8');
+    for await (const data of body) {
+        // Its kind of hacky for now where Kibana streams the response by
+        // writing the data as NDJSON events (data can be interleaved), we
+        // distinguish the final data by checking if the event was a progress vs complete event
+        const chunks = (0, helpers_1.safeNDJSONParse)(data);
+        for (const chunk of chunks) {
+            if (typeof chunk === 'string') {
+                // TODO: add progress back for all states once we get the fix
+                // on kibana side
+                keepStale && (0, helpers_1.apiProgress)(chunk);
+                continue;
+            }
+            const { failedMonitors, failedStaleMonitors } = chunk;
+            if (failedMonitors && failedMonitors.length > 0) {
+                throw (0, request_1.formatFailedMonitors)(failedMonitors);
+            }
+            if (failedStaleMonitors.length > 0) {
+                throw (0, request_1.formatStaleMonitors)(failedStaleMonitors);
             }
         }
     }
-    catch (e) {
-        (0, helpers_1.error)(e);
-    }
 }
 exports.pushMonitors = pushMonitors;
 function trackDuplicates(monitors) {
@@ -114,33 +127,40 @@ function formatDuplicateError(monitors) {
     return outer;
 }
 exports.formatDuplicateError = formatDuplicateError;
-const PROJECT_SETTINGS_PATH = (0, path_1.join)(helpers_1.SYNTHETICS_PATH, 'project.json');
 const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
 async function loadSettings() {
-    if (!(0, fs_1.existsSync)(PROJECT_SETTINGS_PATH)) {
-        throw (0, helpers_1.error)(`Aborted. Synthetics project not set up.
+    try {
+        const config = await (0, config_1.readConfig)(process.env['NODE_ENV'] || 'development');
+        // Missing config file, fake throw to capture as missing file
+        if (Object.keys(config).length === 0) {
+            throw '';
+        }
+        return config.project || {};
+    }
+    catch (e) {
+        throw (0, helpers_1.error)(`Aborted (missing synthetics config file), Project not set up corrrectly.
 
 ${INSTALLATION_HELP}`);
     }
-    const contents = await (0, promises_1.readFile)(PROJECT_SETTINGS_PATH, 'utf-8');
-    return JSON.parse(contents);
 }
 exports.loadSettings = loadSettings;
 function validateSettings(opts) {
     const INVALID = 'Aborted. Invalid synthetics project settings.';
     let reason = '';
-    if (!opts.project) {
-        reason = 'Set project id via CLI as `--project <id>`';
+    if (!opts.id) {
+        reason = `Set project id via
+  - CLI '--id <id>'
+  - Config file 'project.id' field`;
     }
     else if (!opts.locations && !opts.privateLocations) {
         reason = `Set default location for all monitors via
-  - CLI as '--locations <values...> or --privateLocations <values...>'
-  - Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field`;
+  - CLI '--locations <values...> or --privateLocations <values...>'
+  - Config file 'monitors.locations' | 'monitors.privateLocations' field`;
     }
     else if (!opts.schedule) {
         reason = `Set default schedule in minutes for all monitors via
-  - CLI as '--schedule <mins>'
-  - Synthetics config file 'monitors.schedule' field`;
+  - CLI '--schedule <mins>'
+  - Config file 'monitors.schedule' field`;
     }
     if (!reason)
         return;
@@ -151,33 +171,40 @@ ${reason}
 ${INSTALLATION_HELP}`);
 }
 exports.validateSettings = validateSettings;
-async function overrideSettings(project) {
-    const settings = JSON.parse(await (0, promises_1.readFile)(PROJECT_SETTINGS_PATH, 'utf-8'));
-    settings.project = project;
-    await (0, promises_1.writeFile)(PROJECT_SETTINGS_PATH, JSON.stringify(settings, null, 2), 'utf-8');
+async function overrideSettings(oldValue, newValue) {
+    const cwd = process.cwd();
+    const configPath = await (0, config_1.findSyntheticsConfig)(cwd, cwd);
+    if (!configPath) {
+        throw (0, helpers_1.aborted)(`Unable to find synthetics config file: ${configPath}`);
+    }
+    const config = await (0, promises_1.readFile)(configPath, 'utf-8');
+    const updatedConfig = config.replace(`id: '${oldValue}'`, `id: '${newValue}'`);
+    await (0, promises_1.writeFile)(configPath, updatedConfig, 'utf-8');
 }
 async function catchIncorrectSettings(settings, options) {
-    let override = !settings.project;
-    if (settings.project && settings.project !== options.project) {
-        if (typeof process.env.TEST_OVERRIDE != null) {
-            override = Boolean(process.env.TEST_OVERRIDE);
-        }
-        else {
-            // Add an extra line to make it easier to read the prompt
-            (0, helpers_1.write)('');
-            ({ override } = await (0, enquirer_1.prompt)({
-                type: 'confirm',
-                name: 'override',
-                message: `Monitors were pushed under the '${settings.project}' project. Are you sure you want to push them under the new '${options.project}' (note that this will duplicate the monitors, the old ones being orphaned)`,
-                initial: false,
-            }));
-        }
+    let override = !settings.id;
+    if (settings.id && settings.id !== options.id) {
+        // Add an extra line to make it easier to read the prompt
+        (0, helpers_1.write)('');
+        ({ override } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            name: 'override',
+            skip() {
+                if (options.yes) {
+                    this.initial = process.env.TEST_OVERRIDE ?? true;
+                    return true;
+                }
+                return false;
+            },
+            message: `Monitors were pushed under the '${settings.id}' project. Are you sure you want to push them under the new '${options.id}' (note that this will duplicate the monitors, the old ones being orphaned)`,
+            initial: false,
+        }));
         if (!override) {
             throw (0, helpers_1.aborted)('Push command Aborted');
         }
     }
     if (override) {
-        await overrideSettings(options.project);
+        await overrideSettings(settings.id, options.id);
     }
 }
 exports.catchIncorrectSettings = catchIncorrectSettings;

package/dist/push/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,+BAA4B;AAC5B,2BAAgC;AAChC,0CAAkD;AAClD,uCAAkC;AAClC,yCAA4C;AAC5C,uCAMmB;AACnB,uCAA8E;AAG9E,wCAUoB;AAGb,KAAK,UAAU,IAAI,CAAC,QAAmB,EAAE,OAAoB;IAClE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,MAAM,mBAAmB,CAAC;KAC3B;IACD,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;IAED,IAAA,kBAAQ,EAAC,wBAAwB,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;IAEnD,IAAA,kBAAQ,EAAC,uBAAuB,CAAC,CAAC;IAClC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;KACrE;IAED,IAAA,kBAAQ,EAAC,6BAA6B,CAAC,CAAC;IACxC,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC;AACjB,CAAC;AApBD,oBAoBC;AAEM,KAAK,UAAU,YAAY,CAAC,EACjC,OAAO,EACP,SAAS,EACT,OAAO,GAKR;IACC,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,wBAAc,EAC/C,OAAO,EACP,OAAO,EACP,SAAS,CACV,CAAC;QACF,IAAI,UAAU,KAAK,GAAG,EAAE;YACtB,MAAM,IAAA,6BAAmB,EAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE;YACnB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7C,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,EAAE;YAC7B,iEAAiE;YACjE,kEAAkE;YAClE,uFAAuF;YACvF,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;YACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC7B,6DAA6D;oBAC7D,iBAAiB;oBACjB,SAAS,IAAI,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;oBAChC,SAAS;iBACV;gBACD,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;gBACtD,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/C,MAAM,IAAA,8BAAoB,EAAC,cAAc,CAAC,CAAC;iBAC5C;gBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;oBAClC,IAAA,eAAK,EAAC,IAAA,eAAM,EAAC,IAAA,6BAAmB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;iBACzD;aACF;SACF;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;KACV;AACH,CAAC;AA/CD,oCA+CC;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,qBAAqB,GAAG,IAAA,WAAI,EAAC,yBAAe,EAAE,cAAc,CAAC,CAAC;AACpE,MAAM,iBAAiB,GAAG,6EAA6E,CAAC;AAEjG,KAAK,UAAU,YAAY;IAChC,IAAI,CAAC,IAAA,eAAU,EAAC,qBAAqB,CAAC,EAAE;QACtC,MAAM,IAAA,eAAK,EAAC;;EAEd,iBAAiB,EAAE,CAAC,CAAC;KACpB;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAQ,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAChE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAoB,CAAC;AACjD,CAAC;AATD,oCASC;AAED,SAAgB,gBAAgB,CAAC,IAAiB;IAChD,MAAM,OAAO,GAAG,+CAA+C,CAAC;IAEhE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjB,MAAM,GAAG,4CAA4C,CAAC;KACvD;SAAM,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;QACpD,MAAM,GAAG;;oFAEuE,CAAC;KAClF;SAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QACzB,MAAM,GAAG;;qDAEwC,CAAC;KACnD;IAED,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,IAAA,eAAK,EAAC,GAAG,OAAO;;EAEtB,MAAM;;EAEN,iBAAiB,EAAE,CAAC,CAAC;AACvB,CAAC;AAvBD,4CAuBC;AAED,KAAK,UAAU,gBAAgB,CAAC,OAAe;IAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAE3B,MAAM,IAAA,oBAAS,EACb,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACjC,OAAO,CACR,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,QAAyB,EACzB,OAAoB;IAEpB,IAAI,QAAQ,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjC,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE;QAC5D,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,EAAE;YAC5C,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;SAC/C;aAAM;YACL,yDAAyD;YACzD,IAAA,eAAK,EAAC,EAAE,CAAC,CAAC;YACV,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAwB;gBAClD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,mCAAmC,QAAQ,CAAC,OAAO,gEAAgE,OAAO,CAAC,OAAO,6EAA6E;gBACxN,OAAO,EAAE,KAAK;aACf,CAAC,CAAC,CAAC;SACL;QACD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAA,iBAAO,EAAC,sBAAsB,CAAC,CAAC;SACvC;KACF;IACD,IAAI,QAAQ,EAAE;QACZ,MAAM,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACzC;AACH,CAAC;AAzBD,wDAyBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAkD;AAClD,uCAAkC;AAClC,yCAAoC;AACpC,uCAMmB;AACnB,uCAA8E;AAE9E,wCASoB;AAEpB,sCAA6D;AAEtD,KAAK,UAAU,IAAI,CAAC,QAAmB,EAAE,OAAoB;IAClE,IAAI,OAAO,GAAoB,EAAE,CAAC;IAClC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE;YACvB,MAAM,IAAA,eAAK,EAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;SAC/C;QAED,IAAA,kBAAQ,EAAC,wBAAwB,CAAC,CAAC;QACnC,OAAO,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;QAE7C,IAAA,kBAAQ,EAAC,uBAAuB,CAAC,CAAC;QAClC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SACrE;KACF;SAAM;QACL,IAAA,eAAK,EAAC,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAyB;YACzD,IAAI,EAAE,SAAS;YACf,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,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,+GAA+G;YACxH,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAA,iBAAO,EAAC,sBAAsB,CAAC,CAAC;SACvC;KACF;IACD,IAAA,kBAAQ,EAAC,6BAA6B,CAAC,CAAC;IACxC,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAE3D,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC;AACjB,CAAC;AAtCD,oBAsCC;AAEM,KAAK,UAAU,YAAY,CAAC,EACjC,OAAO,EACP,SAAS,EACT,OAAO,GAKR;IACC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,wBAAc,EAC/C,OAAO,EACP,OAAO,EACP,SAAS,CACV,CAAC;IACF,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,MAAM,IAAA,6BAAmB,EAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;KAC9C;IACD,IAAI,CAAC,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE;QACnB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;KAClD;IACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,EAAE;QAC7B,iEAAiE;QACjE,kEAAkE;QAClE,uFAAuF;QACvF,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,6DAA6D;gBAC7D,iBAAiB;gBACjB,SAAS,IAAI,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;gBAChC,SAAS;aACV;YACD,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;YACtD,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/C,MAAM,IAAA,8BAAoB,EAAC,cAAc,CAAC,CAAC;aAC5C;YACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,MAAM,IAAA,6BAAmB,EAAC,mBAAmB,CAAC,CAAC;aAChD;SACF;KACF;AACH,CAAC;AA3CD,oCA2CC;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;IAChC,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,MAAM,IAAA,eAAK,EAAC;;EAEd,iBAAiB,EAAE,CAAC,CAAC;KACpB;AACH,CAAC;AAbD,oCAaC;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;IAED,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,IAAA,eAAK,EAAC,GAAG,OAAO;;EAEtB,MAAM;;EAEN,iBAAiB,EAAE,CAAC,CAAC;AACvB,CAAC;AAzBD,4CAyBC;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,iBAAO,EAAC,0CAA0C,UAAU,EAAE,CAAC,CAAC;KACvE;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,iBAAO,EAAC,sBAAsB,CAAC,CAAC;SACvC;KACF;IACD,IAAI,QAAQ,EAAE;QACZ,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;KACjD;AACH,CAAC;AA5BD,wDA4BC"}

package/dist/push/monitor.js

@@ -62,7 +62,7 @@ async function buildMonitorSchema(monitors) {
 exports.buildMonitorSchema = buildMonitorSchema;
 async function createMonitors(monitors, options, keepStale) {
     const schema = {
-        project: options.project,
+        project: options.id,
         keep_stale: keepStale,
         monitors,
     };

package/dist/push/monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAwC;AACxC,+BAA4B;AAC5B,uCAAoC;AACpC,uCAAwC;AACxC,wCAAkE;AAClE,oEAA6D;AAgB7D,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;AAEM,KAAK,UAAU,kBAAkB,CAAC,QAAmB;IAC1D;;;OAGG;IACH,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,yBAAe,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,IAAA,gBAAK,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAoB,EAAE,CAAC;IAEpC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,MAAM;YACT,OAAO;YACP,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;KACJ;IAED,MAAM,IAAA,aAAE,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,OAAO,OAAO,CAAC;AACjB,CAAC;AAxBD,gDAwBC;AAEM,KAAK,UAAU,cAAc,CAClC,QAAyB,EACzB,OAAoB,EACpB,SAAkB;IAElB,MAAM,MAAM,GAAc;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,SAAS;QACrB,QAAQ;KACT,CAAC;IAEF,OAAO,MAAM,IAAA,qBAAW,EAAC;QACvB,GAAG,EACD,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC;YAChC,MAAM,OAAO,CAAC,KAAK,0CAA0C;QAC/D,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAnBD,wCAmBC"}
+{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAwC;AACxC,+BAA4B;AAC5B,uCAAoC;AACpC,uCAAwC;AACxC,wCAAkE;AAClE,oEAA6D;AAgB7D,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;AAEM,KAAK,UAAU,kBAAkB,CAAC,QAAmB;IAC1D;;;OAGG;IACH,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,yBAAe,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,IAAA,gBAAK,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAoB,EAAE,CAAC;IAEpC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,MAAM;YACT,OAAO;YACP,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;KACJ;IAED,MAAM,IAAA,aAAE,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,OAAO,OAAO,CAAC;AACjB,CAAC;AAxBD,gDAwBC;AAEM,KAAK,UAAU,cAAc,CAClC,QAAyB,EACzB,OAAoB,EACpB,SAAkB;IAElB,MAAM,MAAM,GAAc;QACxB,OAAO,EAAE,OAAO,CAAC,EAAE;QACnB,UAAU,EAAE,SAAS;QACrB,QAAQ;KACT,CAAC;IAEF,OAAO,MAAM,IAAA,qBAAW,EAAC;QACvB,GAAG,EACD,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC;YAChC,MAAM,OAAO,CAAC,KAAK,0CAA0C;QAC/D,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAnBD,wCAmBC"}

package/dist/push/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/push/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,wBAAgB,aAAa,IAAI,OAAO,CAAC,YAAY,CAapD;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,oBAAY,cAAc,GAAG,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;AAExD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAoEzE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/push/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAKnC,wBAAgB,aAAa,IAAI,OAAO,CAAC,YAAY,CAapD;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,oBAAY,cAAc,GAAG,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;AAExD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CA8FzE"}

package/dist/push/plugin.js

@@ -51,13 +51,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiAssetPlugin = exports.commonOptions = void 0;
-const path_1 = __importDefault(require("path"));
+const path_1 = require("path");
 const promises_1 = __importDefault(require("fs/promises"));
 const esbuild = __importStar(require("esbuild"));
+const SOURCE_DIR = (0, path_1.join)(__dirname, '..', '..');
+const SOURCE_NODE_MODULES = (0, path_1.join)(SOURCE_DIR, 'node_modules');
 function commonOptions() {
     return {
         bundle: true,
-        external: ['node_modules', '@elastic/synthetics'],
+        external: ['@elastic/synthetics'],
         minify: false,
         platform: 'node',
         logLevel: 'silent',
@@ -76,23 +78,42 @@ function MultiAssetPlugin(callback) {
         // Note that we use `isAbsolute` to handle UNC/windows style paths like C:\path\to\thing
         // This is not necessary for relative directories since `.\file` is not supported as an import
         // nor is `~/path/to/file`.
-        if (path_1.default.isAbsolute(str) || str.startsWith('./') || str.startsWith('../')) {
+        if ((0, path_1.isAbsolute)(str) || str.startsWith('./') || str.startsWith('../')) {
             return true;
         }
         return false;
     };
+    // If we're importing the @elastic/synthetics package
+    // directly from source instead of using the fully
+    // qualified name, we must skip it too. That's just
+    // so it doesn't get bundled on tests or when we locally
+    // refer to the package itself.
+    const isLocalSynthetics = (entryPath) => {
+        return entryPath.startsWith(SOURCE_DIR);
+    };
+    // When importing the local synthetics module directly
+    // it may import its own local dependencies, so we must
+    // make sure those will be resolved using Node's resolution
+    // algorithm, as they're still "node_modules" that we must bundle
+    const isLocalSyntheticsModule = (str) => {
+        return str.startsWith(SOURCE_NODE_MODULES);
+    };
     return {
         name: 'esbuild-multiasset-plugin',
         setup(build) {
             build.onResolve({ filter: /.*?/ }, async (args) => {
                 // External and other packages need be marked external to
                 // be removed from the bundle
-                if (build.initialOptions.external?.includes(args.path) ||
-                    !isBare(args.path)) {
+                if (build.initialOptions.external?.includes(args.path)) {
                     return {
                         external: true,
                     };
                 }
+                if (!isBare(args.path) ||
+                    args.importer.includes('/node_modules/') ||
+                    isLocalSyntheticsModule(args.importer)) {
+                    return;
+                }
                 if (args.kind === 'entry-point') {
                     return {
                         path: args.path,
@@ -101,8 +122,10 @@ function MultiAssetPlugin(callback) {
                 }
                 // If the modules are resolved locally, then
                 // use the imported path to get full path
-                const entryPath = path_1.default.join(path_1.default.dirname(args.importer), args.path) +
-                    path_1.default.extname(args.importer);
+                const entryPath = (0, path_1.join)((0, path_1.dirname)(args.importer), args.path) + (0, path_1.extname)(args.importer);
+                if (isLocalSynthetics(entryPath)) {
+                    return { external: true };
+                }
                 // Spin off another build to copy over the imported modules without bundling
                 const result = await esbuild.build({
                     ...commonOptions(),

package/dist/push/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/push/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/push/plugin.ts"],"names":[],"mappings":"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"}

package/dist/push/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAM7C,oBAAY,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,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,oBAAY,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAIlD;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"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAM7C,oBAAY,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,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,oBAAY,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAMlD;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/request.js

@@ -40,7 +40,7 @@ async function sendRequest(options) {
             'user-agent': `Elastic/Synthetics ${version}`,
             'kbn-xsrf': 'true',
         },
-        headersTimeout: 60 * 1000
+        headersTimeout: 60 * 1000,
     });
 }
 exports.sendRequest = sendRequest;
@@ -49,7 +49,7 @@ function ok(statusCode) {
 }
 exports.ok = ok;
 function formatNotFoundError(message) {
-    return (0, colors_1.bold)(`${helpers_1.symbols['failed']} Please check your kibana url and try again - 404:${message}`);
+    return (0, colors_1.red)((0, colors_1.bold)(`${helpers_1.symbols['failed']} Please check your kibana url and try again - 404:${message}`));
 }
 exports.formatNotFoundError = formatNotFoundError;
 function formatAPIError(statuCode, error, message) {
@@ -57,7 +57,7 @@ function formatAPIError(statuCode, error, message) {
     let inner = (0, colors_1.bold)(`${helpers_1.symbols['failed']} monitor creation failed - ${statuCode}:${error}\n`);
     inner += (0, helpers_1.indent)(message, '    ');
     outer += (0, helpers_1.indent)(inner);
-    return outer;
+    return (0, colors_1.red)(outer);
 }
 exports.formatAPIError = formatAPIError;
 function formatMonitorError(errors) {
@@ -73,12 +73,12 @@ function formatMonitorError(errors) {
 }
 function formatFailedMonitors(errors) {
     const heading = (0, colors_1.bold)(`${helpers_1.symbols['failed']} Error\n`);
-    return heading + formatMonitorError(errors);
+    return (0, colors_1.red)(heading + formatMonitorError(errors));
 }
 exports.formatFailedMonitors = formatFailedMonitors;
 function formatStaleMonitors(errors) {
     const heading = (0, colors_1.bold)(`${helpers_1.symbols['warning']} Warnings\n`);
-    return heading + formatMonitorError(errors);
+    return (0, colors_1.yellow)(heading + formatMonitorError(errors));
 }
 exports.formatStaleMonitors = formatStaleMonitors;
 //# sourceMappingURL=request.js.map

package/dist/push/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,yCAAoC;AACpC,mCAA6C;AAC7C,wCAA6C;AAE7C,uDAAuD;AACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAS3C,KAAK,UAAU,WAAW,CAAC,OAA0B;IAC1D,OAAO,MAAM,IAAA,gBAAO,EAAC,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,IAAI,EAAE;YACvC,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,sBAAsB,OAAO,EAAE;YAC7C,UAAU,EAAE,MAAM;SACnB;QACD,cAAc,EAAE,EAAE,GAAG,IAAI;KAC1B,CAAC,CAAC;AACL,CAAC;AAZD,kCAYC;AAED,SAAgB,EAAE,CAAC,UAAkB;IACnC,OAAO,UAAU,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AAChD,CAAC;AAFD,gBAEC;AAQD,SAAgB,mBAAmB,CAAC,OAAe;IACjD,OAAO,IAAA,aAAI,EACT,GAAG,iBAAO,CAAC,QAAQ,CAAC,qDAAqD,OAAO,EAAE,CACnF,CAAC;AACJ,CAAC;AAJD,kDAIC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,KAAa,EACb,OAAe;IAEf,IAAI,KAAK,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACjD,IAAI,KAAK,GAAG,IAAA,aAAI,EACd,GAAG,iBAAO,CAAC,QAAQ,CAAC,8BAA8B,SAAS,IAAI,KAAK,IAAI,CACzE,CAAC;IACF,KAAK,IAAI,IAAA,gBAAM,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,wCAYC;AAED,SAAS,kBAAkB,CAAC,MAAyB;IACnD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI,KAAK,GAAG,IAAA,aAAI,EAAC,KAAK,KAAK,CAAC,MAAM,GAAG,SAAS,IAAI,CAAC,CAAC;QACpD,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QAC9B,KAAK,IAAI,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAyB;IAC5D,MAAM,OAAO,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACrD,OAAO,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAHD,oDAGC;AAED,SAAgB,mBAAmB,CAAC,MAAyB;IAC3D,MAAM,OAAO,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACzD,OAAO,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAHD,kDAGC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,yCAAiD;AACjD,mCAA6C;AAC7C,wCAA6C;AAE7C,uDAAuD;AACvD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAS3C,KAAK,UAAU,WAAW,CAAC,OAA0B;IAC1D,OAAO,MAAM,IAAA,gBAAO,EAAC,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,IAAI,EAAE;YACvC,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,sBAAsB,OAAO,EAAE;YAC7C,UAAU,EAAE,MAAM;SACnB;QACD,cAAc,EAAE,EAAE,GAAG,IAAI;KAC1B,CAAC,CAAC;AACL,CAAC;AAZD,kCAYC;AAED,SAAgB,EAAE,CAAC,UAAkB;IACnC,OAAO,UAAU,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AAChD,CAAC;AAFD,gBAEC;AAQD,SAAgB,mBAAmB,CAAC,OAAe;IACjD,OAAO,IAAA,YAAG,EACR,IAAA,aAAI,EACF,GAAG,iBAAO,CAAC,QAAQ,CAAC,qDAAqD,OAAO,EAAE,CACnF,CACF,CAAC;AACJ,CAAC;AAND,kDAMC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,KAAa,EACb,OAAe;IAEf,IAAI,KAAK,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACjD,IAAI,KAAK,GAAG,IAAA,aAAI,EACd,GAAG,iBAAO,CAAC,QAAQ,CAAC,8BAA8B,SAAS,IAAI,KAAK,IAAI,CACzE,CAAC;IACF,KAAK,IAAI,IAAA,gBAAM,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;IACvB,OAAO,IAAA,YAAG,EAAC,KAAK,CAAC,CAAC;AACpB,CAAC;AAZD,wCAYC;AAED,SAAS,kBAAkB,CAAC,MAAyB;IACnD,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI,KAAK,GAAG,IAAA,aAAI,EAAC,KAAK,KAAK,CAAC,MAAM,GAAG,SAAS,IAAI,CAAC,CAAC;QACpD,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QAC9B,KAAK,IAAI,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAyB;IAC5D,MAAM,OAAO,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACrD,OAAO,IAAA,YAAG,EAAC,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,CAAC;AAHD,oDAGC;AAED,SAAgB,mBAAmB,CAAC,MAAyB;IAC3D,MAAM,OAAO,GAAG,IAAA,aAAI,EAAC,GAAG,iBAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACzD,OAAO,IAAA,eAAM,EAAC,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;AACtD,CAAC;AAHD,kDAGC"}