From 265392fa480fb875ede98a5df7359a7dc5340667 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 21 Sep 2017 22:54:31 +0100 Subject: PLT-7667: Clean up elasticsearch indexes when running data retention jobs. (#7481) --- einterfaces/elasticsearch.go | 7 ++++++- i18n/en.json | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/einterfaces/elasticsearch.go b/einterfaces/elasticsearch.go index 8f3d7e76e..b81605b4f 100644 --- a/einterfaces/elasticsearch.go +++ b/einterfaces/elasticsearch.go @@ -3,7 +3,11 @@ package einterfaces -import "github.com/mattermost/mattermost-server/model" +import ( + "time" + + "github.com/mattermost/mattermost-server/model" +) type ElasticsearchInterface interface { Start() *model.AppError @@ -12,6 +16,7 @@ type ElasticsearchInterface interface { DeletePost(post *model.Post) *model.AppError TestConfig(cfg *model.Config) *model.AppError PurgeIndexes() *model.AppError + DataRetentionDeleteIndexes(cutoff time.Time) *model.AppError } var theElasticsearchInterface ElasticsearchInterface diff --git a/i18n/en.json b/i18n/en.json index ae436ebf8..84162e6e9 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3719,6 +3719,14 @@ "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed", "translation": "Failed to setup Elasticsearch index mapping" }, + { + "id": "ent.elasticsearch.data_retention_delete_indexes.get_indexes.error", + "translation": "Failed to get Elasticsearch indexes" + }, + { + "id": "ent.elasticsearch.data_retention_delete_indexes.delete_index.error", + "translation": "Failed to delete Elasticsearch index" + }, { "id": "ent.elasticsearch.delete_post.error", "translation": "Failed to delete the post" -- cgit v1.2.3-1-g7c22