Skip to content

Commit

Permalink
change default ESS region to staging CFT
Browse files Browse the repository at this point in the history
  • Loading branch information
pchila committed Oct 6, 2023
1 parent 99b14c8 commit 3bbbd06
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 228 deletions.
2 changes: 1 addition & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,7 @@ func createTestRunner(matrix bool, singleTest string, goTestFlags string, batche
// Valid values are gcp-us-central1 (default), azure-eastus2
essRegion := os.Getenv("TEST_INTEG_AUTH_ESS_REGION")
if essRegion == "" {
essRegion = "gcp-us-central1"
essRegion = "aws-eu-central-1"
}

instanceProvisionerMode := os.Getenv("INSTANCE_PROVISIONER")
Expand Down
15 changes: 15 additions & 0 deletions pkg/testing/ess/create_deployment_csp_configuration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
gcp:
integrations_server_conf_id: "gcp.es.datahot.n2.68x10x45"
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.es.datahot.edsv4"
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"
101 changes: 101 additions & 0 deletions pkg/testing/ess/create_deployment_request.tmpl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"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
}
}
Loading

0 comments on commit 3bbbd06

Please sign in to comment.