Merge branch 'feature/ingest-node-pipelines' into ingest-node-pipelin…

…es/create-edit-routes

package.json

@@ -126,7 +126,7 @@
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.4.0",
-    "@elastic/request-crypto": "^1.0.2",
+    "@elastic/request-crypto": "1.1.2",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/good-squeeze": "5.2.1",
     "@hapi/wreck": "^15.0.2",

test/scripts/jenkins_visual_regression.sh

@@ -12,7 +12,7 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 
 echo " -> running visual regression tests from kibana directory"
 checks-reporter-with-killswitch "X-Pack visual regression tests" \
-  yarn percy exec -t 500 \
+  yarn percy exec -t 500 -- -- \
   node scripts/functional_tests \
     --debug --bail \
     --kibana-install-dir "$installDir" \

test/scripts/jenkins_xpack_visual_regression.sh

@@ -14,7 +14,7 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1
 echo " -> running visual regression tests from x-pack directory"
 cd "$XPACK_DIR"
 checks-reporter-with-killswitch "X-Pack visual regression tests" \
-  yarn percy exec -t 500 \
+  yarn percy exec -t 500 -- -- \
   node scripts/functional_tests \
     --debug --bail \
     --kibana-install-dir "$installDir" \

x-pack/legacy/plugins/monitoring/common/constants.ts

@@ -239,15 +239,11 @@ export const ALERT_TYPE_PREFIX = 'monitoring_';
  * This is the alert type id for the license expiration alert
  */
 export const ALERT_TYPE_LICENSE_EXPIRATION = `${ALERT_TYPE_PREFIX}alert_type_license_expiration`;
-/**
- * This is the alert type id for the cluster state alert
- */
-export const ALERT_TYPE_CLUSTER_STATE = `${ALERT_TYPE_PREFIX}alert_type_cluster_state`;
 
 /**
  * A listing of all alert types
  */
-export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION, ALERT_TYPE_CLUSTER_STATE];
+export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION];
 
 /**
  * Matches the id for the built-in in email action type
@@ -258,7 +254,7 @@ export const ALERT_ACTION_TYPE_EMAIL = '.email';
 /**
  * The number of alerts that have been migrated
  */
