Fix rebase issues

grafana · Oct 9, 2024 · f832fe0 · f832fe0
1 parent 6ca8e9c
commit f832fe0
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 75 deletions.
diff --git a/pkg/ruler/api.go b/pkg/ruler/api.go
@@ -173,7 +173,6 @@ func (a *API) PrometheusRules(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	nextToken := req.URL.Query().Get("next_token")
 	var maxGroups int
 	if maxGroupsVal := req.URL.Query().Get("max_groups"); maxGroupsVal != "" {
 		maxGroups, err = strconv.Atoi(maxGroupsVal)

diff --git a/pkg/ruler/api_test.go b/pkg/ruler/api_test.go
@@ -1033,7 +1033,7 @@ func TestRuler_PrometheusRulesPagination(t *testing.T) {
 		return len(rls.Groups)
 	})
 
-	a := NewAPI(r, r.directStore, log.NewNopLogger())
+	a := NewAPI(r, r.store, log.NewNopLogger())
 
 	getRulesResponse := func(groupSize int, nextToken string) response {
 		queryParams := "?" + url.Values{

diff --git a/pkg/ruler/ruler.pb.go b/pkg/ruler/ruler.pb.go
diff --git a/pkg/ruler/ruler.proto b/pkg/ruler/ruler.proto
@@ -38,8 +38,8 @@ message RulesRequest {
   repeated string rule_group = 3;
   repeated string file = 4;
   bool exclude_alerts = 5;
-  uint64 max_groups = 6;
-  uint64 next_token = 7;
+  int32 max_groups = 6;
+  string next_token = 7;
 }
 
 message RulesResponse {