Adds support for host tags #2140
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| 'grafana-zabbix': minor | ||
| --- | ||
|
|
||
| Add support for host tags when querying metrics |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,137 @@ | ||||||||
| import { Tooltip, Button, Combobox, ComboboxOption, Stack, Input, RadioButtonGroup } from '@grafana/ui'; | ||||||||
| import React, { FormEvent, useCallback, useEffect, useState } from 'react'; | ||||||||
| import { HostTagOperatorLabel, HostTagOperatorValue } from './types'; | ||||||||
| import { HostTagFilter, ZabbixTagEvalType } from 'datasource/types/query'; | ||||||||
| import { getHostTagOptionLabel } from './utils'; | ||||||||
|
|
||||||||
| interface Props { | ||||||||
| hostTagOptions: ComboboxOption[]; | ||||||||
| hostTagOptionsLoading: boolean; | ||||||||
| version: string; | ||||||||
| evalTypeValue?: ZabbixTagEvalType; | ||||||||
| onHostTagFilterChange?: (hostTags: HostTagFilter[]) => void; | ||||||||
| onHostTagEvalTypeChange?: (evalType: ZabbixTagEvalType) => void; | ||||||||
| } | ||||||||
| export const HostTagQueryEditor = ({ | ||||||||
| hostTagOptions, | ||||||||
| hostTagOptionsLoading, | ||||||||
| version, | ||||||||
| evalTypeValue, | ||||||||
| onHostTagFilterChange, | ||||||||
| onHostTagEvalTypeChange, | ||||||||
| }: Props) => { | ||||||||
| const [hostTagFilters, setHostTagFilters] = useState<HostTagFilter[]>([]); | ||||||||
| const operatorOptions: ComboboxOption[] = [ | ||||||||
| { value: HostTagOperatorValue.Exists, label: HostTagOperatorLabel.Exists }, | ||||||||
| { value: HostTagOperatorValue.Equals, label: HostTagOperatorLabel.Equals }, | ||||||||
| { value: HostTagOperatorValue.Contains, label: HostTagOperatorLabel.Contains }, | ||||||||
| { | ||||||||
| value: HostTagOperatorValue.DoesNotExist, | ||||||||
| label: getHostTagOptionLabel(HostTagOperatorValue.DoesNotExist, version), | ||||||||
| }, | ||||||||
| { | ||||||||
| value: HostTagOperatorValue.DoesNotEqual, | ||||||||
| label: getHostTagOptionLabel(HostTagOperatorValue.DoesNotEqual, version), | ||||||||
| }, | ||||||||
| { | ||||||||
| value: HostTagOperatorValue.DoesNotContain, | ||||||||
| label: getHostTagOptionLabel(HostTagOperatorValue.DoesNotContain, version), | ||||||||
| }, | ||||||||
| ]; | ||||||||
|
|
||||||||
| const onAddHostTagFilter = useCallback(() => { | ||||||||
| setHostTagFilters((prevFilters) => [ | ||||||||
| ...prevFilters, | ||||||||
| { tag: '', value: '', operator: HostTagOperatorValue.Contains }, | ||||||||
| ]); | ||||||||
| }, []); | ||||||||
|
|
||||||||
| const onRemoveHostTagFilter = useCallback((index: number) => { | ||||||||
| setHostTagFilters((prevFilters) => prevFilters.filter((_, i) => i !== index)); | ||||||||
| }, []); | ||||||||
|
|
||||||||
| const setHostTagFilterName = useCallback((index: number, name: string) => { | ||||||||
| setHostTagFilters((prevFilters) => | ||||||||
| prevFilters.map((filter, i) => (i === index ? { ...filter, tag: name } : filter)) | ||||||||
| ); | ||||||||
| }, []); | ||||||||
|
|
||||||||
| const setHostTagFilterValue = useCallback((index: number, value: string) => { | ||||||||
| if (value !== undefined) { | ||||||||
| setHostTagFilters((prevFilters) => | ||||||||
| prevFilters.map((filter, i) => (i === index ? { ...filter, value: value } : filter)) | ||||||||
| ); | ||||||||
| } | ||||||||
| }, []); | ||||||||
|
|
||||||||
| const setHostTagFilterOperator = useCallback((index: number, operator: HostTagOperatorValue) => { | ||||||||
| setHostTagFilters((prevFilters) => | ||||||||
| prevFilters.map((filter, i) => (i === index ? { ...filter, operator } : filter)) | ||||||||
| ); | ||||||||
| }, []); | ||||||||
|
|
||||||||
| useEffect(() => { | ||||||||
| onHostTagFilterChange(hostTagFilters); | ||||||||
| }, [hostTagFilters]); | ||||||||
| return ( | ||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||||
| <div> | ||||||||
| <Stack direction="row"> | ||||||||
| <Tooltip content="Add host tag filter"> | ||||||||
| <Button icon="plus" variant="secondary" aria-label="Add new host tag filter" onClick={onAddHostTagFilter} /> | ||||||||
| </Tooltip> | ||||||||
| {hostTagFilters.length > 0 && ( | ||||||||
| <RadioButtonGroup | ||||||||
| options={[ | ||||||||
| { label: 'AND/OR', value: '0' }, // Default | ||||||||
| { label: 'OR', value: '2' }, | ||||||||
| ]} | ||||||||
| onChange={onHostTagEvalTypeChange} | ||||||||
| value={evalTypeValue ?? '0'} | ||||||||
| /> | ||||||||
| )} | ||||||||
| </Stack> | ||||||||
| <Stack direction="column"> | ||||||||
| {hostTagFilters.map((filter, index) => { | ||||||||
| return ( | ||||||||
| <Stack key={`host-tag-filter-${index}`} direction="row"> | ||||||||
| <Combobox | ||||||||
| value={filter.tag} | ||||||||
| onChange={(option: ComboboxOption) => setHostTagFilterName(index, option.value)} | ||||||||
| options={hostTagOptions ?? []} | ||||||||
| width={19} | ||||||||
| loading={hostTagOptionsLoading} | ||||||||
| /> | ||||||||
| <Combobox | ||||||||
| value={filter.operator} | ||||||||
| onChange={(option: ComboboxOption<HostTagOperatorValue>) => | ||||||||
| setHostTagFilterOperator(index, option.value) | ||||||||
| } | ||||||||
| options={operatorOptions} | ||||||||
| width={19} | ||||||||
| /> | ||||||||
| {filter.operator !== HostTagOperatorValue.Exists && | ||||||||
| filter.operator !== HostTagOperatorValue.DoesNotExist && ( | ||||||||
| <Input | ||||||||
| value={filter.value} | ||||||||
| onChange={(evt: FormEvent<HTMLInputElement>) => | ||||||||
| setHostTagFilterValue(index, evt?.currentTarget?.value) | ||||||||
| } | ||||||||
| width={19} | ||||||||
| /> | ||||||||
|
Comment on lines
+114
to
+120
Contributor
There was a problem hiding this comment. A short placeholder would be useful. At first glance I've missed what I need to do with the input field.
Contributor
There was a problem hiding this comment. For my each keystroke it sends another request to the backend. Can we have a debounce logic? |
||||||||
| )} | ||||||||
| <Tooltip content="Remove host tag filter"> | ||||||||
| <Button | ||||||||
| key={`remove-host-tag-${index}`} | ||||||||
| icon="minus" | ||||||||
| variant="secondary" | ||||||||
| aria-label="Remove host tag filter" | ||||||||
| onClick={() => onRemoveHostTagFilter(index)} | ||||||||
| /> | ||||||||
| </Tooltip> | ||||||||
| </Stack> | ||||||||
| ); | ||||||||
| })} | ||||||||
| </Stack> | ||||||||
| </div> | ||||||||
| ); | ||||||||
| }; | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.