Skip to content

Commit cb02066

Browse files
tobiotobio
committed
Merge remote-tracking branch 'origin/main' into add-ilm-rollover-max-primary-shard-docs
* origin/main: (76 commits) Bump golang.org/x/net from 0.27.0 to 0.33.0 in /libs/go-kibana-rest (elastic#981) Bump golang.org/x/net from 0.28.0 to 0.33.0 (elastic#980) Update go version in go-kibana-rest (elastic#978) Bump golang.org/x/crypto from 0.25.0 to 0.31.0 in /libs/go-kibana-rest (elastic#947) chore(deps): pin dependencies (elastic#972) Accept API keys for running acceptance tests (elastic#951) Bump github.com/go-git/go-git/v5 from 5.12.0 to 5.13.0 in /tools (elastic#977) Bump golang.org/x/crypto from 0.28.0 to 0.31.0 (elastic#960) fix(deps): update module github.com/goreleaser/goreleaser/v2 to v2.5.1 (elastic#976) chore(deps): update actions/setup-go digest to 3041bf5 (elastic#944) chore(deps): update dependency go to v1.23.4 (elastic#938) Bump actions/setup-go from 5.1.0 to 5.2.0 (elastic#958) chore(deps): update golang docker tag to v1.23.4 (elastic#939) fix(deps): update github.com/hashicorp/go-cty digest to a0325cb (elastic#934) chore(deps): update codecov/codecov-action digest to 1e68e06 (elastic#941) Bump github.com/golangci/golangci-lint from 1.62.2 to 1.63.4 in /tools (elastic#970) Prepare release v0.11.13 update team name (elastic#974) feat: update synthetics implementation according to Kibana 8.16 API changes (elastic#967) Add 8.17.0 to test matrix (elastic#969) ...
2 parents b608fbf + a6131cd commit cb02066

File tree

206 files changed

+24678
-24870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+24678
-24870
lines changed

‎.buildkite/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- label: Release
33
agents:
4-
image: "golang:1.23.2@sha256:a7f2fc9834049c1f5df787690026a53738e55fc097cd8a4a93faa3e06c67ee32"
4+
image: "golang:1.23.4@sha256:7ea4c9dcb2b97ff8ee80a67db3d44f98c8ffa0d191399197007d8459c1453041"
55
cpu: "16"
66
memory: "24G"
77
ephemeralStorage: "20G"

‎.github/workflows/test.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 5
2020
steps:
21-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
22-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
22+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
2323
with:
2424
go-version-file: 'go.mod'
2525
cache: true
@@ -34,8 +34,8 @@ jobs:
3434
name: Lint
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
38-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
37+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
38+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
3939
with:
4040
go-version-file: 'tools/go.mod'
4141
cache: true
@@ -123,10 +123,12 @@ jobs:
123123
- '8.12.2'
124124
- '8.13.4'
125125
- '8.14.3'
126-
- '8.15.0'
126+
- '8.15.5'
127+
- '8.16.2'
128+
- '8.17.0'
127129
steps:
128-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
129-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
130+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
131+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
130132
with:
131133
go-version-file: 'go.mod'
132134
cache: true
@@ -153,7 +155,7 @@ jobs:
153155

154156
- id: setup-fleet
155157
name: Setup Fleet
156-
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.0'
158+
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'
157159
run: |-
158160
make setup-kibana-fleet
159161
env:
@@ -162,7 +164,7 @@ jobs:
162164

163165
- id: force-install-synthetics
164166
name: Force install synthetics
165-
if: matrix.version == '8.14.3' || matrix.version == '8.15.0'
167+
if: matrix.version == '8.14.3' || matrix.version == '8.15.5' || matrix.version == '8.16.2' || matrix.version == '8.17.0'
166168
run: |-
167169
for i in {1..5}; do curl -s -H "Authorization: ApiKey ${{ steps.get-api-key.outputs.apikey }}" --header "Content-Type: application/json" --header "kbn-xsrf: true" --request POST --data '{ "force": true }' http://localhost:5601/api/fleet/epm/packages/synthetics/1.2.2 && break || sleep 15; done
168170

‎CHANGELOG.md

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,44 @@
11
## [Unreleased]
22

3-
### Changes
4-
53
- Add `max_primary_shard_docs` condition to ILM rollover ([#845](https://github.com/elastic/terraform-provider-elasticstack/pull/845))
4+
5+
## [0.11.13] - 2025-01-09
6+
7+
- Support 8.15.5 in acc tests ([#963](https://github.com/elastic/terraform-provider-elasticstack/pull/963)).
8+
- Support 8.16.2 in acc tests ([#964](https://github.com/elastic/terraform-provider-elasticstack/pull/964)).
9+
- Support 8.17.0 in acc tests ([#969](https://github.com/elastic/terraform-provider-elasticstack/pull/969)).
10+
- Support several ssl fields in `elasticstack_kibana_synthetics_monitor` ([#967](https://github.com/elastic/terraform-provider-elasticstack/pull/967))
11+
12+
## [0.11.12] - 2024-12-16
13+
14+
### Breaking changes
15+
16+
- Support multiple group by fields in SLOs ([#870](https://github.com/elastic/terraform-provider-elasticstack/pull/878)). This changes to type of the `group_by` attribute of the `elasticstack_kibana_slo` resource from a String to a list of Strings. Any existing SLO defintions will need to update `group_by = "field"` to `group_by = ["field"]`.
17+
18+
### Changes
19+
- Handle NPE in integration policy secrets ([#946](https://github.com/elastic/terraform-provider-elasticstack/pull/946))
20+
- Use the auto-generated OAS schema from elastic/kibana for the Fleet API. ([#834](https://github.com/elastic/terraform-provider-elasticstack/issues/834))
21+
- Support description in `elasticstack_elasticsearch_security_role` data sources. ([#884](https://github.com/elastic/terraform-provider-elasticstack/pull/884))
22+
- Prevent spurious recreation of `elasticstack_fleet_agent_policy` resources due to 'changing' policy ids ([#885](https://github.com/elastic/terraform-provider-elasticstack/pull/885))
23+
- Support `elasticstack_kibana_alerting_rule` resources with only one of `kql` or `timeframe` attributes set ([#886](https://github.com/elastic/terraform-provider-elasticstack/pull/886))
24+
- Rename generated/fleet to generated/kibana, add data_view APIs. Keep libs/go-kibana-rest until migration can be completed. Clean and simplify the `elasticstack_kibana_data_view` resource to match the styling of Fleet resources. ([#881](https://github.com/elastic/terraform-provider-elasticstack/issues/881))
25+
- Exposes internal objects needed to build a Crossplane Elasticstack provider ([#949](https://github.com/elastic/terraform-provider-elasticstack/pull/949))
26+
27+
## [0.11.11] - 2024-10-25
28+
29+
- Allow `elasticstack_kibana_alerting_rule` to be used without Elasticsearch being configured. ([#869](https://github.com/elastic/terraform-provider-elasticstack/pull/869))
30+
- Add resource `elasticstack_elasticsearch_data_stream_lifecycle` ([#838](https://github.com/elastic/terraform-provider-elasticstack/issues/838))
31+
- Ensure API keys are not replaced when upgrading from 0.11.9 or earlier. ([#875](https://github.com/elastic/terraform-provider-elasticstack/pull/875))
32+
33+
## [0.11.10] - 2024-10-23
34+
35+
- Fix bug updating alert delay ([#859](https://github.com/elastic/terraform-provider-elasticstack/pull/859))
36+
- Support updating `elasticstack_elasticsearch_security_api_key` when supported by the backing cluster ([#843](https://github.com/elastic/terraform-provider-elasticstack/pull/843))
37+
- Fix validation of `throttle`, and `interval` attributes in `elasticstack_kibana_alerting_rule` allowing all Elastic duration values ([#846](https://github.com/elastic/terraform-provider-elasticstack/pull/846))
38+
>>>>>>> origin/main
639
- Fix boolean setting parsing for `elasticstack_elasticsearch_indices` data source. ([#842](https://github.com/elastic/terraform-provider-elasticstack/pull/842))
40+
- Update all Fleet and utils/tfsdk instances of diagnostics parameters to pass by pointer instead of pass by value. Added upgrader for fleet_integration_policy v0 to handle empty string vars_json/streams_json. ([#855](https://github.com/elastic/terraform-provider-elasticstack/pull/855))
41+
- Fix handling of EPM packages when uninstalled outside Terraform, and diags in create/update. ([#854](https://github.com/elastic/terraform-provider-elasticstack/pull/854))
742

843
## [0.11.9] - 2024-10-14
944

@@ -372,8 +407,12 @@
372407
- Initial set of docs
373408
- CI integration
374409
375-
[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.9...HEAD
376-
[0.11.8]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.8...v0.11.9
410+
[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.13...HEAD
411+
[0.11.13]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.12...v0.11.13
412+
[0.11.12]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.11...v0.11.12
413+
[0.11.11]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.10...v0.11.11
414+
[0.11.10]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.9...v0.11.10
415+
[0.11.9]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.8...v0.11.9
377416
[0.11.8]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.7...v0.11.8
378417
[0.11.7]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.6...v0.11.7
379418
[0.11.6]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.5...v0.11.6

‎CONTRIBUTING.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Typical development workflow
2+
3+
Fork the repo, work on an issue
4+
5+
## Acceptance tests
6+
7+
```bash
8+
make docker-testacc
9+
```
10+
11+
Run a single test with terraform debug enabled:
12+
```bash
13+
env TF_LOG=DEBUG make docker-testacc TESTARGS='-run ^TestAccResourceDataStreamLifecycle$$'
14+
```
15+
16+
A way to forward debug logs to a file:
17+
```bash
18+
env TF_ACC_LOG_PATH=/tmp/tf.log TF_ACC_LOG=DEBUG TF_LOG=DEBUG make docker-testacc
19+
```
20+
21+
22+
## Update documentation
23+
24+
Update documentation templates in `./templates` directory and re-generate docs via:
25+
```bash
26+
make docs-generate
27+
```
28+
29+
## Update `./CHANGELOG.md`
30+
31+
List of previous commits is a good example of what should be included in the changelog.
32+
33+
34+
## Pull request
35+
36+
Format the code before pushing:
37+
```bash
38+
make fmt
39+
```
40+
41+
Check if the linting:
42+
```bash
43+
make lint
44+
```
45+
46+
Create a PR and check acceptance test matrix is green.
47+
48+
## Run provider with local terraform
49+
50+
TBD

‎Makefile

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SHELL := /bin/bash
33

44

5-
VERSION ?= 0.11.9
5+
VERSION ?= 0.11.13
66

77
NAME = elasticstack
88
BINARY = terraform-provider-${NAME}
@@ -16,7 +16,7 @@ SWAGGER_VERSION ?= 8.7
1616

1717
GOVERSION ?= $(shell grep -e '^go' go.mod | cut -f 2 -d ' ')
1818

19-
STACK_VERSION ?= 8.15.2
19+
STACK_VERSION ?= 8.17.0
2020

2121
ELASTICSEARCH_NAME ?= terraform-elasticstack-es
2222
ELASTICSEARCH_ENDPOINTS ?= http://$(ELASTICSEARCH_NAME):9200
@@ -35,7 +35,6 @@ FLEET_NAME ?= terraform-elasticstack-fleet
3535
FLEET_ENDPOINT ?= https://$(FLEET_NAME):8220
3636

3737
SOURCE_LOCATION ?= $(shell pwd)
38-
, := ,
3938

4039
export GOBIN = $(shell pwd)/bin
4140

@@ -73,6 +72,11 @@ retry = until [ $$(if [ -z "$$attempt" ]; then echo -n "0"; else echo -n "$$atte
7372
backoff=$$((backoff * 2)); \
7473
done
7574

75+
# wait_until_healthy command - first argument is the container name
76+
wait_until_healthy = $(call retry, 5, [ "$$(docker inspect -f '{{ .State.Health.Status }}' $(1))" == "healthy" ])
77+
78+
CURL_OPTS = -sS --retry 5 --retry-all-errors -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json"
79+
7680
# To run specific test (e.g. TestAccResourceActionConnector) execute `make docker-testacc TESTARGS='-run ^TestAccResourceActionConnector$$'`
7781
# To enable tracing (or debugging), execute `make docker-testacc TF_LOG=TRACE`
7882
.PHONY: docker-testacc
@@ -107,8 +111,7 @@ docker-testacc-with-token:
107111
.PHONY: docker-elasticsearch
108112
docker-elasticsearch: docker-network ## Start Elasticsearch single node cluster in docker container
109113
@ docker rm -f $(ELASTICSEARCH_NAME) &> /dev/null || true
110-
@ $(call retry, 5, if ! docker ps --format '{{.Names}}' | grep -w $(ELASTICSEARCH_NAME) > /dev/null 2>&1 ; then \
111-
docker run -d \
114+
@ docker run -d \
112115
--memory $(ELASTICSEARCH_MEM) \
113116
-p 9200:9200 -p 9300:9300 \
114117
-e "discovery.type=single-node" \
@@ -122,14 +125,15 @@ docker-elasticsearch: docker-network ## Start Elasticsearch single node cluster
122125
-e ELASTIC_PASSWORD=$(ELASTICSEARCH_PASSWORD) \
123126
--name $(ELASTICSEARCH_NAME) \
124127
--network $(ELASTICSEARCH_NETWORK) \
125-
docker.elastic.co/elasticsearch/elasticsearch:$(STACK_VERSION); \
126-
fi)
128+
--health-cmd="curl http://localhost:9200/_cluster/health" \
129+
--health-interval=10s --health-timeout=5s --health-retries=10 \
130+
docker.elastic.co/elasticsearch/elasticsearch:$(STACK_VERSION)
131+
@ $(call wait_until_healthy, $(ELASTICSEARCH_NAME))
127132

128133
.PHONY: docker-kibana
129134
docker-kibana: docker-network docker-elasticsearch set-kibana-password ## Start Kibana node in docker container
130135
@ docker rm -f $(KIBANA_NAME) &> /dev/null || true
131-
@ $(call retry, 5, if ! docker ps --format '{{.Names}}' | grep -w $(KIBANA_NAME) > /dev/null 2>&1 ; then \
132-
docker run -d \
136+
@ docker run -d \
133137
-p 5601:5601 \
134138
-e SERVER_NAME=kibana \
135139
-e ELASTICSEARCH_HOSTS=$(ELASTICSEARCH_ENDPOINTS) \
@@ -139,18 +143,18 @@ docker-kibana: docker-network docker-elasticsearch set-kibana-password ## Start
139143
-e LOGGING_ROOT_LEVEL=debug \
140144
--name $(KIBANA_NAME) \
141145
--network $(ELASTICSEARCH_NETWORK) \
142-
docker.elastic.co/kibana/kibana:$(STACK_VERSION); \
143-
fi)
146+
--health-cmd="curl http://localhost:5601/api/status" \
147+
--health-interval=10s --health-timeout=5s --health-retries=10 \
148+
docker.elastic.co/kibana/kibana:$(STACK_VERSION)
149+
@ $(call wait_until_healthy, $(KIBANA_NAME))
144150

145151
.PHONY: docker-kibana-with-tls
146152
docker-kibana-with-tls: docker-network docker-elasticsearch set-kibana-password
147153
@ docker rm -f $(KIBANA_NAME) &> /dev/null || true
148154
@ mkdir -p certs
149155
@ CAROOT=certs mkcert localhost $(KIBANA_NAME)
150156
@ mv localhost*.pem certs/
151-
152-
@ $(call retry, 5, if ! docker ps --format '{{.Names}}' | grep -w $(KIBANA_NAME) > /dev/null 2>&1 ; then \
153-
docker run -d \
157+
@ docker run -d \
154158
-p 5601:5601 \
155159
-v $(shell pwd)/certs:/certs \
156160
-e SERVER_NAME=kibana \
@@ -164,14 +168,15 @@ docker-kibana-with-tls: docker-network docker-elasticsearch set-kibana-password
164168
-e LOGGING_ROOT_LEVEL=debug \
165169
--name $(KIBANA_NAME) \
166170
--network $(ELASTICSEARCH_NETWORK) \
167-
docker.elastic.co/kibana/kibana:$(STACK_VERSION); \
168-
fi)
171+
--health-cmd="curl -k https://localhost:5601/api/status" \
172+
--health-interval=10s --health-timeout=5s --health-retries=10 \
173+
docker.elastic.co/kibana/kibana:$(STACK_VERSION)
174+
@ $(call wait_until_healthy, $(KIBANA_NAME))
169175

170176
.PHONY: docker-fleet
171177
docker-fleet: docker-network docker-elasticsearch docker-kibana setup-kibana-fleet ## Start Fleet node in docker container
172178
@ docker rm -f $(FLEET_NAME) &> /dev/null || true
173-
@ $(call retry, 5, if ! docker ps --format '{{.Names}}' | grep -w $(FLEET_NAME) > /dev/null 2>&1 ; then \
174-
docker run -d \
179+
@ docker run -d \
175180
-p 8220:8220 \
176181
-e SERVER_NAME=fleet \
177182
-e FLEET_ENROLL=1 \
@@ -188,33 +193,30 @@ docker-fleet: docker-network docker-elasticsearch docker-kibana setup-kibana-fle
188193
-e KIBANA_FLEET_PASSWORD=$(ELASTICSEARCH_PASSWORD) \
189194
--name $(FLEET_NAME) \
190195
--network $(ELASTICSEARCH_NETWORK) \
191-
docker.elastic.co/beats/elastic-agent:$(STACK_VERSION); \
192-
fi)
196+
docker.elastic.co/beats/elastic-agent:$(STACK_VERSION)
193197

194198

195199
.PHONY: docker-network
196200
docker-network: ## Create a dedicated network for ES and test runs
197-
@ if ! docker network ls --format '{{.Name}}' | grep -w $(ELASTICSEARCH_NETWORK) > /dev/null 2>&1 ; then \
198-
docker network create $(ELASTICSEARCH_NETWORK); \
199-
fi
201+
@ docker network inspect $(ELASTICSEARCH_NETWORK) >/dev/null 2>&1 || docker network create $(ELASTICSEARCH_NETWORK)
200202

201203
.PHONY: set-kibana-password
202204
set-kibana-password: ## Sets the ES KIBANA_SYSTEM_USERNAME's password to KIBANA_SYSTEM_PASSWORD. This expects Elasticsearch to be available at localhost:9200
203-
@ $(call retry, 10, curl -sS -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" http://localhost:9200/_security/user/$(KIBANA_SYSTEM_USERNAME)/_password -d '{"password":"$(KIBANA_SYSTEM_PASSWORD)"}' | grep -q "^{}")
205+
@ curl $(CURL_OPTS) http://localhost:9200/_security/user/$(KIBANA_SYSTEM_USERNAME)/_password -d '{"password":"$(KIBANA_SYSTEM_PASSWORD)"}'
204206

205207
.PHONY: create-es-api-key
206208
create-es-api-key: ## Creates and outputs a new API Key. This expects Elasticsearch to be available at localhost:9200
207-
@ $(call retry, 10, curl -sS -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" http://localhost:9200/_security/api_key -d '{"name":"$(KIBANA_API_KEY_NAME)"}')
209+
@ curl $(CURL_OPTS) http://localhost:9200/_security/api_key -d '{"name":"$(KIBANA_API_KEY_NAME)"}'
208210

209211
.PHONY: create-es-bearer-token
210212
create-es-bearer-token: ## Creates and outputs a new OAuth bearer token. This expects Elasticsearch to be available at localhost:9200
211-
@ $(call retry, 10, curl -sS -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" http://localhost:9200/_security/oauth2/token -d '{"grant_type":"client_credentials"}')
213+
@ curl $(CURL_OPTS) http://localhost:9200/_security/oauth2/token -d '{"grant_type":"client_credentials"}'
212214

213215
.PHONY: setup-kibana-fleet
214216
setup-kibana-fleet: ## Creates the agent and integration policies required to run Fleet. This expects Kibana to be available at localhost:5601
215-
@ $(call retry, 10, curl -sS --fail-with-body -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" -H "kbn-xsrf: true" http://localhost:5601/api/fleet/fleet_server_hosts -d '{"name":"default"$(,)"host_urls":["$(FLEET_ENDPOINT)"]$(,)"is_default":true}')
216-
@ $(call retry, 10, curl -sS --fail-with-body -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" -H "kbn-xsrf: true" http://localhost:5601/api/fleet/agent_policies -d '{"id":"fleet-server"$(,)"name":"Fleet Server"$(,)"namespace":"default"$(,)"monitoring_enabled":["logs"$(,)"metrics"]}')
217-
@ $(call retry, 10, curl -sS --fail-with-body -X POST -u $(ELASTICSEARCH_USERNAME):$(ELASTICSEARCH_PASSWORD) -H "Content-Type: application/json" -H "kbn-xsrf: true" http://localhost:5601/api/fleet/package_policies -d '{"name":"fleet-server"$(,)"namespace":"default"$(,)"policy_id":"fleet-server"$(,)"enabled":true$(,)"inputs":[{"type":"fleet-server"$(,)"enabled":true$(,)"streams":[]$(,)"vars":{}}]$(,)"package":{"name":"fleet_server"$(,)"version":"1.5.0"}}')
217+
curl $(CURL_OPTS) -H "kbn-xsrf: true" http://localhost:5601/api/fleet/fleet_server_hosts -d '{"name":"default","host_urls":["$(FLEET_ENDPOINT)"],"is_default":true}'
218+
curl $(CURL_OPTS) -H "kbn-xsrf: true" http://localhost:5601/api/fleet/agent_policies -d '{"id":"fleet-server","name":"Fleet Server","namespace":"default","monitoring_enabled":["logs","metrics"]}'
219+
curl $(CURL_OPTS) -H "kbn-xsrf: true" http://localhost:5601/api/fleet/package_policies -d '{"name":"fleet-server","namespace":"default","policy_id":"fleet-server","enabled":true,"inputs":[{"type":"fleet-server","enabled":true,"streams":[],"vars":{}}],"package":{"name":"fleet_server","version":"1.5.0"}}'
218220

219221
.PHONY: docker-clean
220222
docker-clean: ## Try to remove provisioned nodes and assigned network
@@ -341,21 +343,6 @@ generate-alerting-client: ## generate Kibana alerting client
341343
@ rm -rf generated/alerting/go.mod generated/alerting/go.sum generated/alerting/test
342344
@ go fmt ./generated/alerting/...
343345

344-
.PHONY: generate-data-views-client
345-
generate-data-views-client: ## generate Kibana data-views client
346-
@ docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli:v7.0.1 generate \
347-
-i /local/generated/data_views/bundled.yaml \
348-
--skip-validate-spec \
349-
--git-repo-id terraform-provider-elasticstack \
350-
--git-user-id elastic \
351-
-p isGoSubmodule=true \
352-
-p packageName=data_views \
353-
-p generateInterfaces=true \
354-
-g go \
355-
-o /local/generated/data_views
356-
@ rm -rf generated/data_views/go.mod generated/data_views/go.sum generated/data_views/test
357-
@ go fmt ./generated/data_views/...
358-
359346
.PHONY: generate-connectors-client
360347
generate-connectors-client: tools ## generate Kibana connectors client
361348
@ cd tools && go generate
@@ -379,4 +366,4 @@ generate-slo-client: tools ## generate Kibana slo client
379366
@ go fmt ./generated/...
380367

381368
.PHONY: generate-clients
382-
generate-clients: generate-alerting-client generate-slo-client generate-data-views-client generate-connectors-client ## generate all clients
369+
generate-clients: generate-alerting-client generate-slo-client generate-connectors-client ## generate all clients

‎catalog-info.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111

1212
spec:
1313
type: buildkite-pipeline
14-
owner: group:control-plane-stateful-applications
14+
owner: group:control-plane-hosted-applications
1515
system: buildkite
1616
implementation:
1717
apiVersion: buildkite.elastic.dev/v1
@@ -29,7 +29,7 @@ spec:
2929
filter_condition: 'build.tag =~ /^v[0-9.]+$/'
3030
filter_enabled: true
3131
teams:
32-
control-plane-stateful-applications:
32+
control-plane-hosted-applications:
3333
access_level: MANAGE_BUILD_AND_READ
3434
serverless-core-architecture:
3535
access_level: MANAGE_BUILD_AND_READ

0 commit comments

Comments
 (0)