[Maps] Handle cross cluster index _settings resp (#66797) (#66813)

elastic · May 15, 2020 · b80bb68 · b80bb68
1 parent d9532b8
commit b80bb68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.js b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.js
@@ -29,5 +29,9 @@ export function getIndexPatternSettings(indicesSettingsResp) {
  maxInnerResultWindow = Math.min(indexMaxInnerResultWindow, indexMaxResultWindow);
  });
 
- return { maxResultWindow, maxInnerResultWindow };
+ return {
+ maxResultWindow: maxResultWindow === Infinity ? DEFAULT_MAX_RESULT_WINDOW : maxResultWindow,
+ maxInnerResultWindow:
+ maxInnerResultWindow === Infinity ? DEFAULT_MAX_INNER_RESULT_WINDOW : maxInnerResultWindow,
+ };
 }
diff --git a/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.test.js b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.test.js
@@ -24,6 +24,14 @@ describe('max_result_window and max_inner_result_window are not set', () => {
  expect(maxInnerResultWindow).toBe(DEFAULT_MAX_INNER_RESULT_WINDOW);
  });
 
+ test('Should provide default values from cross cluster index response', () => {
+ // _settings returns empty object for cross cluster index
+ const indicesSettingsResp = {};
+ const { maxResultWindow, maxInnerResultWindow } = getIndexPatternSettings(indicesSettingsResp);
+ expect(maxResultWindow).toBe(DEFAULT_MAX_RESULT_WINDOW);
+ expect(maxInnerResultWindow).toBe(DEFAULT_MAX_INNER_RESULT_WINDOW);
+ });
+
  test('Should include default values when providing minimum values for indices in index pattern', () => {
  const indicesSettingsResp = {
  kibana_sample_data_logs: {