Merge branch 'stackhpc/2024.1' into wazuh_fix_cfg

stackhpc · Jan 9, 2025 · 51ca32d · 51ca32d
2 parents dbe0ca3 + 8bb62b4
commit 51ca32d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml
@@ -1,7 +1,7 @@
 ---
 collections:
   - name: stackhpc.cephadm
-    version: 1.18.0
+    version: 1.19.1
   # NOTE: Pinning pulp.squeezer to 0.0.13 because 0.0.14+ depends on the
   # pulp_glue Python library being installed.
   - name: pulp.squeezer

diff --git a/etc/kayobe/ansible/wazuh-manager.yml b/etc/kayobe/ansible/wazuh-manager.yml
@@ -102,6 +102,23 @@
       notify:
         - Restart wazuh
 
+    - name: Add JVM proxy settings to wazuh-indexer
+      blockinfile:
+        path: "/etc/wazuh-indexer/jvm.options"
+        state: present
+        owner: root
+        group: wazuh
+        marker: "# {mark} ANSIBLE MANAGED BLOCK JVM PROXY SETTINGS"
+        block: |
+          -Dhttp.proxyHost={{ http_proxy_url | urlsplit('hostname') }}
+          -Dhttp.proxyPort={{ http_proxy_url | urlsplit('port') }}
+          -Dhttps.proxyHost={{ http_proxy_url | urlsplit('hostname') }}
+          -Dhttps.proxyPort={{ http_proxy_url | urlsplit('port') }}
+        backup: yes
+      when: http_proxy_url is defined
+      notify:
+        - Restart wazuh-indexer
+
     - name: Perform health check against filebeat
       command: filebeat test output
       changed_when: false
@@ -112,3 +129,8 @@
       service:
         name: wazuh-manager
         state: restarted
+
+    - name: Restart wazuh-indexer
+      service:
+        name: wazuh-indexer
+        state: restarted
diff --git a/releasenotes/notes/bump-ansible-collection-cephadm-2a6c988a34b192a6.yaml b/releasenotes/notes/bump-ansible-collection-cephadm-2a6c988a34b192a6.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Updates the StackHPC Cephadm Ansible collection from 1.18.0 to 1.19.1.