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

influxdb: influxql: better tag-value filtering (#36570)

Browse Source
This commit is contained in:
Gábor Farkas
2021-07-12 07:55:10 +02:00
committed by GitHub
parent e19c690426
commit cc460110b1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx
View File

@@ -130,7 +130,7 @@ export const Editor = (props: Props): JSX.Element => {
onChange={handleTagsSectionChange} onChange={handleTagsSectionChange}
getTagKeyOptions={getTagKeys} getTagKeyOptions={getTagKeys}
getTagValueOptions={(key: string) => getTagValueOptions={(key: string) =>
withTemplateVariableOptions(getTagValues(key, measurement, policy, datasource)) withTemplateVariableOptions(getTagValues(key, measurement, policy, query.tags ?? [], datasource))
} }
/> />
</SectionWrap> </SectionWrap>

3
public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
View File

@@ -45,9 +45,10 @@ export async function getTagValues(
tagKey: string, tagKey: string,
measurement: string | undefined, measurement: string | undefined,
policy: string | undefined, policy: string | undefined,
tags: InfluxQueryTag[],
datasource: InfluxDatasource datasource: InfluxDatasource
): Promise<string[]> { ): Promise<string[]> {
const target = { tags: [], measurement, policy }; const target = { tags, measurement, policy };
const data = await runExploreQuery('TAG_VALUES', tagKey, undefined, target, datasource); const data = await runExploreQuery('TAG_VALUES', tagKey, undefined, target, datasource);
return data.map((item) => item.text); return data.map((item) => item.text);
} }