Merge branch 'main' into feature/beats-tls-passphrase-291

widhalmt · web-flow · commit 82c1c53302dd · 2024-02-09T18:03:33.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -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.
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -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.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -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 info@netways.de
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature request
+      description: Please provide a concise description of the feature. You can use markdown.
diff --git a/.github/ISSUE_TEMPLATE/question.yaml b/.github/ISSUE_TEMPLATE/question.yaml
@@ -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.
diff --git a/.github/workflows/test_full_stack.yml b/.github/workflows/test_full_stack.yml
@@ -51,7 +51,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml
@@ -17,24 +17,9 @@ on:
       rolename:
         required: true
         type: string
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - '.github/workflows/test_linting.yml'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
   pull_request:
     branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - '.github/workflows/test_linting.yml'
-      - '.config/ansible-lint.yml'
-      - '.yamllint'
+      - '*'
 
 jobs:
   lint:
@@ -44,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/test_plugins.yml b/.github/workflows/test_plugins.yml
@@ -12,17 +12,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'plugins/**'
-      - '.github/workflows/test_plugins.yml'
-      - 'molecule/plugins/**'
-      - '.config/pep8.yml'
-      - 'tests/**'
   pull_request:
     branches:
       - 'feature/**'
@@ -43,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -72,7 +61,7 @@ jobs:
         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
 
@@ -118,7 +107,7 @@ jobs:
         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 }}
 
@@ -157,7 +146,7 @@ jobs:
         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
 
@@ -196,7 +185,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml
@@ -12,15 +12,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'roles/beats/**'
-      - '.github/workflows/test_role_beats.yml'
-      - 'molecule/beats_**'
   pull_request:
     branches:
       - 'feature/**'
@@ -57,7 +48,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml
@@ -12,15 +12,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'roles/elasticsearch/**'
-      - '.github/workflows/test_role_elasticsearch.yml'
-      - 'molecule/elasticsearch_**'
   pull_request:
     branches:
       - 'feature/**'
@@ -63,7 +54,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml
@@ -12,15 +12,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'roles/kibana/**'
-      - '.github/workflows/test_role_kibana.yml'
-      - 'molecule/kibana_**'
   pull_request:
     branches:
       - 'feature/**'
@@ -58,7 +49,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml
@@ -12,15 +12,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'roles/logstash/**'
-      - '.github/workflows/test_role_logstash.yml'
-      - 'molecule/logstash_**'
   pull_request:
     branches:
       - 'feature/**'
@@ -63,7 +54,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml
@@ -11,15 +11,6 @@ on:
           - info
           - warning
           - debug
-  push:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
-    paths:
-      - 'roles/repos/**'
-      - '.github/workflows/test_role_repos.yml'
-      - 'molecule/repos_**'
   pull_request:
     branches:
       - 'feature/**'
@@ -57,7 +48,7 @@ jobs:
         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
 
diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml
@@ -13,23 +13,6 @@ 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:
@@ -63,7 +46,7 @@ jobs:
         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
 
diff --git a/docs/role-elasticsearch.md b/docs/role-elasticsearch.md
@@ -32,6 +32,19 @@ Role Variables
 * *elasticsearch_check_calculation*: End play in checks (Default: `false`)
 * *elasticsearch_network_host*: You can configure multipe network addresses where the networking is bind to. You can assign IP addresses or interfaces by their names. You can also use elasticsearch internal variabels as it set as default. Example: `"_ens190_,_local_"` (Default: `"_local_,"_site_"`) (Optional; if not defined `default` is used)
 
+* *elasticsearch_extra_config*: You can set additional configuration in YAML-notation as you would write in the `elasaticsearch.yml`. Example:
+
+```YAML
+...
+elasticsearch_extra_config:
+  xpack.security.authc.token.enabled: true
+
+    xpack.security.authc.realms:
+        native.native1:
+            order: 0
+            enabled: true
+```
+
 This variable activates a workaround to start on systems that have certain hardening measures active. See [Stackoverflow](https://stackoverflow.com/questions/47824643/unable-to-load-jna-native-support-library-elasticsearch-6-x/50371992#50371992) for details and logmessages to look for. **WARNING**: This will change your `/etc/sysconfig/elasticseach`or `/etc/default/elasticsearch` file and overwrite `ES_JAVA_OPTS`. See this [issue](https://github.com/netways/ansible-role-elasticsearch/issues/79) for details.
 
 * *elasticsearch_jna_workaround*: Activate JNA workaround. (default: `false`)
diff --git a/molecule/beats_peculiar/converge.yml b/molecule/beats_peculiar/converge.yml
@@ -18,6 +18,9 @@
           pattern: '^[[:space:]]+(at|\.{3})[[:space:]]+\b|^Caused by:'
           negate: false
           match: after
+        fields:
+          testfield: thisisatest
+          testfield2: thisisanothertest
     elasticsearch_jna_workaround: true
     elasticsearch_disable_systemcallfilterchecks: true
     elasticstack_full_stack: false
diff --git a/molecule/beats_peculiar/verify.yml b/molecule/beats_peculiar/verify.yml
@@ -26,3 +26,11 @@
       when:
         - beats_filebeat_version.stdout.find('8.4.1') == -1
         - elasticstack_release == 8
+
+    - name: Ensure field is set correctly
+      ansible.builtin.lineinfile:
+        dest: /etc/filebeat/filebeat.yml
+        line: "    testfield: thisisatest"
+      check_mode: true
+      register: _field
+      failed_when: _field.changed
diff --git a/molecule/elasticstack_default/verify.yml b/molecule/elasticstack_default/verify.yml
@@ -135,3 +135,4 @@
         success_msg: "'{{ item }}' was found in nodes.content"
       with_inventory_hostnames: all
       when: groups['elasticsearch'] | length > 1
+
diff --git a/roles/beats/tasks/auditbeat.yml b/roles/beats/tasks/auditbeat.yml
diff --git a/roles/beats/tasks/filebeat.yml b/roles/beats/tasks/filebeat.yml
diff --git a/roles/beats/tasks/metricbeat.yml b/roles/beats/tasks/metricbeat.yml
diff --git a/roles/beats/templates/filebeat.yml.j2 b/roles/beats/templates/filebeat.yml.j2
diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
diff --git a/roles/elasticsearch/templates/elasticsearch.yml.j2 b/roles/elasticsearch/templates/elasticsearch.yml.j2
diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml
diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml
