Skip to content

Commit 13b8aba

Browse files
dimuoncursoragent
dimuon
and
cursoragent
authored
fix: stop clamping unset Kibana topology to 1g (#1057)
Empty kibana {} now uses the deployment template size and zone count so new deployments match current ESS defaults (2g) instead of OOMing at 1g. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 9b45848 commit 13b8aba

12 files changed

Lines changed: 52 additions & 43 deletions

‎.changelog/1057.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/ec_deployment: Use the deployment template Kibana size and zone count when `kibana` is set without those attributes, instead of clamping to 1g and 1 zone.
3+
```

‎ec/acc/deployment_basic_defaults_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestAccDeployment_basic_defaults_first(t *testing.T) {
5757
resource.TestCheckResourceAttrSet(resName, "elasticsearch.hot.node_roles.#"),
5858
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
5959
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
60-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
60+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
6161
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
6262
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
6363
resource.TestCheckNoResourceAttr(resName, "integrations_server"),
@@ -133,7 +133,7 @@ func TestAccDeployment_basic_defaults_hw(t *testing.T) {
133133
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
134134

135135
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
136-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
136+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
137137
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
138138
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
139139
resource.TestCheckResourceAttrSet(resName, "integrations_server.instance_configuration_id"),
@@ -158,7 +158,7 @@ func TestAccDeployment_basic_defaults_hw(t *testing.T) {
158158
resource.TestCheckResourceAttrSet(resName, "elasticsearch.warm.node_roles.#"),
159159
resource.TestCheckResourceAttr(resName, "elasticsearch.warm.zone_count", "2"),
160160
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
161-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
161+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
162162
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
163163
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
164164
resource.TestCheckNoResourceAttr(resName, "integrations_server"),

‎ec/acc/deployment_basic_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func checkBasicDeploymentResource(resName, randomDeploymentName, deploymentVersi
240240
resource.TestCheckResourceAttrSet(resName, "elasticsearch.http_endpoint"),
241241
resource.TestCheckResourceAttrSet(resName, "elasticsearch.https_endpoint"),
242242
resource.TestCheckResourceAttr(resName, "kibana.region", getRegion()),
243-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
243+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
244244
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
245245
resource.TestCheckResourceAttrSet(resName, "kibana.http_endpoint"),
246246
resource.TestCheckResourceAttrSet(resName, "kibana.https_endpoint"),

‎ec/acc/deployment_cpu_optimized_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestAccDeployment_cpuOptimized(t *testing.T) {
4848
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
4949
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
5050
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
51-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
51+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
5252
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
5353
resource.TestCheckNoResourceAttr(resName, "apm"),
5454
resource.TestCheckNoResourceAttr(resName, "enterprise_search"),
@@ -65,7 +65,7 @@ func TestAccDeployment_cpuOptimized(t *testing.T) {
6565
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
6666
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
6767
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
68-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
68+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
6969
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
7070
resource.TestCheckResourceAttr(resName, "apm.zone_count", "1"),
7171
resource.TestCheckResourceAttrSet(resName, "apm.instance_configuration_id"),

‎ec/acc/deployment_template_migration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestAccDeployment_template_migration(t *testing.T) {
4949
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
5050
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
5151
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
52-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
52+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
5353
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
5454
resource.TestCheckNoResourceAttr(resName, "apm"),
5555
resource.TestCheckNoResourceAttr(resName, "enterprise_search"),
@@ -67,7 +67,7 @@ func TestAccDeployment_template_migration(t *testing.T) {
6767
resource.TestCheckResourceAttr(resName, "elasticsearch.hot.zone_count", "2"),
6868
resource.TestCheckResourceAttr(resName, "kibana.zone_count", "1"),
6969
resource.TestCheckResourceAttrSet(resName, "kibana.instance_configuration_id"),
70-
resource.TestCheckResourceAttr(resName, "kibana.size", "1g"),
70+
resource.TestCheckResourceAttr(resName, "kibana.size", "2g"),
7171
resource.TestCheckResourceAttr(resName, "kibana.size_resource", "memory"),
7272
resource.TestCheckNoResourceAttr(resName, "apm"),
7373
resource.TestCheckNoResourceAttr(resName, "enterprise_search"),

‎ec/acc/testdata/datasource_deployment_basic.tf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ resource "ec_deployment" "basic_datasource" {
3434
}
3535
}
3636

37-
kibana = {
38-
size = "2g"
39-
}
37+
kibana = {}
4038

4139
apm = {}
4240

‎ec/acc/testdata/deployment_cpu_optimized_with_custom_hot_ic.tf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ resource "ec_deployment" "cpu_optimized" {
1616
}
1717
}
1818

19-
kibana = {
20-
size = "2g"
21-
}
19+
kibana = {}
2220
}

‎ec/acc/testdata/deployment_cpu_optimized_with_migrate_to_latest_hw.tf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ resource "ec_deployment" "cpu_optimized" {
1616
}
1717
}
1818

19-
kibana = {
20-
size = "2g"
21-
}
19+
kibana = {}
2220
}

‎ec/acc/testdata/deployment_observability_self.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ resource "ec_deployment" "observability" {
2424
}
2525

2626
kibana = {
27-
size = "2g"
2827
zone_count = 1
2928
}
30-
}
29+
}

‎ec/ecresource/deploymentresource/kibana/v2/kibana_payload.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (kibana KibanaTF) payload(ctx context.Context, payload models.KibanaPayload
8080
ZoneCount: kibana.ZoneCount,
8181
}
8282

83-
topologyPayload, ds := kibanaTopologyPayload(ctx, topologyTF, defaultKibanaTopology(payload.Plan.ClusterTopology)[0])
83+
topologyPayload, ds := kibanaTopologyPayload(ctx, topologyTF, payload.Plan.ClusterTopology[0])
8484

8585
diags.Append(ds...)
8686

0 commit comments

Comments
 (0)