diff --git a/app/vmalert/config/config.go b/app/vmalert/config/config.go index bf3d49cb55..4d8c963cf7 100644 --- a/app/vmalert/config/config.go +++ b/app/vmalert/config/config.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config/log" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/envtemplate" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil" "gopkg.in/yaml.v2" @@ -265,7 +265,7 @@ func Parse(pathPatterns []string, validateTplFn ValidateTplFn, validateExpressio } func parse(files map[string][]byte, validateTplFn ValidateTplFn, validateExpressions bool) ([]Group, error) { - errGroup := new(utils.ErrGroup) + errGroup := new(vmalertutil.ErrGroup) var groups []Group for file, data := range files { uniqueGroups := map[string]struct{}{} diff --git a/app/vmalert/datasource/client_test.go b/app/vmalert/datasource/client_test.go index d69db2787a..dad6a30d14 100644 --- a/app/vmalert/datasource/client_test.go +++ b/app/vmalert/datasource/client_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" ) @@ -753,7 +753,7 @@ func TestHeaders(t *testing.T) { // basic auth f(func() *Client { - cfg, err := utils.AuthConfig(utils.WithBasicAuth("foo", "bar", "")) + cfg, err := vmalertutil.AuthConfig(vmalertutil.WithBasicAuth("foo", "bar", "")) if err != nil { t.Fatalf("Error get auth config: %s", err) } @@ -766,7 +766,7 @@ func TestHeaders(t *testing.T) { // bearer auth f(func() *Client { - cfg, err := utils.AuthConfig(utils.WithBearer("foo", "")) + cfg, err := vmalertutil.AuthConfig(vmalertutil.WithBearer("foo", "")) if err != nil { t.Fatalf("Error get auth config: %s", err) } @@ -798,7 +798,7 @@ func TestHeaders(t *testing.T) { // custom header overrides basic auth f(func() *Client { - cfg, err := utils.AuthConfig(utils.WithBasicAuth("foo", "bar", "")) + cfg, err := vmalertutil.AuthConfig(vmalertutil.WithBasicAuth("foo", "bar", "")) if err != nil { t.Fatalf("Error get auth config: %s", err) } diff --git a/app/vmalert/datasource/init.go b/app/vmalert/datasource/init.go index 7074c00744..3364f9c9c3 100644 --- a/app/vmalert/datasource/init.go +++ b/app/vmalert/datasource/init.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil" @@ -106,11 +106,11 @@ func Init(extraParams url.Values) (QuerierBuilder, error) { if err != nil { return nil, fmt.Errorf("cannot parse JSON for -datasource.oauth2.endpointParams=%s: %w", *oauth2EndpointParams, err) } - authCfg, err := utils.AuthConfig( - utils.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), - utils.WithBearer(*bearerToken, *bearerTokenFile), - utils.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), - utils.WithHeaders(*headers)) + authCfg, err := vmalertutil.AuthConfig( + vmalertutil.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), + vmalertutil.WithBearer(*bearerToken, *bearerTokenFile), + vmalertutil.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), + vmalertutil.WithHeaders(*headers)) if err != nil { return nil, fmt.Errorf("failed to configure auth: %w", err) } diff --git a/app/vmalert/notifier/alert.go b/app/vmalert/notifier/alert.go index 48a13b1ea4..85d9d94f64 100644 --- a/app/vmalert/notifier/alert.go +++ b/app/vmalert/notifier/alert.go @@ -9,7 +9,7 @@ import ( "time" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/templates" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel" ) @@ -141,7 +141,7 @@ func ValidateTemplates(annotations map[string]string) error { func templateAnnotations(annotations map[string]string, data AlertTplData, tmpl *textTpl.Template, execute bool) (map[string]string, error) { var builder strings.Builder var buf bytes.Buffer - eg := new(utils.ErrGroup) + eg := new(vmalertutil.ErrGroup) r := make(map[string]string, len(annotations)) tData := tplData{data, externalLabels, externalURL} header := strings.Join(tplHeaders, "") diff --git a/app/vmalert/notifier/alertmanager.go b/app/vmalert/notifier/alertmanager.go index b5cd5cded5..0828555850 100644 --- a/app/vmalert/notifier/alertmanager.go +++ b/app/vmalert/notifier/alertmanager.go @@ -12,7 +12,7 @@ import ( "github.com/VictoriaMetrics/metrics" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promauth" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" @@ -171,11 +171,11 @@ func NewAlertManager(alertManagerURL string, fn AlertURLGenerator, authCfg proma oauth = authCfg.OAuth2 } - aCfg, err := utils.AuthConfig( - utils.WithBasicAuth(ba.Username, ba.Password.String(), ba.PasswordFile), - utils.WithBearer(authCfg.BearerToken.String(), authCfg.BearerTokenFile), - utils.WithOAuth(oauth.ClientID, oauth.ClientSecret.String(), oauth.ClientSecretFile, oauth.TokenURL, strings.Join(oauth.Scopes, ";"), oauth.EndpointParams), - utils.WithHeaders(strings.Join(authCfg.Headers, "^^")), + aCfg, err := vmalertutil.AuthConfig( + vmalertutil.WithBasicAuth(ba.Username, ba.Password.String(), ba.PasswordFile), + vmalertutil.WithBearer(authCfg.BearerToken.String(), authCfg.BearerTokenFile), + vmalertutil.WithOAuth(oauth.ClientID, oauth.ClientSecret.String(), oauth.ClientSecretFile, oauth.TokenURL, strings.Join(oauth.Scopes, ";"), oauth.EndpointParams), + vmalertutil.WithHeaders(strings.Join(authCfg.Headers, "^^")), ) if err != nil { return nil, fmt.Errorf("failed to configure auth: %w", err) diff --git a/app/vmalert/remoteread/init.go b/app/vmalert/remoteread/init.go index 68177c8db6..4ed12234d2 100644 --- a/app/vmalert/remoteread/init.go +++ b/app/vmalert/remoteread/init.go @@ -7,7 +7,7 @@ import ( "time" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil" @@ -77,11 +77,11 @@ func Init() (datasource.QuerierBuilder, error) { if err != nil { return nil, fmt.Errorf("cannot parse JSON for -remoteRead.oauth2.endpointParams=%s: %w", *oauth2EndpointParams, err) } - authCfg, err := utils.AuthConfig( - utils.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), - utils.WithBearer(*bearerToken, *bearerTokenFile), - utils.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), - utils.WithHeaders(*headers)) + authCfg, err := vmalertutil.AuthConfig( + vmalertutil.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), + vmalertutil.WithBearer(*bearerToken, *bearerTokenFile), + vmalertutil.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), + vmalertutil.WithHeaders(*headers)) if err != nil { return nil, fmt.Errorf("failed to configure auth: %w", err) } diff --git a/app/vmalert/remotewrite/init.go b/app/vmalert/remotewrite/init.go index 09cca33a3c..b6e822d2c2 100644 --- a/app/vmalert/remotewrite/init.go +++ b/app/vmalert/remotewrite/init.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/flagutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/httputil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/netutil" @@ -81,11 +81,11 @@ func Init(ctx context.Context) (*Client, error) { if err != nil { return nil, fmt.Errorf("cannot parse JSON for -remoteWrite.oauth2.endpointParams=%s: %w", *oauth2EndpointParams, err) } - authCfg, err := utils.AuthConfig( - utils.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), - utils.WithBearer(*bearerToken, *bearerTokenFile), - utils.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), - utils.WithHeaders(*headers)) + authCfg, err := vmalertutil.AuthConfig( + vmalertutil.WithBasicAuth(*basicAuthUsername, *basicAuthPassword, *basicAuthPasswordFile), + vmalertutil.WithBearer(*bearerToken, *bearerTokenFile), + vmalertutil.WithOAuth(*oauth2ClientID, *oauth2ClientSecret, *oauth2ClientSecretFile, *oauth2TokenURL, *oauth2Scopes, endpointParams), + vmalertutil.WithHeaders(*headers)) if err != nil { return nil, fmt.Errorf("failed to configure auth: %w", err) } diff --git a/app/vmalert/rule/alerting.go b/app/vmalert/rule/alerting.go index 0611685427..87ccf6c056 100644 --- a/app/vmalert/rule/alerting.go +++ b/app/vmalert/rule/alerting.go @@ -15,7 +15,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/templates" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/logger" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" @@ -52,18 +52,18 @@ type AlertingRule struct { } type alertingRuleMetrics struct { - errors *utils.Counter - pending *utils.Gauge - active *utils.Gauge - samples *utils.Gauge - seriesFetched *utils.Gauge + errors *vmalertutil.Counter + pending *vmalertutil.Gauge + active *vmalertutil.Gauge + samples *vmalertutil.Gauge + seriesFetched *vmalertutil.Gauge } func newAlertingRuleMetrics(set *metrics.Set, ar *AlertingRule) *alertingRuleMetrics { labels := fmt.Sprintf(`alertname=%q, group=%q, file=%q, id="%d"`, ar.Name, ar.GroupName, ar.File, ar.ID()) arm := &alertingRuleMetrics{} - arm.pending = utils.NewGauge(set, fmt.Sprintf(`vmalert_alerts_pending{%s}`, labels), + arm.pending = vmalertutil.NewGauge(set, fmt.Sprintf(`vmalert_alerts_pending{%s}`, labels), func() float64 { ar.alertsMu.RLock() defer ar.alertsMu.RUnlock() @@ -75,7 +75,7 @@ func newAlertingRuleMetrics(set *metrics.Set, ar *AlertingRule) *alertingRuleMet } return float64(num) }) - arm.active = utils.NewGauge(set, fmt.Sprintf(`vmalert_alerts_firing{%s}`, labels), + arm.active = vmalertutil.NewGauge(set, fmt.Sprintf(`vmalert_alerts_firing{%s}`, labels), func() float64 { ar.alertsMu.RLock() defer ar.alertsMu.RUnlock() @@ -87,13 +87,13 @@ func newAlertingRuleMetrics(set *metrics.Set, ar *AlertingRule) *alertingRuleMet } return float64(num) }) - arm.errors = utils.NewCounter(set, fmt.Sprintf(`vmalert_alerting_rules_errors_total{%s}`, labels)) - arm.samples = utils.NewGauge(set, fmt.Sprintf(`vmalert_alerting_rules_last_evaluation_samples{%s}`, labels), + arm.errors = vmalertutil.NewCounter(set, fmt.Sprintf(`vmalert_alerting_rules_errors_total{%s}`, labels)) + arm.samples = vmalertutil.NewGauge(set, fmt.Sprintf(`vmalert_alerting_rules_last_evaluation_samples{%s}`, labels), func() float64 { e := ar.state.getLast() return float64(e.Samples) }) - arm.seriesFetched = utils.NewGauge(set, fmt.Sprintf(`vmalert_alerting_rules_last_evaluation_series_fetched{%s}`, labels), + arm.seriesFetched = vmalertutil.NewGauge(set, fmt.Sprintf(`vmalert_alerting_rules_last_evaluation_series_fetched{%s}`, labels), func() float64 { e := ar.state.getLast() if e.SeriesFetched == nil { diff --git a/app/vmalert/rule/alerting_test.go b/app/vmalert/rule/alerting_test.go index 016c554705..45bc414b55 100644 --- a/app/vmalert/rule/alerting_test.go +++ b/app/vmalert/rule/alerting_test.go @@ -16,7 +16,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promutil" @@ -1258,7 +1258,7 @@ func newTestAlertingRule(name string, waitFor time.Duration) *AlertingRule { func getTestAlertingRuleMetrics(name string) *alertingRuleMetrics { m := &alertingRuleMetrics{} - m.errors = utils.NewCounter(metrics.NewSet(), fmt.Sprintf(`vmalert_alerting_rules_errors_total{alertname=%q}`, name)) + m.errors = vmalertutil.NewCounter(metrics.NewSet(), fmt.Sprintf(`vmalert_alerting_rules_errors_total{alertname=%q}`, name)) return m } diff --git a/app/vmalert/rule/group.go b/app/vmalert/rule/group.go index 5c7eb55591..bbf143930d 100644 --- a/app/vmalert/rule/group.go +++ b/app/vmalert/rule/group.go @@ -19,7 +19,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/notifier" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/remotewrite" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/logger" "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal" ) @@ -707,7 +707,7 @@ func (e *executor) exec(ctx context.Context, r Rule, ts time.Time, resolveDurati } wg := sync.WaitGroup{} - errGr := new(utils.ErrGroup) + errGr := new(vmalertutil.ErrGroup) for _, nt := range e.Notifiers() { wg.Add(1) go func(nt notifier.Notifier) { diff --git a/app/vmalert/rule/recording.go b/app/vmalert/rule/recording.go index 6ac328723c..c31abfa3e6 100644 --- a/app/vmalert/rule/recording.go +++ b/app/vmalert/rule/recording.go @@ -10,7 +10,7 @@ import ( "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" "github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/logger" "github.com/VictoriaMetrics/VictoriaMetrics/lib/logstorage" @@ -43,16 +43,16 @@ type RecordingRule struct { } type recordingRuleMetrics struct { - errors *utils.Counter - samples *utils.Gauge + errors *vmalertutil.Counter + samples *vmalertutil.Gauge } func newRecordingRuleMetrics(set *metrics.Set, rr *RecordingRule) *recordingRuleMetrics { rmr := &recordingRuleMetrics{} labels := fmt.Sprintf(`recording=%q, group=%q, file=%q, id="%d"`, rr.Name, rr.GroupName, rr.File, rr.ID()) - rmr.errors = utils.NewCounter(set, fmt.Sprintf(`vmalert_recording_rules_errors_total{%s}`, labels)) - rmr.samples = utils.NewGauge(set, fmt.Sprintf(`vmalert_recording_rules_last_evaluation_samples{%s}`, labels), + rmr.errors = vmalertutil.NewCounter(set, fmt.Sprintf(`vmalert_recording_rules_errors_total{%s}`, labels)) + rmr.samples = vmalertutil.NewGauge(set, fmt.Sprintf(`vmalert_recording_rules_last_evaluation_samples{%s}`, labels), func() float64 { e := rr.state.getLast() return float64(e.Samples) diff --git a/app/vmalert/tpl/footer.qtpl b/app/vmalert/tpl/footer.qtpl index fab37deea1..b2db8be52b 100644 --- a/app/vmalert/tpl/footer.qtpl +++ b/app/vmalert/tpl/footer.qtpl @@ -1,12 +1,12 @@ {% import ( "net/http" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" ) %} {% func Footer(r *http.Request) %} - {%code prefix := utils.Prefix(r.URL.Path) %} + {%code prefix := vmalertutil.Prefix(r.URL.Path) %} diff --git a/app/vmalert/tpl/footer.qtpl.go b/app/vmalert/tpl/footer.qtpl.go index ca42f5c9ec..fe0ecebdf8 100644 --- a/app/vmalert/tpl/footer.qtpl.go +++ b/app/vmalert/tpl/footer.qtpl.go @@ -8,7 +8,7 @@ package tpl import ( "net/http" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" ) //line app/vmalert/tpl/footer.qtpl:8 @@ -30,7 +30,7 @@ func StreamFooter(qw422016 *qt422016.Writer, r *http.Request) { qw422016.N().S(` `) //line app/vmalert/tpl/footer.qtpl:9 - prefix := utils.Prefix(r.URL.Path) + prefix := vmalertutil.Prefix(r.URL.Path) //line app/vmalert/tpl/footer.qtpl:9 qw422016.N().S(` diff --git a/app/vmalert/tpl/header.qtpl b/app/vmalert/tpl/header.qtpl index e2c6b0fd5c..2f9ea405a2 100644 --- a/app/vmalert/tpl/header.qtpl +++ b/app/vmalert/tpl/header.qtpl @@ -3,11 +3,11 @@ "path" "net/url" - "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" + "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/vmalertutil" ) %} {% func Header(r *http.Request, navItems []NavItem, title string, userErr error) %} -{%code prefix := utils.Prefix(r.URL.Path) %} +{%code prefix := vmalertutil.Prefix(r.URL.Path) %}
@@ -85,7 +85,7 @@ type NavItem struct { {% func printNavItems(r *http.Request, current string, items []NavItem, userErr error) %} {%code - prefix := utils.Prefix(r.URL.Path) + prefix := vmalertutil.Prefix(r.URL.Path) %}