mirror of
https://github.com/VictoriaMetrics/VictoriaMetrics.git
synced 2024-12-22 16:36:27 +01:00
123aa4c79e
Previously ScrapeConfig.clone() was improperly copying promauth.Secret fields -
their contents was replaced with `<secret>` value.
This led to inability to use passwords and secrets in `-promscrape.config` file.
The bug has been introduced in v1.77.0 in the commit 67b10896d2
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2551
56 lines
1.2 KiB
Go
56 lines
1.2 KiB
Go
package promutils
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/VictoriaMetrics/metricsql"
|
|
)
|
|
|
|
// Duration is duration, which must be used in Prometheus-compatible yaml configs.
|
|
type Duration struct {
|
|
D time.Duration
|
|
}
|
|
|
|
// NewDuration returns Duration for given d.
|
|
func NewDuration(d time.Duration) *Duration {
|
|
return &Duration{
|
|
D: d,
|
|
}
|
|
}
|
|
|
|
// MarshalYAML implements yaml.Marshaler interface.
|
|
func (pd Duration) MarshalYAML() (interface{}, error) {
|
|
return pd.D.String(), nil
|
|
}
|
|
|
|
// UnmarshalYAML implements yaml.Unmarshaler interface.
|
|
func (pd *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|
var s string
|
|
if err := unmarshal(&s); err != nil {
|
|
return err
|
|
}
|
|
ms, err := metricsql.DurationValue(s, 0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
pd.D = time.Duration(ms) * time.Millisecond
|
|
return nil
|
|
}
|
|
|
|
// Duration returns duration for pd.
|
|
func (pd *Duration) Duration() time.Duration {
|
|
if pd == nil {
|
|
return 0
|
|
}
|
|
return pd.D
|
|
}
|
|
|
|
// ParseDuration parses duration string in Prometheus format
|
|
func ParseDuration(s string) (time.Duration, error) {
|
|
ms, err := metricsql.DurationValue(s, 0)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return time.Duration(ms) * time.Millisecond, nil
|
|
}
|