Merge branch 'master' into chore/ban-lodash-template

elastic · May 18, 2021 · 7e3f8ca · 7e3f8ca
2 parents 723e431 + 0f97665
commit 7e3f8ca
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 38 deletions.
diff --git a/...ns/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts b/...ns/security_solution/public/detections/containers/detection_engine/rules/__mocks__/api.ts
@@ -68,7 +68,7 @@ export const getRuleStatusById = async ({
         gap: null,
         bulk_create_time_durations: ['2235.01'],
         search_after_time_durations: ['616.97'],
-        last_look_back_date: '2020-03-19T00:32:07.996Z',
+        last_look_back_date: '2020-03-19T00:32:07.996Z', // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
       },
       failures: [],
     },
@@ -94,7 +94,7 @@ export const getRulesStatusByIds = async ({
         gap: null,
         bulk_create_time_durations: ['2235.01'],
         search_after_time_durations: ['616.97'],
-        last_look_back_date: '2020-03-19T00:32:07.996Z',
+        last_look_back_date: '2020-03-19T00:32:07.996Z', // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
       },
       failures: [],
     },

diff --git a/...ck/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts b/...ck/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
@@ -270,7 +270,7 @@ export interface RuleInfoStatus {
   last_success_at: string | null;
   last_failure_message: string | null;
   last_success_message: string | null;
-  last_look_back_date: string | null | undefined;
+  last_look_back_date: string | null | undefined; // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
   gap: string | null | undefined;
   bulk_create_time_durations: string[] | null | undefined;
   search_after_time_durations: string[] | null | undefined;

diff --git a/...ity_solution/public/detections/containers/detection_engine/rules/use_rule_status.test.tsx b/...ity_solution/public/detections/containers/detection_engine/rules/use_rule_status.test.tsx
@@ -112,7 +112,7 @@ describe('useRuleStatus', () => {
               gap: null,
               bulk_create_time_durations: ['2235.01'],
               search_after_time_durations: ['616.97'],
-              last_look_back_date: '2020-03-19T00:32:07.996Z',
+              last_look_back_date: '2020-03-19T00:32:07.996Z', // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
             },
             failures: [],
           },
@@ -168,7 +168,7 @@ describe('useRuleStatus', () => {
                 gap: null,
                 last_failure_at: null,
                 last_failure_message: null,
-                last_look_back_date: '2020-03-19T00:32:07.996Z',
+                last_look_back_date: '2020-03-19T00:32:07.996Z', // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
                 last_success_at: 'mm/dd/yyyyTHH:MM:sssz',
                 last_success_message: 'it is a success',
                 search_after_time_durations: ['616.97'],

diff --git a/.../plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx b/.../plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
@@ -369,20 +369,6 @@ export const getMonitoringColumns = (
       truncateText: true,
       width: '14%',
     },
-    // hiding this field until after 7.11 release
-    // {
-    //   field: 'current_status.last_look_back_date',
-    //   name: i18n.COLUMN_LAST_LOOKBACK_DATE,
-    //   render: (value: RuleStatus['current_status']['last_look_back_date']) => {
-    //     return value == null ? (
-    //       getEmptyTagValue()
-    //     ) : (
-    //       <FormattedDate value={value} fieldName={'last look back date'} />
-    //     );
-    //   },
-    //   truncateText: true,
-    //   width: '16%',
-    // },
     {
       field: 'current_status.status_date',
       name: i18n.COLUMN_LAST_COMPLETE_RUN,

diff --git a/...ugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx b/...ugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
@@ -157,7 +157,7 @@ describe('AllRules', () => {
             gap: null,
             last_failure_at: null,
             last_failure_message: null,
-            last_look_back_date: new Date().toISOString(),
+            last_look_back_date: new Date().toISOString(), // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
             last_success_at: new Date().toISOString(),
             last_success_message: 'it is a success',
             search_after_time_durations: ['616.97'],

diff --git a/.../plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts b/.../plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
@@ -358,13 +358,6 @@ export const COLUMN_GAP = i18n.translate(
   }
 );
 
-export const COLUMN_LAST_LOOKBACK_DATE = i18n.translate(
-  'xpack.securitySolution.detectionEngine.rules.allRules.columns.lastLookBackDate',
-  {
-    defaultMessage: 'Last Look-Back Date',
-  }
-);
-
 export const RULES_TAB = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules',
   {

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.test.ts
@@ -315,7 +315,7 @@ describe('utils', () => {
             gap: null,
             bulk_create_time_durations: [],
             search_after_time_durations: [],
-            last_look_back_date: null,
+            last_look_back_date: null, // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
           },
           failures: [],
         },
@@ -333,7 +333,7 @@ describe('utils', () => {
             gap: null,
             bulk_create_time_durations: [],
             search_after_time_durations: [],
-            last_look_back_date: null,
+            last_look_back_date: null, // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
           },
           failures: [],
         },
@@ -349,7 +349,7 @@ describe('utils', () => {
             gap: null,
             bulk_create_time_durations: [],
             search_after_time_durations: [],
-            last_look_back_date: null,
+            last_look_back_date: null, // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
           },
           failures: [
             {
@@ -363,7 +363,7 @@ describe('utils', () => {
               gap: null,
               bulk_create_time_durations: [],
               search_after_time_durations: [],
-              last_look_back_date: null,
+              last_look_back_date: null, // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
             },
             {
               alert_id: 'f4b8e31d-cf93-4bde-a265-298bde885cd7',
@@ -376,7 +376,7 @@ describe('utils', () => {
               gap: null,
               bulk_create_time_durations: [],
               search_after_time_durations: [],
-              last_look_back_date: null,
+              last_look_back_date: null, // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
             },
           ],
         },

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
@@ -131,7 +131,7 @@ export interface IRuleStatusResponseAttributes {
   last_success_at: LastSuccessAt | null | undefined;
   last_success_message: LastSuccessMessage | null | undefined;
   status: JobStatus | null | undefined;
-  last_look_back_date: string | null | undefined;
+  last_look_back_date: string | null | undefined; // NOTE: This is no longer used on the UI, but left here in case users are using it within the API
   gap: string | null | undefined;
   bulk_create_time_durations: string[] | null | undefined;
   search_after_time_durations: string[] | null | undefined;

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20505,7 +20505,6 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.activateTitle": "有効化",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gap": "最後のギャップ (該当する場合) ",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "インデックス時間 (ミリ秒) ",
-    "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastLookBackDate": "前回の確認日",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastResponseTitle": "前回の応答",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastRunTitle": "前回の実行",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastUpdateTitle": "最終更新",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -20795,7 +20795,6 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.activateTitle": "已激活",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.gap": "上一缺口 (如果有) ",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.indexingTimes": "索引时间 (ms)",
-    "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastLookBackDate": "最后回查日期",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastResponseTitle": "上次响应",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastRunTitle": "上次运行",
     "xpack.securitySolution.detectionEngine.rules.allRules.columns.lastUpdateTitle": "上次更新时间",

diff --git a/...ion_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts b/...ion_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts
@@ -626,8 +626,7 @@ export default ({ getService }: FtrProviderContext) => {
         expect(ips).to.eql(['127.0.0.1', '127.0.0.3']);
       });
 
-      // flaky https://github.com/elastic/kibana/issues/89389
-      it.skip('will return 4 results if we have a list that excludes all ips', async () => {
+      it('will return 4 results if we have a list that excludes all ips', async () => {
         await importFile(
           supertest,
           'ip',

diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -721,7 +721,7 @@ export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<
 export const waitFor = async (
   functionToTest: () => Promise<boolean>,
   functionName: string,
-  maxTimeout: number = 10000,
+  maxTimeout: number = 20000,
   timeoutWait: number = 10
 ): Promise<void> => {
   await new Promise<void>(async (resolve, reject) => {