Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support UTF-8 label matchers: Add compat package with feature flag and use in amtool #3483

Merged
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ed5998d
Add adapter package for parser feature flag
grobinson-grafana Aug 24, 2023
2c311db
Fix lint
grobinson-grafana Aug 24, 2023
5fde3a0
Add tests
grobinson-grafana Sep 6, 2023
7516580
Fix missing license
grobinson-grafana Sep 6, 2023
075bd06
Fix lint
grobinson-grafana Sep 7, 2023
f958675
Use adapter in amtool
grobinson-grafana Sep 7, 2023
9282da4
Create feature flag to disable new label matchers
grobinson-grafana Sep 8, 2023
8744682
Fix missing feature in AllowedFlags
grobinson-grafana Sep 8, 2023
cdab2c4
Rename adapter to compat
grobinson-grafana Sep 11, 2023
4ec38da
Fix lint
grobinson-grafana Sep 11, 2023
86f0851
Add two option flag
grobinson-grafana Sep 12, 2023
2278d78
Fix lint
grobinson-grafana Sep 12, 2023
846a933
Update warning log on fallback
grobinson-grafana Sep 12, 2023
6e76633
Use same error when parsing matchers plural
grobinson-grafana Sep 13, 2023
d2e0b07
Fix TestQuerySilence test
grobinson-grafana Sep 13, 2023
b1f8e9c
Add check for braces to parseLabels
grobinson-grafana Sep 14, 2023
0fa923e
Remove extra : in error message
grobinson-grafana Sep 14, 2023
c8691b4
Add verbose logging and suggestions to warning logs
grobinson-grafana Sep 15, 2023
794361d
Fix check for braces in wrong place
grobinson-grafana Sep 15, 2023
5371e4a
Fix incorrect parser used
grobinson-grafana Sep 21, 2023
9dbd07d
Put enabled at the end of the sentence
grobinson-grafana Sep 23, 2023
9543033
Use single line when emitting logs
grobinson-grafana Sep 23, 2023
40d3e53
Move comment inside if
grobinson-grafana Sep 23, 2023
f85a75e
Update log line to include both labels and matchers
grobinson-grafana Sep 23, 2023
1efe79b
Rename stable to classic
grobinson-grafana Sep 23, 2023
5f49101
Remove functions from utils.go
grobinson-grafana Sep 25, 2023
ff1c279
Fix tests
grobinson-grafana Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests
Signed-off-by: George Robinson <george.robinson@grafana.com>
  • Loading branch information
grobinson-grafana committed Oct 11, 2023
commit ff1c27928e8641bc8a039853ede08590144db872
2 changes: 1 addition & 1 deletion test/cli/acceptance/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,5 +269,5 @@ receivers:
// Bad labels should return error
out, err := am.TestRoute("{foo=bar}")
require.EqualError(t, err, "exit status 1")
require.Equal(t, "amtool: error: Failed to parse labels: bad matcher format: {foo=bar}\n\n", string(out))
require.Equal(t, "amtool: error: Failed to parse labels: unexpected open or close brace: {foo=bar}\n\n", string(out))
}
Loading