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

Elasticsearch: Display custom values in version select (#42051)

Browse Source 
* Elasticsearch: Display custom values in version select

* Update public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
This commit is contained in:
Giordano Ricci 2021-11-22 14:14:11 +00:00 committed by GitHub
parent 3340d7ad44
commit e7e5c54148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,8 @@ import { EventsWithValidation, regexValidation, LegacyForms } from '@grafana/ui'
const { Switch, Select, Input, FormField } = LegacyForms; const { Switch, Select, Input, FormField } = LegacyForms;
import { ElasticsearchOptions, Interval } from '../types'; import { ElasticsearchOptions, Interval } from '../types';
import { DataSourceSettings, SelectableValue } from '@grafana/data'; import { DataSourceSettings, SelectableValue } from '@grafana/data';
import { gte, lt } from 'semver'; import { gte, lt, valid } from 'semver';
import { isTruthy } from './utils';
const indexPatternTypes: Array<SelectableValue<'none' | Interval>> = [ const indexPatternTypes: Array<SelectableValue<'none' | Interval>> = [
{ label: 'No pattern', value: 'none' }, { label: 'No pattern', value: 'none' },
@ -34,6 +35,14 @@ type Props = {
onChange: (value: DataSourceSettings<ElasticsearchOptions>) => void; onChange: (value: DataSourceSettings<ElasticsearchOptions>) => void;
}; };
export const ElasticDetails = ({ value, onChange }: Props) => { export const ElasticDetails = ({ value, onChange }: Props) => {
const currentVersion = esVersions.find((version) => version.value === value.jsonData.esVersion);
const customOption =
!currentVersion && valid(value.jsonData.esVersion)
? {
label: value.jsonData.esVersion,
value: value.jsonData.esVersion,
}
: undefined;
return ( return (
<> <>
<h3 className="page-heading">Elasticsearch details</h3> <h3 className="page-heading">Elasticsearch details</h3>
@ -89,7 +98,7 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
inputEl={ inputEl={
<Select <Select
menuShouldPortal menuShouldPortal
options={esVersions} options={[customOption, ...esVersions].filter(isTruthy)}
onChange={(option) => { onChange={(option) => {
const maxConcurrentShardRequests = getMaxConcurrenShardRequestOrDefault( const maxConcurrentShardRequests = getMaxConcurrenShardRequestOrDefault(
value.jsonData.maxConcurrentShardRequests, value.jsonData.maxConcurrentShardRequests,
@ -104,7 +113,7 @@ export const ElasticDetails = ({ value, onChange }: Props) => {
}, },
}); });
}} }}
value={esVersions.find((version) => version.value === value.jsonData.esVersion)} value={currentVersion || customOption}
/> />
} }
/> />

4
public/app/plugins/datasource/elasticsearch/configuration/utils.ts
View File

@ -37,3 +37,7 @@ export const isValidOptions = (options: DataSourceSettings<ElasticsearchOptions,
options.jsonData.logLevelField !== undefined options.jsonData.logLevelField !== undefined
); );
}; };
type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
export const isTruthy = <T>(value: T): value is Truthy<T> => Boolean(value);