Skip to content

Commit 51ca32d

Browse files
Merge branch 'stackhpc/2024.1' into wazuh_fix_cfg
2 parents dbe0ca3 + 8bb62b4 commit 51ca32d

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

etc/kayobe/ansible/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
collections:
33
- name: stackhpc.cephadm
4-
version: 1.18.0
4+
version: 1.19.1
55
# NOTE: Pinning pulp.squeezer to 0.0.13 because 0.0.14+ depends on the
66
# pulp_glue Python library being installed.
77
- name: pulp.squeezer

etc/kayobe/ansible/wazuh-manager.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,23 @@
102102
notify:
103103
- Restart wazuh
104104

105+
- name: Add JVM proxy settings to wazuh-indexer
106+
blockinfile:
107+
path: "/etc/wazuh-indexer/jvm.options"
108+
state: present
109+
owner: root
110+
group: wazuh
111+
marker: "# {mark} ANSIBLE MANAGED BLOCK JVM PROXY SETTINGS"
112+
block: |
113+
-Dhttp.proxyHost={{ http_proxy_url | urlsplit('hostname') }}
114+
-Dhttp.proxyPort={{ http_proxy_url | urlsplit('port') }}
115+
-Dhttps.proxyHost={{ http_proxy_url | urlsplit('hostname') }}
116+
-Dhttps.proxyPort={{ http_proxy_url | urlsplit('port') }}
117+
backup: yes
118+
when: http_proxy_url is defined
119+
notify:
120+
- Restart wazuh-indexer
121+
105122
- name: Perform health check against filebeat
106123
command: filebeat test output
107124
changed_when: false
@@ -112,3 +129,8 @@
112129
service:
113130
name: wazuh-manager
114131
state: restarted
132+
133+
- name: Restart wazuh-indexer
134+
service:
135+
name: wazuh-indexer
136+
state: restarted
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Updates the StackHPC Cephadm Ansible collection from 1.18.0 to 1.19.1.

0 commit comments

Comments
 (0)