@elastic/synthetics 1.2.0 → 1.4.0

package/src/push/monitor.ts

@@ -28,9 +28,14 @@ import { extname, join } from 'path';
 import { LineCounter, parseDocument, YAMLSeq, YAMLMap } from 'yaml';
 import { bold, red } from 'kleur/colors';
 import { Bundler } from './bundler';
-import { SYNTHETICS_PATH, totalist, indent, warn, isMatch } from '../helpers';
+import { SYNTHETICS_PATH, totalist, indent, warn } from '../helpers';
 import { LocationsMap } from '../locations/public-locations';
-import { ALLOWED_SCHEDULES, Monitor, MonitorConfig } from '../dsl/monitor';
+import {
+  AlertConfig,
+  ALLOWED_SCHEDULES,
+  Monitor,
+  MonitorConfig,
+} from '../dsl/monitor';
 import { PushOptions } from '../common_types';
 import { isParamOptionSupported } from './utils';
 
@@ -105,12 +110,12 @@ export function diffMonitors(
   return result;
 }
 
-export function getLocalMonitors(monitors: Monitor[]) {
+export function getLocalMonitors(schemas: MonitorSchema[]) {
   const data: MonitorHashID[] = [];
-  for (const monitor of monitors) {
+  for (const schema of schemas) {
     data.push({
-      journey_id: monitor.config.id,
-      hash: monitor.hash(),
+      journey_id: schema.id,
+      hash: schema.hash,
     });
   }
   return data;
@@ -132,14 +137,20 @@ export async function buildMonitorSchema(monitors: Monitor[], isV2: boolean) {
       ...config,
       locations: translateLocation(config.locations),
     };
-    if (isV2) {
-      schema.hash = monitor.hash();
-    }
+
     if (type === 'browser') {
       const outPath = join(bundlePath, config.name + '.zip');
       const content = await bundler.build(source.file, outPath);
+      monitor.setContent(content);
       Object.assign(schema, { content, filter });
     }
+    /**
+     * Generate hash only after the bundled content is created
+     * to capture code changes in imported files
+     */
+    if (isV2) {
+      schema.hash = monitor.hash();
+    }
     schemas.push(schema);
   }
 
@@ -198,10 +209,6 @@ export async function createLightweightMonitors(
         continue;
       }
       const config = monNode.toJSON();
-      // Filter based on matched tags and name
-      if (!isMatch(config.tags, config.name, options.tags, options.match)) {
-        continue;
-      }
       const { line, col } = lineCounter.linePos(monNode.srcToken.offset);
       try {
         const mon = buildMonitorFromYaml(config, options);
@@ -232,12 +239,14 @@ export function buildMonitorFromYaml(
   }
   const schedule = config.schedule && parseSchedule(String(config.schedule));
   const privateLocations =
-    config['private_locations'] || options.privateLocations;
+    config['private_locations'] ||
+    config.privateLocations ||
+    options.privateLocations;
   delete config['private_locations'];
-
-  const alertConfig = parseAlertConfig(config);
+  const alertConfig = parseAlertConfig(config, options.alert);
   const mon = new Monitor({
     locations: options.locations,
+    tags: options.tags,
     ...config,
     privateLocations,
     schedule: schedule || options.schedule,
@@ -254,18 +263,56 @@ export function buildMonitorFromYaml(
   return mon;
 }
 
-export const parseAlertConfig = (config: MonitorConfig) => {
-  if (config['alert.status.enabled'] !== undefined) {
-    const value = config['alert.status.enabled'];
-    delete config['alert.status.enabled'];
+export const parseAlertConfig = (
+  config: MonitorConfig,
+  gConfig?: AlertConfig
+) => {
+  // If the user has provided a global alert config, merge it with the monitor alert config
+  const status = getAlertKeyValue('status', config, gConfig);
+  const tls = getAlertKeyValue('tls', config, gConfig);
+  const result = {};
+  if (status) {
+    result['status'] = status;
+  }
+  if (tls) {
+    result['tls'] = tls;
+  }
+  return Object.keys(result).length > 0 ? result : undefined;
+};
+
+export function getAlertKeyValue(
+  key: 'status' | 'tls',
+  config: MonitorConfig,
+  alertConfig?: AlertConfig
+): { enabled: boolean } {
+  const value = config.alert;
+  if (value?.[key]?.enabled !== undefined) {
     return {
-      status: {
-        enabled: value,
-      },
+      enabled: value[key].enabled,
     };
   }
-  return config.alert;
-};
+
+  if (value?.[`${key}.enabled`] !== undefined) {
+    const val = value?.[`${key}.enabled`];
+    delete value?.[`${key}.enabled`];
+    if (Object.keys(value).length === 0) {
+      delete config.alert;
+    }
+    return {
+      enabled: val,
+    };
+  }
+  const rootKey = `alert.${key}.enabled`;
+  if (config[rootKey] !== undefined) {
+    const enabled = config[rootKey];
+    delete config[rootKey];
+    return {
+      enabled,
+    };
+  }
+
+  return alertConfig?.[key];
+}
 
 export function parseSchedule(schedule: string) {
   const EVERY_SYNTAX = '@every';

package/src/push/utils.ts

@@ -81,7 +81,7 @@ export function generateURL(options: PushOptions, operation: Operation) {
 /**
  * Bulk API is supported for push monitors only from 8.6.0 and above
  */
-export function isBulkAPISupported(version: number) {
+export function isBulkAPISupported(version: string) {
   return semver.satisfies(version, '>=8.6.0');
 }
 
@@ -103,6 +103,6 @@ export function isLightweightMonitorSupported(
  * Lighweight monitor param options are supported only from
  * 8.7.2 and above
  */
-export function isParamOptionSupported(version: number) {
+export function isParamOptionSupported(version: string) {
   return semver.satisfies(version, '>=8.7.2');
 }