Skip to content

Commit 63fda46

Browse files
authored
Merge pull request #5 from NETWAYS/upgradeEL8/changes
Upgrade el8/changes
2 parents c16d416 + 28afe22 commit 63fda46

File tree

48 files changed

+104
-174
lines changed

Some content is hidden

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

48 files changed

+104
-174
lines changed

.github/workflows/test_full_stack.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
- rockylinux8
3030
scenario:
3131
- elasticstack_default
32+
release:
33+
- 7
34+
- 8
3235

3336
steps:
3437
- name: Check out code
@@ -56,3 +59,4 @@ jobs:
5659
MOLECULE_DISTRO: ${{ matrix.distro }}
5760
PY_COLORS: '1'
5861
ANSIBLE_FORCE_COLOR: '1'
62+
ELASTIC_RELEASE: ${{ matrix.release }}

.github/workflows/test_role_beats.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
matrix:
7272
distro: [debian11, rockylinux8, ubuntu2204]
7373
scenario: [beats_default, beats_full_stack, beats_peculiar]
74+
release: [ 7, 8 ]
7475

7576
steps:
7677
- name: Check out code
@@ -98,3 +99,4 @@ jobs:
9899
MOLECULE_DISTRO: ${{ matrix.distro }}
99100
PY_COLORS: '1'
100101
ANSIBLE_FORCE_COLOR: '1'
102+
ELASTIC_RELEASE: ${{ matrix.release }}

.github/workflows/test_role_elasticsearch.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
matrix:
7272
distro: [ubuntu2204]
7373
scenario: [elasticsearch_default, elasticsearch_cluster, elasticsearch_cluster-oss, elasticsearch_no-security]
74+
release: [7, 8]
7475

7576
steps:
7677
- name: Check out code
@@ -96,5 +97,6 @@ jobs:
9697
molecule test -s ${{ matrix.scenario }}
9798
env:
9899
MOLECULE_DISTRO: ${{ matrix.distro }}
100+
ELASTIC_RELEASE: ${{ matrix.release }}
99101
PY_COLORS: '1'
100102
ANSIBLE_FORCE_COLOR: '1'

.github/workflows/test_role_kibana.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
matrix:
7272
distro: [ubuntu2204]
7373
scenario: [kibana_default, kibana_full_stack, kibana_full_stack-oss]
74+
release: [ 7, 8 ]
7475

7576
steps:
7677
- name: Check out code
@@ -96,3 +97,4 @@ jobs:
9697
molecule test -s ${{ matrix.scenario }}
9798
env:
9899
MOLECULE_DISTRO: ${{ matrix.distro }}
100+
ELASTIC_RELEASE: ${{ matrix.release }}

.github/workflows/test_role_logstash.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
matrix:
7070
distro: [ubuntu2204]
7171
scenario: [logstash_default]
72+
release: [ 7, 8 ]
7273

7374
steps:
7475
- name: Check out code
@@ -96,6 +97,7 @@ jobs:
9697
MOLECULE_DISTRO: ${{ matrix.distro }}
9798
PY_COLORS: '1'
9899
ANSIBLE_FORCE_COLOR: '1'
100+
ELASTIC_RELEASE: ${{ matrix.release }}
99101

100102
molecule_tests:
101103
runs-on: ubuntu-latest
@@ -115,6 +117,7 @@ jobs:
115117
logstash_full_stack-oss,
116118
logstash_specific_version,
117119
logstash_pipelines]
120+
release: [ 7, 8 ]
118121

119122
steps:
120123
- name: Check out code
@@ -142,3 +145,4 @@ jobs:
142145
MOLECULE_DISTRO: ${{ matrix.distro }}
143146
PY_COLORS: '1'
144147
ANSIBLE_FORCE_COLOR: '1'
148+
ELASTIC_RELEASE: ${{ matrix.release }}

.github/workflows/test_role_repos.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ jobs:
7070
matrix:
7171

7272
distro: [centos7, debian10, debian11, rockylinux8, rockylinux9, ubuntu2004, ubuntu2204]
73-
scenario: [repos_default, repos_oss, repos_elastic8]
73+
scenario: [repos_default, repos_oss]
74+
release: [ 7, 8 ]
7475

