Fix type issues, and disable new alerting for tests

elastic · Mar 27, 2020 · 4bff2e2 · 4bff2e2
1 parent 1ea1a9e
commit 4bff2e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/x-pack/legacy/plugins/monitoring/common/constants.ts b/x-pack/legacy/plugins/monitoring/common/constants.ts
@@ -228,7 +228,7 @@ export const TELEMETRY_COLLECTION_INTERVAL = 86400000;
  * as the only way to see the new UI and actually run Kibana alerts. It will
  * be false until all alerts have been migrated, then it will be removed
  */
-export const KIBANA_ALERTING_ENABLED = true;
+export const KIBANA_ALERTING_ENABLED = false;
 
 /**
  * The prefix for all alert types used by monitoring

diff --git a/x-pack/plugins/monitoring/common/constants.ts b/x-pack/plugins/monitoring/common/constants.ts
@@ -228,7 +228,7 @@ export const TELEMETRY_COLLECTION_INTERVAL = 86400000;
  * as the only way to see the new UI and actually run Kibana alerts. It will
  * be false until all alerts have been migrated, then it will be removed
  */
-export const KIBANA_ALERTING_ENABLED = true;
+export const KIBANA_ALERTING_ENABLED = false;
 
 /**
  * The prefix for all alert types used by monitoring

diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts
@@ -6,23 +6,17 @@
 
 import moment from 'moment-timezone';
 import { getLicenseExpiration } from './license_expiration';
-import {
-  ALERT_TYPE_LICENSE_EXPIRATION,
-  MONITORING_CONFIG_ALERTING_EMAIL_ADDRESS,
-} from '../../common/constants';
+import { ALERT_TYPE_LICENSE_EXPIRATION } from '../../common/constants';
 import { Logger } from 'src/core/server';
-import { AlertServices, AlertInstance } from '../../../alerting/server';
+import { AlertServices } from '../../../alerting/server';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import {
   AlertCommonParams,
   AlertCommonState,
   AlertLicensePerClusterState,
-  AlertCommonExecutorOptions,
   AlertLicense,
 } from './types';
-import { SavedObject, SavedObjectAttributes } from 'src/core/server';
 import { executeActions } from '../lib/alerts/license_expiration.lib';
-import { SavedObjectsClientContract } from 'src/core/server';
 import { PreparedAlert, getPreparedAlert } from '../lib/alerts/get_prepared_alert';
 
 jest.mock('../lib/alerts/license_expiration.lib', () => ({