Merge branch '8.0' into backport/8.0/pr-119199

elastic · Nov 29, 2021 · a2b6162 · a2b6162
2 parents e022c79 + 9322069
commit a2b6162
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -183,6 +183,7 @@ async function fetchIndexPatternStats({
           {
             range: {
               [timeFieldName]: {
+                format: 'strict_date_optional_time',
                 gte: fromDate,
                 lte: toDate,
               },

diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/alert_flyout.ts
@@ -142,7 +142,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
     });
 
-    describe('tls alert', function () {
+    // FLAKY: https://github.com/elastic/kibana/issues/116865
+    describe.skip('tls alert', function () {
       const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
       const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
       let alerts: any;