IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

elastic: remove most of xpack (#63460)

Browse Source 
elasticsearch: do not show the xpack toggle in datasource config
This commit is contained in:
Gábor Farkas 2023-02-24 08:24:31 +01:00 committed by GitHub
parent 36e474d109
commit 6cee0cdbad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
View File

@ -122,23 +122,13 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
/> />
</InlineField> </InlineField>
<InlineField label="X-Pack enabled" labelWidth={26}> <InlineField label="Include Frozen Indices" labelWidth={26}>
<InlineSwitch <InlineSwitch
id="es_config_xpackEnabled" id="es_config_frozenIndices"
value={value.jsonData.xpack || false} value={(value.jsonData.xpack ?? false) && (value.jsonData.includeFrozen ?? false)}
onChange={jsonDataSwitchChangeHandler('xpack', value, onChange)} onChange={(event) => includeFrozenIndicesOnChange(event.currentTarget.checked, value, onChange)}
/> />
</InlineField> </InlineField>
{value.jsonData.xpack && (
<InlineField label="Include Frozen Indices" labelWidth={26}>
<InlineSwitch
id="es_config_frozenIndices"
value={value.jsonData.includeFrozen ?? false}
onChange={jsonDataSwitchChangeHandler('includeFrozen', value, onChange)}
/>
</InlineField>
)}
</FieldSet> </FieldSet>
</> </>
); );
@ -167,17 +157,20 @@ const jsonDataChangeHandler =
}); });
}; };
const jsonDataSwitchChangeHandler = const includeFrozenIndicesOnChange = (newValue: boolean, formValue: Props['value'], onChange: Props['onChange']) => {
(key: keyof ElasticsearchOptions, value: Props['value'], onChange: Props['onChange']) => const newJsonData = { ...formValue.jsonData };
(event: React.SyntheticEvent<HTMLInputElement>) => { if (newValue) {
onChange({ newJsonData.xpack = true;
...value, newJsonData.includeFrozen = true;
jsonData: { } else {
...value.jsonData, delete newJsonData.xpack;
[key]: event.currentTarget.checked, delete newJsonData.includeFrozen;
}, }
}); onChange({
}; ...formValue,
jsonData: newJsonData,
});
};
const intervalHandler = const intervalHandler =
(value: Props['value'], onChange: Props['onChange']) => (option: SelectableValue<Interval | 'none'>) => { (value: Props['value'], onChange: Props['onChange']) => (option: SelectableValue<Interval | 'none'>) => {