Skip to content

Commit

Permalink
Merge branch 'main' into feature/kibana-web-default-tls
Browse files Browse the repository at this point in the history
  • Loading branch information
widhalmt authored Jan 16, 2024
2 parents d263c79 + ba6e5aa commit 5b1558d
Show file tree
Hide file tree
Showing 55 changed files with 681 additions and 500 deletions.
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["bug", "needs-triage"]
body:
- type: checkboxes
id: terms
attributes:
label: Please try to fill out as much of the information below as you can. Thank you!
options:
- label: Yes, I've searched similar issues on GitHub and didn't find any.
required: true
- type: input
id: app_version
attributes:
label: Which version contains the bug?
placeholder: 1.0.0
- type: textarea
id: description
attributes:
label: Describe the bug
description: Please provide a concise description of the bug, add any relevant output or error messages. You can use markdown.
- type: textarea
id: recreate
attributes:
label: How to recreate the bug?
description: Please provide the steps to recreate the issue.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Documentation
description: Suggest documentation improvements
title: "[Documentation]: "
labels: ["documentation"]
body:
- type: textarea
id: description
attributes:
label: Describe the improvements you'd like.
description: Please provide as much context as possible. You can use markdown.
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Feature Request
description: Request a feature or enhancement
title: "[Feature]: "
labels: ["feature", "needs-triage"]
body:
- type: markdown
attributes:
value: |
Please try to fill out as much of the information below as you can. Thank you!
**Note:** If you want to sponsor new features, contact us at [email protected]
- type: textarea
id: description
attributes:
label: Describe the feature request
description: Please provide a concise description of the feature. You can use markdown.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Question
description: Ask a question
title: "[Question]: "
labels: ["question"]
body:
- type: textarea
id: description
attributes:
label: Ask a question
description: Please provide as much context as possible. You can use markdown.
5 changes: 2 additions & 3 deletions .github/workflows/test_full_stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:

strategy:
fail-fast: false
max-parallel: 2
matrix:
distro:
- rockylinux8
Expand All @@ -49,10 +48,10 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/test_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand All @@ -66,14 +66,13 @@ jobs:

strategy:
fail-fast: false
max-parallel: 1

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.9.14
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9.14

Expand Down Expand Up @@ -111,16 +110,15 @@ jobs:

strategy:
fail-fast: false
max-parallel: 1
matrix:
python_version: [ 3.5.10, 3.6.15, 3.7.13, 3.8.16, 3.10.10 ]

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python_version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_version }}

Expand Down Expand Up @@ -151,16 +149,15 @@ jobs:

strategy:
fail-fast: false
max-parallel: 1
matrix:
ansible_core_version: [ 2.11.12, 2.12.10, 2.13.8, 2.14.4 ]

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.9.14
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9.14

Expand Down Expand Up @@ -191,16 +188,15 @@ jobs:

strategy:
fail-fast: false
max-parallel: 1
matrix:
python_cryptography_version: [ 2.5, 3.0, 3.1, 3.2, 3.3, 3.4, 35.0.0, 36.0.0, 38.0.0, 40.0.1]

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.9.14
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9.14

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_role_beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,17 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
matrix:
distro: [ubuntu2204]
scenario: [beats_default, beats_peculiar]
release: [ 7, 8 ]

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_role_elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
matrix:
distro: [ubuntu2204]
scenario:
Expand All @@ -61,10 +60,10 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_role_kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,17 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
matrix:
distro: [ubuntu2204]
scenario: [kibana_default]
release: [ 7, 8 ]

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_role_logstash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
matrix:
distro: [ubuntu2204]
scenario:
Expand All @@ -61,10 +60,10 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_role_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
matrix:

distro: [centos7, debian10, debian11, rockylinux8, rockylinux9, ubuntu2004, ubuntu2204]
Expand All @@ -55,10 +54,10 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
21 changes: 2 additions & 19 deletions .github/workflows/test_roles_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,7 @@ on:
- warning
- debug
pull_request:
branches:
- 'feature/**'
- 'fix/**'
- '!doc/**'
paths:
- 'roles/**'
- '.github/workflows/test_roles_pr.yml'
- 'molecule/elasticstack_default/**'
push:
branches:
- 'feature/**'
- 'fix/**'
- '!doc/**'
paths:
- 'roles/**'
- '.github/workflows/test_roles_pr.yml'
- 'molecule/elasticstack_default/**'
merge_group:

jobs:
Expand All @@ -48,7 +32,6 @@ jobs:

strategy:
fail-fast: false
max-parallel: 2
matrix:
distro:
- rockylinux8
Expand All @@ -61,10 +44,10 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,34 @@ collections:

You will need the following Ansible collections installed

* community.general (probably already present)
* `community.general` (probably already present)

You will need these packages / libraries installed. Some very basic packages like `openssl` get handled by the collection if needed. The following list contains packages and libraries which only apply to special cases or need for you to decide on the installation method.

* `passlib` Python library if you do not disable password hashing for logstash user and you want to use logstash role from this collection. It should be installed with pip on the Ansible controller.

You may want the following Ansible roles installed. There other ways to achieve what they are doing but using them is easy and convenient.

* geerlingguy.redis
* openssl if you want to use Elastic Security
* `geerlingguy.redis` if you want to use logstash role

### Supported systems

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

* Rocky Linux 9
* Rocky Linux 8
* Ubuntu 20.04 LTS
* Ubuntu 22.04 LTS
* Ubuntu 20.04 LTS
* Debian 11
* 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

### Known Issues

There are known issues with the following Linux distributions.

* Rocky Linux 9: The GnuPG key used by Elastic seems to be incompatible with this version of Rocky.

## Usage

Expand Down
2 changes: 0 additions & 2 deletions docs/role-beats.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Requirements

You need to have the beats you want to install available in your software repositories. We provide a [role](./role-repos.md) for just that but if you have other ways of managing software, just make sure it's available. Alternatively you can install the Beats yourself.

* `cryptography` >= 2.5
* `community.crypto` collection: ansible-galaxy collection install community.crypto

Role Variables
Expand Down Expand Up @@ -87,7 +86,6 @@ beats_filebeat_journald_inputs:
* *beats_loglevel*: Level of logging (for all beats) (Default: `info`)
* *beats_logpath*: If logging to file, where to put logfiles (Default: `/var/log/beats`)
* *beats_fields*: Fields that are added to every input in the configuration
* *beats_manage_unzip*: Install `unzip` via package manager (Default: `true`)

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

Expand Down
Loading

0 comments on commit 5b1558d

Please sign in to comment.