Merge remote-tracking branch 'origin/main' into supports-agentless

* origin/main:
  Fix master timeout for serverless flavor (#1207)
  Add reroute processor data source for Elasticsearch ingest pipelines (#1204)
  chore(deps): update golang docker tag to v1.24.5 (#1202)
  chore(deps): update dependency go to v1.24.5 (#1200)
  Add support for timeslice metrics indicator (#1195)

Author: tobio

.buildkite/release.yml

@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.24.4@sha256:20a022e5112a144aa7b7aeb3f22ebf2cdaefcc4aac0d64e8deeee8cdc18b9c0f"
+      image: "golang:1.24.5@sha256:14fd8a55e59a560704e5fc44970b301d00d344e45d6b914dda228e09f359a088"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+- Add support for `timeslice_metric_indicator` in `elasticstack_kibana_slo` ([#1195](https://github.com/elastic/terraform-provider-elasticstack/pull/1195))
+- Add `elasticstack_elasticsearch_ingest_processor_reroute` data source ([#678](https://github.com/elastic/terraform-provider-elasticstack/issues/678))
+
 ## [0.11.16] - 2025-07-09
 
 - Add `headers` for the provider connection ([#1057](https://github.com/elastic/terraform-provider-elasticstack/pull/1057))

docs/data-sources/elasticsearch_ingest_processor_reroute.md

@@ -0,0 +1,55 @@
+---
+subcategory: "Ingest"
+layout: ""
+page_title: "Elasticstack: elasticstack_elasticsearch_ingest_processor_reroute Data Source"
+description: |-
+  Helper data source to create a processor which reroutes a document to a different data stream, index, or index alias.
+---
+
+# Data Source: elasticstack_elasticsearch_ingest_processor_reroute
+
+Reroutes a document to a different data stream, index, or index alias. This processor is useful for routing documents based on data stream routing rules.
+
+See: https://www.elastic.co/guide/en/elasticsearch/reference/current/reroute-processor.html
+
+
+## Example Usage
+
+```terraform
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+data "elasticstack_elasticsearch_ingest_processor_reroute" "reroute" {
+  destination = "logs-generic-default"
+  dataset     = "generic"
+  namespace   = "default"
+}
+
+resource "elasticstack_elasticsearch_ingest_pipeline" "my_ingest_pipeline" {
+  name = "reroute-ingest"
+
+  processors = [
+    data.elasticstack_elasticsearch_ingest_processor_reroute.reroute.json
+  ]
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `dataset` (String) The destination dataset to route the document to.
+- `description` (String) Description of the processor.
+- `destination` (String) The destination data stream, index, or index alias to route the document to.
+- `if` (String) Conditionally execute the processor
+- `ignore_failure` (Boolean) Ignore failures for the processor.
+- `namespace` (String) The destination namespace to route the document to.
+- `on_failure` (List of String) Handle failures for the processor.
+- `tag` (String) Identifier for the processor.
+
+### Read-Only
+
+- `id` (String) Internal identifier of the resource.
+- `json` (String) JSON representation of this data source.

docs/resources/kibana_slo.md

@@ -190,6 +190,41 @@ resource "elasticstack_kibana_slo" "custom_metric" {
     timeslice_window = "5m"
   }
 
+}
+
+//Available from 8.12.0
+resource "elasticstack_kibana_slo" "timeslice_metric" {
+  name        = "timeslice metric"
+  description = "timeslice metric"
+
+  timeslice_metric_indicator {
+    index           = "my-index"
+    timestamp_field = "@timestamp"
+    metric {
+      metrics {
+        name        = "A"
+        aggregation = "sum"
+        field       = "latency"
+      }
+      equation   = "A"
+      comparator = "GT"
+      threshold  = 100
+    }
+  }
+
+  time_window {
+    duration = "7d"
+    type     = "rolling"
+  }
+
+  budgeting_method = "timeslices"
+
+  objective {
+    target           = 0.95
+    timeslice_target = 0.95
+    timeslice_window = "5m"
+  }
+
 }
 ```
 
@@ -216,6 +251,7 @@ resource "elasticstack_kibana_slo" "custom_metric" {
 - `slo_id` (String) An ID (8 and 36 characters). If omitted, a UUIDv1 will be generated server-side.
 - `space_id` (String) An identifier for the space. If space_id is not provided, the default space is used.
 - `tags` (List of String) The tags for the SLO.
+- `timeslice_metric_indicator` (Block List, Max: 1) Defines a timeslice metric indicator for SLO. (see [below for nested schema](#nestedblock--timeslice_metric_indicator))
 
 ### Read-Only
 
@@ -405,6 +441,44 @@ Optional:
 - `frequency` (String)
 - `sync_delay` (String)
 
+
+<a id="nestedblock--timeslice_metric_indicator"></a>
+### Nested Schema for `timeslice_metric_indicator`
+
+Required:
+
+- `index` (String)
+- `metric` (Block List, Min: 1, Max: 1) (see [below for nested schema](#nestedblock--timeslice_metric_indicator--metric))
+- `timestamp_field` (String)
+
+Optional:
+
+- `filter` (String)
+
+<a id="nestedblock--timeslice_metric_indicator--metric"></a>
+### Nested Schema for `timeslice_metric_indicator.metric`
+
+Required:
+
+- `comparator` (String)
+- `equation` (String)
+- `metrics` (Block List, Min: 1) (see [below for nested schema](#nestedblock--timeslice_metric_indicator--metric--metrics))
+- `threshold` (Number)
+
+<a id="nestedblock--timeslice_metric_indicator--metric--metrics"></a>
+### Nested Schema for `timeslice_metric_indicator.metric.metrics`
+
+Required:
+
+- `aggregation` (String) The aggregation type for this metric. One of: sum, avg, min, max, value_count, percentile, doc_count. Determines which other fields are required:
+- `name` (String) The unique name for this metric. Used as a variable in the equation field.
+
+Optional:
+
+- `field` (String) Field to aggregate. Required for aggregations: sum, avg, min, max, value_count, percentile. Must NOT be set for doc_count.
+- `filter` (String) Optional KQL filter for this metric. Supported for all aggregations except doc_count.
+- `percentile` (Number) Percentile value (e.g., 99). Required if aggregation is 'percentile'. Must NOT be set for other aggregations.
+
 ## Import
 
 Import is supported using the following syntax:

examples/data-sources/elasticstack_elasticsearch_ingest_processor_reroute/data-source.tf

@@ -0,0 +1,17 @@
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+data "elasticstack_elasticsearch_ingest_processor_reroute" "reroute" {
+  destination = "logs-generic-default"
+  dataset     = "generic"
+  namespace   = "default"
+}
+
+resource "elasticstack_elasticsearch_ingest_pipeline" "my_ingest_pipeline" {
+  name = "reroute-ingest"
+
+  processors = [
+    data.elasticstack_elasticsearch_ingest_processor_reroute.reroute.json
+  ]
+}

examples/resources/elasticstack_kibana_slo/resource.tf

@@ -176,3 +176,38 @@ resource "elasticstack_kibana_slo" "custom_metric" {
   }
 
 }
+
+//Available from 8.12.0
+resource "elasticstack_kibana_slo" "timeslice_metric" {
+  name        = "timeslice metric"
+  description = "timeslice metric"
+
+  timeslice_metric_indicator {
+    index           = "my-index"
+    timestamp_field = "@timestamp"
+    metric {
+      metrics {
+        name        = "A"
+        aggregation = "sum"
+        field       = "latency"
+      }
+      equation   = "A"
+      comparator = "GT"
+      threshold  = 100
+    }
+  }
+
+  time_window {
+    duration = "7d"
+    type     = "rolling"
+  }
+
+  budgeting_method = "timeslices"
+
+  objective {
+    target           = 0.95
+    timeslice_target = 0.95
+    timeslice_window = "5m"
+  }
+
+}

generated/slo-spec.yml

@@ -969,6 +969,18 @@ components:
                   description: List of metrics with their name, aggregation type, and field.
                   type: array
                   items:
+                    discriminator:
+                      propertyName: aggregation
+                      mapping:
+                        percentile: '#/components/schemas/timeslice_metric_percentile_metric'
+                        doc_count: '#/components/schemas/timeslice_metric_doc_count_metric'
+                        sum: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        avg: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        min: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        max: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        std_deviation: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        last_value: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+                        cardinality: '#/components/schemas/timeslice_metric_basic_metric_with_field'
                     anyOf:
                       - $ref: '#/components/schemas/timeslice_metric_basic_metric_with_field'
                       - $ref: '#/components/schemas/timeslice_metric_percentile_metric'

generated/slo/api/openapi.yaml

@@ -1705,6 +1705,18 @@ components:
       - $ref: '#/components/schemas/timeslice_metric_basic_metric_with_field'
       - $ref: '#/components/schemas/timeslice_metric_percentile_metric'
       - $ref: '#/components/schemas/timeslice_metric_doc_count_metric'
+      discriminator:
+        mapping:
+          percentile: '#/components/schemas/timeslice_metric_percentile_metric'
+          doc_count: '#/components/schemas/timeslice_metric_doc_count_metric'
+          sum: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          avg: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          min: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          max: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          std_deviation: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          last_value: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+          cardinality: '#/components/schemas/timeslice_metric_basic_metric_with_field'
+        propertyName: aggregation
     indicator_properties_timeslice_metric_params_metric:
       description: |
         An object defining the metrics, equation, and threshold to determine if it's a good slice or not