Skip to content

Commit 7781d46

Browse files
committed
wip
1 parent b56b734 commit 7781d46

File tree

24 files changed

+1806
-13
lines changed

24 files changed

+1806
-13
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ CURL_OPTS = -sS --retry 5 --retry-all-errors -X POST -u $(ELASTICSEARCH_USERNAME
6767
# To enable tracing (or debugging), execute `make docker-testacc TF_LOG=TRACE`
6868
.PHONY: docker-testacc
6969
docker-testacc: docker-fleet ## Run acceptance tests in the docker container
70-
@ docker compose -f $(COMPOSE_FILE) --profile acceptance-tests up --quiet-pull acceptance-tests
70+
docker compose -f $(COMPOSE_FILE) --profile acceptance-tests up --quiet-pull acceptance-tests
7171

7272
# To run specific test (e.g. TestAccResourceActionConnector) execute `make docker-testacc TESTARGS='-run ^TestAccResourceActionConnector$$'`
7373
# To enable tracing (or debugging), execute `make docker-testacc TF_LOG=TRACE`
7474
.PHONY: docker-testacc-with-token
7575
docker-testacc-with-token: docker-fleet
76-
@ export ELASTICSEARCH_BEARER_TOKEN=$(shell $(MAKE) create-es-bearer-token | jq -r .access_token); \
76+
export ELASTICSEARCH_BEARER_TOKEN=$(shell $(MAKE) create-es-bearer-token | jq -r .access_token); \
7777
docker compose -f $(COMPOSE_FILE) --profile token-acceptance-tests up --quiet-pull token-acceptance-tests;
7878

7979
.PHONY: docker-elasticsearch

docs/resources/elasticsearch_security_user.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,14 @@ resource "elasticstack_elasticsearch_security_user" "dev" {
6363

6464
### Optional
6565

66-
> **NOTE**: [Write-only arguments](https://developer.hashicorp.com/terraform/language/resources/ephemeral#write-only-arguments) are supported in Terraform 1.11 and later.
67-
6866
- `elasticsearch_connection` (Block List, Deprecated) Elasticsearch connection configuration block. (see [below for nested schema](#nestedblock--elasticsearch_connection))
6967
- `email` (String) The email of the user.
7068
- `enabled` (Boolean) Specifies whether the user is enabled. The default value is true.
7169
- `full_name` (String) The full name of the user.
7270
- `metadata` (String) Arbitrary metadata that you want to associate with the user.
7371
- `password` (String, Sensitive) The user's password. Passwords must be at least 6 characters long. Note: Consider using `password_wo` for better security with ephemeral resources.
7472
- `password_hash` (String, Sensitive) A hash of the user's password. This must be produced using the same hashing algorithm as has been configured for password storage (see the [security settings documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html#hashing-settings)).
75-
- `password_wo` (String, Sensitive, [Write-only](https://developer.hashicorp.com/terraform/language/resources/ephemeral#write-only-arguments)) Write-only password attribute for use with ephemeral resources. Passwords must be at least 6 characters long. This attribute is designed for use with ephemeral resources like `vault_kv_secret_v2` to prevent secrets from being stored in the Terraform state. Must be used with `password_wo_version`.
73+
- `password_wo` (String, Sensitive) Write-only password attribute for use with ephemeral resources. Passwords must be at least 6 characters long. This attribute is designed for use with ephemeral resources like `vault_kv_secret_v2` to prevent secrets from being stored in the Terraform state. Must be used with `password_wo_version`.
7674
- `password_wo_version` (String) Version identifier for the write-only password. This field is used to trigger updates when the password changes. Required when `password_wo` is set. Typically, you would use a hash of the password or a version identifier from your secret management system.
7775

7876
### Read-Only

docs/resources/kibana_alerting_rule.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ resource "elasticstack_kibana_alerting_rule" "example" {
5858
- `interval` (String) The check interval, which specifies how frequently the rule conditions are checked. The interval must be specified in seconds, minutes, hours or days.
5959
- `name` (String) The name of the rule. While this name does not have to be unique, a distinctive name can help you identify a rule.
6060
- `params` (String) The rule parameters, which differ for each rule type.
61-
- `rule_type_id` (String) The ID of the rule type that you want to call when the rule is scheduled to run. For more information about the valid values, list the rule types using [Get rule types API](https://www.elastic.co/guide/en/kibana/master/list-rule-types-api.html) or refer to the [Rule types documentation](https://www.elastic.co/guide/en/kibana/master/rule-types.html).
61+
- `rule_type_id` (String) The ID of the rule type that you want to call when the rule is scheduled to run. For more information about the valid values, list the rule types using Get rule types API or refer to the Rule types documentation.
6262

6363
### Optional
6464

@@ -73,7 +73,7 @@ resource "elasticstack_kibana_alerting_rule" "example" {
7373

7474
### Read-Only
7575

76-
- `id` (String) The ID of this resource.
76+
- `id` (String) Generated ID for the alerting rule.
7777
- `last_execution_date` (String) Date of the last execution of this rule.
7878
- `last_execution_status` (String) Status of the last execution of this rule.
7979
- `scheduled_task_id` (String) ID of the scheduled task that will execute the alert.
@@ -88,8 +88,8 @@ Required:
8888

8989
Optional:
9090

91-
- `alerts_filter` (Block List, Max: 1) Conditions that affect whether the action runs. If you specify multiple conditions, all conditions must be met for the action to run. For example, if an alert occurs within the specified time frame and matches the query, the action runs. (see [below for nested schema](#nestedblock--actions--alerts_filter))
92-
- `frequency` (Block List, Max: 1) The properties that affect how often actions are generated. If the rule type supports setting summary to true, the action can be a summary of alerts at the specified notification interval. Otherwise, an action runs for each alert at the specified notification interval. NOTE: You cannot specify these parameters when `notify_when` or `throttle` are defined at the rule level. (see [below for nested schema](#nestedblock--actions--frequency))
91+
- `alerts_filter` (Block List) Conditions that affect whether the action runs. If you specify multiple conditions, all conditions must be met for the action to run. For example, if an alert occurs within the specified time frame and matches the query, the action runs. (see [below for nested schema](#nestedblock--actions--alerts_filter))
92+
- `frequency` (Block List) The properties that affect how often actions are generated. If the rule type supports setting summary to true, the action can be a summary of alerts at the specified notification interval. Otherwise, an action runs for each alert at the specified notification interval. NOTE: You cannot specify these parameters when `notify_when` or `throttle` are defined at the rule level. (see [below for nested schema](#nestedblock--actions--frequency))
9393
- `group` (String) The group name, which affects when the action runs (for example, when the threshold is met or when the alert is recovered). Each rule type has a list of valid action group names.
9494

9595
<a id="nestedblock--actions--alerts_filter"></a>
@@ -98,7 +98,7 @@ Optional:
9898
Optional:
9999

100100
- `kql` (String) Defines a query filter that determines whether the action runs. Written in Kibana Query Language (KQL).
101-
- `timeframe` (Block List, Max: 1) Defines a period that limits whether the action runs. (see [below for nested schema](#nestedblock--actions--alerts_filter--timeframe))
101+
- `timeframe` (Block List) Defines a period that limits whether the action runs. (see [below for nested schema](#nestedblock--actions--alerts_filter--timeframe))
102102

103103
<a id="nestedblock--actions--alerts_filter--timeframe"></a>
104104
### Nested Schema for `actions.alerts_filter.timeframe`
@@ -117,12 +117,12 @@ Required:
117117

118118
Required:
119119

120-
- `notify_when` (String) 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.
120+
- `notify_when` (String) 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.
121121
- `summary` (Boolean) Indicates whether the action is a summary.
122122

123123
Optional:
124124

125-
- `throttle` (String) 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.
125+
- `throttle` (String) 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`.
126126

127127
## Import
128128

0 commit comments

Comments
 (0)