From 68166a49e1465319dd0d45ec5c4b92d6fe3a15b6 Mon Sep 17 00:00:00 2001
From: limitup <17516880+limitup@users.noreply.github.com>
Date: Mon, 14 Oct 2019 17:01:56 -0500
Subject: [PATCH 1/5] Update Manager templates for integrations

---
 .../ansible-wazuh-manager/defaults/main.yml   | 20 ++++++++
 .../ansible-wazuh-manager/tasks/main.yml      | 10 ++++
 .../var-ossec-etc-ossec-server.conf.j2        | 49 +++++++++++++++++++
 .../ansible-wazuh-manager/vars/aws_creds.yml  | 11 +++++
 .../vars/external_API_creds.yml               |  9 ++++
 5 files changed, 99 insertions(+)
 create mode 100644 roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
 create mode 100644 roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index 170a8da5..f1ad3826 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -260,6 +260,26 @@ wazuh_manager_config:
     - server: null
       port: null
       format: null
+  integrations:
+    - name: 'slack'
+      hook_url: <hook_url>
+      alert_level: 10
+      alert_format: 'json'
+    - name: 'pagerduty'
+      api_key: <api_key>
+      alert_level: 10
+  monitor_aws:
+    disable: 'no'
+    internal: '10m'
+    run_on_start: 'yes'
+    skip_on_error: 'yes'
+    s3:
+      - name: 's3-bucket-example-name'
+        bucket_type: 'guardduty'
+        path: 'path'
+        only_logs_after: '1970-JAN-01'
+        access_key: <access key>
+        secret_key: <secret key>
   labels:
     enable: false
     list:
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
index a1afbb4c..c247e60f 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@@ -200,6 +200,16 @@
   tags:
     - config
 
+- name: Retrieving external API Credentials
+  include_vars: external_API_creds.yml
+  tags:
+    - config
+
+- name: Retrieving AWS Credentials
+  include_vars: aws_creds.yml
+  tags:
+    - config
+
 - name: Retrieving Wazuh-API User Credentials
   include_vars: wazuh_api_creds.yml
   when:
diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
index 65ae38fb..5995d79a 100644
--- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
+++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
@@ -530,6 +530,55 @@
 {% endfor %}
 {% endif %}
 
+{% if wazuh_manager_config.integrations is defined %}
+{% for integration in wazuh_manager_config.integrations %}
+{% if integration.name is not none %}
+  <!-- Integration with {{ integration.name }} -->
+  <integration>
+    <name>{{ integration.name }}</name>
+    {% if integration.hook_url is defined %}
+    <hook_url>{{ integration.hook_url }}</hook_url>
+    {% endif %}
+    {% if integration.api_key is defined %}
+    <api_key>{{ integration.api_key }}</api_key>
+    {% endif %}
+    {% if integration.alert_format is defined %}
+    <alert_format>{{ integration.alert_format }}</alert_format>
+    {% endif %}
+    {% if integration.alert_level is defined %}
+    <level>{{ integration.alert_level }}</level>
+    {% endif %}
+    {% if integration.rule_id is defined %}
+    <rule_id>{{ integration.rule_id }}</rule_id>
+    {% endif %}
+  </integration>
+{% endif %}
+{% endfor %}
+{% endif %}
+
+{% if monitor_aws is defined %}
+  <!-- S3 -->
+  <wodle name="aws-s3">
+    <disabled>{{ monitor_aws.disable }}</disabled>
+    <interval>{{ monitor_aws.interval }}</interval>
+    <run_on_start>{{ monitor_aws.run_on_start }}</run_on_start>
+    <skip_on_error>{{ monitor_aws.skip_on_error }}</skip_on_error>
+    {% for bucket in monitor_aws.s3 %}
+    <bucket type="{{ bucket.bucket_type }}">
+      <name>{{ bucket.name }}</name>
+      {% if bucket.path is defined %}
+      <path>{{ bucket.path }}</path>
+      {% endif %}
+      {% if bucket.only_logs_after is defined %}
+      <only_logs_after>{{ bucket.only_logs_after }}</only_logs_after>
+      {% endif %}
+      <access_key>{{ bucket.access_key }}</access_key>
+      <secret_key>{{ bucket.secret_key }}</secret_key>
+    </bucket>
+    {% endfor %}
+  </wodle>
+{% endif %}
+
 {% if wazuh_manager_config.labels.enable == true %}
   <labels>
   {% for label in wazuh_manager_config.labels.list %}
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
new file mode 100644
index 00000000..1a164900
--- /dev/null
+++ b/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
@@ -0,0 +1,11 @@
+---
+monitor_aws:
+    disable: 'no'
+    interval: '10m'
+    run_on_start: 'yes'
+    skip_on_error: 'yes'
+    s3:
+      - name: 'S3_bucket'
+        bucket_type: 'guardduty'
+        access_key: ''
+        secret_key: ''
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
new file mode 100644
index 00000000..2d743af0
--- /dev/null
+++ b/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
@@ -0,0 +1,9 @@
+#---
+#integrations:
+#  - name: 'slack'
+#    hook_url: <hook_url>
+#    alert_level: 10
+#    alert_format: 'json'
+#  - name: 'pagerduty'
+#    api_key: <api_key>
+#    alert_level: 10

