Skip to content

Commit

Permalink
Proper fix for prometheus backend, non-tagged requests and groupByNod…
Browse files Browse the repository at this point in the history
…es function

 * fixes tests that got broken before
  • Loading branch information
Civil committed May 20, 2020
1 parent ee75c94 commit 13668d3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ Changes

CHANGELOG
---------
**0.13.0.rc.3**
- [Fix] Proper fix for prometheus backend and non-taged render requests with groupByNodes function
- [Fix] Align timestamps in prometheus backend (thx to @rodio, #467)

**0.13.0-rc.2**
- [Fix] Prometheus backend wasn't working correctly for non-taged render requests (#465, thx to @menai34 for proposed fix)
- [Fix] Fix panic when using prometheus tagged response for non-tagged queries in groupByTags function (and maybe more)
- [Fix] Add proper aliases for `aggregate` functions - that would make groupByTags properly usable with functions like `diff` and `total`.

**0.13.0-rc.1**
- [Improvement] Redesign error handling and logging. Logging should be now less noisy and all error messages should contain better reasoning about error cause
- [Improvement] Move some of the logging messages to Debug level - that should make logs less noisy and still preserve ability to see detailed errors on Debug level
Expand Down
3 changes: 3 additions & 0 deletions expr/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ FOR:
}

switch s[i] {
// If metric name have tags, we want to skip them
case ';':
break FOR
case '{':
braces++
case '}':
Expand Down
3 changes: 1 addition & 2 deletions pkg/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,7 @@ func IsNameChar(r byte) bool {
r == '^' || r == '$' ||
r == '<' || r == '>' ||
r == '&' || r == '#' ||
r == '/' || r == '%' ||
r == ';' || r == '=' // this could happen if returned metric contains tags
r == '/' || r == '%'
}

func isDigit(r byte) bool {
Expand Down

0 comments on commit 13668d3

Please sign in to comment.