ESS Staging integ test improvements (#3547) (#3604)

* support tags on integration tests ESS deployments (cherry picked from commit be04fba) Co-authored-by: Paolo Chilà <[email protected]>
elastic · Oct 16, 2023 · fda3726 · fda3726
1 parent f3c1f77
commit fda3726
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 228 deletions.
diff --git a/pkg/testing/ess/create_deployment_csp_configuration.yaml b/pkg/testing/ess/create_deployment_csp_configuration.yaml
@@ -0,0 +1,15 @@
+gcp:
+  integrations_server_conf_id: "gcp.integrationsserver.n2.68x32x45.2"
+  elasticsearch_conf_id: "gcp.es.datahot.n2.68x10x45"
+  elasticsearch_deployment_template_id: "gcp-storage-optimized-v5"
+  kibana_instance_configuration_id: "gcp.kibana.n2.68x32x45"
+azure:
+  integrations_server_conf_id: "azure.integrationsserver.fsv2.2"
+  elasticsearch_conf_id: "azure.es.datahot.edsv4"
+  elasticsearch_deployment_template_id: "azure-storage-optimized-v2"
+  kibana_instance_configuration_id: "azure.kibana.fsv2"
+aws:
+  integrations_server_conf_id: "aws.integrationsserver.c5d.2.1"
+  elasticsearch_conf_id: "aws.es.datahot.i3.1.1"
+  elasticsearch_deployment_template_id: "aws-storage-optimized-v5"
+  kibana_instance_configuration_id: "aws.kibana.c5d.1.1"
diff --git a/pkg/testing/ess/create_deployment_request.tmpl.json b/pkg/testing/ess/create_deployment_request.tmpl.json
@@ -0,0 +1,102 @@
+{
+  "resources": {
+    "integrations_server": [
+      {
+        "elasticsearch_cluster_ref_id": "main-elasticsearch",
+        "region": "{{ .request.Region }}",
+        "plan": {
+          "cluster_topology": [
+            {
+              "instance_configuration_id": "{{ .integrations_server_conf_id }}",
+              "zone_count": 1,
+              "size": {
+                "resource": "memory",
+                "value": 1024
+              }
+            }
+          ],
+          "integrations_server": {
+            "version": "{{ .request.Version }}"
+          }
+        },
+        "ref_id": "main-integrations_server"
+      }
+    ],
+    "elasticsearch": [
+      {
+        "region": "{{ .request.Region }}",
+        "settings": {
+          "dedicated_masters_threshold": 6
+        },
+        "plan": {
+          "cluster_topology": [
+            {
+              "zone_count": 1,
+              "elasticsearch": {
+                "node_attributes": {
+                  "data": "hot"
+                }
+              },
+              "instance_configuration_id": "{{.elasticsearch_conf_id}}",
+              "node_roles": [
+                "master",
+                "ingest",
+                "transform",
+                "data_hot",
+                "remote_cluster_client",
+                "data_content"
+              ],
+              "id": "hot_content",
+              "size": {
+                "resource": "memory",
+                "value": 8192
+              }
+            }
+          ],
+          "elasticsearch": {
+            "version": "{{ .request.Version }}",
+            "enabled_built_in_plugins": []
+          },
+          "deployment_template": {
+            "id": "{{ .elasticsearch_deployment_template_id }}"
+          }
+        },
+        "ref_id": "main-elasticsearch"
+      }
+    ],
+    "enterprise_search": [],
+    "kibana": [
+      {
+        "elasticsearch_cluster_ref_id": "main-elasticsearch",
+        "region": "{{ .request.Region }}",
+        "plan": {
+          "cluster_topology": [
+            {
+              "instance_configuration_id": "{{.kibana_instance_configuration_id}}",
+              "zone_count": 1,
+              "size": {
+                "resource": "memory",
+                "value": 1024
+              }
+            }
+          ],
+          "kibana": {
+            "version": "{{ .request.Version }}",
+            "user_settings_json": {
+              "xpack.fleet.enableExperimental": ["agentTamperProtectionEnabled"]
+            }
+          }
+        },
+        "ref_id": "main-kibana"
+      }
+    ]
+  },
+  "settings": {
+    "autoscaling_enabled": false
+  },
+  "name": "{{ .request.Name }}",
+  "metadata": {
+    "system_owned": false,
+    "tags": {{ json .request.Tags }}
+  }
+}