From a49f394858cb93fe902c7960e8e46a6bc9c398ac Mon Sep 17 00:00:00 2001
From: limitup <17516880+limitup@users.noreply.github.com>
Date: Mon, 14 Oct 2019 17:12:43 -0500
Subject: [PATCH 2/5] Add pseudo credentials for template

---
 .../ansible-wazuh-manager/defaults/main.yml   |  6 ++---
 .../ansible-wazuh-manager/vars/aws_creds.yml  | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index f1ad3826..a5840bec 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -266,7 +266,7 @@ wazuh_manager_config:
       alert_level: 10
       alert_format: 'json'
     - name: 'pagerduty'
-      api_key: <api_key>
+      api_key: '<api_key>'
       alert_level: 10
   monitor_aws:
     disable: 'no'
@@ -278,8 +278,8 @@ wazuh_manager_config:
         bucket_type: 'guardduty'
         path: 'path'
         only_logs_after: '1970-JAN-01'
-        access_key: <access key>
-        secret_key: <secret key>
+        access_key: '<access key>'
+        secret_key: '<secret key>'
   labels:
     enable: false
     list:
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
index 1a164900..6251c292 100644
--- a/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
+++ b/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
@@ -1,11 +1,11 @@
----
-monitor_aws:
-    disable: 'no'
-    interval: '10m'
-    run_on_start: 'yes'
-    skip_on_error: 'yes'
-    s3:
-      - name: 'S3_bucket'
-        bucket_type: 'guardduty'
-        access_key: ''
-        secret_key: ''
+#---
+#monitor_aws:
+#    disable: 'no'
+#    interval: '10m'
+#    run_on_start: 'yes'
+#    skip_on_error: 'yes'
+#    s3:
+#      - name: 'S3_bucket'
+#        bucket_type: 'guardduty'
+#        access_key: '<access_key>'
+#        secret_key: '<secret_key>'

From dd0c0d24ad15b3d765ffc999a6704c715c05109a Mon Sep 17 00:00:00 2001
From: limitup <17516880+limitup@users.noreply.github.com>
Date: Mon, 14 Oct 2019 17:25:50 -0500
Subject: [PATCH 3/5] adjust for passing strings

---
 roles/wazuh/ansible-wazuh-manager/defaults/main.yml         | 2 +-
 .../wazuh/ansible-wazuh-manager/vars/external_API_creds.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index a5840bec..f86d7bf3 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -262,7 +262,7 @@ wazuh_manager_config:
       format: null
   integrations:
     - name: 'slack'
-      hook_url: <hook_url>
+      hook_url: '<hook_url>'
       alert_level: 10
       alert_format: 'json'
     - name: 'pagerduty'
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
index 2d743af0..5b557fea 100644
--- a/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
+++ b/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
@@ -1,9 +1,9 @@
 #---
 #integrations:
 #  - name: 'slack'
