Skip to content
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test_full_stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
scenario:
- elasticstack_default
release:
- 7
Comment thread
widhalmt marked this conversation as resolved.
- 8
ansible_version:
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test_role_beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
- beats_default
- beats_peculiar
release:
- 7
- 8
ansible_version:
- "ansible>=9.0,<10.0" #Correspond ansible-core>=2.16,<2.17
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test_role_elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ jobs:
scenario:
- elasticsearch_default
- elasticsearch_roles_calculation
- elasticsearch_cluster-oss
- elasticsearch_no-security
release:
- 7
- 8
ansible_version:
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test_role_kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
scenario:
- kibana_default
release:
- 7
- 8
ansible_version:
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test_role_logstash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ jobs:
matrix:
distro: [ubuntu2204]
scenario:
- logstash_full_stack-oss
- logstash_specific_version
- logstash_pipelines
release:
- 7
- 8
ansible_version:
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test_role_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
- repos_default
- repos_oss
release:
- 7
- 8
ansible_version:
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test_roles_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
scenario:
- elasticstack_default
release:
- 7
- 8
python_version:
- "3.11"
Expand Down
22 changes: 8 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ You may want the following Ansible roles installed. There other ways to achieve

### Supported systems

We test the collection on the following Linux distributions. Each one with Elastic Stack 7 and 8.
We test the collection on the following Linux distributions. Each one with Elastic Stack 8.

* Rocky Linux 9
* Rocky Linux 8
Expand All @@ -72,10 +72,6 @@ We test the collection on the following Linux distributions. Each one with Elast
* Debian 10
* CentOS 8

We know from personal experience, that the collections work in following combinations. Missing tests mostly come from incompatibilties between the distribution and our testing environment, not from problems with the collection itself.

* CentOS 7 - Elastic Stack 7

## Caveats and information for long time users

### Variable renaming
Expand All @@ -98,9 +94,9 @@ The variable `elasticstack_no_log` can be set to `false` if you want to see the

### Versions and upgrades

*elasticstack_version*: Version number of tools to install. Only set if you don't want the latest on new setups. (default: none). If you already have an installation of Elastic Stack, this collection will query the version of Elasticsearch on the CA host and use it for all further installations in the same setup. (Only if you run the `elasticsearch` role before all others) Example: `7.17.2`
*elasticstack_version*: Version number of tools to install. Only set if you don't want the latest on new setups. (default: none). If you already have an installation of Elastic Stack, this collection will query the version of Elasticsearch on the CA host and use it for all further installations in the same setup. (Only if you run the `elasticsearch` role before all others) Example: `8.11.2`

*elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`) Make sure it corresponds to `elasticstack_version` if you set both.
*elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`) Make sure it corresponds to `elasticstack_version` if you set both.

For OSS version see `elasticstack_variant` below.

Expand Down Expand Up @@ -142,8 +138,6 @@ ansible-galaxy install geerlingguy.redis

1) Default: For general Elastic Stack installations using all features use the following. You will need Redis installed and running for the default setup to run. A viable way is using the `geerlingguy.redis` role.

2) Specific: For OSS Installation without X-Pack features you can use the following. _Note_: this is only available for version `7.x`.

Our default configuration will collect filesystem logs placed by `rsyslog`. Therefor our example playbook makes sure, `rsyslog` is installed. If you don't want that, please change the configuration of the `beats` module. Without syslog you won't receive any messages with the default configuration.

There are some comments in the Playbook. Either fill them with the correct values (`remote_user`) or consider them as a hint to commonly used options.
Expand All @@ -163,7 +157,7 @@ The execution order of the roles is important! (see below)
- netways.elasticstack
vars:
elasticstack_variant: elastic #oss
# elasticstack_release: 8 #7
# elasticstack_release: 8
roles:
- repos

Expand All @@ -175,7 +169,7 @@ The execution order of the roles is important! (see below)
vars:
elasticstack_variant: elastic #oss
elasticsearch_jna_workaround: true
# elasticstack_release: 8 #7
# elasticstack_release: 8
roles:
- elasticsearch