-export const NUMBER_OF_MIGRATED_ALERTS = 2;
+export const NUMBER_OF_MIGRATED_ALERTS = 1;
 
 /**
  * The advanced settings config name for the email address

x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js

@@ -6,15 +6,10 @@
 
 import React from 'react';
 import chrome from '../../np_imports/ui/chrome';
-import { capitalize, get } from 'lodash';
+import { capitalize } from 'lodash';
 import { formatDateTimeLocal } from '../../../common/formatting';
 import { formatTimestampToDuration } from '../../../common';
-import {
-  CALCULATE_DURATION_SINCE,
-  EUI_SORT_DESCENDING,
-  ALERT_TYPE_LICENSE_EXPIRATION,
-  ALERT_TYPE_CLUSTER_STATE,
-} from '../../../common/constants';
+import { CALCULATE_DURATION_SINCE, EUI_SORT_DESCENDING } from '../../../common/constants';
 import { mapSeverity } from './map_severity';
 import { FormattedAlert } from 'plugins/monitoring/components/alerts/formatted_alert';
 import { EuiMonitoringTable } from 'plugins/monitoring/components/table';
@@ -26,8 +21,6 @@ const linkToCategories = {
   'elasticsearch/indices': 'Elasticsearch Indices',
   'kibana/instances': 'Kibana Instances',
   'logstash/instances': 'Logstash Nodes',
-  [ALERT_TYPE_LICENSE_EXPIRATION]: 'License expiration',
-  [ALERT_TYPE_CLUSTER_STATE]: 'Cluster state',
 };
 const getColumns = (kbnUrl, scope, timezone) => [
   {
@@ -101,22 +94,19 @@ const getColumns = (kbnUrl, scope, timezone) => [
     }),
     field: 'message',
     sortable: true,
-    render: (_message, alert) => {
-      const message = get(alert, 'message.text', get(alert, 'message', ''));
-      return (
-        <FormattedAlert
-          prefix={alert.prefix}
-          suffix={alert.suffix}
-          message={message}
-          metadata={alert.metadata}
-          changeUrl={target => {
-            scope.$evalAsync(() => {
-              kbnUrl.changePath(target);
-            });
-          }}
-        />
-      );
-    },
+    render: (message, alert) => (
+      <FormattedAlert
+        prefix={alert.prefix}
+        suffix={alert.suffix}
+        message={message}
+        metadata={alert.metadata}
+        changeUrl={target => {
+          scope.$evalAsync(() => {
+            kbnUrl.changePath(target);
+          });
+        }}
+      />
+    ),
   },
   {
     name: i18n.translate('xpack.monitoring.alerts.categoryColumnTitle', {
@@ -158,8 +148,8 @@ const getColumns = (kbnUrl, scope, timezone) => [
 export const Alerts = ({ alerts, angular, sorting, pagination, onTableChange }) => {
   const alertsFlattened = alerts.map(alert => ({
     ...alert,
-    status: get(alert, 'metadata.severity', get(alert, 'severity', 0)),
-    category: get(alert, 'metadata.link', get(alert, 'type', null)),
+    status: alert.metadata.severity,
+    category: alert.metadata.link,
   }));
 
   const injector = chrome.dangerouslyGetActiveInjector();

x-pack/legacy/plugins/monitoring/public/components/alerts/status.test.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { kfetch } from 'ui/kfetch';
 import { AlertsStatus, AlertsStatusProps } from './status';
-import { ALERT_TYPES } from '../../../common/constants';
+import { ALERT_TYPE_PREFIX } from '../../../common/constants';
 import { getSetupModeState } from '../../lib/setup_mode';
 import { mockUseEffects } from '../../jest.helpers';
 
@@ -63,7 +63,11 @@ describe('Status', () => {
 
   it('should render a success message if all alerts have been migrated and in setup mode', async () => {
     (kfetch as jest.Mock).mockReturnValue({
-      data: ALERT_TYPES.map(type => ({ alertTypeId: type })),
+      data: [
+        {
+          alertTypeId: ALERT_TYPE_PREFIX,
+        },
+      ],
     });
 
     (getSetupModeState as jest.Mock).mockReturnValue({

x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx

@@ -142,7 +142,7 @@ export const AlertsStatus: React.FC<AlertsStatusProps> = (props: AlertsStatusPro
       );
     }
 
-    const allMigrated = kibanaAlerts.length >= NUMBER_OF_MIGRATED_ALERTS;
+    const allMigrated = kibanaAlerts.length === NUMBER_OF_MIGRATED_ALERTS;
     if (allMigrated) {
       if (setupModeEnabled) {
         return (

x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js

@@ -6,12 +6,14 @@
 
 import React, { Fragment } from 'react';
 import moment from 'moment-timezone';
+import chrome from '../../../np_imports/ui/chrome';
 import { FormattedAlert } from 'plugins/monitoring/components/alerts/formatted_alert';
 import { mapSeverity } from 'plugins/monitoring/components/alerts/map_severity';
 import { formatTimestampToDuration } from '../../../../common/format_timestamp_to_duration';
 import {
   CALCULATE_DURATION_SINCE,
   KIBANA_ALERTING_ENABLED,
+  ALERT_TYPE_LICENSE_EXPIRATION,
   CALCULATE_DURATION_UNTIL,
 } from '../../../../common/constants';
 import { formatDateTimeLocal } from '../../../../common/formatting';
@@ -29,37 +31,6 @@ import {
   EuiLink,
 } from '@elastic/eui';
 
-function replaceTokens(alert) {
-  if (!alert.message.tokens) {
-    return alert.message.text;
-  }
-
-  let text = alert.message.text;
-
-  for (const token of alert.message.tokens) {
-    if (token.type === 'time') {
-      text = text.replace(
-        token.startToken,
-        token.isRelative
-          ? formatTimestampToDuration(alert.expirationTime, CALCULATE_DURATION_UNTIL)
-          : moment.tz(alert.expirationTime, moment.tz.guess()).format('LLL z')
-      );
-    } else if (token.type === 'link') {
-      const linkPart = new RegExp(`${token.startToken}(.+?)${token.endToken}`).exec(text);
-      // TODO: we assume this is at the end, which works for now but will not always work
-      const nonLinkText = text.replace(linkPart[0], '');
-      text = (
-        <Fragment>
-          {nonLinkText}
-          <EuiLink href={`#${token.url}`}>{linkPart[1]}</EuiLink>
-        </Fragment>
-      );
-    }
-  }
-
-  return text;
-}
-
 export function AlertsPanel({ alerts, changeUrl }) {
   const goToAlerts = () => changeUrl('/alerts');
 
@@ -87,6 +58,9 @@ export function AlertsPanel({ alerts, changeUrl }) {
       severityIcon.iconType = 'check';
     }
 
+    const injector = chrome.dangerouslyGetActiveInjector();
+    const timezone = injector.get('config').get('dateFormat:tz');
+
     return (
       <EuiCallOut
         key={`alert-item-${index}`}
@@ -109,7 +83,7 @@ export function AlertsPanel({ alerts, changeUrl }) {
               id="xpack.monitoring.cluster.overview.alertsPanel.lastCheckedTimeText"
               defaultMessage="Last checked {updateDateTime} (triggered {duration} ago)"
               values={{
-                updateDateTime: formatDateTimeLocal(item.update_timestamp),
+                updateDateTime: formatDateTimeLocal(item.update_timestamp, timezone),
                 duration: formatTimestampToDuration(item.timestamp, CALCULATE_DURATION_SINCE),
               }}
             />
@@ -122,7 +96,14 @@ export function AlertsPanel({ alerts, changeUrl }) {
   const alertsList = KIBANA_ALERTING_ENABLED
     ? alerts.map((alert, idx) => {
         const callOutProps = mapSeverity(alert.severity);
-        const message = replaceTokens(alert);
+        let message = alert.message
+          // scan message prefix and replace relative times
+          // \w: Matches any alphanumeric character from the basic Latin alphabet, including the underscore. Equivalent to [A-Za-z0-9_].
+          .replace(
+            '#relative',
+            formatTimestampToDuration(alert.expirationTime, CALCULATE_DURATION_UNTIL)
+          )
+          .replace('#absolute', moment.tz(alert.expirationTime, moment.tz.guess()).format('LLL z'));
 
         if (!alert.isFiring) {
           callOutProps.title = i18n.translate(
@@ -137,30 +118,22 @@ export function AlertsPanel({ alerts, changeUrl }) {
           );
           callOutProps.color = 'success';
           callOutProps.iconType = 'check';
+        } else {
+          if (alert.type === ALERT_TYPE_LICENSE_EXPIRATION) {
+            message = (
+              <Fragment>
+                {message}
+                &nbsp;
+                <EuiLink href="#license">Please update your license</EuiLink>
+              </Fragment>
+            );
+          }
         }
 
         return (
-          <Fragment key={idx}>
-            <EuiCallOut {...callOutProps}>
-              <p>{message}</p>
-              <EuiText size="xs">
-                <p data-test-subj="alertMeta" className="monCallout--meta">
-                  <FormattedMessage
-                    id="xpack.monitoring.cluster.overview.alertsPanel.lastCheckedTimeText"
-                    defaultMessage="Last checked {updateDateTime} (triggered {duration} ago)"
-                    values={{
-                      updateDateTime: formatDateTimeLocal(alert.lastCheckedMS),
-                      duration: formatTimestampToDuration(
-                        alert.triggeredMS,
-                        CALCULATE_DURATION_SINCE
-                      ),
-                    }}
-                  />
-                </p>
-              </EuiText>
-            </EuiCallOut>
-            <EuiSpacer />
-          </Fragment>
+          <EuiCallOut key={idx} {...callOutProps}>
+            <p>{message}</p>
+          </EuiCallOut>
         );
       })
     : alerts.map((item, index) => (

x-pack/legacy/plugins/monitoring/public/views/alerts/index.js

@@ -18,37 +18,25 @@ import { Alerts } from '../../components/alerts';
 import { MonitoringViewBaseEuiTableController } from '../base_eui_table_controller';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiPage, EuiPageBody, EuiPageContent, EuiSpacer, EuiLink } from '@elastic/eui';
-import { CODE_PATH_ALERTS, KIBANA_ALERTING_ENABLED } from '../../../common/constants';
+import { CODE_PATH_ALERTS } from '../../../common/constants';
 
 function getPageData($injector) {
   const globalState = $injector.get('globalState');
   const $http = $injector.get('$http');
   const Private = $injector.get('Private');
-  const url = KIBANA_ALERTING_ENABLED
-    ? `../api/monitoring/v1/alert_status`
-    : `../api/monitoring/v1/clusters/${globalState.cluster_uuid}/legacy_alerts`;
+  const url = `../api/monitoring/v1/clusters/${globalState.cluster_uuid}/legacy_alerts`;
 
   const timeBounds = timefilter.getBounds();
-  const data = {
-    timeRange: {
-      min: timeBounds.min.toISOString(),
-      max: timeBounds.max.toISOString(),
-    },
-  };
-
-  if (!KIBANA_ALERTING_ENABLED) {
-    data.ccs = globalState.ccs;
-  }
 
   return $http
-    .post(url, data)
-    .then(response => {
-      const result = get(response, 'data', []);
-      if (KIBANA_ALERTING_ENABLED) {
-        return result.alerts;
-      }
-      return result;
+    .post(url, {
+      ccs: globalState.ccs,
+      timeRange: {
+        min: timeBounds.min.toISOString(),
+        max: timeBounds.max.toISOString(),
+      },
     })
+    .then(response => get(response, 'data', []))
     .catch(err => {
       const ajaxErrorHandlers = Private(ajaxErrorHandlersProvider);
       return ajaxErrorHandlers(err);

x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts

@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { CryptoFactory, Logger } from '../../../types';
+import { Logger } from '../../../types';
 
 interface HasEncryptedHeaders {
   headers?: string;
@@ -25,9 +25,16 @@ export const decryptJobHeaders = async <
   job: JobDocPayloadType;
   logger: Logger;
 }): Promise<Record<string, string>> => {
-  const crypto: CryptoFactory = cryptoFactory(encryptionKey);
   try {
-    const decryptedHeaders: Record<string, string> = await crypto.decrypt(job.headers);
+    if (typeof job.headers !== 'string') {
+      throw new Error(
+        i18n.translate('xpack.reporting.exportTypes.common.missingJobHeadersErrorMessage', {
+          defaultMessage: 'Job headers are missing',
+        })
+      );
+    }
+    const crypto = cryptoFactory(encryptionKey);
+    const decryptedHeaders = (await crypto.decrypt(job.headers)) as Record<string, string>;
     return decryptedHeaders;
   } catch (err) {
     logger.error(err);