Promtail: Rename config name limit_config to limits_config (#5707)

* Rename promtail config name 'limit_config' to 'limits_config'

* Add changelog entry

* Fix formatting
pull/5697/head
Franz Wong 3 years ago committed by GitHub
parent 908692794d
commit d67306b657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 2
      clients/cmd/promtail/promtail-local-limit-config.yaml
  3. 4
      clients/pkg/promtail/config/config.go
  4. 4
      clients/pkg/promtail/config/config_test.go
  5. 4
      clients/pkg/promtail/promtail.go

@ -1,4 +1,5 @@
## Main
* [5707](https://github.com/grafana/loki/pull/5707) **franzwong** Promtail: Rename config name limit_config to limits_config.
* [5626](https://github.com/grafana/loki/pull/5626) **jeschkies** Support multi-tenant select logs and samples queries.
* [5622](https://github.com/grafana/loki/pull/5622) **chaudum**: Fix bug in query splitter that caused `interval` query parameter to be ignored and therefore returning more logs than expected.
* [5521](https://github.com/grafana/loki/pull/5521) **cstyan**: Move stream lag configuration to top level clients config struct and refactor stream lag metric, this resolves a bug with duplicate metric collection when a single Promtail binary is running multiple Promtail clients.

@ -17,6 +17,6 @@ scrape_configs:
job: varlogs
__path__: /var/log/*log
limit_config:
limits_config:
readline_rate: 100
readline_burst: 200

@ -32,7 +32,7 @@ type Config struct {
PositionsConfig positions.Config `yaml:"positions,omitempty"`
ScrapeConfig []scrapeconfig.Config `yaml:"scrape_configs,omitempty"`
TargetConfig file.Config `yaml:"target_config,omitempty"`
LimitConfig limit.Config `yaml:"limit_config,omitempty"`
LimitsConfig limit.Config `yaml:"limits_config,omitempty"`
Options Options `yaml:"options,omitempty"`
}
@ -43,7 +43,7 @@ func (c *Config) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) {
c.ClientConfig.RegisterFlagsWithPrefix(prefix, f)
c.PositionsConfig.RegisterFlagsWithPrefix(prefix, f)
c.TargetConfig.RegisterFlagsWithPrefix(prefix, f)
c.LimitConfig.RegisterFlagsWithPrefix(prefix, f)
c.LimitsConfig.RegisterFlagsWithPrefix(prefix, f)
}
// RegisterFlags registers flags.

@ -33,7 +33,7 @@ scrape_configs:
- localhost
labels:
job: varlogs
limit_config:
limits_config:
readline_rate: 100
readline_burst: 200
options:
@ -50,7 +50,7 @@ func Test_RateLimitLoad(t *testing.T) {
var dst Config
err := yaml.Unmarshal([]byte(testFile), &dst)
require.Nil(t, err)
config := dst.LimitConfig
config := dst.LimitsConfig
require.Equal(t, float64(100), config.ReadlineRate)
require.Equal(t, 200, config.ReadlineBurst)
}

@ -63,8 +63,8 @@ func New(cfg config.Config, metrics *client.Metrics, dryRun bool, opts ...Option
cfg.Setup()
if cfg.LimitConfig.ReadlineRateEnabled {
stages.SetReadLineRateLimiter(cfg.LimitConfig.ReadlineRate, cfg.LimitConfig.ReadlineBurst, cfg.LimitConfig.ReadlineRateDrop)
if cfg.LimitsConfig.ReadlineRateEnabled {
stages.SetReadLineRateLimiter(cfg.LimitsConfig.ReadlineRate, cfg.LimitsConfig.ReadlineBurst, cfg.LimitsConfig.ReadlineRateDrop)
}
var err error
if dryRun {

Loading…
Cancel
Save