[query] Remove empty series from output when dropping NaNs #1682
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
|
|
||
| return filtered | ||
| } | ||
|
|
||
| func renderResultsJSON( | ||
| w io.Writer, | ||
| series []*ts.Series, | ||
| params models.RequestParams, | ||
| keepNans bool, |
There was a problem hiding this comment.
Is this ever true? If not, can we remove the option entirely perhaps?
There was a problem hiding this comment.
I'm pretty happy to remove it since I don't really know why you'd want to keep nans, but you'll have to convert Ben :p
There was a problem hiding this comment.
Oh, if you're asking if it can theoretically be true, there's a config option to keep nans in the output; don't know why anyone would turn it on, but it's there :p
| @@ -240,12 +240,37 @@ func parseQuery(r *http.Request) (string, error) { | |||
| return queries[0], nil | |||
| } | |||
|
|
|||
| func sanitizeSeries(series []*ts.Series) []*ts.Series { | |||
There was a problem hiding this comment.
nit: Can we rename this perhaps just to removeAllNaNsSeries(...) or similar? Not clear what sanitize does from just the name.
There was a problem hiding this comment.
Changed to filterNaNSeries
robskillington
approved these changes
May 30, 2019
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.
What this PR does / why we need it:
Drops empty series from appearing in output when keepNaNs option is set to disabled. This is important for functions like
topk, which leave a lot of empty series and can crash Grafana.Does this PR introduce a user-facing and/or backwards incompatible change?:
Does this PR require updating code package or user-facing documentation?: