From 22459ee17a3ba0b4487f975b6ebe630cab2d9feb Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 17 Aug 2017 15:05:17 +0100 Subject: PLT-7302: Aggregate Elasticsearch indexes over a certain age. (#7224) * PLT-7302: Aggregate Elasticsearch indexes over a certain age. This is done by a scheduled daily job, in order to keep the shard count to a sensible level in Elasticsearch. * Use map[string]string instead of StringMap --- jobs/schedulers.go | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'jobs/schedulers.go') diff --git a/jobs/schedulers.go b/jobs/schedulers.go index 73ec6661a..2f4e18001 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -16,7 +16,8 @@ import ( type Schedulers struct { startOnce sync.Once - DataRetention model.Scheduler + DataRetention model.Scheduler + ElasticsearchAggregation model.Scheduler listenerId string } @@ -28,6 +29,10 @@ func InitSchedulers() *Schedulers { schedulers.DataRetention = dataRetentionInterface.MakeScheduler() } + if elasticsearchAggregatorInterface := ejobs.GetElasticsearchAggregatorInterface(); elasticsearchAggregatorInterface != nil { + schedulers.ElasticsearchAggregation = elasticsearchAggregatorInterface.MakeScheduler() + } + return schedulers } @@ -38,6 +43,10 @@ func (schedulers *Schedulers) Start() *Schedulers { if schedulers.DataRetention != nil && *utils.Cfg.DataRetentionSettings.Enable { go schedulers.DataRetention.Run() } + + if schedulers.ElasticsearchAggregation != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing { + go schedulers.ElasticsearchAggregation.Run() + } }) schedulers.listenerId = utils.AddConfigListener(schedulers.handleConfigChange) @@ -53,6 +62,14 @@ func (schedulers *Schedulers) handleConfigChange(oldConfig *model.Config, newCon schedulers.DataRetention.Stop() } } + + if schedulers.ElasticsearchAggregation != nil { + if !*oldConfig.ElasticsearchSettings.EnableIndexing && *newConfig.ElasticsearchSettings.EnableIndexing { + go schedulers.ElasticsearchAggregation.Run() + } else if *oldConfig.ElasticsearchSettings.EnableIndexing && !*newConfig.ElasticsearchSettings.EnableIndexing { + schedulers.ElasticsearchAggregation.Stop() + } + } } func (schedulers *Schedulers) Stop() *Schedulers { @@ -62,6 +79,10 @@ func (schedulers *Schedulers) Stop() *Schedulers { schedulers.DataRetention.Stop() } + if schedulers.ElasticsearchAggregation != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing { + schedulers.ElasticsearchAggregation.Stop() + } + l4g.Info("Stopped schedulers") return schedulers -- cgit v1.2.3-1-g7c22