Skip to content

Commit 68535e3

Browse files
committed
Rename elasticstack_full_stack to elasticstack_collection_managed
This fixes #316
1 parent 608aa6e commit 68535e3

File tree

30 files changed

+66
-63
lines changed

30 files changed

+66
-63
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ Every role is documented with all variables, please refer to the documentation f
2929

3030
## Global variables
3131

32+
* `elasticstack_collection_managed`: When set to true, roles inside this collection can fully rely on each other’s default configuration, naming conventions, and managed resources. This means the collection handles repositories, package names, and other components internally, leaving no room for external tools or custom configurations to override these defaults.
33+
When set to false, you can provide your own repositories, package names, or other configurations, but roles cannot assume defaults from other roles anymore. (Default: `true`)
34+
3235
* `elasticstack_force_pip`: Will force installation of required Python modules via `pip`. This is useful if your package manager doesn't provide current versions of modules. (Default: `false`) See [PEP668](https://peps.python.org/pep-0668/) for more details.
3336
* `elasticstack_manage_pip`: Will install `pip` on your system. (Default: `false`)
3437

docs/role-beats.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ beats_filebeat_journald_inputs:
7979
* *beats_metricbeat_modules*: List of modules to enable. (Default: `- system`)
8080
* *beats_metricbeat_loadbalance*: Enable loadbalancing for Metricbeats Logstash output (default: `true`)
8181

82-
* *beats_security*: Activate TLS for connections to targets. Can either be use with our other roles and `elasticstack_full_stack` to automatically create certificates or `beats_tls*` variables for custom certificates. (default: `false`)
82+
* *beats_security*: Activate TLS for connections to targets. Can either be use with our other roles and `elasticstack_collection_managed` to automatically create certificates or `beats_tls*` variables for custom certificates. (default: `false`)
8383
* *beats_target_hosts*: Only use when this role is used standalone. When used in combination with our other roles, the target hosts will be determined automatically. Use a YAML list. (default: `- localhost`)
8484
* *elasticstack_elasticsearch_http_port*: Port of Elasticsearch to send events to (Default: `9200`)
8585
* *elasticstack_beats_port*: Port of Logstash to send events to (Default: `5044`)
@@ -90,7 +90,7 @@ beats_filebeat_journald_inputs:
9090

9191
The following variables only apply if you use this role together with our other Elastic Stack roles.
9292

93-
* *elasticstack_full_stack*: Use `elasticsearch` as well (default: `false`)
93+
* *elasticstack_collection_managed*: Use `elasticsearch` as well (default: `false`)
9494
* *elasticstack_variant*: Define which variant of elastic stack to use. (default: `elastic`)
9595
* *elasticstack_ca_dir*: Directory where on the Elasticsearch CA host certificates are stored. This is only useful in connection with out other Elastic Stack related roles. (default: `/opt/es-ca`)
9696
* *elasticstack_ca_pass*: Password for Elasticsearch CA (default: `PleaseChangeMe`)

docs/role-kibana.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Role Variables
1515
* *kibana_tls_key*: Path to the key Kibana should use when communicating with clients (default: `/etc/kibana/certs/key.pem`)
1616
* *kibana_extra_config*: You can add arbitraty configuration options with this option. Just start it with `|-` and indent the following lines. So you can add as many lines and options to `kibana.yml` as you like. (default: none)
1717

18-
* *kibana_security*: Activate TLS and authentication when connecting to Elasticsearch. **Note**: Only works when `elasticstack_full_stack` is enabled. (default: `true`)
18+
* *kibana_security*: Activate TLS and authentication when connecting to Elasticsearch. **Note**: Only works when `elasticstack_collection_managed` is enabled. (default: `true`)
1919

2020
These variables are identical over all our elastic related roles, hence the different naming scheme.
2121

22-
* *elasticstack_full_stack*: Use `ansible-role-elasticsearch` as well (default: `false`). If you set to `true`, you will be able to use the following variables:
22+
* *elasticstack_collection_managed*: Use `ansible-role-elasticsearch` as well (default: `false`). If you set to `true`, you will be able to use the following variables:
2323
* *kibana_elasticsearch_hosts*: A list of DNS resolvable hostnames of Elasticsearch hosts to connect your Kibana instance to. (default: `- localhost`)
2424
* *elasticstack_elasticsearch_http_port*: Port of Elasticsearch http (Default: `9200`)
2525
* *kibana_sniff_on_start*: Attempt to find other Elasticsearch nodes on startup (default: `false`)
@@ -50,7 +50,7 @@ If you use `localhost` in `kibana_elasticsearch_hosts` , certificate verificatio
5050
- netways.elasticstack
5151
hosts: kibana-host
5252
vars:
53-
elasticstack_full_stack: true
53+
elasticstack_collection_managed: true
5454
elasticstack_variant: oss
5555
roles:
5656
- repos

