[cft] Enable enterprise search, integrations server, and ml (#125847)

* wip

* cleanup

* fix syntax

* update all versions

* newline
This commit is contained in:
Jonathan Budzenski 2022-02-23 14:24:58 -06:00 committed by GitHub
parent 78103870bb
commit f0cfbca673
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 17 deletions

View file

@ -42,7 +42,9 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
.resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
.name = "'$CLOUD_DEPLOYMENT_NAME'" |
.resources.kibana[0].plan.kibana.version = "'$VERSION'" |
.resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
.resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'" |
.resources.enterprise_search[0].plan.enterprise_search.version = "'$VERSION'" |
.resources.integrations_server[0].plan.integrations_server.version = "'$VERSION'"
' .buildkite/scripts/steps/cloud/deploy.json > /tmp/deploy.json
ecctl deployment create --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
@ -59,11 +61,10 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ]; then
retry 5 5 vault write "secret/kibana-issues/dev/cloud-deploy/$CLOUD_DEPLOYMENT_NAME" username="$CLOUD_DEPLOYMENT_USERNAME" password="$CLOUD_DEPLOYMENT_PASSWORD"
else
ecctl deployment show "$CLOUD_DEPLOYMENT_ID" --generate-update-payload | jq '
.resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
.resources.kibana[0].plan.kibana.version = "'$VERSION'" |
.resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'"
' > /tmp/deploy.json
ecctl deployment show "$CLOUD_DEPLOYMENT_ID" --generate-update-payload | jq '
.resources.kibana[0].plan.kibana.docker_image = "'$CLOUD_IMAGE'" |
(.. | select(.version? != null).version) = "'$VERSION'"
' > /tmp/deploy.json
ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/deploy.json &> "$JSON_FILE"
fi

View file

@ -1,5 +1,27 @@
{
"resources": {
"integrations_server": [
{
"elasticsearch_cluster_ref_id": "main-elasticsearch",
"region": "gcp-us-west2",
"plan": {
"cluster_topology": [
{
"instance_configuration_id": "gcp.integrationsserver.1",
"zone_count": 1,
"size": {
"value": 512,
"resource": "memory"
}
}
],
"integrations_server": {
"version": null
}
},
"ref_id": "main-integrations_server"
}
],
"elasticsearch": [
{
"region": "gcp-us-west2",
@ -12,7 +34,10 @@
{
"zone_count": 2,
"instance_configuration_id": "gcp.coordinating.1",
"node_roles": ["ingest", "remote_cluster_client"],
"node_roles": [
"ingest",
"remote_cluster_client"
],
"id": "coordinating",
"size": {
"resource": "memory",
@ -54,7 +79,10 @@
"enabled_built_in_plugins": []
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": ["data_warm", "remote_cluster_client"],
"node_roles": [
"data_warm",
"remote_cluster_client"
],
"id": "warm",
"size": {
"resource": "memory",
@ -70,7 +98,10 @@
"enabled_built_in_plugins": []
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": ["data_cold", "remote_cluster_client"],
"node_roles": [
"data_cold",
"remote_cluster_client"
],
"id": "cold",
"size": {
"resource": "memory",
@ -86,7 +117,9 @@
"enabled_built_in_plugins": []
},
"instance_configuration_id": "gcp.es.datafrozen.n1.64x10x95",
"node_roles": ["data_frozen"],
"node_roles": [
"data_frozen"
],
"id": "frozen",
"size": {
"resource": "memory",
@ -96,7 +129,10 @@
{
"zone_count": 3,
"instance_configuration_id": "gcp.master.1",
"node_roles": ["master", "remote_cluster_client"],
"node_roles": [
"master",
"remote_cluster_client"
],
"id": "master",
"size": {
"resource": "memory",
@ -109,11 +145,14 @@
{
"zone_count": 1,
"instance_configuration_id": "gcp.ml.1",
"node_roles": ["ml", "remote_cluster_client"],
"node_roles": [
"ml",
"remote_cluster_client"
],
"id": "ml",
"size": {
"resource": "memory",
"value": 0
"value": 1024,
"resource": "memory"
},
"elasticsearch": {
"enabled_built_in_plugins": []
@ -130,7 +169,33 @@
"ref_id": "main-elasticsearch"
}
],
"enterprise_search": [],
"enterprise_search": [
{
"elasticsearch_cluster_ref_id": "main-elasticsearch",
"region": "gcp-us-west2",
"plan": {
"cluster_topology": [
{
"node_type": {
"connector": true,
"appserver": true,
"worker": true
},
"instance_configuration_id": "gcp.enterprisesearch.1",
"zone_count": 1,
"size": {
"resource": "memory",
"value": 2048
}
}
],
"enterprise_search": {
"version": null
}
},
"ref_id": "main-enterprise_search"
}
],
"kibana": [
{
"elasticsearch_cluster_ref_id": "main-elasticsearch",
@ -153,8 +218,7 @@
},
"ref_id": "main-kibana"
}
],
"apm": []
]
},
"name": null,
"metadata": {