mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

add limit to the rules api (#10152)

Browse source
This commit is contained in:
Abhishek 2022-01-12 09:14:22 +05:30 committed by GitHub
parent eb7c10dbbd
commit 2f4289a3bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/querying/api.md
View file

@ -620,6 +620,7 @@ $ curl http://localhost:9090/api/v1/rules
], ],
"file": "/rules.yaml", "file": "/rules.yaml",
"interval": 60, "interval": 60,
"limit": 0,
"name": "example" "name": "example"
} }
] ]

2
web/api/v1/api.go
View file

@ -1164,6 +1164,7 @@ type RuleGroup struct {
// same array. // same array.
Rules []Rule `json:"rules"` Rules []Rule `json:"rules"`
Interval float64 `json:"interval"` Interval float64 `json:"interval"`
Limit int `json:"limit"`
EvaluationTime float64 `json:"evaluationTime"` EvaluationTime float64 `json:"evaluationTime"`
LastEvaluation time.Time `json:"lastEvaluation"` LastEvaluation time.Time `json:"lastEvaluation"`
} }
@ -1216,6 +1217,7 @@ func (api *API) rules(r *http.Request) apiFuncResult {
Name: grp.Name(), Name: grp.Name(),
File: grp.File(), File: grp.File(),
Interval: grp.Interval().Seconds(), Interval: grp.Interval().Seconds(),
Limit: grp.Limit(),
Rules: []Rule{}, Rules: []Rule{},
EvaluationTime: grp.GetEvaluationTime().Seconds(), EvaluationTime: grp.GetEvaluationTime().Seconds(),
LastEvaluation: grp.GetLastEvaluation(), LastEvaluation: grp.GetLastEvaluation(),

3
web/api/v1/api_test.go
View file

@ -1470,6 +1470,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Name: "grp", Name: "grp",
File: "/path/to/file", File: "/path/to/file",
Interval: 1, Interval: 1,
Limit: 0,
Rules: []Rule{ Rules: []Rule{
AlertingRule{ AlertingRule{
State: "inactive", State: "inactive",
@ -1516,6 +1517,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Name: "grp", Name: "grp",
File: "/path/to/file", File: "/path/to/file",
Interval: 1, Interval: 1,
Limit: 0,
Rules: []Rule{ Rules: []Rule{
AlertingRule{ AlertingRule{
State: "inactive", State: "inactive",
@ -1555,6 +1557,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Name: "grp", Name: "grp",
File: "/path/to/file", File: "/path/to/file",
Interval: 1, Interval: 1,
Limit: 0,
Rules: []Rule{ Rules: []Rule{
RecordingRule{ RecordingRule{
Name: "recording-rule-1", Name: "recording-rule-1",