Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-12 12:46:23 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

app/vmalert: follow-up after 7a9ae9de0d (#4381)

Browse Source 
7a9ae9de0d

Signed-off-by: hagen1778 <roman@victoriametrics.com>
(cherry picked from commit eccecdf177)
This commit is contained in:
Roman Khavronenko 2023-06-01 11:38:48 +02:00 committed by hagen1778
parent 598671c0e8
commit fde5a59726
No known key found for this signature in database
GPG Key ID: 3BF75F3741CA9640
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/vmalert/Makefile
View File

@ -73,6 +73,7 @@ test-vmalert:
go test -v -race -cover ./app/vmalert/notifier go test -v -race -cover ./app/vmalert/notifier
go test -v -race -cover ./app/vmalert/config go test -v -race -cover ./app/vmalert/config
go test -v -race -cover ./app/vmalert/remotewrite go test -v -race -cover ./app/vmalert/remotewrite
go test -v -race -cover ./app/vmalert/utils
run-vmalert: vmalert run-vmalert: vmalert
./bin/vmalert -rule=app/vmalert/config/testdata/rules/rules2-good.rules \ ./bin/vmalert -rule=app/vmalert/config/testdata/rules/rules2-good.rules \

25
app/vmalert/datasource/vm.go
View File

@ -29,6 +29,7 @@ func toDatasourceType(s string) datasourceType {
} }
// VMStorage represents vmstorage entity with ability to read and write metrics // VMStorage represents vmstorage entity with ability to read and write metrics
// WARN: when adding a new field, remember to update Clone() method.
type VMStorage struct { type VMStorage struct {
c *http.Client c *http.Client
authCfg *promauth.Config authCfg *promauth.Config
@ -58,11 +59,16 @@ func (s *VMStorage) Clone() *VMStorage {
c: s.c, c: s.c,
authCfg: s.authCfg, authCfg: s.authCfg,
datasourceURL: s.datasourceURL, datasourceURL: s.datasourceURL,
appendTypePrefix: s.appendTypePrefix,
lookBack: s.lookBack, lookBack: s.lookBack,
queryStep: s.queryStep, queryStep: s.queryStep,
appendTypePrefix: s.appendTypePrefix,
dataSourceType: s.dataSourceType, dataSourceType: s.dataSourceType,
extraParams: s.extraParams, evaluationInterval: s.evaluationInterval,
extraParams: s.extraParams,
extraHeaders: s.extraHeaders,
debug: s.debug,
} }
} }
@ -70,23 +76,18 @@ func (s *VMStorage) Clone() *VMStorage {
func (s *VMStorage) ApplyParams(params QuerierParams) *VMStorage { func (s *VMStorage) ApplyParams(params QuerierParams) *VMStorage {
s.dataSourceType = toDatasourceType(params.DataSourceType) s.dataSourceType = toDatasourceType(params.DataSourceType)
s.evaluationInterval = params.EvaluationInterval s.evaluationInterval = params.EvaluationInterval
if len(params.QueryParams) != 0 { for k, vl := range params.QueryParams {
for k, vl := range params.QueryParams { for _, v := range vl { // custom query params are prior to default ones
if s.extraParams.Has(k) { s.extraParams.Set(k, v)
s.extraParams.Del(k)
}
for _, v := range vl {
s.extraParams.Add(k, v)
}
} }
} }
s.debug = params.Debug
if params.Headers != nil { if params.Headers != nil {
for key, value := range params.Headers { for key, value := range params.Headers {
kv := keyValue{key: key, value: value} kv := keyValue{key: key, value: value}
s.extraHeaders = append(s.extraHeaders, kv) s.extraHeaders = append(s.extraHeaders, kv)
} }
} }
s.debug = params.Debug
return s return s
} }