Expand All @@ -187,7 +181,7 @@ The execution order of the roles is important! (see below)
vars:
elasticstack_variant: elastic #oss
elasticstack_override_beats_tls: true
# elasticstack_release: 8 #7
# elasticstack_release: 8
roles:
- geerlingguy.redis
- logstash
Expand All @@ -199,7 +193,7 @@ The execution order of the roles is important! (see below)
- netways.elasticstack
vars:
elasticstack_variant: elastic #oss
# elasticstack_release: 8 #7
# elasticstack_release: 8
roles:
- kibana

Expand All @@ -211,7 +205,7 @@ The execution order of the roles is important! (see below)
vars:
elasticstack_variant: elastic #oss
elasticstack_override_beats_tls: true
# elasticstack_release: 8 #7
# elasticstack_release: 8
pre_tasks:
- name: Install Rsyslog
ansible.builtin.package:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ Variables

Every role got its own set of variables, in addition a few variables are useable on any role. Below are all general collection vars.

* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`)
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`)
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic` or `oss`. (default: `elastic`)
6 changes: 3 additions & 3 deletions docs/role-beats.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ beats_filebeat_log_inputs:
negate: false
match: after
```
* *beats_filebeat_journald*: Enable collection of JournalD logs (default: `false`) - available since Filebeat 7.16
* *beats_filebeat_journald*: Enable collection of JournalD logs (default: `false`)
* *beats_filebeat_journald_inputs*: List of journald inputs. Use for different filters on events. You can add a list of `include_matches` entries for filtering.
Default of `beats_filebeat_journald_inputs`:
```
beats_filebeat_journald_inputs:
everything:
id: everything
```
* *beats_filebeat_docker*: Enable collection of Docker logs (default: `false`) **ONLY WORKS ON RELEASE 7 SO FAR**
* *beats_filebeat_docker*: Enable collection of Docker logs (default: `false`)
* *beats_filebeat_docker_ids*: IDs of containers to collect. (default: `*`)

