Commit Graph

1141 Commits

Author SHA1 Message Date
Christos Pollalis
ae40cb4582 Split "Copy CA, SSL key and cert for authd" task
of the wazuh-agent playbook to allow one to perform either manager
or agent verification, or both.
2020-04-11 18:26:13 +03:00
Christos Pollalis
f6e020631e Make agent registration via the rest API idempotent
Check whether an error was returned by the HTTP POST to the `agents/`
endpoint before invoking `/var/ossec/bin/manage_agents` in order to
register a new agent.

It seems like that if an agent has already been registered under the
given name, the HTTP POST will return an error that'll cause the next
task, which is meant to retrieve the agent information, to be skipped.
That'll cause the agent registration task to fail in return. Instead,
this change will cause the aforementioned task to be skipped, too. So,
if an agent has already been successfully registered and the playbook
is re-run, it'll run all the way to the end.

If anything goes wrong (during the registration process) and the agent
fails to start, the `restart wazuh-agent` handler will still fail.
2020-04-11 02:15:42 +03:00
Manuel J. Bernal
719e0fb8ce
Merge pull request #399 from wazuh/wazuh-release-v3.12.0_7.6.1-extras
Release changelog
2020-03-25 18:21:16 +01:00
Zenidd
f518635a11 Changelog minor fix 2020-03-25 18:20:30 +01:00
Zenidd
02d945bed4 Empty custom agent packages url 2020-03-25 18:07:29 +01:00
Zenidd
ec9a4b61c7 v3.12 changelog 2020-03-25 17:57:38 +01:00
Manuel J. Bernal
018973c8d6
Merge pull request #396 from wazuh/wazuh-release-v3.12.0_7.6.1
Wazuh release v3.12.0 7.6.1
2020-03-25 17:26:17 +01:00
Zenidd
1d6988768f Minor jinja template fixes 2020-03-25 16:23:46 +01:00
Manuel J. Bernal
22733cb7fd
Merge pull request #398 from wazuh/feature-394-templates-update
Updating configuration templates to Wazuh 3.12
2020-03-25 15:56:35 +01:00
Zenidd
832561e14b Merge branch 'feature-394-templates-update' of github.com:wazuh/wazuh-ansible into feature-394-templates-update 2020-03-25 15:51:40 +01:00
Zenidd
6b57e195b8 jinja template fixes 2020-03-25 15:50:47 +01:00
Zenidd
0019c7fdf2 Updating manager configuration templates and vars 2020-03-25 15:50:47 +01:00
Zenidd
245f4e7d6b jinja template fixes 2020-03-25 15:33:55 +01:00
Zenidd
f625f0b310 Updating manager configuration templates and vars 2020-03-25 12:49:49 +01:00
Zenidd
52f4907847 Updates to adapt ossec.conf templates to Wazuh v3.12 default ones 2020-03-25 10:10:32 +01:00
Manuel Gutierrez
14307bd22a Merge branch 'wazuh-release-v3.12.0_7.6.1' of github.com:wazuh/wazuh-ansible into wazuh-release-v3.12.0_7.6.1 2020-03-24 20:27:31 +01:00
Manuel Gutierrez
c872140f28 Update path for wazuh.yml 2020-03-24 20:25:38 +01:00
Manuel Gutierrez
bee5986b03 Bump branch when building from sources 2020-03-24 20:24:59 +01:00
Manuel J. Bernal
0936d47786
Merge branch 'master' into wazuh-release-v3.12.0_7.6.1 2020-03-24 19:20:51 +01:00
Manuel J. Bernal
2cdc6fd731 Updated elasticsearch template 2020-03-24 18:31:13 +01:00
Zenidd
dfc7bbf4b3 Updates to adapt ossec.conf templates to Wazuh v3.12 default ones 2020-03-24 18:21:46 +01:00
Manuel Gutierrez
14e2a6bb47 Bump versions to 3.12.0_7.6.1 2020-03-24 16:46:01 +01:00
Jose M. Garcia
f04615c792
Merge pull request #393 from wazuh/feature-331-relative-paths
Rule paths are now relative to playbooks
2020-03-24 12:56:04 +01:00
Zenidd
1f2670f74e Rule paths are now relative to playbooks 2020-03-24 12:42:45 +01:00
Jose M. Garcia
5037ea8695
Merge pull request #361 from wazuh/feature-359-agent-auth-groups
Add the option to create agent groups and add an agent to 1 or more group
2020-03-24 10:36:22 +01:00
Rshad Zhran
e27d0d3310 Remove agent groups redundant list 2020-03-23 20:32:12 +01:00
Rshad Zhran
fd4515ab16 Merge branch 'devel' into feature-359-agent-auth-groups 2020-03-23 19:38:02 +01:00
Manuel J. Bernal
ba0aa78966
Merge pull request #392 from wazuh/feature-384-minor-fix
Added registration address var to default wazuh-agent playbook
2020-03-23 18:00:48 +01:00
Zenidd
0f1d958ff2 Added registration address var to default wazuh-agent playbook 2020-03-23 17:57:22 +01:00
Manuel J. Bernal
e8fcf0d4f7
Merge pull request #391 from wazuh/fix-390-xml
Removed bad formed XML comments.
2020-03-23 17:10:30 +01:00
Rshad Zhran
aba02c801a Merge branch 'devel' into feature-359-agent-auth-groups 2020-03-23 16:21:37 +01:00
Zenidd
ec481c790a Fixing lint warnings 2020-03-23 15:37:52 +01:00
manuasir
f0bf926c8d Merge branch 'devel' into fix-390-xml 2020-03-23 15:18:25 +01:00
Manuel J. Bernal
ba8a255de6
Merge pull request #389 from wazuh/feature-384-nodes-addresses
Adding explicit registration address variable for wazuh-agent role
2020-03-23 15:01:00 +01:00
Manuel J. Bernal
d75f75b76b Fixes #390 . Removed bad formed XML comments. 2020-03-23 14:01:57 +01:00
Zenidd
b67a5e5e97 Adding new registration_adress ansible var 2020-03-23 12:47:58 +01:00
Rshad Zhran
805695766c Merge branch 'devel' into feature-359-agent-auth-groups 2020-03-20 22:04:54 +01:00
Rshad Zhran
c63756d541 Fix list check if it's empty 2020-03-20 21:35:18 +01:00
Jose M. Garcia
1939cc51d7
Merge pull request #382 from wazuh/feature-373-adjust-files-permissions
Restrictive permissions on filebeat sensitive files
2020-03-18 16:49:02 +01:00
Zenidd
4b9fb53549 Removing readall perms in certs files. Minor syntax normalizations 2020-03-17 18:21:33 +01:00
Zenidd
33fceff612 Normalization to octal for permissions asignations 2020-03-17 16:40:39 +01:00
Zenidd
c6a3dda23a Restricting already existing cert permissions and setting missing ones 2020-03-17 15:50:22 +01:00
Zenidd
eff4b38bed Restricting too open xpack and kibana permissions 2020-03-17 12:17:49 +01:00
Zenidd
3ba86f7cd8 minor fix 2020-03-13 14:15:50 +01:00
Jose M. Garcia
7f1ed0afb0
Merge pull request #385 from wazuh/feature-node_options-variable
NodeJS node_options variable and Kibana plugin optimization
2020-03-13 14:06:39 +01:00
Zenidd
824395a258 Updating with the Kibana optimization fixes 2020-03-13 14:04:55 +01:00
Zenidd
f4b70ab1c6 removing kibana script extra node options 2020-03-13 12:27:18 +01:00
Zenidd
84b5510e30 Removing whitespaces surrounding node_options var 2020-03-13 12:11:07 +01:00
Zenidd
b9a8dfff8a fix to pass the indempotence test 2020-03-13 09:29:54 +01:00
Zenidd
dab2f69b68 removing single quotes 2020-03-12 15:02:28 +01:00