Merge branch 'feature/refactor-context-initilization' of github.com:s…

…hahzad31/kibana into feature/refactor-context-initilization
elastic · Jan 14, 2020 · e3bdfa2 · e3bdfa2
2 parents 99fc6f1 + 68d57ac
commit e3bdfa2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -16,11 +16,6 @@ export const DEFAULT_TIME_RANGE = 'timepicker:timeDefaults';
 export const DEFAULT_REFRESH_RATE_INTERVAL = 'timepicker:refreshIntervalDefaults';
 export const DEFAULT_SIEM_TIME_RANGE = 'siem:timeDefaults';
 export const DEFAULT_SIEM_REFRESH_INTERVAL = 'siem:refreshIntervalDefaults';
-
-// DEPRECATED: THIS WILL BE REMOVED VERY SOON AND IS NO LONGER USED ON THE BACKEND
-// TODO: Remove this as soon as no code is left that is pulling data from it.
-export const DEFAULT_SIGNALS_INDEX_KEY = 'siem:defaultSignalsIndex';
-
 export const DEFAULT_SIGNALS_INDEX = '.siem-signals';
 export const DEFAULT_MAX_SIGNALS = 100;
 export const DEFAULT_SEARCH_AFTER_PAGE_SIZE = 100;

diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
@@ -26,7 +26,6 @@ import {
   DEFAULT_TO,
   DEFAULT_SIGNALS_INDEX,
   SIGNALS_INDEX_KEY,
-  DEFAULT_SIGNALS_INDEX_KEY,
 } from './common/constants';
 import { defaultIndexPattern } from './default_index_pattern';
 import { initServerWithKibana } from './server/kibana.index';
@@ -106,20 +105,6 @@ export const siem = (kibana: any) => {
           category: ['siem'],
           requiresPageReload: true,
         },
-        // DEPRECATED: This should be removed once the front end is no longer using any parts of it.
-        // TODO: Remove this as soon as no code is left that is pulling data from it.
-        [DEFAULT_SIGNALS_INDEX_KEY]: {
-          name: i18n.translate('xpack.siem.uiSettings.defaultSignalsIndexLabel', {
-            defaultMessage: 'Elasticsearch signals index',
-          }),
-          value: DEFAULT_SIGNALS_INDEX,
-          description: i18n.translate('xpack.siem.uiSettings.defaultSignalsIndexDescription', {
-            defaultMessage:
-              '<p>Elasticsearch signals index from which outputted signals will appear by default</p>',
-          }),
-          category: ['siem'],
-          requiresPageReload: true,
-        },
         [DEFAULT_ANOMALY_SCORE]: {
           name: i18n.translate('xpack.siem.uiSettings.defaultAnomalyScoreLabel', {
             defaultMessage: 'Anomaly threshold',

diff --git a/...time/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx b/...time/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
@@ -8,8 +8,8 @@ import React, { useContext } from 'react';
 import { EuiHealth, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { UptimeThemeContext } from '../../../../contexts';
-import { UNNAMED_LOCATION } from '../../../../../common/constants';
 import { UP } from './monitor_status_list';
+import { UNNAMED_LOCATION } from '../../../../../common/constants';
 
 interface MonitorStatusRowProps {
   /**