Merge branch 'master' into eui-upgrade-38.2.0

elastic · Oct 11, 2021 · d13120a · d13120a
2 parents dd4ccbb + 804da09
commit d13120a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/renovate.json5 b/renovate.json5
@@ -75,6 +75,16 @@
         labels: ['Team:Operations', 'release_note:skip'],
         enabled: true,
       },
+      {
+        groupName: 'polyfills',
+        packageNames: ['core-js'],
+        matchPackagePatterns: ["polyfill"],
+        excludePackageNames: ['@loaders.gl/polyfills'],
+        reviewers: ['team:kibana-operations'],
+        matchBaseBranches: ['master'],
+        labels: ['Team:Operations', 'release_note:skip'],
+        enabled: true,
+      },
       {
         groupName: 'vega related modules',
         packageNames: ['vega', 'vega-lite', 'vega-schema-url-parser', 'vega-tooltip'],

diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
@@ -9,6 +9,7 @@ import { useState, useCallback } from 'react';
 import { EuiTableSortingType } from '@elastic/eui';
 import { euiTableStorageGetter, euiTableStorageSetter } from '../../components/table';
 import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { EUI_SORT_ASCENDING } from '../../../common/constants';
 
 interface Pagination {
   pageSize: number;
@@ -77,7 +78,9 @@ export function useTable(storageKey: string) {
   );
 
   // get initial state from localStorage
-  const [sorting, setSorting] = useState<Sorting>(storageData.sort || { sort: {} });
+  const [sorting, setSorting] = useState<Sorting>(
+    storageData.sort || { sort: { field: 'name', direction: EUI_SORT_ASCENDING } }
+  );
 
   const [query, setQuery] = useState('');
 

diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/item_template.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/item_template.tsx
@@ -25,6 +25,7 @@ export const ItemTemplate: React.FC<ItemTemplateProps> = (props) => {
     },
     {
       id: 'advanced',
+      testSubj: 'esItemDetailAdvancedLink',
       label: i18n.translate('xpack.monitoring.esItemNavigation.advancedLinkText', {
         defaultMessage: 'Advanced',
       }),

diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -103,7 +103,7 @@ <h1 class="euiTitle euiTitle--xsmall">{{pageTitle || monitoringMain.instance}}</
       </a>
       <a
         ng-if="monitoringMain.instance && (monitoringMain.name === 'nodes' || monitoringMain.name === 'indices')"
-        data-test-subj="esNodeDetailAdvancedLink"
+        data-test-subj="esItemDetailAdvancedLink"
         kbn-href="#/elasticsearch/{{ monitoringMain.name }}/{{ monitoringMain.resolver }}/advanced"
         class="euiTab"
         ng-class="{'euiTab-isSelected': monitoringMain.page === 'advanced'}"

diff --git a/x-pack/plugins/uptime/public/hooks/use_url_params.ts b/x-pack/plugins/uptime/public/hooks/use_url_params.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useCallback, useEffect, useMemo } from 'react';
+import { useCallback, useEffect } from 'react';
 import { parse, stringify } from 'query-string';
 import { useLocation, useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
@@ -28,7 +28,7 @@ const getParsedParams = (search: string) => {
 export const useGetUrlParams: GetUrlParams = () => {
   const { search } = useLocation();
 
-  return useMemo(() => getSupportedUrlParams(getParsedParams(search)), [search]);
+  return getSupportedUrlParams(getParsedParams(search));
 };
 
 const getMapFromFilters = (value: any): Map<string, any> | undefined => {

diff --git a/x-pack/test/accessibility/apps/index_lifecycle_management.ts b/x-pack/test/accessibility/apps/index_lifecycle_management.ts
@@ -57,7 +57,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     throw new Error(`Could not find ${policyName} in policy table`);
   };
 
-  describe('Index Lifecycle Management', async () => {
+  // FLAKY
+  // https://github.com/elastic/kibana/issues/114541
+  // https://github.com/elastic/kibana/issues/114542
+  describe.skip('Index Lifecycle Management', async () => {
     before(async () => {
       await esClient.ilm.putLifecycle({ policy: POLICY_NAME, body: POLICY_ALL_PHASES });
       await esClient.indices.putIndexTemplate({

diff --git a/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js b/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js
@@ -21,7 +21,7 @@ export function MonitoringElasticsearchNodeDetailProvider({ getService }) {
 
   return new (class ElasticsearchNodeDetail {
     async clickAdvanced() {
-      return testSubjects.click('esNodeDetailAdvancedLink');
+      return testSubjects.click('esItemDetailAdvancedLink');
     }
 
     async getSummary() {