7576
steps:
7677
- name: Check out code
@@ -97,3 +98,4 @@ jobs:
9798
molecule test -s ${{ matrix.scenario }}
9899
env:
99100
MOLECULE_DISTRO: ${{ matrix.distro }}
101+
ELASTIC_RELEASE: ${{ matrix.release }}

.github/workflows/test_roles_pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
- kibana_default
2929
- logstash_default
3030
- repos_default
31+
release:
32+
- 7
33+
- 8
3134

3235
steps:
3336
- name: Check out code
@@ -55,3 +58,4 @@ jobs:
5558
MOLECULE_DISTRO: ${{ matrix.distro }}
5659
PY_COLORS: '1'
5760
ANSIBLE_FORCE_COLOR: '1'
61+
ELASTIC_RELEASE: ${{ matrix.release }}

README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,32 @@ You may want the following Ansible roles installed. There other ways to achieve
3939

4040
## Usage
4141

42+
### Default Passwords
43+
44+
Default Passwords can be seen during generation, or found later in `/usr/share/elasticsearch/initial_passwords`
45+
46+
To turn off security currently:
47+
`elastic_override_beats_tls: true`
48+
### Redis
49+
50+
0) You need to install the redis role which is maintained by geerlingguy.
51+
52+
```
53+
ansible-galaxy install geerlingguy.redis
54+
```
55+
56+
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. (You can install it with `ansible-galaxy install geerlingguy.redis)
57+
58+
2) Specific: For OSS Installation without X-Pack features you can use the following. _Note_ this is only available for version `7.x`.
59+
4260
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.
4361

4462
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.
4563

4664
_Note_: The roles rely on hardcoded group names for placing services on hosts. Please make sure you have groups named `elasticsearch`, `logstash` and `kibana` in your Ansible inventory. Hosts in these groups will get the respective services. Restricting your plays to the appropriate hosts will not work because the roles interact with hosts from other groups e.g. for certificate generation.
4765

4866
The execution order of the roles is important! (see below)
67+
4968
```
5069
---
5170
- hosts: all
@@ -74,5 +93,4 @@ The execution order of the roles is important! (see below)
7493
- logstash
7594
- kibana
7695
- beats
77-
7896
```

docs/role-elasticsearch.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This role installs manages Elasticsearch on your hosts. Optionally it can config
77

88
If you use the role to set up security you can use its CA to create certificates for Logstash and Kibana, too.
99

10+
Please note that setting `elasticsearch_bootstrap_pw` as variable will only take effect when initialising Elasticsearch. Changes after starting elasticsearch for the first time will not change the bootstrap password for the instance and will lead to breaking tests.
11+
1012
Role Variables
1113
--------------
1214

@@ -16,6 +18,7 @@ Role Variables
1618
* *elasticsearch_datapath*: Path where Elasticsearch will store it's data. (default: `/var/lib/elasticsearch` - the packages default)
1719
* *elasticsearch_create_datapath*: Create the path for data to store if it doesn't exist. (default: `false` - only useful if you change `elasticsearch_datapath`)
1820
* *elasticsearch_fs_repo*: List of paths that should be registered as repository for snapshots (only filesystem supported so far). (default: none) Remember, that every node needs access to the same share under the same path.
21+
* *elasticsearch_bootstrap_pw*: Bootstrap password for Elasticsearch (Default: `PleaseChangeMe`)
1922
* *elasticsearch_disable_systemcallfilterchecks*: Disable system call filter checks. This has a security impact but is necessary on some systems. Please refer to the [docs](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/_system_call_filter_check.html) for details. (default: `false`)
2023
* *elasticsearch_pamlimits*: Set pam_limits neccessary for Elasticsearch. (Default: `true`)
2124

molecule/beats_default/converge.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
collections:
99
- NETWAYS.elasticstack
1010
vars:
11+
elastic_stack_full_stack: false
1112
elasticsearch_jna_workaround: true
1213
elasticsearch_disable_systemcallfilterchecks: true
14+
elastic_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
1315
tasks:
1416
- name: Include Elastics repos role
1517
include_role:

0 commit comments

Comments
 (0)