Add target index settings to rollup

MrChaos1993 · MrChaos1993 · commit ec486c1013b9 · 2025-06-25T17:12:36.000+03:00
Signed-off-by: Aleksandr Tuliakov &lt;tulyakov@yandex-team.ru&gt;
diff --git a/models/interfaces.ts b/models/interfaces.ts
@@ -7,7 +7,6 @@
 
 import { long } from "@opensearch-project/opensearch/api/types";
 import { ActionType } from "../public/pages/VisualCreatePolicy/utils/constants";
-import { IndicesUpdateMode } from "../public/utils/constants";
 
 export interface ManagedIndexMetaData {
   index: string;
@@ -490,6 +489,7 @@ export interface Rollup {
   schema_version: number;
   source_index: string;
   target_index: string;
+  target_index_settings: Map<string, any> | null;
   roles: string[];
 }
 
diff --git a/public/pages/CreateRollup/components/JobNameAndIndices/JobNameAndIndices.tsx b/public/pages/CreateRollup/components/JobNameAndIndices/JobNameAndIndices.tsx
@@ -5,15 +5,17 @@
 
 import React, { Component } from "react";
 import { EuiFlexGrid, EuiSpacer, EuiFlexItem, EuiText, EuiFlexGroup, EuiHorizontalRule, EuiPanel, EuiTitle } from "@elastic/eui";
-import { ContentPanel, ContentPanelActions } from "../../../../components/ContentPanel";
+import { ContentPanelActions } from "../../../../components/ContentPanel";
 import { ModalConsumer } from "../../../../components/Modal";
 import { IndexItem } from "../../../../../models/interfaces";
+import { getOrderedJson } from "../../../../../utils/helper";
 
 interface JobNameAndIndicesProps {
   rollupId: string;
   description: string;
   sourceIndex: { label: string; value?: IndexItem }[];
   targetIndex: { label: string; value?: IndexItem }[];
+  targetIndexSettings: Pick<IndexItem, "settings"> | null;
   onChangeStep: (step: number) => void;
 }
 
@@ -23,7 +25,7 @@ export default class JobNameAndIndices extends Component<JobNameAndIndicesProps>
   }
 
   render() {
-    const { rollupId, description, onChangeStep, sourceIndex, targetIndex } = this.props;
+    const { rollupId, description, onChangeStep, sourceIndex, targetIndex, targetIndexSettings } = this.props;
 
     return (
       <EuiPanel>
@@ -72,6 +74,14 @@ export default class JobNameAndIndices extends Component<JobNameAndIndicesProps>
                 <dd>{targetIndex[0].label}</dd>
               </EuiText>
             </EuiFlexItem>
+            {targetIndexSettings && (
+              <EuiFlexItem>
+                <EuiText size="s">
+                  <dt>Target index Settings</dt>
+                  <dd>{JSON.stringify(getOrderedJson(targetIndexSettings || {}), null, 2)}</dd>
+                </EuiText>
+              </EuiFlexItem>
+            )}
             <EuiFlexItem>
               <EuiText size="s">
                 <dt>Description</dt>
diff --git a/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx b/public/pages/CreateRollup/components/RollupIndices/RollupIndices.tsx
@@ -22,15 +22,21 @@ import { IndexItem } from "../../../../../models/interfaces";
 import IndexService from "../../../../services/IndexService";
 import { CoreServicesContext } from "../../../../components/core_services";
 import { wildcardOption } from "../../../../utils/helpers";
+import AdvancedSettings from "../../../../components/AdvancedSettings";
+import flat from "flat";
+import { INDEX_SETTINGS_URL } from "../../../../utils/constants";
 
 interface RollupIndicesProps {
   indexService: IndexService;
   sourceIndex: { label: string; value?: IndexItem }[];
   sourceIndexError: string;
   targetIndex: { label: string; value?: IndexItem }[];
   targetIndexError: string;
+  targetIndexSettings: Pick<IndexItem, "settings"> | null;
+  targetIndexSettingsError: string;
   onChangeSourceIndex: (options: EuiComboBoxOptionOption<IndexItem>[]) => void;
   onChangeTargetIndex: (options: EuiComboBoxOptionOption<IndexItem>[]) => void;
+  onChangeTargetIndexSettings: (settings: Pick<IndexItem, "settings"> | null) => void;
   hasAggregation: boolean;
 }
 
@@ -124,8 +130,11 @@ export default class RollupIndices extends Component<RollupIndicesProps, RollupI
       sourceIndexError,
       targetIndex,
       targetIndexError,
+      targetIndexSettings,
+      targetIndexSettingsError,
       onChangeSourceIndex,
       onChangeTargetIndex,
+      onChangeTargetIndexSettings,
       hasAggregation,
     } = this.props;
     const { isLoading, indexOptions, targetIndexOptions } = this.state;
@@ -209,6 +218,66 @@ export default class RollupIndices extends Component<RollupIndicesProps, RollupI
             data-test-subj="targetIndexCombobox"
           />
         </EuiCompressedFormRow>
+
+        <EuiCompressedFormRow
+          error={targetIndexSettingsError}
+          isInvalid={targetIndexSettingsError != ""}
+          helpText={
+            <EuiText size={"xs"}>
+              {"Optional. The target index settings will be apply only if target index will be created during the rollup."}
+              {
+                <EuiLink external href={ROLLUP_RESULTS_HELP_TEXT_LINK} target={"_blank"} rel="noopener noreferrer">
+                  Learn more
+                </EuiLink>
+              }
+            </EuiText>
+          }
+        >
+          <AdvancedSettings
+            value={targetIndexSettings || {}}
+            onChange={(val) => {
+              if (Object.keys(val).length === 0) {
+                onChangeTargetIndexSettings(null);
+              } else {
+                onChangeTargetIndexSettings(val);
+              }
+            }}
+            accordionProps={{
+              initialIsOpen: false,
+              id: "accordionForCreateRollupTargetIndexSettings",
+              buttonContent: <h3>Target index settings</h3>,
+            }}
+            editorProps={{
+              disabled: false,
+              width: "100%",
+              formatValue: flat,
+            }}
+            rowProps={{
+              fullWidth: true,
+              label: "Specify advanced index settings",
+              helpText: (
+                <>
+                  <p>
+                    Specify a comma-delimited list of settings.{" "}
+                    <EuiLink href={INDEX_SETTINGS_URL} target="_blank" external>
+                      View index settings
+                    </EuiLink>
+                  </p>
+                  <p>
+                    All the settings will be handled in flat structure.{" "}
+                    <EuiLink
+                      href="https://opensearch.org/docs/latest/api-reference/index-apis/get-index/#query-parameters"
+                      external
+                      target="_blank"
+                    >
+                      Learn more
+                    </EuiLink>
+                  </p>
+                </>
+              ),
+            }}
+          />
+        </EuiCompressedFormRow>
       </EuiPanel>
     );
   }