-#    hook_url: <hook_url>
-#    alert_level: 10
+#    hook_url: '<hook_url>'
+#    rule_id: '80102'
 #    alert_format: 'json'
 #  - name: 'pagerduty'
-#    api_key: <api_key>
+#    api_key: '<api_key>'
 #    alert_level: 10

From 0252131041284841e1ecb68f4ea20ec93a098878 Mon Sep 17 00:00:00 2001
From: limitup <17516880+limitup@users.noreply.github.com>
Date: Thu, 31 Oct 2019 08:29:11 -0500
Subject: [PATCH 4/5] Recommended changes

---
 .../ansible-wazuh-manager/defaults/main.yml   | 21 +++++++++++--------
 .../ansible-wazuh-manager/tasks/main.yml      | 10 ---------
 .../ansible-wazuh-manager/vars/aws_creds.yml  | 11 ----------
 .../vars/external_API_creds.yml               |  9 --------
 4 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
 delete mode 100644 roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index f86d7bf3..ddc62093 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -261,25 +261,28 @@ wazuh_manager_config:
       port: null
       format: null
   integrations:
-    - name: 'slack'
+    #slack
+    - name: null
       hook_url: '<hook_url>'
       alert_level: 10
       alert_format: 'json'
-    - name: 'pagerduty'
+      rule_id: null
+    #pagerduty
+    - name: null
       api_key: '<api_key>'
-      alert_level: 10
+      alert_level: 12
   monitor_aws:
     disable: 'no'
     internal: '10m'
     run_on_start: 'yes'
     skip_on_error: 'yes'
     s3:
-      - name: 's3-bucket-example-name'
-        bucket_type: 'guardduty'
-        path: 'path'
-        only_logs_after: '1970-JAN-01'
-        access_key: '<access key>'
-        secret_key: '<secret key>'
+      - name: null
+        bucket_type: null
+        path: null
+        only_logs_after: null
+        access_key: null
+        secret_key: null
   labels:
     enable: false
     list:
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
index c247e60f..a1afbb4c 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@@ -200,16 +200,6 @@
   tags:
     - config
 
-- name: Retrieving external API Credentials
-  include_vars: external_API_creds.yml
-  tags:
-    - config
-
-- name: Retrieving AWS Credentials
-  include_vars: aws_creds.yml
-  tags:
-    - config
-
 - name: Retrieving Wazuh-API User Credentials
   include_vars: wazuh_api_creds.yml
   when:
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
deleted file mode 100644
index 6251c292..00000000
--- a/roles/wazuh/ansible-wazuh-manager/vars/aws_creds.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-#---
-#monitor_aws:
-#    disable: 'no'
-#    interval: '10m'
-#    run_on_start: 'yes'
-#    skip_on_error: 'yes'
-#    s3:
-#      - name: 'S3_bucket'
-#        bucket_type: 'guardduty'
-#        access_key: '<access_key>'
-#        secret_key: '<secret_key>'
diff --git a/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml b/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
deleted file mode 100644
index 5b557fea..00000000
--- a/roles/wazuh/ansible-wazuh-manager/vars/external_API_creds.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-#---
-#integrations:
-#  - name: 'slack'
-#    hook_url: '<hook_url>'
-#    rule_id: '80102'
-#    alert_format: 'json'
-#  - name: 'pagerduty'
-#    api_key: '<api_key>'
-#    alert_level: 10

From d9b693066334714840da4db0daa7bf980ecd4095 Mon Sep 17 00:00:00 2001
From: "Manuel J. Bernal" <manu.asi2@gmail.com>
Date: Mon, 23 Mar 2020 18:24:27 +0100
Subject: [PATCH 5/5] Update
 roles/wazuh/ansible-wazuh-manager/defaults/main.yml

---
 roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index ddc62093..81996848 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -273,7 +273,7 @@ wazuh_manager_config:
       alert_level: 12
   monitor_aws:
     disable: 'no'
-    internal: '10m'
+    interval: '10m'
     run_on_start: 'yes'
     skip_on_error: 'yes'
     s3: