From f54499343bb8e7fd23ffdb2a40bf3ef588e1e509 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Fri, 19 Jul 2024 20:42:27 +0300 Subject: [PATCH] feat: expose availability-zone as a cli flag for ingester (#3881) * expose availability-zone as a cli flag for ingester Signed-off-by: Aviv Guiser * update changelog Signed-off-by: Aviv Guiser * update changelog Signed-off-by: Aviv Guiser * fix cli flag Signed-off-by: Aviv Guiser * change default to empty string Signed-off-by: Aviv Guiser * fix nit Signed-off-by: Aviv Guiser --------- Signed-off-by: Aviv Guiser --- CHANGELOG.md | 1 + modules/ingester/config.go | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a666cd1fd7..aee30f4e2d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ * [BUGFIX] Improved handling of complete blocks in localblocks processor after enabling flusing [#3805](https://github.com/grafana/tempo/pull/3805) (@mapno) * [BUGFIX] Handle out of boundaries spans kinds [#3861](https://github.com/grafana/tempo/pull/3861) (@javiermolinar) * [BUGFIX] Maintain previous tenant blocklist on tenant errors [#3860](https://github.com/grafana/tempo/pull/3860) (@zalegrala) +* [ENHANCEMENT] expose availability-zone as a cli flag in ingester [#3881](https://github.com/grafana/tempo/pull/3881) ## v2.5.0 diff --git a/modules/ingester/config.go b/modules/ingester/config.go index 4c9e520fa52..1b5d34c8a87 100644 --- a/modules/ingester/config.go +++ b/modules/ingester/config.go @@ -48,6 +48,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) f.DurationVar(&cfg.MaxBlockDuration, prefix+".max-block-duration", 30*time.Minute, "Maximum duration which the head block can be appended to before cutting it.") f.Uint64Var(&cfg.MaxBlockBytes, prefix+".max-block-bytes", 500*1024*1024, "Maximum size of the head block before cutting it.") f.DurationVar(&cfg.CompleteBlockTimeout, prefix+".complete-block-timeout", 3*tempodb.DefaultBlocklistPoll, "Duration to keep blocks in the ingester after they have been flushed.") + f.StringVar(&cfg.LifecyclerConfig.Zone, prefix+".availability-zone", "", "Define Availability Zone in which this ingester is running.") hostname, err := os.Hostname() if err != nil {