Merge remote-tracking branch 'upstream/main' into mw-resource

Author: adcoelho

.buildkite/release.yml

@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.24.0@sha256:2b1cbf278ce05a2a310a3d695ebb176420117a8cfcfcc4e5e68a1bef5f6354da"
+      image: "golang:1.24.2@sha256:d9db32125db0c3a680cfb7a1afcaefb89c898a075ec148fdc2f0f646cc2ed509"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'tools/go.mod'
           cache: true
@@ -129,7 +129,7 @@ jobs:
           - '9.0.0-SNAPSHOT'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'go.mod'
           cache: true

.golangci.yaml

@@ -1,4 +1,20 @@
-# increase the default timeout for slow CI needs
-run:
-  timeout: 300s
-  concurrency: 0
+version: "2"
+linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

CHANGELOG.md

@@ -1,9 +1,15 @@
 ## [Unreleased]
 
+- Add `global_data_tags` to fleet agent policies. ([#1044](https://github.com/elastic/terraform-provider-elasticstack/pull/1044))
+
+## [0.11.14] - 2025-03-17
+
 - Fix a provider crash when interacting with elasticstack_kibana_data_view resources created with 0.11.0. ([#979](https://github.com/elastic/terraform-provider-elasticstack/pull/979))
 - Add `max_primary_shard_docs` condition to ILM rollover ([#845](https://github.com/elastic/terraform-provider-elasticstack/pull/845))
 - Add missing entries to `data_view.field_formats.params` ([#1001](https://github.com/elastic/terraform-provider-elasticstack/pull/1001))
 - Fix namespaces inconsistency when creating elasticstack_kibana_data_view resources ([#1011](https://github.com/elastic/terraform-provider-elasticstack/pull/1011))
+- Update rule ID documentation. ([#1047](https://github.com/elastic/terraform-provider-elasticstack/pull/1047))
+- Mark `elasticstack_kibana_action_connector.secrets` as sensitive. ([#1045](https://github.com/elastic/terraform-provider-elasticstack/pull/1045))
 
 ## [0.11.13] - 2025-01-09
 
@@ -12,6 +18,7 @@
 - Support 8.17.0 in acc tests ([#969](https://github.com/elastic/terraform-provider-elasticstack/pull/969)).
 - Support 9.0.0 in acc tests ([#954](https://github.com/elastic/terraform-provider-elasticstack/pull/954)).
 - Support several ssl fields in `elasticstack_kibana_synthetics_monitor` ([#967](https://github.com/elastic/terraform-provider-elasticstack/pull/967)).
+- HTTP 400 Bad Request When Creating elasticstack_kibana_security_role ([933](https://github.com/elastic/terraform-provider-elasticstack/issues/933)).
 
 ## [0.11.12] - 2024-12-16
 
@@ -411,7 +418,8 @@
 - Initial set of docs
 - CI integration
 
-[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.13...HEAD
+[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.14...HEAD
+[0.11.14]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.13...v0.11.14
 [0.11.13]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.12...v0.11.13
 [0.11.12]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.11...v0.11.12
 [0.11.11]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.10...v0.11.11

CONTRIBUTING.md

@@ -47,4 +47,17 @@ Create a PR and check acceptance test matrix is green.
 
 ## Run provider with local terraform
 
-TBD
+TBD
+
+## Releasing
+
+Releasing is implemented in CI pipeline.
+
+To release a new provider version:
+
+* Create PR which
+- updates Makefile with the new provider VERSION (e.g. `VERSION ?= 0.11.13`);
+- updates CHANGELOG.md with the list of changes being released.
+[Example](https://github.com/elastic/terraform-provider-elasticstack/commit/be866ebc918184e843dc1dd2f6e2e1b963da386d).
+
+* Once the PR merged, the release CI pipeline can be started by pushing a new release tag to `main` branch.

Makefile

@@ -1,8 +1,7 @@
 .DEFAULT_GOAL = help
 SHELL := /bin/bash
 
-
-VERSION ?= 0.11.13
+VERSION ?= 0.11.14
 
 NAME = elasticstack
 BINARY = terraform-provider-${NAME}
@@ -246,14 +245,18 @@ install: build ## Install built provider into the local terraform cache
 
 
 .PHONY: tools
-tools: $(GOBIN) ## Install useful tools for linting, docs generation and development
+tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs generation and development
 	@ cd tools && go install github.com/client9/misspell/cmd/misspell
 	@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
-	@ cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint
 	@ cd tools && go install github.com/goreleaser/goreleaser/v2
 	@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
 	@ cd tools && go install go.uber.org/mock/mockgen
 
+.PHONY: tools-golangci-lint
+tools-golangci-lint: ## Download golangci-lint locally if necessary.
+	@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.0.2
+
+
 .PHONY: misspell
 misspell:
 	@ $(GOBIN)/misspell -error -source go ./internal/

docs/resources/fleet_agent_policy.md

@@ -24,6 +24,15 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
   sys_monitoring  = true
   monitor_logs    = true
   monitor_metrics = true
+
+  global_data_tags = {
+    first_tag = {
+      string_value = "tag_value"
+    },
+    second_tag = {
+      number_value = 1.2
+    }
+  }
 }
 ```
 
@@ -41,6 +50,7 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
 - `description` (String) The description of the agent policy.
 - `download_source_id` (String) The identifier for the Elastic Agent binary download server.
 - `fleet_server_host_id` (String) The identifier for the Fleet server host.
+- `global_data_tags` (Attributes Map) User-defined data tags to apply to all inputs. Values can be strings (string_value) or numbers (number_value) but not both. Example -- key1 = {string_value = value1}, key2 = {number_value = 42} (see [below for nested schema](#nestedatt--global_data_tags))
 - `monitor_logs` (Boolean) Enable collection of agent logs.
 - `monitor_metrics` (Boolean) Enable collection of agent metrics.
 - `monitoring_output_id` (String) The identifier for monitoring output.
@@ -52,6 +62,14 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
 
 - `id` (String) The ID of this resource.
 
+<a id="nestedatt--global_data_tags"></a>
+### Nested Schema for `global_data_tags`
+
+Optional:
+
+- `number_value` (Number) Number value for the field. If this is set, string_value must not be defined.
+- `string_value` (String) String value for the field. If this is set, number_value must not be defined.
+
 ## Import
 
 Import is supported using the following syntax:

docs/resources/kibana_action_connector.md

@@ -66,7 +66,7 @@ resource "elasticstack_kibana_action_connector" "slack-api-connector" {
 
 - `config` (String) The configuration for the connector. Configuration properties vary depending on the connector type.
 - `connector_id` (String) A UUID v1 or v4 to use instead of a randomly generated ID.
-- `secrets` (String) The secrets configuration for the connector. Secrets configuration properties vary depending on the connector type.
+- `secrets` (String, Sensitive) The secrets configuration for the connector. Secrets configuration properties vary depending on the connector type.
 - `space_id` (String) An identifier for the space. If space_id is not provided, the default space is used.
 
 ### Read-Only

docs/resources/kibana_alerting_rule.md

@@ -64,7 +64,7 @@ Could not create API key - Unsupported scheme "ApiKey" for granting API Key
 - `alert_delay` (Number) A number that indicates how many consecutive runs need to meet the rule conditions for an alert to occur.
 - `enabled` (Boolean) Indicates if you want to run the rule on an interval basis.
 - `notify_when` (String) Required until v8.6.0. Deprecated in v8.13.0. Use the `notify_when` property in the action `frequency` object instead. Defines how often alerts generate actions. Valid values include: `onActionGroupChange`: Actions run when the alert status changes; `onActiveAlert`: Actions run when the alert becomes active and at each check interval while the rule conditions are met; `onThrottleInterval`: Actions run when the alert becomes active and at the interval specified in the throttle property while the rule conditions are met. NOTE: This is a rule level property; if you update the rule in Kibana, it is automatically changed to use action-specific `notify_when` values.
-- `rule_id` (String) A UUID v1 or v4 to use instead of a randomly generated ID.
+- `rule_id` (String) The identifier for the rule. Until Kibana version 8.17.0 this should be a UUID v1 or v4, for later versions any format can be used. If it is omitted, an ID is randomly generated.
 - `space_id` (String) An identifier for the space. If space_id is not provided, the default space is used.
 - `tags` (List of String) A list of tag names that are applied to the rule.
 - `throttle` (String) Deprecated in 8.13.0. Defines how often an alert generates repeated actions. This custom action interval must be specified in seconds, minutes, hours, or days. For example, 10m or 1h. This property is applicable only if `notify_when` is `onThrottleInterval`. NOTE: This is a rule level property; if you update the rule in Kibana, it is automatically changed to use action-specific `throttle` values.

examples/resources/elasticstack_fleet_agent_policy/resource.tf

@@ -9,4 +9,13 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
   sys_monitoring  = true
   monitor_logs    = true
   monitor_metrics = true
+
+  global_data_tags = {
+    first_tag = {
+      string_value = "tag_value"
+    },
+    second_tag = {
+      number_value = 1.2
+    }
+  }
 }