Skip to content

Fix Fleet Agent Policy monitoring settings #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Fix Fleet Agent Policy monitoring settings #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3253ea6
Fix Fleet Agent Policy monitoring settings
taylor-swanson Oct 13, 2023
0053cb5
Update changelog
taylor-swanson Oct 13, 2023
19ee7a8
Merge branch 'main' into bug/fleet-agent-policy-monitoring
taylor-swanson Oct 16, 2023
0c06e35
Alternate true/false for monitoring regression test
taylor-swanson Oct 16, 2023
ee36c96
Merge branch 'main' into bug/fleet-agent-policy-monitoring
taylor-swanson Oct 25, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Introduce `elasticstack_kibana_import_saved_objects` resource as an additive only way to manage Kibana saved objects ([#343](https://github.com/elastic/terraform-provider-elasticstack/pull/343)).
- Add support for Terraform Plugin Framework ([#343](https://github.com/elastic/terraform-provider-elasticstack/pull/343)).
- Fix fleet resources not having ID set on import ([#447](https://github.com/elastic/terraform-provider-elasticstack/pull/447))
- Fix Fleet Agent Policy monitoring settings ([#448](https://github.com/elastic/terraform-provider-elasticstack/pull/448))

## [0.9.0] - 2023-10-09

Expand Down
2 changes: 1 addition & 1 deletion internal/clients/config/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func (c elasticsearchConfig) withEnvironmentOverrides() elasticsearchConfig {
}

if insecure, ok := os.LookupEnv("ELASTICSEARCH_INSECURE"); ok {
if insecureValue, err := strconv.ParseBool(insecure); err != nil {
if insecureValue, err := strconv.ParseBool(insecure); err == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

tlsClientConfig := c.ensureTLSClientConfig()
tlsClientConfig.InsecureSkipVerify = insecureValue
}
Expand Down
15 changes: 6 additions & 9 deletions internal/fleet/agent_policy_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,14 @@ func resourceAgentPolicyCreate(ctx context.Context, d *schema.ResourceData, meta
req.MonitoringOutputId = &value
}

var monitoringValues []fleetapi.AgentPolicyCreateRequestMonitoringEnabled
monitoringValues := make([]fleetapi.AgentPolicyCreateRequestMonitoringEnabled, 0, 2)
if value := d.Get("monitor_logs").(bool); value {
monitoringValues = append(monitoringValues, monitorLogs)
}
if value := d.Get("monitor_metrics").(bool); value {
monitoringValues = append(monitoringValues, monitorMetrics)
}
if len(monitoringValues) > 0 {
req.MonitoringEnabled = &monitoringValues
}
req.MonitoringEnabled = &monitoringValues

policy, diags := fleet.CreateAgentPolicy(ctx, fleetClient, req)
if diags.HasError() {
Expand Down Expand Up @@ -182,16 +180,15 @@ func resourceAgentPolicyUpdate(ctx context.Context, d *schema.ResourceData, meta
req.MonitoringOutputId = &value
}

var monitoringValues []fleetapi.AgentPolicyUpdateRequestMonitoringEnabled
monitoringValues := make([]fleetapi.AgentPolicyUpdateRequestMonitoringEnabled, 0, 2)
if value := d.Get("monitor_logs").(bool); value {
monitoringValues = append(monitoringValues, monitorLogs)
}
if value := d.Get("monitor_metrics").(bool); value {
monitoringValues = append(monitoringValues, monitorMetrics)
}
if len(monitoringValues) > 0 {
req.MonitoringEnabled = &monitoringValues
}
req.MonitoringEnabled = &monitoringValues

_, diags = fleet.UpdateAgentPolicy(ctx, fleetClient, d.Id(), req)
if diags.HasError() {
return diags
Expand Down Expand Up @@ -256,7 +253,7 @@ func resourceAgentPolicyRead(ctx context.Context, d *schema.ResourceData, meta i
return diag.FromErr(err)
}
case monitorMetrics:
if err := d.Set("monitor_logs", true); err != nil {
if err := d.Set("monitor_metrics", true); err != nil {
return diag.FromErr(err)

}
Expand Down
10 changes: 5 additions & 5 deletions internal/fleet/agent_policy_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestAccResourceAgentPolicy(t *testing.T) {
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "description", "Test Agent Policy"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_logs", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_metrics", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_metrics", "false"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "skip_destroy", "false"),
),
},
Expand All @@ -44,7 +44,7 @@ func TestAccResourceAgentPolicy(t *testing.T) {
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Updated Policy %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "description", "This policy was updated"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_logs", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_logs", "false"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_metrics", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "skip_destroy", "false"),
),
Expand All @@ -69,7 +69,7 @@ func TestAccResourceAgentPolicySkipDestroy(t *testing.T) {
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "description", "Test Agent Policy"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_logs", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_metrics", "true"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "monitor_metrics", "false"),
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "skip_destroy", "true"),
),
},
Expand All @@ -89,7 +89,7 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
namespace = "default"
description = "Test Agent Policy"
monitor_logs = true
monitor_metrics = true
monitor_metrics = false
skip_destroy = %t
}

Expand All @@ -111,7 +111,7 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
name = "%s"
namespace = "default"
description = "This policy was updated"
monitor_logs = true
monitor_logs = false
monitor_metrics = true
skip_destroy = %t
}
Expand Down