[MM-49084] public/model/config: elasticsearch: add ingore option to some indexes to purge (#23571)

Этот коммит содержится в:
Ibrahim Serdar Acikgoz
2023-06-10 00:50:08 +03:00
коммит произвёл GitHub
родитель b9f52126c2
Коммит 446b474489
7 изменённых файлов: 82 добавлений и 0 удалений

Просмотреть файл

@@ -362,6 +362,25 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
}
}
/>
<AdminTextSetting
disabled={true}
helpText={
<Memo(MemoizedFormattedMessage)
defaultMessage="When filled in, these indexes will be ignored during the purge, separated by commas."
id="admin.elasticsearch.ignoredPurgeIndexesDescription"
/>
}
id="ignoredPurgeIndexes"
label={
<Memo(MemoizedFormattedMessage)
defaultMessage="Indexes to skip while purging:"
id="admin.elasticsearch.ignoredPurgeIndexes"
/>
}
onChange={[Function]}
placeholder="E.g.: .opendistro*,.security*"
setByEnv={false}
/>
<BooleanSetting
disabled={true}
falseText={
@@ -829,6 +848,25 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
}
}
/>
<AdminTextSetting
disabled={false}
helpText={
<Memo(MemoizedFormattedMessage)
defaultMessage="When filled in, these indexes will be ignored during the purge, separated by commas."
id="admin.elasticsearch.ignoredPurgeIndexesDescription"
/>
}
id="ignoredPurgeIndexes"
label={
<Memo(MemoizedFormattedMessage)
defaultMessage="Indexes to skip while purging:"
id="admin.elasticsearch.ignoredPurgeIndexes"
/>
}
onChange={[Function]}
placeholder="E.g.: .opendistro*,.security*"
setByEnv={false}
/>
<BooleanSetting
disabled={false}
falseText={

Просмотреть файл

@@ -31,6 +31,7 @@ export default class ElasticsearchSettings extends AdminSettings {
config.ElasticsearchSettings.EnableIndexing = this.state.enableIndexing;
config.ElasticsearchSettings.EnableSearching = this.state.enableSearching;
config.ElasticsearchSettings.EnableAutocomplete = this.state.enableAutocomplete;
config.ElasticsearchSettings.IgnoredPurgeIndexes = this.state.ignoredPurgeIndexes;
return config;
};
@@ -51,6 +52,7 @@ export default class ElasticsearchSettings extends AdminSettings {
configTested: true,
canSave: true,
canPurgeAndIndex: config.ElasticsearchSettings.EnableIndexing,
ignoredPurgeIndexes: config.ElasticsearchSettings.IgnoredPurgeIndexes,
};
}
@@ -430,6 +432,26 @@ export default class ElasticsearchSettings extends AdminSettings {
/>
)}
/>
<TextSetting
id='ignoredPurgeIndexes'
label={
<FormattedMessage
id='admin.elasticsearch.ignoredPurgeIndexes'
defaultMessage='Indexes to skip while purging:'
/>
}
placeholder={'E.g.: .opendistro*,.security*'}
helpText={
<FormattedMessage
id='admin.elasticsearch.ignoredPurgeIndexesDescription'
defaultMessage='When filled in, these indexes will be ignored during the purge, separated by commas.'
/>
}
value={this.state.ignoredPurgeIndexes}
disabled={this.props.isDisabled || !this.state.enableIndexing}
onChange={this.handleSettingChanged}
setByEnv={this.isSetByEnv('ElasticsearchSettings.IgnoredPurgeIndexes')}
/>
<BooleanSetting
id='enableSearching'
label={

Просмотреть файл

@@ -772,6 +772,8 @@
"admin.elasticsearch.enableIndexingTitle": "Enable Elasticsearch Indexing:",
"admin.elasticsearch.enableSearchingDescription": "Requires a successful connection to the Elasticsearch server. When true, Elasticsearch will be used for all search queries using the latest index. Search results may be incomplete until a bulk index of the existing post database is finished. When false, database search is used.",
"admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
"admin.elasticsearch.ignoredPurgeIndexes": "Indexes to skip while purging:",
"admin.elasticsearch.ignoredPurgeIndexesDescription": "When filled in, these indexes will be ignored during the purge, separated by commas.",
"admin.elasticsearch.password": "E.g.: \"yourpassword\"",
"admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
"admin.elasticsearch.passwordTitle": "Server Password:",

Просмотреть файл

@@ -774,6 +774,7 @@ export type ElasticsearchSettings = {
ClientCert: string;
ClientKey: string;
Trace: string;
IgnoredPurgeIndexes: string;
};
export type BleveSettings = {