From ac373895307c60d3fa8a215023ac6f969a75b6be Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko Date: Sun, 13 Jul 2025 12:53:05 +0200 Subject: [PATCH 1/6] Prepare release 0.11.17 --- CHANGELOG.md | 7 +++++-- Makefile | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e78b535..c72326b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## [Unreleased] +## [0.11.17] - 2025-07-14 + - Add support for `timeslice_metric_indicator` in `elasticstack_kibana_slo` ([#1195](https://github.com/elastic/terraform-provider-elasticstack/pull/1195)) ## [0.11.16] - 2025-07-09 @@ -430,8 +432,9 @@ - Initial set of docs - CI integration -[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.16...HEAD -[0.11.15]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.15...v0.11.16 +[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.17...HEAD +[0.11.17]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.16...v0.11.17 +[0.11.16]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.15...v0.11.16 [0.11.15]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.14...v0.11.15 [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 diff --git a/Makefile b/Makefile index 8171bce9e..c9fa8d229 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL = help SHELL := /bin/bash -VERSION ?= 0.11.16 +VERSION ?= 0.11.17 NAME = elasticstack BINARY = terraform-provider-${NAME} @@ -15,7 +15,7 @@ SWAGGER_VERSION ?= 8.7 GOVERSION ?= $(shell grep -e '^go' go.mod | cut -f 2 -d ' ') -STACK_VERSION ?= 9.0.0-SNAPSHOT +STACK_VERSION ?= 9.0.3 ELASTICSEARCH_NAME ?= terraform-elasticstack-es ELASTICSEARCH_ENDPOINTS ?= http://$(ELASTICSEARCH_NAME):9200 From 96cca752db1c83de0a2e1f9c726de10e8143ce3e Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko Date: Mon, 14 Jul 2025 08:48:06 +0200 Subject: [PATCH 2/6] Switch to 9.0.3 in CI tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd1ccfc82..2a22ecc9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -126,7 +126,7 @@ jobs: - '8.15.5' - '8.16.2' - '8.17.0' - - '9.0.0-SNAPSHOT' + - '9.0.3' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 From 3a7ded260a0c2d6cd37b29d6f75e94174f90b98e Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko Date: Mon, 14 Jul 2025 08:59:43 +0200 Subject: [PATCH 3/6] Fix setup for 9.0.3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a22ecc9d..e40ba4f93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -156,7 +156,7 @@ jobs: - id: setup-fleet name: Setup Fleet - if: matrix.version == '8.10.3' || matrix.version == '8.11.4' || matrix.version == '8.12.2' || matrix.version == '8.13.4' || matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0' || matrix.version == '9.0.0-SNAPSHOT' + if: matrix.version == '8.10.3' || matrix.version == '8.11.4' || matrix.version == '8.12.2' || matrix.version == '8.13.4' || matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0' || matrix.version == '9.0.3' run: |- make setup-kibana-fleet env: From 7df5445b014017f092ce4565e47ceea123c13c95 Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko Date: Mon, 14 Jul 2025 17:13:18 +0200 Subject: [PATCH 4/6] fix docker image path --- .github/workflows/test.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e40ba4f93..4f7808896 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -84,7 +84,7 @@ jobs: - 5601:5601 options: --health-cmd="curl http://localhost:5601/api/status" --health-interval=10s --health-timeout=5s --health-retries=10 fleet: - image: docker.elastic.co/beats/elastic-agent:${{ matrix.version }} + image: elastic/elastic-agent:${{ matrix.version }} env: SERVER_NAME: fleet FLEET_ENROLL: "1" diff --git a/Makefile b/Makefile index c9fa8d229..0995c0739 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ docker-fleet: docker-network docker-elasticsearch docker-kibana setup-kibana-fle -e KIBANA_FLEET_PASSWORD=$(ELASTICSEARCH_PASSWORD) \ --name $(FLEET_NAME) \ --network $(ELASTICSEARCH_NETWORK) \ - docker.elastic.co/beats/elastic-agent:$(STACK_VERSION) + elastic/elastic-agent:$(STACK_VERSION) .PHONY: docker-network From 4a98be0f7da8f597b5ac5987a922d6dd8434c578 Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko <8962171+dimuon@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:08:23 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b3b4775..9491a60e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,8 @@ ## [Unreleased] -<<<<<<< HEAD ## [0.11.17] - 2025-07-14 -======= - Add `elasticstack_apm_agent_configuration` resource ([#1196](https://github.com/elastic/terraform-provider-elasticstack/pull/1196)) ->>>>>>> upstream/main - 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)) - Add support for `supports_agentless` to `elasticstack_fleet_agent_policy` ([#1197](https://github.com/elastic/terraform-provider-elasticstack/pull/1197)) From 6a7950ee5d495a5401e96f3556bac286c7481da4 Mon Sep 17 00:00:00 2001 From: Dmitry Onishchenko <8962171+dimuon@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:14:15 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9491a60e3..2bcd4541b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [Unreleased] -## [0.11.17] - 2025-07-14 +## [0.11.17] - 2025-07-21 - Add `elasticstack_apm_agent_configuration` resource ([#1196](https://github.com/elastic/terraform-provider-elasticstack/pull/1196)) - Add support for `timeslice_metric_indicator` in `elasticstack_kibana_slo` ([#1195](https://github.com/elastic/terraform-provider-elasticstack/pull/1195))