Skip to content
Draft
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0f98577
Add stack provider for Elastic Cloud
jsoriano Apr 21, 2023
8315709
Fix version
jsoriano Apr 21, 2023
8d7b1d7
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano May 22, 2023
ff03886
Upload GeoIP databases
jsoriano May 22, 2023
4cede7e
Replace GeoIP database in cloud deployment
jsoriano May 23, 2023
8298102
Start local agent connected to cloud
jsoriano May 23, 2023
1931b77
Create Agent policy
jsoriano May 24, 2023
0938e7a
Fix path to env file
jsoriano May 24, 2023
3a1643f
Retrieve Fleet Server url from Fleet API
jsoriano May 24, 2023
7f1450a
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano May 24, 2023
f71f8cb
Use facts directly in templates where possible
jsoriano May 24, 2023
ee3a31b
Some refactors
jsoriano May 24, 2023
6255827
Reduce size of deployment
jsoriano May 25, 2023
9b22f2c
Parameterize deployment
jsoriano May 25, 2023
4565592
Update deployments on stack up
jsoriano May 25, 2023
4864a3d
Use diferent compose project names per project
jsoriano May 25, 2023
42b95a7
Install zipped package
jsoriano May 25, 2023
a41b053
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano May 26, 2023
ed9e89d
Remove TODO
jsoriano May 26, 2023
c61f7db
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano Jul 12, 2023
74b5d1e
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano Jul 25, 2023
7a3f2f2
Merge remote-tracking branch 'origin/main' into stack-cloud-provider
jsoriano Jul 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reduce size of deployment
  • Loading branch information
jsoriano committed May 25, 2023
commit 6255827086fd1a39efde99b7f533c303cb2543a1
27 changes: 18 additions & 9 deletions internal/stack/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (cp *cloudProvider) BootUp(options Options) error {
// TODO: Parameterize this.
name := "elastic-package-test"
region := "gcp-europe-west3"
templateID := "gcp-io-optimized"
templateID := "gcp-general-purpose-v5"

logger.Debugf("Getting deployment template %q", templateID)
payload, err := cp.getDeploymentRequest(options, region, templateID)
Expand All @@ -111,6 +111,12 @@ func (cp *cloudProvider) BootUp(options Options) error {
return fmt.Errorf("failed to create deployment: %w", err)
}

logger.Infof("Replacing GeoIP databases")
err = cp.replaceGeoIPDatabases(config, options, templateID, region, payload.Resources.Elasticsearch[0].Plan.ClusterTopology)
if err != nil {
return fmt.Errorf("failed to replace GeoIP databases: %w", err)
}

logger.Infof("Creating agent policy")
err = cp.createAgentPolicy(config, options.StackVersion)
if err != nil {
Expand All @@ -123,12 +129,6 @@ func (cp *cloudProvider) BootUp(options Options) error {
return fmt.Errorf("failed to start local agent: %w", err)
}

logger.Infof("Replacing GeoIP databases")
err = cp.replaceGeoIPDatabases(config, options, templateID, region, payload.Resources.Elasticsearch[0].Plan.ClusterTopology)
if err != nil {
return fmt.Errorf("failed to replace GeoIP databases: %w", err)
}

return nil
}

Expand Down Expand Up @@ -157,6 +157,14 @@ func (cp *cloudProvider) getDeploymentRequest(options Options, region, templateI
plan.DeploymentTemplate = &models.DeploymentTemplateReference{}
}
plan.DeploymentTemplate.ID = &templateID

for _, tier := range plan.ClusterTopology {
if tier.ID == "hot_content" {
memory := int32(4096)
tier.Size.Value = &memory
tier.ZoneCount = 1
}
}
}

return payload, nil
Expand Down Expand Up @@ -188,6 +196,9 @@ func (cp *cloudProvider) createDeployment(name string, options Options, payload
return Config{}, fmt.Errorf("deployment created, but couldn't get its ID, check in the console UI")
}
config.Parameters[paramCloudDeploymentID] = *deploymentID

// We need the ref id to make update requests, otherwise we need to make a get deployment
// request using the deployment ID.
config.Parameters[paramCloudClusterRefID] = *res.Resources[0].RefID

for _, resource := range res.Resources {
Expand Down Expand Up @@ -393,8 +404,6 @@ func getDefaultFleetServerURL(config Config) (string, error) {
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
logger.Debugf("Fleet Server hosts response: %q", string(body))

if err != nil {
return "", fmt.Errorf("could not read response body (status %v): %w", resp.StatusCode, err)
}
Expand Down