-
Notifications
You must be signed in to change notification settings - Fork 833
Parse query #6978
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
Merged
Merged
Parse query #6978
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bfc33ed
Add support for /api/v1/parse_query API (experimental)
siddarth2810 6796d47
Integration: Add test for parse query API
siddarth2810 4ebef6d
docs: fix typo of format query api in the endpoints table
siddarth2810 795aa1a
update changelog
siddarth2810 71f7ed9
move entry for proper grouping
siddarth2810 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,135 @@ | ||
| //go:build requires_docker | ||
| // +build requires_docker | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/cortexproject/cortex/integration/e2e" | ||
| e2edb "github.com/cortexproject/cortex/integration/e2e/db" | ||
| "github.com/cortexproject/cortex/integration/e2ecortex" | ||
| ) | ||
|
|
||
| func TestParseQueryAPIQuerier(t *testing.T) { | ||
| s, err := e2e.NewScenario(networkName) | ||
| require.NoError(t, err) | ||
| defer s.Close() | ||
|
|
||
| // Start dependencies. | ||
| consul := e2edb.NewConsul() | ||
| minio := e2edb.NewMinio(9000, bucketName) | ||
| require.NoError(t, s.StartAndWaitReady(consul, minio)) | ||
|
|
||
| flags := mergeFlags(BlocksStorageFlags(), map[string]string{ | ||
| "-auth.enabled": "true", | ||
| }) | ||
|
|
||
| distributor := e2ecortex.NewDistributor("distributor", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), flags, "") | ||
| ingester := e2ecortex.NewIngester("ingester", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), flags, "") | ||
| require.NoError(t, s.StartAndWaitReady(distributor, ingester)) | ||
|
|
||
| // Wait until the distributor has updated the ring. | ||
| require.NoError(t, distributor.WaitSumMetrics(e2e.Equals(512), "cortex_ring_tokens_total")) | ||
|
|
||
| querier := e2ecortex.NewQuerier("querier", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), flags, "") | ||
| require.NoError(t, s.StartAndWaitReady(querier)) | ||
|
|
||
| // Wait until the querier has updated the ring. | ||
| require.NoError(t, querier.WaitSumMetrics(e2e.Equals(512), "cortex_ring_tokens_total")) | ||
|
|
||
| endpoint := fmt.Sprintf("http://%s/api/prom/api/v1/parse_query?query=foo/bar", querier.HTTPEndpoint()) | ||
|
|
||
| req, err := http.NewRequest("GET", endpoint, nil) | ||
| require.NoError(t, err) | ||
| req.Header.Set("X-Scope-OrgID", "user-1") | ||
|
|
||
| resp, err := http.DefaultClient.Do(req) | ||
| require.NoError(t, err) | ||
| defer resp.Body.Close() | ||
|
|
||
| body, err := io.ReadAll(resp.Body) | ||
| require.NoError(t, err) | ||
|
|
||
| require.Equal(t, http.StatusOK, resp.StatusCode) | ||
|
|
||
| var parsed struct { | ||
| Status string `json:"status"` | ||
| Data json.RawMessage `json:"data"` | ||
| } | ||
| require.NoError(t, json.Unmarshal(body, &parsed)) | ||
| require.Equal(t, "success", parsed.Status) | ||
|
|
||
| // check for AST contents. | ||
| require.Contains(t, string(parsed.Data), "\"op\":\"/\"") | ||
| require.Contains(t, string(parsed.Data), `"lhs":{"matchers":[{"name":"__name__","type":"=","value":"foo"}]`) | ||
| require.Contains(t, string(parsed.Data), `"rhs":{"matchers":[{"name":"__name__","type":"=","value":"bar"}]`) | ||
| } | ||
|
|
||
| func TestParseQueryAPIQueryFrontend(t *testing.T) { | ||
| s, err := e2e.NewScenario(networkName) | ||
| require.NoError(t, err) | ||
| defer s.Close() | ||
|
|
||
| // Start dependencies. | ||
| consul := e2edb.NewConsul() | ||
| minio := e2edb.NewMinio(9000, bucketName) | ||
| require.NoError(t, s.StartAndWaitReady(consul, minio)) | ||
|
|
||
| flags := mergeFlags(BlocksStorageFlags(), map[string]string{ | ||
| "-auth.enabled": "true", | ||
| }) | ||
|
|
||
| // Start the query-frontend. | ||
| queryFrontend := e2ecortex.NewQueryFrontend("query-frontend", flags, "") | ||
| require.NoError(t, s.Start(queryFrontend)) | ||
|
|
||
| distributor := e2ecortex.NewDistributor("distributor", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), flags, "") | ||
| ingester := e2ecortex.NewIngester("ingester", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), flags, "") | ||
| require.NoError(t, s.StartAndWaitReady(distributor, ingester)) | ||
|
|
||
| // Wait until both the distributor updated the ring. | ||
| require.NoError(t, distributor.WaitSumMetrics(e2e.Equals(512), "cortex_ring_tokens_total")) | ||
|
|
||
| querier := e2ecortex.NewQuerier("querierWithFrontend", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), mergeFlags(flags, map[string]string{ | ||
| "-querier.frontend-address": queryFrontend.NetworkGRPCEndpoint(), | ||
| }), "") | ||
|
|
||
| require.NoError(t, s.StartAndWaitReady(querier)) | ||
| require.NoError(t, s.WaitReady(queryFrontend)) | ||
|
|
||
| require.NoError(t, querier.WaitSumMetrics(e2e.Equals(512), "cortex_ring_tokens_total")) | ||
|
|
||
| endpoint := fmt.Sprintf("http://%s/api/prom/api/v1/parse_query?query=foo/bar", queryFrontend.HTTPEndpoint()) | ||
|
|
||
| req, err := http.NewRequest("GET", endpoint, nil) | ||
| require.NoError(t, err) | ||
| req.Header.Set("X-Scope-OrgID", "user-1") | ||
|
|
||
| resp, err := http.DefaultClient.Do(req) | ||
| require.NoError(t, err) | ||
| defer resp.Body.Close() | ||
|
|
||
| body, err := io.ReadAll(resp.Body) | ||
| require.NoError(t, err) | ||
|
|
||
| require.Equal(t, http.StatusOK, resp.StatusCode) | ||
|
|
||
| var parsed struct { | ||
| Status string `json:"status"` | ||
| Data json.RawMessage `json:"data"` | ||
| } | ||
| require.NoError(t, json.Unmarshal(body, &parsed)) | ||
| require.Equal(t, "success", parsed.Status) | ||
|
|
||
| // check for AST contents. | ||
| require.Contains(t, string(parsed.Data), "\"op\":\"/\"") | ||
| require.Contains(t, string(parsed.Data), `"lhs":{"matchers":[{"name":"__name__","type":"=","value":"foo"}]`) | ||
| require.Contains(t, string(parsed.Data), `"rhs":{"matchers":[{"name":"__name__","type":"=","value":"bar"}]`) | ||
| } |
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
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.
Can you move the changelog entry down to the
FEATUREpart? We group items order by change, feature, enhancement and bugfix.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.
My bad ! Changed it, thank you so much.