* *beats_filebeat_loadbalance*: Enable loadbalancing for Filebeats Logstash output (default: `true`)
Expand Down Expand Up @@ -95,7 +95,7 @@ The following variables only apply if you use this role together with our other
* *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`)
* *elasticstack_ca_pass*: Password for Elasticsearch CA (default: `PleaseChangeMe`)
* *elasticstack_initial_passwords*: Path to file with initical elasticsearch passwords (default: `/usr/share/elasticsearch/initial_passwords`)
* *elasticstack_version*: Install specific version (Default: none. Possible values: e.g. `7.10.1` or `latest`)
* *elasticstack_version*: Install specific version (Default: none. Possible values: e.g. `8.10.1` or `latest`)

If you want to use this role with your own TLS certificates, use these variables.

Expand Down
6 changes: 3 additions & 3 deletions docs/role-elasticsearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ These variables are identical over all our elastic related roles, hence the diff
* *elasticstack_ca_validity_period*: number of days that the generated CA are valid (default: 1095).
* *elasticstack_ca_expiration_buffer*: Ansible will renew the CA if its validity is shorter than this value, which should be number of days. (default: 30)
* *elasticstack_ca_will_expire_soon*: Set it to true to renew the CA and the certificate of all Elastic Stack components (default: `false`), Or run the playbook with `--tags renew_ca` to do that.
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`)
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic` or `oss`. (default: `elastic`)
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`)
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic`. (default: `elastic`)
* *elasticstack_elasticsearch_http_port*: Port of Elasticsearch http (Default: `9200`)

```
Expand All @@ -75,7 +75,7 @@ These variables are identical over all our elastic related roles, hence the diff
- netways.elasticstack
hosts: elasticsearch-hosts
vars:
elasticstack_variant: oss
elasticstack_variant: elastic
elasticsearch_jna_workaround: true
elasticsearch_disable_systemcallfilterchecks: true
roles:
Expand Down
6 changes: 3 additions & 3 deletions docs/role-kibana.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ These variables are identical over all our elastic related roles, hence the diff
* *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`)
* *elasticstack_ca_pass*: Password for Elasticsearch CA (default: `PleaseChangeMe`)
* *elasticstack_initial_passwords*: Path to file with initical elasticsearch passwords (default: `/usr/share/elasticsearch/initial_passwords`)
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`)
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic` or `oss` (default: `elastic`)
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`)
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic`. (default: `elastic`)


If you use `localhost` in `kibana_elasticsearch_hosts` , certificate verification will skip hostname checks
Expand All @@ -51,7 +51,7 @@ If you use `localhost` in `kibana_elasticsearch_hosts` , certificate verificatio
hosts: kibana-host
vars:
elasticstack_full_stack: true
elasticstack_variant: oss
elasticstack_variant: elastic
roles:
- repos
- kibana
Expand Down
4 changes: 2 additions & 2 deletions docs/role-logstash.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you want to use the default pipeline (or other pipelines communicating via Re
Role Variables
--------------

* *elasticstack_version*: Version number of Logstash to install (e.g. `7.10.1`). Only set if you don't want the latest. (default: none). For OSS version see `elasticstack_variant` below.
* *elasticstack_version*: Version number of Logstash to install (e.g. `8.10.1`). Only set if you don't want the latest. (default: none). For OSS version see `elasticstack_variant` below.
* *logstash_enable*: Start and enable Logstash service (default: `true`)
* *logstash_config_backup*: Keep backups of all changed configuration (default: `no`)
* *logstash_manage_yaml*: Manage and overwrite `logstash.yml` (default: `true`)
Expand Down Expand Up @@ -109,7 +109,7 @@ The following variables configure extra fields in your events that help with ide

The following variables are identical over all our elastic related roles, hence the different naming scheme.

*elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`)
*elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`)
*elasticstack_variant*: Variant of the stack to install. Valid values: `elastic` or `oss`. (default: `elastic`)

The following variables only apply if you use this role together with our Elasticsearch and Kibana roles.
Expand Down
2 changes: 1 addition & 1 deletion docs/role-repos.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Requirements
Role Variables
--------------

* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `7`). `7` and `8` are supported.
* *elasticstack_release*: Major release version of Elastic stack to configure. (default: `8`).
* *elasticstack_variant*: Variant of the stack to install. Valid values: `elastic` or `oss`. (default: `elastic`).
* *elasticstack_enable_repos*: Enable repositories after creating them. (default: `true`) Only works on RPM based distributions!

Expand Down
6 changes: 0 additions & 6 deletions molecule/beats_peculiar/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
tasks:

- name: Set Filebeat version for 7.x
ansible.builtin.set_fact:
elasticstack_version: "7.17.1"
when:
- elasticstack_release == 7

- name: Set Filebeat version for 8.x
ansible.builtin.set_fact:
elasticstack_version: "8.4.1"
Expand Down
7 changes: 0 additions & 7 deletions molecule/beats_peculiar/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
ansible.builtin.debug:
var: beats_filebeat_version.stdout

- name: Fail if Filebeat has the wrong version
ansible.builtin.fail:
msg: "Filebeat has the wrong version"
when:
- beats_filebeat_version.stdout.find('7.17.1') == -1
- elasticstack_release == 7

- name: Fail if Filebeat has the wrong version
ansible.builtin.fail:
msg: "Filebeat has the wrong version"
Expand Down
21 changes: 0 additions & 21 deletions molecule/elasticsearch_cluster-oss/converge.yml

This file was deleted.

32 changes: 0 additions & 32 deletions molecule/elasticsearch_cluster-oss/molecule.yml

This file was deleted.

19 changes: 0 additions & 19 deletions molecule/elasticsearch_cluster-oss/prepare.yml

This file was deleted.

3 changes: 0 additions & 3 deletions molecule/elasticsearch_cluster-oss/requirements.yml

This file was deleted.

23 changes: 0 additions & 23 deletions molecule/elasticsearch_no-security/converge.yml

This file was deleted.

Loading
Loading