diff --git a/public/pages/CreateRollup/containers/CreateRollup/CreateRollup.tsx b/public/pages/CreateRollup/containers/CreateRollup/CreateRollup.tsx
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { ChangeEvent, Component, useContext } from "react";
-import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiText } from "@elastic/eui";
+import React, { ChangeEvent, Component } from "react";
+import { EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiText } from "@elastic/eui";
 import { RouteComponentProps } from "react-router-dom";
 import { RollupService } from "../../../../services";
 import ConfigureRollup from "../../components/ConfigureRollup";
 import RollupIndices from "../../components/RollupIndices";
 import CreateRollupSteps from "../../components/CreateRollupSteps";
 import IndexService from "../../../../services/IndexService";
 import { IndexItem } from "../../../../../models/interfaces";
-import { DataSourceMenuContext, DataSourceMenuProperties } from "../../../../services/DataSourceMenuContext";
+import { DataSourceMenuProperties } from "../../../../services/DataSourceMenuContext";
 
 interface CreateRollupProps extends RouteComponentProps, DataSourceMenuProperties {
   rollupService: RollupService;
@@ -27,10 +27,13 @@ interface CreateRollupProps extends RouteComponentProps, DataSourceMenuPropertie
   sourceIndexError: string;
   targetIndex: { label: string; value?: IndexItem }[];
   targetIndexError: string;
+  targetIndexSettings: Pick<IndexItem, "settings"> | null;
+  targetIndexSettingsError: string;
   onChangeName: (e: ChangeEvent<HTMLInputElement>) => void;
   onChangeDescription: (value: ChangeEvent<HTMLTextAreaElement>) => void;
   onChangeSourceIndex: (options: EuiComboBoxOptionOption<IndexItem>[]) => void;
   onChangeTargetIndex: (options: EuiComboBoxOptionOption<IndexItem>[]) => void;
+  onChangeTargetIndexSettings: (settings: Pick<IndexItem, "settings"> | null) => void;
   currentStep: number;
   hasAggregation: boolean;
   useNewUX: boolean;
diff --git a/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx b/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx
@@ -5,7 +5,7 @@
 
 import React, { ChangeEvent, Component, useContext } from "react";
 import { EuiSmallButton, EuiSmallButtonEmpty, EuiComboBoxOptionOption, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
-import { RouteComponentProps, useHistory } from "react-router-dom";
+import { RouteComponentProps } from "react-router-dom";
 import moment from "moment";
 import { RollupService } from "../../../../services";
 import { BREADCRUMBS, ROUTES } from "../../../../utils/constants";
@@ -24,7 +24,6 @@ import { CoreServicesContext } from "../../../../components/core_services";
 import {
   DataSourceMenuContext,
   DataSourceMenuProperties,
-  DataSourceMenuReadOnlyContext,
   DataSourceMenuReadOnlyProperties,
 } from "../../../../services/DataSourceMenuContext";
 import { useUpdateUrlWithDataSourceProperties } from "../../../../components/MDSEnabledComponent";
@@ -53,6 +52,8 @@ interface CreateRollupFormState {
   sourceIndexError: string;
   targetIndex: { label: string; value?: IndexItem }[];
   targetIndexError: string;
+  targetIndexSettings: Pick<IndexItem, "settings"> | null;
+  targetIndexSettingsError: string;
 
   mappings: any;
   allMappings: FieldItem[][];
@@ -115,6 +116,8 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
     sourceIndexError: "",
     targetIndex: [],
     targetIndexError: "",
+    targetIndexSettings: null,
+    targetIndexSettingsError: "",
 
     timestamp: [],
     timestampError: "",
@@ -333,6 +336,12 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
     this.setState({ targetIndex: options, rollupJSON: newJSON, targetIndexError: targetIndexError });
   };
 
+  onChangeTargetIndexSettings = (settings: Pick<IndexItem, "settings"> | null): void => {
+    let newJSON = this.state.rollupJSON;
+    newJSON.rollup.target_index_settings = settings;
+    this.setState({ targetIndexSettings: settings, rollupJSON: newJSON });
+  };
+
   onChangeIntervalType = (intervalType: string): void => {
     this.setState({ intervalType, timeunit: "h" });
   };
@@ -573,6 +582,8 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
       sourceIndexError,
       targetIndex,
       targetIndexError,
+      targetIndexSettings,
+      targetIndexSettingsError,
       currentStep,
 
       timestamp,
@@ -614,10 +625,13 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
           sourceIndexError={sourceIndexError}
           targetIndex={targetIndex}
           targetIndexError={targetIndexError}
+          targetIndexSettings={targetIndexSettings}
+          targetIndexSettingsError={targetIndexSettingsError}
           onChangeName={this.onChangeName}
           onChangeDescription={this.onChangeDescription}
           onChangeSourceIndex={this.onChangeSourceIndex}
           onChangeTargetIndex={this.onChangeTargetIndex}
+          onChangeTargetIndexSettings={this.onChangeTargetIndexSettings}
           currentStep={this.state.currentStep}
           hasAggregation={selectedDimensionField.length != 0 || selectedMetrics.length != 0}
           useNewUX={useNewUX}
@@ -677,6 +691,7 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
           description={description}
           sourceIndex={sourceIndex}
           targetIndex={targetIndex}
+          targetIndexSettings={targetIndexSettings}
           intervalType={intervalType}
           intervalValue={intervalValue}
           timestamp={timestamp}
diff --git a/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx b/public/pages/CreateRollup/containers/CreateRollupStep4/CreateRollupStep4.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { Component } from "react";
-import { EuiSpacer, EuiTitle, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiCallOut, EuiText } from "@elastic/eui";
+import { EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionOption, EuiCallOut, EuiText } from "@elastic/eui";
 import { RouteComponentProps } from "react-router-dom";
 import { RollupService } from "../../../../services";
 import { BREADCRUMBS, ROUTES } from "../../../../utils/constants";
@@ -24,6 +24,7 @@ interface CreateRollupProps extends RouteComponentProps {
   description: string;
   sourceIndex: { label: string; value?: IndexItem }[];
   targetIndex: { label: string; value?: IndexItem }[];
+  targetIndexSettings: Pick<IndexItem, "settings"> | null;
 
   timestamp: EuiComboBoxOptionOption<String>[];
   intervalType: string;
diff --git a/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx b/public/pages/RollupDetails/components/GeneralInformation/GeneralInformation.tsx
@@ -5,14 +5,15 @@
 
 import React, { Component } from "react";
 import { EuiFlexGrid, EuiSpacer, EuiFlexItem, EuiText, EuiFlexGroup, EuiHorizontalRule, EuiPanel, EuiTitle } from "@elastic/eui";
-import { ContentPanel, ContentPanelActions } from "../../../../components/ContentPanel";
+import { ContentPanelActions } from "../../../../components/ContentPanel";
 import { ModalConsumer } from "../../../../components/Modal";
 
 interface GeneralInformationProps {
   rollupId: string;
   description: string;
   sourceIndex: string;
   targetIndex: string;
+  targetIndexSettings: string | null;
   scheduleText: string;
   pageSize: number;
   lastUpdated: string;
@@ -26,11 +27,23 @@ export default class GeneralInformation extends Component<GeneralInformationProp
   }
 
   render() {
-    const { rollupId, description, onEdit, sourceIndex, targetIndex, scheduleText, pageSize, lastUpdated, useNewUX } = this.props;
+    const {
+      rollupId,
+      description,
+      onEdit,
+      sourceIndex,
+      targetIndex,
+      targetIndexSettings,
+      scheduleText,
+      pageSize,
+      lastUpdated,
+      useNewUX,
+    } = this.props;
     const infoItems = [
       { term: "Name", value: rollupId },
       { term: "Source index", value: sourceIndex },
       { term: "Target index", value: targetIndex },
+      { term: "Target index settings", value: targetIndexSettings },
       { term: "Schedule", value: scheduleText },
       { term: "Description", value: description || "-" },
       { term: "Last updated", value: lastUpdated },
@@ -61,14 +74,16 @@ export default class GeneralInformation extends Component<GeneralInformationProp
         <EuiHorizontalRule margin={"xs"} />
         <div>
           <EuiFlexGrid columns={4}>
-            {infoItems.map((item) => (
-              <EuiFlexItem key={`${item.term}#${item.value}`}>
-                <EuiText size="s">
-                  <dt>{item.term}</dt>
-                  <dd>{item.value}</dd>
-                </EuiText>
-              </EuiFlexItem>
-            ))}
+            {infoItems
+              .filter((v) => v.value != null)
+              .map((item) => (
+                <EuiFlexItem key={`${item.term}#${item.value}`}>
+                  <EuiText size="s">
+                    <dt>{item.term}</dt>
+                    <dd>{item.value}</dd>
+                  </EuiText>
+                </EuiFlexItem>
+              ))}
           </EuiFlexGrid>
           <EuiSpacer size="s" />
         </div>
diff --git a/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx b/public/pages/RollupDetails/containers/RollupDetails/RollupDetails.tsx