docs/role-logstash.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Aside from `logstash.yml` we can manage Logstashs pipelines.
8686
* *logstash_sniffing*: Enable sniffing (Default: `false`).
8787
* *logstash_sniffing_delay*: How long to wait, in seconds, between sniffing attempts (Default: `not set`).
8888
* *logstash_sniffing_path*: HTTP Path to be used for the sniffing requests (Default: `not set`).
89-
* *logstash_legacy_monitoring*: Enables legacy monitoring - ignored when `elasticstack_full_stack` is not set. (default: `true`)
89+
* *logstash_legacy_monitoring*: Enables legacy monitoring - ignored when `elasticstack_collection_managed` is not set. (default: `true`)
9090
* *logstash_redis_password*: If set this will use this password when connecting our simple inputs and outputs to Redis. (default: not set)
9191

9292
* *logstash_mermaid*: Print overview over Logstash pipelines in Mermaid syntax. (default: `true`)
@@ -114,7 +114,7 @@ The following variables are identical over all our elastic related roles, hence
114114

115115
The following variables only apply if you use this role together with our Elasticsearch and Kibana roles.
116116

117-
* *elasticstack_full_stack*: Use `ansible-role-elasticsearch` as well (default: `false`)
117+
* *elasticstack_collection_managed*: Use `ansible-role-elasticsearch` as well (default: `false`)
118118
* *elasticstack_ca_dir*: Directory where the CA and certificates lie on the main Elasticsearch host (default: `/opt/es-ca`)
119119
* *elasticstack_elasticsearch_http_port*: Port of Elasticsearch to send events to (Default: `9200`)
120120
* *elasticstack_initial_passwords*: File where initial passwords are stored on the main Elasticsearch host (default: `/usr/share/elasticsearch/initial_passwords`)

molecule/beats_default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
collections:
99
- netways.elasticstack
1010
vars:
11-
elasticstack_full_stack: false
11+
elasticstack_collection_managed: false
1212
elasticsearch_jna_workaround: true
1313
elasticsearch_disable_systemcallfilterchecks: true
1414
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"

molecule/beats_peculiar/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
testfield2: thisisanothertest
2424
elasticsearch_jna_workaround: true
2525
elasticsearch_disable_systemcallfilterchecks: true
26-
elasticstack_full_stack: false
26+
elasticstack_collection_managed: false
2727
elasticstack_no_log: false
2828
beats_filebeat_mysql_slowlog_input: true
2929
beats_auditbeat: true

molecule/elasticsearch_default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
hosts: all
88
vars:
99
#elasticsearch_security: true # needed for tests of > 7 releases
10-
elasticstack_full_stack: false
10+
elasticstack_collection_managed: false
1111
elasticsearch_jna_workaround: true
1212
elasticsearch_disable_systemcallfilterchecks: true
1313
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"

molecule/elasticsearch_test_modules/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- netways.elasticstack
77
hosts: all
88
vars:
9-
elasticstack_full_stack: false
9+
elasticstack_collection_managed: false
1010
elasticsearch_jna_workaround: true
1111
elasticsearch_disable_systemcallfilterchecks: true
1212
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"

molecule/elasticstack_default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
elasticsearch_monitoring_enabled: false
1616
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
1717
elasticsearch_heap: "2"
18-
elasticstack_full_stack: true
18+
elasticstack_collection_managed: true
1919
elasticstack_no_log: false
2020
logstash_pipeline_unsafe_shutdown: true
2121
logstash_redis_password: "{{ lookup('ansible.builtin.password', '/tmp/redispassword', chars=['ascii_letters'], length=15) }}"

molecule/kibana_default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- name: Converge
77
hosts: all
88
vars:
9-
elasticstack_full_stack: false
9+
elasticstack_collection_managed: false
1010
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
1111
elasticstack_no_log: false
1212
collections:

0 commit comments

Comments
 (0)