From d6609d5fc243d264f1c97dfeb9ac130d7e81f8a3 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Fri, 13 Dec 2024 14:51:59 +0530 Subject: [PATCH 1/2] MM-60336: Allow ability to create empty OS https://mattermost.atlassian.net/browse/MM-60336 --- deployment/config.go | 8 -------- deployment/terraform/create.go | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/deployment/config.go b/deployment/config.go index a35286dc0..7d17e5596 100644 --- a/deployment/config.go +++ b/deployment/config.go @@ -464,14 +464,6 @@ func (c *Config) validateElasticSearchConfig() error { return fmt.Errorf("Incorrect engine version: %s. Must start with %q", c.ElasticSearchSettings.Version, "OpenSearch") } - if c.ElasticSearchSettings.SnapshotRepository == "" { - return fmt.Errorf("Empty SnapshotRepository. Must supply a value") - } - - if c.ElasticSearchSettings.SnapshotName == "" { - return fmt.Errorf("Empty SnapshotName. Must supply a value") - } - return nil } diff --git a/deployment/terraform/create.go b/deployment/terraform/create.go index f3807b7fe..b8da1d3d4 100644 --- a/deployment/terraform/create.go +++ b/deployment/terraform/create.go @@ -540,6 +540,11 @@ func (t *Terraform) setupElasticSearchServer(extAgent *ssh.ExtAgent, ip string) mlog.Debug("Repositories registered", mlog.Array("repositories", repositories)) repo := esSettings.SnapshotRepository + snapshotName := esSettings.SnapshotName + if snapshotName == "" { + mlog.Debug("No Opensearch snapshot name given. Not restoring to any snapshot.") + return nil + } // Check if the registered repositories already include the one configured repoFound := false @@ -568,7 +573,6 @@ func (t *Terraform) setupElasticSearchServer(extAgent *ssh.ExtAgent, ip string) // Look for the configured snapshot var snapshot opensearch.Snapshot - snapshotName := esSettings.SnapshotName for _, s := range snapshots { if s.Name == snapshotName { snapshot = s From d42b26be0fdd84599d0da96e08aebb42dfeece25 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 30 Dec 2024 12:13:18 +0530 Subject: [PATCH 2/2] Setting to index 0 --- deployment/terraform/assets/bindata.go | 6 +++--- deployment/terraform/assets/elasticsearch.tf | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/deployment/terraform/assets/bindata.go b/deployment/terraform/assets/bindata.go index fec4ee56d..feefbf290 100644 --- a/deployment/terraform/assets/bindata.go +++ b/deployment/terraform/assets/bindata.go @@ -6,7 +6,7 @@ // dashboard.yaml (231B) // datasource.yaml (415B) // default_dashboard_tmpl.json (99.385kB) -// elasticsearch.tf (4.221kB) +// elasticsearch.tf (4.457kB) // es_dashboard_data.json (16.697kB) // keycloak-database.sql (141B) // mattermost-realm.json (115.117kB) @@ -208,7 +208,7 @@ func default_dashboard_tmplJson() (*asset, error) { return a, nil } -var _elasticsearchTf = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x58\x5f\x6f\x1b\x39\x0e\x7f\xf7\xa7\x20\xe6\x8a\x5e\x13\xc4\x13\x27\xc5\x5d\xd1\x41\x7d\x45\xda\x6b\x8b\x02\x49\x13\x34\xc5\xee\x43\x10\x08\xb2\x86\xb6\xd5\xc8\xd2\x40\xd4\xd8\xeb\x16\xfe\xee\x0b\x49\xf3\xcf\x93\x71\x10\x60\xfd\xb2\x3b\x14\x29\x52\x3f\x92\x3f\x32\xb5\x48\xa6\xb4\x02\x21\xe1\x1b\x62\x92\xaf\x18\xa1\x5d\x4b\x81\x4c\x49\xfd\x80\x39\xb3\x46\x61\x02\x09\x52\x02\xbf\x47\x00\xc2\x94\xda\x41\xe7\x37\x85\x35\xb7\x29\x12\x93\x9a\x1c\xd7\x02\x59\x54\xf9\x1f\x4c\xe0\xe5\xcb\xfa\x50\x58\xe4\x0e\xc3\x65\xf0\x1e\xce\x20\x83\xc9\x08\xc0\xbb\xac\xdd\x69\xbe\x42\x98\x7a\x47\x29\x5f\xf1\x5f\x46\xf3\x0d\xa5\xc2\xac\x92\xd1\x6e\x34\xca\xb9\xe3\x6d\x84\x85\x51\x52\x6c\x59\x6e\x44\xb9\x42\xed\x42\x74\x8c\x13\x95\x2b\xac\xc2\xf5\x91\x92\xe3\x0e\xfd\x79\xf8\x02\xc0\xf9\x1c\x85\xf3\x2e\x2e\x94\x32\x9b\x64\x14\xa4\x85\x95\x5a\xc8\x82\x2b\xaa\xd4\x00\xdc\xb6\xc0\xf6\x75\xc9\x6d\x0c\x30\xa9\x4e\x65\x8e\xda\xc9\xb9\x44\x4b\x30\x85\xbb\xc7\xf1\xde\x07\xc5\x5d\xbc\x9e\x0b\x27\x8d\x8e\x9a\xe4\x28\xbb\x08\x51\x7e\xf7\x41\x7a\xbd\x9d\x7f\xdc\xe3\x14\x34\x98\x77\x9e\x13\xf0\xd9\xff\x4d\x21\x79\xf1\xdb\x03\x2c\x54\x49\x0e\x6d\xc0\x70\x37\x46\x1a\x07\x33\x0f\x70\x0b\x4a\x85\x1a\x4c\xc1\x83\x99\x1e\xc0\x32\xdd\x47\x32\xfd\x49\x46\x3f\x33\x01\x8f\x84\x4f\x24\x21\x06\x5f\xe5\xa1\x8b\x13\x44\xa4\x5e\x67\x97\x92\xdc\x87\x52\x3c\xa0\xab\x00\xad\x51\x8a\x58\x72\xab\x33\xbe\xa1\x8c\x5e\x67\x59\x16\x41\x40\x62\xa4\x79\x41\x4b\xe3\x98\xc5\xc2\x90\x74\xc6\x6e\x77\x15\xce\xcf\x29\x08\x2f\xfc\x17\xdc\x94\x0e\xb8\xce\xe1\xff\xa8\xd0\x21\x70\x8b\xa0\x11\x73\xcc\xc1\x19\xb0\xb8\x90\x1e\x6a\x70\x4b\x84\xd6\x0b\x90\xd4\x02\x83\x50\x28\xe9\x5d\x94\x85\x32\x3c\xa7\x70\x93\x5b\xa2\x86\x3c\x5c\x47\xc0\xc1\x21\x39\x30\xb3\x9f\xde\xb9\x33\x80\x9a\x4a\x8b\x80\x6b\xb4\x5b\xb7\x94\x7a\xf1\x6f\x82\x8d\xb1\x0f\x52\x2f\x80\x13\xe0\x5f\x05\x0a\x87\xf9\x30\x4c\x5f\xd0\x5d\x87\x9b\x92\x13\xf0\xdf\x37\xe5\xfe\x77\x7c\x44\x25\xfa\x67\x40\x9e\x1e\x3f\x55\xb2\x31\xfb\xdd\x4a\xd8\x2b\xdb\xc3\xa5\x5a\x29\x8f\x00\x9e\x5d\xa0\x7d\x51\x5d\xa4\xc3\x8d\x54\xab\x73\xe7\xb8\x58\x76\x08\x23\x7c\xc7\x28\x03\x2f\xd5\x4d\xd5\x35\x4e\xab\x1e\x4c\x7d\xbc\x4d\x8c\x8c\x5b\xdd\x51\x8c\xc2\x36\xb2\x94\xdb\x10\xcf\xe9\x31\x5c\x5d\x8d\xff\xf3\xf6\xf5\xd9\x7f\x33\xf8\x6c\x7c\xd1\x48\xf2\x29\xf7\xe9\x3d\x09\xd5\x72\xf1\xe7\x2d\x70\x11\x19\xd3\x57\x59\x38\x5e\xf2\x35\x02\x1f\x75\x72\x35\x9e\x71\xc2\xbc\x46\x48\xc9\x87\x58\x6b\x73\xe3\x0b\xd7\x17\x8a\xd1\x98\x79\x83\x8a\xc3\x92\xdb\xba\xd6\x93\x0c\xee\x2a\xe6\x6a\x08\xce\x2b\x5c\x84\x4a\xea\x9e\x06\xb1\x32\x0b\xf2\x45\x74\x69\x16\x9f\xd6\xa8\x1d\x7d\xe0\x4e\x2c\x93\x93\xa7\x95\x86\xce\x3f\x06\xc6\xbf\x34\x8b\x5b\x67\x91\xaf\x92\x56\xe3\xbe\xa3\x9d\x7c\x0a\x4d\x98\x64\x75\x13\x76\xcf\x6e\x6a\x6e\x4e\xb2\x6e\xec\xd0\x72\x72\x36\x34\x2f\x1a\xb5\x5d\xf7\xb2\xef\x15\x94\xde\xa6\x2e\xfa\x10\xe8\x71\x63\xb1\x1b\xed\xc5\x97\xfc\x81\x96\x22\x48\xc9\xf9\xe4\xec\x7c\x7c\x36\x19\x9f\xbd\x09\xda\xbb\xd1\xf1\x69\xaf\xdc\x84\x32\x65\xbe\xf1\x68\x31\x65\x16\x6c\x61\x4d\x59\xc4\x42\xeb\x7c\xb6\x13\xb4\x19\x9b\xa8\xf9\x4c\x61\xcf\x9c\x3a\x43\xb2\x1e\x8c\x43\xfd\xa3\xcc\x62\x1c\xaf\xde\x27\x69\x2a\x67\x1a\x1d\x25\x90\x10\xaa\x40\x1f\xd1\xf7\x5c\x2a\x4f\x5e\x11\xcc\xb6\x35\xd7\x85\x18\xcb\x3c\xe2\xb0\xe6\xaa\x8c\xdc\xd0\x75\xb7\x2e\x04\x93\xf9\x81\xfe\x37\x05\x6a\x42\x6e\xc5\x92\xe5\x66\xc5\xa5\x8e\xef\xf6\x93\x1d\x6d\x74\xec\xf8\xc2\xdf\x19\x1d\x7f\x7b\xe2\x45\xad\x5d\x4d\xdb\xf1\x4a\x56\xcf\xbf\x83\x76\xde\x00\xf5\x42\x6a\x64\xeb\x98\xb8\x16\xe4\x4a\xe0\xaf\xf3\x2f\x31\x45\xa4\xd1\x18\x4e\x04\x8b\xc9\x9c\x3a\x93\xf5\x95\x42\xbd\x70\xcb\x57\x5d\x4f\xad\x62\x8a\x8a\x93\x93\x22\xbe\xfa\xc8\x2f\x3b\x47\xf0\x1e\x9c\x51\x92\xdc\x33\x6d\x32\xb8\x43\x15\x7a\xf4\x55\x65\xd7\xf0\x5e\x95\xbe\xb4\x4e\x5e\x2a\x73\x3a\x3a\x81\xc9\x51\x64\x70\x42\x51\x5a\xe9\xb6\xb1\xaa\x42\xe0\x53\xb8\x8b\xcb\x54\xf7\xa4\xf6\x78\x37\xb9\x4f\xeb\xe4\x79\x90\x66\xd4\x43\xc0\x4b\x62\x1d\xe6\x30\x05\x67\x4b\x8c\xa5\x60\x94\x5f\x04\xc2\x3e\x14\xa1\x9c\x29\x23\x1e\x58\x8e\x61\x63\xf3\xf2\xae\x1e\xc9\x5f\x83\x7a\x5e\x4e\x6c\xef\xf5\x75\x28\x35\x4a\xc2\xe8\xb9\x5c\x54\xd1\xf4\x16\xc9\x36\x27\x83\x8b\xe6\xbe\x49\x77\x77\x1b\x32\x69\x62\xfe\x65\x34\x32\xbe\xe1\x16\x35\x52\xf7\xf5\x95\xc5\xf0\xf9\x90\xe9\x5e\xec\x00\x7c\xcd\xa5\xe2\x33\xa9\x7c\x1a\x82\x6a\xaf\xe1\x1b\xf3\x60\x7d\x40\x7d\x54\xf3\x51\x80\x89\x0b\xe1\x75\x03\xfd\xcb\xd0\x9c\xef\xde\x7d\xbc\xfe\xf6\xf9\xeb\x97\x51\xcb\xea\x07\xe8\xaa\xe6\xc0\xe1\x91\xb0\x3f\x15\xa2\x62\x33\x1a\x12\xf4\xec\x78\xd2\x3f\xef\xd2\x72\x32\x70\xfe\x04\xa5\x1f\xa6\x62\xa4\xec\xc5\xef\xa6\x01\xfc\x9a\x65\x74\x2a\x4a\x6b\xfd\x80\x0f\x2d\xde\x3d\x17\x5c\x29\xb4\x2c\xee\xe2\x6e\xdb\x28\x56\xa3\x94\xc9\x7c\x97\x45\xde\x38\x1d\x26\x8b\xd3\xe3\xce\x9c\xa8\x89\x1f\x62\x8b\x00\x54\xd8\x7a\xf2\xc1\x02\x75\x4e\x2c\x90\x49\x44\xed\x89\xbf\x93\x52\x24\xff\xd8\xfb\x60\xb9\xd5\x7c\x25\x45\x98\x86\xac\x28\x67\x4a\x92\x5f\xee\xea\xce\x4b\x2a\xdc\xe7\xc6\x32\xe4\x62\xf9\x8c\x81\x70\xe7\x1b\xf3\xde\xf3\x46\xa4\x01\x61\xb4\x6b\xb7\x59\xdf\x4c\x8f\x27\x50\x67\x53\x19\x3a\x4e\xbb\xe3\x29\xac\x2d\xf1\x2a\x2f\xdb\x6f\xa5\xa6\xa3\x92\x4f\xb7\xec\xe2\xe6\xe6\xf2\xeb\xc7\x8b\x1f\x5f\xaf\xbf\xb1\xcb\xeb\x2f\xb7\x49\xaf\x5c\xf3\xb5\x6f\xb6\xbc\xa5\xa3\x1e\xdd\x54\xcd\x76\xe0\x37\x85\x39\x57\x14\xdb\x94\x6b\xa3\xb7\x2b\x53\x12\xe3\xa5\x5b\xb2\xbe\x65\x87\xac\xa4\x76\x68\x35\x57\xac\x24\xb4\xcc\x57\x8a\xdf\x99\x86\x68\x6d\xc5\x43\x29\x04\xbd\xfd\xc0\xf6\xcf\x9a\xbf\xb8\xa6\x90\xf4\xe5\xc9\x80\x7e\xc1\x89\x36\xc6\x7a\x5f\xc9\x55\x5f\x3e\xb1\x79\x0f\x25\xd4\xc2\x6e\x0b\xc7\xb8\xdf\xb2\xc9\xf5\xb0\x69\xe2\xed\xce\x40\xd4\x79\x61\xa4\x76\x8f\xf0\x9c\x1b\x2b\x90\x2d\x9d\x2b\xe8\x31\x32\x4e\x75\x06\x43\xb3\x64\x27\x37\xe1\xff\xc6\x57\x52\x8f\x7f\x5c\xde\x8e\xcf\xc6\xe7\xe3\xf3\xc9\xd9\xdb\xf1\xe4\x4d\x33\x7a\xb5\xc9\x91\x39\xc3\xc2\x7f\xab\x78\xfd\x5c\x7d\x2a\xd4\x1e\xdb\x0d\xfc\xab\x40\xbd\xda\xec\x46\x7f\x07\x00\x00\xff\xff\x41\x94\x49\x47\x7d\x10\x00\x00") +var _elasticsearchTf = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x58\xe1\x6f\xdb\xb6\x12\xff\xee\xbf\xe2\xa0\x0d\x5b\x5b\x44\xb6\x93\x76\x6b\x2b\xcc\x6f\xc8\xfa\xba\xa2\x0f\x69\x1b\x2c\xc3\xdb\x87\x20\x20\x68\xea\x6c\x73\xa1\x49\x81\x47\x39\x73\x0b\xff\xef\x0f\x47\x4a\xb2\xec\x28\x41\x80\xa7\x2f\xb1\x8e\x77\xe4\xf1\x77\x77\xbf\x3b\xc5\x23\xb9\xda\x2b\x84\x4c\xde\x91\xd0\x72\x2d\x08\xfd\x46\x2b\x14\x46\xdb\x5b\x2c\x85\x77\x06\x33\xc8\x90\x32\xf8\x36\x02\x50\xae\xb6\x01\x7a\xcf\x0c\x36\xd2\x8f\x91\x84\xb6\x14\xa4\x55\x28\x92\xca\xbf\x60\x0a\x3f\xfc\xd0\x2e\x2a\x8f\x32\x60\xdc\x0c\x7e\x85\x53\x28\x60\x3a\x02\xe0\x23\xdb\xe3\xac\x5c\x23\xcc\xf8\xa0\xb1\x5c\xcb\xaf\xce\xca\x3b\x1a\x2b\xb7\xce\x46\xbb\xd1\xa8\x94\x41\xee\x3d\xac\x9c\xd1\x6a\x2b\x4a\xa7\xea\x35\xda\x10\xbd\x13\x92\xa8\x5e\x63\xe3\x2e\x7b\x4a\x41\x06\xe4\xf5\xf8\x06\x80\x8b\x05\xaa\xc0\x47\x9c\x1b\xe3\xee\xb2\x51\x94\x56\x5e\x5b\xa5\x2b\x69\xa8\x51\x03\x08\xdb\x0a\xf7\xb7\xcb\xae\x92\x83\x59\xb3\xaa\x4b\xb4\x41\x2f\x34\x7a\x82\x19\x5c\xdf\xf7\xf7\x26\x2a\xee\xd2\xf6\x52\x05\xed\x6c\xd2\xa4\x40\xc5\x79\xf4\xf2\x0f\x76\x92\xf5\x76\x7c\xb9\xfb\x21\xe8\x30\xef\x5d\x27\xe2\x73\xf8\xcc\x20\xfb\xfe\x1b\x03\xac\x4c\x4d\x01\x7d\xc4\x70\x97\x23\xe5\xd1\x8c\x01\xde\x83\xd2\xa0\x06\x33\x60\x30\xc7\x0f\x60\x39\x3e\x44\x72\xfc\x37\x39\xfb\xc4\x00\xdc\x13\x3e\x12\x84\xe4\x7c\x13\x87\x3e\x4e\x90\x90\x7a\x59\x5c\x68\x0a\xbf\xd5\xea\x16\x43\x03\x68\x8b\x52\xc2\x52\x7a\x5b\xc8\x3b\x2a\xe8\x65\x51\x14\x09\x04\x24\x41\x56\x56\xb4\x72\x41\x78\xac\x1c\xe9\xe0\xfc\x76\xd7\xe0\xfc\x94\x84\x60\xe1\x77\x70\x59\x07\x90\xb6\x84\x7f\xa3\xc1\x80\x20\x3d\x82\x45\x2c\xb1\x84\xe0\xc0\xe3\x52\x33\xd4\x10\x56\x08\xfb\x53\x80\xb4\x55\x18\x85\xca\x68\x3e\xa2\xae\x8c\x93\x25\xc5\x9d\xc2\x0a\x2d\x94\x71\x3b\x02\x09\x01\x29\x80\x9b\xff\xcd\x87\x07\x07\x68\xa9\xf6\x08\xb8\x41\xbf\x0d\x2b\x6d\x97\x3f\x12\xdc\x39\x7f\xab\xed\x12\x24\x01\xfe\x53\xa1\x0a\x58\x0e\xc3\xf4\x01\xc3\x97\xb8\x53\x76\x02\xfc\x7e\x59\x1f\xbe\xa7\x4b\x34\xa2\xff\x0f\xc8\xc9\x8b\xc7\x52\x36\x45\xbf\x9f\x09\x07\x69\xfb\x70\xaa\x36\xca\x23\x80\x27\x27\xe8\xb1\xa8\x4d\xd2\xe1\x42\x6a\xd5\x65\x08\x52\xad\x7a\x84\x11\xdf\x93\x97\x91\x97\xda\xa2\xea\x1b\x8f\x9b\x1a\x1c\xb3\xbf\x9d\x8f\x42\x7a\xdb\x53\x4c\xc2\xbd\x67\x63\xe9\xa3\x3f\x93\x17\xf0\xe9\x53\xfe\xd3\xdb\x97\xa7\x3f\x17\xf0\xbb\xe3\xa4\xd1\xc4\x21\xe7\xf0\x9e\xc4\x6c\x39\xff\xeb\x0a\xa4\x4a\x8c\xc9\x59\x16\x97\x57\x72\x83\x20\x47\xbd\x58\xe5\x73\x49\x58\xb6\x08\x19\x7d\x9b\x72\x6d\xe1\x38\x71\x39\x51\x9c\xc5\x82\x0d\x1a\x0e\xcb\xae\xda\x5c\xcf\x0a\xb8\x6e\x98\xab\x23\x38\x56\x38\x8f\x99\xd4\x5f\x8d\x62\xe3\x96\xc4\x49\x74\xe1\x96\xef\x37\x68\x03\xfd\x26\x83\x5a\x65\x27\x8f\x2b\x0d\xad\xbf\x8b\x8c\x7f\xe1\x96\x57\xc1\xa3\x5c\x67\x7b\x8d\x9b\x9e\x76\xf6\x3e\x16\x61\x56\xb4\x45\xd8\x5f\xbb\x6c\xb9\x39\x2b\xfa\xbe\xc3\x9e\x93\x8b\xa1\x7e\xd1\xa9\xed\xfa\x9b\xfd\xd1\x40\xc9\x36\x6d\xd2\x47\x47\x5f\x74\x16\xbb\xd1\x81\x7f\xd9\x7f\xd1\x53\x02\x29\x3b\x9b\x9e\x9e\xe5\xa7\xd3\xfc\xf4\x75\xd4\xde\x8d\x5e\x4c\x8e\xd2\x4d\x19\x57\x97\x77\x8c\x96\x30\x6e\x29\x96\xde\xd5\x55\x4a\xb4\xde\xeb\xbe\x83\x76\x6d\x13\xad\x9c\x1b\x3c\x32\xa7\x5e\x93\x6c\x1b\xe3\x50\xfd\x18\xb7\xcc\xd3\xd6\x87\x24\x4d\xf5\xdc\x62\xa0\x0c\x32\x42\x13\xe9\x23\x9d\xbd\xd0\x86\xc9\x2b\x81\xb9\x2f\xcd\x4d\xa5\x72\x5d\x26\x1c\x36\xd2\xd4\x89\x1b\xfa\xc7\x6d\x2a\x25\x74\xf9\x40\xfd\xbb\x0a\x2d\xa1\xf4\x6a\x25\x4a\xb7\x96\xda\xa6\x7b\x73\x67\x47\x9f\x0e\x0e\x72\xc9\x7b\xa6\x83\x3f\x3f\x72\xa3\xbd\x5d\x4b\xdb\x69\x4b\xd1\xf6\xbf\x07\xed\xd8\x00\xed\x52\x5b\x14\x9b\x14\xb8\x3d\xc8\x8d\x80\xb7\xe3\x9b\xb8\x2a\xd1\x68\x72\x27\x81\x25\x74\x49\xbd\xce\xfa\xcc\xa0\x5d\x86\xd5\xb3\xfe\x49\x7b\xc5\x31\x1a\x49\x41\xab\x74\xeb\xe7\x3c\xec\x3c\x87\x5f\x21\x38\xa3\x29\x3c\xd1\xa6\x80\x6b\x34\xb1\x46\x9f\x35\x76\x1d\xef\x35\xe1\x1b\xb7\xc1\x1b\xeb\x92\x9e\x9f\xc0\xf4\x79\x62\x70\x42\x55\x7b\x1d\xb6\x29\xab\xa2\xe3\x33\xb8\x4e\xc3\x54\x7f\xa5\x3d\xf1\x7a\x7a\x33\x6e\x83\xc7\x20\xcd\xe9\x08\x01\x96\xa4\x3c\x2c\x61\x06\xc1\xd7\x98\x52\xc1\x19\x1e\x04\xe2\x3c\x94\xa0\x9c\x1b\xa7\x6e\x45\x89\x71\x62\x63\x79\x5f\x8f\xf4\xd7\x41\x3d\x96\x93\x38\xb8\x7d\xeb\x4a\x8b\x92\x72\x76\xa1\x97\x8d\x37\x47\x83\xe4\x3e\x26\x83\x83\xe6\xa1\x49\x7f\x76\x1b\x32\xe9\x7c\xfe\xea\x2c\x0a\x79\x27\x3d\x5a\xa4\xfe\xed\x1b\x8b\xe1\xf5\x21\xd3\x03\xdf\x01\xe4\x46\x6a\x23\xe7\xda\x70\x18\xa2\xea\x51\xc1\x77\xe6\xd1\xfa\x01\xf5\x51\xcb\x47\x11\x26\xa9\x14\xeb\x46\xfa\xd7\xb1\x38\x7f\xf9\xe5\xdd\x97\xcf\xbf\x7f\xfc\x30\xda\xb3\xfa\x03\x74\xd5\x72\xe0\x70\x4b\x38\xec\x0a\x49\xb1\x6b\x0d\x19\x32\x3b\x9e\x1c\xaf\xf7\x69\x39\x1b\x58\x7f\x84\xd2\x1f\xa6\x62\xa4\xe2\xfb\x6f\x5d\x01\xf0\x98\xe5\xec\x58\xd5\xde\x73\x83\x8f\x25\xde\x5f\x57\xd2\x18\xf4\x22\xcd\xe2\x61\xdb\x29\x36\xad\x54\xe8\x72\x57\x24\xde\x98\x0c\x93\xc5\xe4\x45\xaf\x4f\xb4\xc4\x0f\xa9\x44\x00\x1a\x6c\x99\x7c\xb0\x42\x5b\x92\x88\x64\x92\x50\x7b\xe4\x3b\x69\x8c\xc4\x97\xbd\x89\x96\x5b\x2b\xd7\x5a\xc5\x6e\x28\xaa\x7a\x6e\x34\xf1\x70\xd7\x56\x5e\xd6\xe0\xbe\x70\x5e\xa0\x54\xab\x27\x34\x84\x6b\x2e\xcc\x1b\xe6\x8d\x44\x03\xca\xd9\xb0\x9f\x66\x79\x74\xfd\x4f\x4d\x01\x6a\xe2\x81\x40\xdb\x12\xff\x81\x29\xcc\x51\xc9\x9a\x9a\xd1\x34\x26\xa2\x26\x60\x60\xcc\x16\x6a\x4a\x43\x2d\x6f\xe4\x9d\xe1\x21\x02\x9c\x07\xeb\x2c\x8e\xbb\x3d\xff\x42\x28\x9d\xfd\x31\x34\x53\x49\x9c\x52\xd8\x6b\x58\xd7\x26\xe8\xca\x20\x18\xb7\x84\xc8\x37\xb4\xb7\x5a\x85\x50\x51\x31\x99\x2c\x75\x58\xd5\x73\xee\xcb\x93\xb5\x0c\x01\xfd\xda\x51\xe8\xfd\xcc\x79\x4a\xce\x79\x22\xce\xed\x72\x52\xd5\xc6\x4c\xde\xbc\x7e\xf5\x9d\x26\xaa\x51\xb9\x35\xa7\x6b\x7e\xf6\xd3\xab\x57\x6f\xdf\xbc\x7a\xf3\xf3\x69\xb3\xfd\x50\xab\xed\x8d\x64\x43\xcb\xe3\x7e\x1f\x66\x3e\xe4\x11\x2d\xed\xc6\xe2\x43\xda\xe8\xd8\x23\x7b\x7f\x25\xce\x2f\x2f\x2f\x3e\xbe\x3b\xff\xf3\xe3\x97\xcf\xe2\xe2\xcb\x87\xab\xec\xa8\x34\xcb\x0d\x13\x4b\xb9\xa7\xde\x23\x6a\x6d\x88\xe5\x81\x67\x06\x0b\x69\x28\x51\x92\xb4\xce\x6e\xd7\xae\x26\x21\xeb\xb0\x12\xc7\x96\x3d\x62\xd6\x36\xa0\xb7\xd2\x88\x9a\xd0\x0b\xae\x0a\x9e\x0f\x87\x28\x7c\x2d\x63\xda\x47\xbd\x43\xc7\x0e\xd7\xba\xaf\xcb\x19\x64\xc7\xf2\x6c\x40\xbf\x92\x44\x77\xce\xf3\x59\xd9\xa7\x63\xf9\xd4\x97\x47\x28\xa1\x55\x7e\x5b\x05\x21\xf9\x8b\x82\xc2\x11\x36\x9d\xbf\xfd\x7e\x8f\xb6\xac\x9c\xb6\xe1\x1e\x9e\x0b\xe7\x15\x8a\x98\x60\xf7\x91\x09\xa6\xd7\x04\xbb\x0f\x8a\xec\x32\xfe\xca\x3f\x69\x9b\xff\x79\x71\x95\x9f\xe6\x67\xf9\xd9\xf4\xf4\x6d\x3e\x7d\xdd\x8d\x19\xd6\x95\x28\x82\x13\xf1\x6f\xe3\x2f\xcf\x10\x8f\xb9\x7a\xc4\xec\x03\xff\x01\x69\xc7\xb8\xdd\xe8\x7f\x01\x00\x00\xff\xff\xff\x4f\x06\xac\x69\x11\x00\x00") func elasticsearchTfBytes() ([]byte, error) { return bindataRead( @@ -224,7 +224,7 @@ func elasticsearchTf() (*asset, error) { } info := bindataFileInfo{name: "elasticsearch.tf", size: 0, mode: os.FileMode(0644), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x87, 0xeb, 0xb5, 0x8, 0x28, 0xc0, 0x75, 0xb2, 0xfb, 0xb4, 0xfa, 0xcc, 0xd2, 0x12, 0xd, 0x43, 0xa4, 0x74, 0x20, 0xef, 0x92, 0xf1, 0x5, 0x49, 0x5d, 0x8f, 0xab, 0x70, 0x97, 0x12, 0x22, 0x37}} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x2, 0xe2, 0xbd, 0x7c, 0x24, 0x30, 0x88, 0xe0, 0xf8, 0x1a, 0xb7, 0x62, 0x7c, 0xfb, 0x3d, 0x98, 0x2b, 0x8f, 0x8b, 0x95, 0x5b, 0x90, 0x1, 0x6d, 0x3c, 0xed, 0x85, 0x94, 0x7f, 0x54, 0xf5, 0x76}} return a, nil } diff --git a/deployment/terraform/assets/elasticsearch.tf b/deployment/terraform/assets/elasticsearch.tf index 701dcdf46..0d3f8748c 100644 --- a/deployment/terraform/assets/elasticsearch.tf +++ b/deployment/terraform/assets/elasticsearch.tf @@ -127,7 +127,10 @@ resource "aws_opensearch_domain" "es_server" { dynamic "log_publishing_options" { for_each = var.es_enable_cloudwatch_logs ? [true] : [] content { - cloudwatch_log_group_arn = aws_cloudwatch_log_group.es_log_group.arn + # Just using index 0 because the count is mainly used to control one or none. + # We don't have a need for multiple log groups. + # https://github.com/mattermost/mattermost-load-test-ng/pull/874#issuecomment-2544984861 + cloudwatch_log_group_arn = aws_cloudwatch_log_group.es_log_group[0].arn log_type = "ES_APPLICATION_LOGS" } }