Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [Unreleased]

- Fix provider crash with `elasticstack_kibana_action_connector` when `config` or `secrets` was unset in 0.11.17 ([#1355](https://github.com/elastic/terraform-provider-elasticstack/pull/1355))
- Fixes provider crash with `elasticstack_kibana_slo` when using `kql_custom_indicator` with no `filter` set.

## [0.11.18] - 2025-10-10

Expand Down
6 changes: 5 additions & 1 deletion internal/kibana/slo.go
Original file line number Diff line number Diff line change
Expand Up @@ -1019,11 +1019,15 @@ func resourceSloRead(ctx context.Context, d *schema.ResourceData, meta interface
params := s.Indicator.IndicatorPropertiesCustomKql.Params
indicatorMap := map[string]interface{}{
"index": params.Index,
"filter": params.Filter.String,
"good": params.Good.String,
"total": params.Total.String,
"timestamp_field": params.TimestampField,
}

if params.Filter != nil && params.Filter.String != nil {
indicatorMap["filter"] = params.Filter.String
}

if params.DataViewId != nil {
indicatorMap["data_view_id"] = *params.DataViewId
}
Expand Down
52 changes: 52 additions & 0 deletions internal/kibana/slo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,58 @@ func TestAccResourceSloValidation(t *testing.T) {
})
}

func TestAccResourceSlo_kql_custom_indicator_basic(t *testing.T) {
sloName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
CheckDestroy: checkResourceSloDestroy,
Steps: []resource.TestStep{
{
ProtoV6ProviderFactories: acctest.Providers,
SkipFunc: versionutils.CheckIfVersionIsUnsupported(sloTimesliceMetricsMinVersion),
Config: fmt.Sprintf(`
provider "elasticstack" {
elasticsearch {}
kibana {}
}

resource "elasticstack_elasticsearch_index" "my_index" {
name = "my-index-%s"
deletion_protection = false
}
resource "elasticstack_kibana_slo" "test_slo" {
name = "%s"
description = "basic kql indicator"
kql_custom_indicator {
index = "my-index-%s"
good = "latency < 300"
total = "*"
timestamp_field = "custom_timestamp"
}
budgeting_method = "timeslices"
objective {
target = 0.95
timeslice_target = 0.95
timeslice_window = "5m"
}
time_window {
duration = "7d"
type = "rolling"
}
depends_on = [elasticstack_elasticsearch_index.my_index]
}
`, sloName, sloName, sloName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "kql_custom_indicator.0.index", "my-index-"+sloName),
resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "kql_custom_indicator.0.good", "latency < 300"),
resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "kql_custom_indicator.0.total", "*"),
resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "kql_custom_indicator.0.timestamp_field", "custom_timestamp"),
),
},
},
})
}

func TestSloIdValidation(t *testing.T) {
resource := kibanaresource.ResourceSlo()
sloIdSchema := resource.Schema["slo_id"]
Expand Down