Fields: Regex - Operator UI updates and double-quotes #1028
Conversation
This file contains 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
Merged
|
Let's wait on review of this until the child PRs are ready, and we'll work our way from the bottom to the top |
gtk-grafana
commented
Feb 4, 2025
| const filters = variable.state.filters.filter((f) => f.key !== currentKey); | ||
| const otherFiltersString = this.renderVariableFilters(variableType, filters); | ||
| const uninterpolatedExpression = this.getFieldsTagValuesExpression(variableType); | ||
| const expr = uninterpolatedExpression.replace(PENDING_FIELDS_EXPR, otherFiltersString); | ||
| const interpolated = sceneGraph.interpolate(this, expr); | ||
| return getFieldsKeysProvider(interpolated, this, sceneGraph.getTimeRange(this).state.value, variableType); | ||
| console.log('getFieldsTagKeysProvider', { |
There was a problem hiding this comment.
Whoops, removed in child branch
gtk-grafana
commented
Feb 4, 2025
| const otherFiltersString = this.renderVariableFilters(variableType, filters); | ||
| const uninterpolatedExpression = this.getFieldsTagValuesExpression(variableType); | ||
| const expr = uninterpolatedExpression.replace(PENDING_FIELDS_EXPR, otherFiltersString); | ||
| const interpolated = sceneGraph.interpolate(this, expr); | ||
|
|
||
| // @todo remove existing equal/notequal values |
There was a problem hiding this comment.
also removed in child branch
… gtk-grafana/issues/1009/regex-fields-from-explore__operator-ui
… gtk-grafana/issues/1009/regex-fields-from-explore__operator-ui
matyax
reviewed
Feb 5, 2025
matyax
approved these changes
Feb 5, 2025
Co-authored-by: Matias Chomicki <[email protected]>
* feat: combine metadata and fields variables Co-authored-by: Matias Chomicki <[email protected]>
gtk-grafana
merged commit ec11d60
into
gtk-grafana/issues/1009/regex-fields-from-explore
2 of 3 checks passed
gtk-grafana
added a commit
that referenced
this pull request
Feb 5, 2025
* Fields: Regex - Supporting regex fields from Explore (#1023) * Fields: Regex - Operator UI updates and double-quotes (#1028) * Fields: Regex - Combining metadata and fields (#1029) * Fields: Regex - custom multi-select levels variable (#1030) --------- Co-authored-by: Matias Chomicki <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds descriptions to the operators, fixes some bugs with generating regex fields, e2e coverage, and converts fields and metadata to use doublequotes instead of backticks.
NOTE: We had to copy the
fetchDetectedFieldsfrom core Grafana since that PR missed the 11.5 cutoff. The implementation in this PR is not tested but it is a direct lift from the PR linked above, I'm hoping that we can upgrade quickly and remove this tech debt. The good news is that Grafana 11.3 should still work with this feature.Parent branch: #1023
Child branch: #1029