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
Retrieve Fleet Server url from Fleet API
  • Loading branch information
jsoriano committed May 24, 2023
commit 3a1643f90222586823d32f4ee912aa43464c7ea4
74 changes: 65 additions & 9 deletions internal/stack/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,22 @@ func (cp *cloudProvider) BootUp(options Options) error {
if err != nil {
return fmt.Errorf("failed to get kibana host: %w", err)
}
config.Parameters["fleet_url"], err = cp.getServiceURL(deployment.Resources.IntegrationsServer)
if err != nil {
return fmt.Errorf("failed to get fleet host: %w", err)
}

// FIXME: Why this URL is not the good one?
//config.Parameters["fleet_url"], err = cp.getServiceURL(deployment.Resources.IntegrationsServer)
//if err != nil {
// return fmt.Errorf("failed to get fleet host: %w", err)
//}

printUserConfig(options.Printer, config)

// Storing configuration now, so if something fails from now on, we still
// keep track of the deployment id.
err = storeConfig(cp.profile, config)
if err != nil {
return fmt.Errorf("failed to store config: %w", err)
}

logger.Debug("Waiting for creation plan to be completed")
err = planutil.TrackChange(planutil.TrackChangeParams{
TrackChangeParams: plan.TrackChangeParams{
Expand All @@ -204,11 +213,10 @@ func (cp *cloudProvider) BootUp(options Options) error {
return fmt.Errorf("failed to track cluster creation: %w", err)
}

// Storing configuration now, so if something fails with the extension, we still
// keep track of the deployment id.
err = storeConfig(cp.profile, config)
// FIXME: See comment above, why the Integrations Server URL cannot be used?
config.Parameters["fleet_url"], err = getDefaultFleetServerURL(config)
if err != nil {
return fmt.Errorf("failed to store config: %w", err)
return fmt.Errorf("failed to get fleet URL: %w", err)
}

logger.Infof("Creating agent policy")
Expand Down Expand Up @@ -426,6 +434,51 @@ func doKibanaRequest(config Config, req *http.Request) error {
return nil
}

func getDefaultFleetServerURL(config Config) (string, error) {
fleetServersURL, err := url.JoinPath(config.KibanaHost, "/api/fleet/fleet_server_hosts")
if err != nil {
return "", fmt.Errorf("failed to build url for fleet server hosts: %w", err)
}
req, err := http.NewRequest(http.MethodGet, fleetServersURL, nil)
if err != nil {
return "", fmt.Errorf("failed to initialize request: %w", err)
}
req.SetBasicAuth(config.ElasticsearchUsername, config.ElasticsearchPassword)
resp, err := http.DefaultClient.Do(req)
if err != nil {
return "", fmt.Errorf("performing request failed: %w", err)
}
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 %s): %w", resp.StatusCode, err)
}
if resp.StatusCode >= 300 {
return "", fmt.Errorf("request failed with status %v and response %v", resp.StatusCode, string(body))
}

var hosts struct {
Items []struct {
IsDefault bool `json:"is_default"`
HostURLs []string `json:"host_urls"`
} `json:"items"`
}
err = json.Unmarshal(body, &hosts)
if err != nil {
return "", fmt.Errorf("failed to decode response: %w", err)
}

for _, server := range hosts.Items {
if server.IsDefault && len(server.HostURLs) > 0 {
return server.HostURLs[0], nil
}
}

return "", errors.New("could not find the fleet server URL for this deployment")
}

func (cp *cloudProvider) createAgentPolicy(config Config) error {
agentPoliciesURL, err := url.JoinPath(config.KibanaHost, "/api/fleet/agent_policies")
if err != nil {
Expand Down Expand Up @@ -477,7 +530,7 @@ func (cp *cloudProvider) startLocalAgent(options Options, config Config) error {
return fmt.Errorf("failed to build images for local agent: %w", err)
}

err = project.Up(compose.CommandOptions{})
err = project.Up(compose.CommandOptions{ExtraArgs: []string{"-d"}})
if err != nil {
return fmt.Errorf("failed to start local agent: %w", err)
}
Expand Down Expand Up @@ -670,6 +723,9 @@ func (cp *cloudProvider) localAgentStatus() ([]ServiceStatus, error) {
if err != nil {
return nil, err
}
if strings.HasSuffix(service.Name, readyServicesSuffix) {
continue
}
logger.Debugf("Adding Service: \"%v\"", service.Name)
services = append(services, *service)
}
Expand Down