Commit Graph

1765 Commits

Author SHA1 Message Date
Gonzalo Acuña
a2de74ecf5
Merge pull request #723 from wazuh/dependabot/pip/jinja2-2.11.3
Bump jinja2 from 2.11.2 to 2.11.3
2022-03-29 14:06:38 -03:00
dependabot[bot]
2537649c42
Bump jinja2 from 2.11.2 to 2.11.3
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 16:47:30 +00:00
Gonzalo Acuña
3d702d1497
Merge pull request #673 from wazuh/dependabot/pip/ansible-4.2.0
Bump ansible from 2.9.5 to 4.2.0
2022-03-29 13:45:26 -03:00
Gonzalo Acuña
5d584538db
Merge branch 'master' into dependabot/pip/ansible-4.2.0 2022-03-29 13:35:21 -03:00
Gonzalo Acuña
56effe43c1
Merge pull request #672 from wazuh/dependabot/pip/pywin32-301
Bump pywin32 from 227 to 301
2022-03-29 13:17:37 -03:00
Gonzalo Acuña
779a97bc4e
Pywin version corrected 2022-03-29 13:03:48 -03:00
Gonzalo Acuña
6c12f8f640
Tabulate updated 2022-03-28 17:51:39 -03:00
Gonzalo Acuña
75d8f112bc
Docker metadata updated 2022-03-28 17:41:29 -03:00
Gonzalo Acuña
876f0f69ad
Merge branch 'master' into dependabot/pip/pywin32-301 2022-03-28 17:34:10 -03:00
Gonzalo Acuña
a457be257b
Merge pull request #671 from wazuh/dependabot/pip/pygments-2.7.4
Bump pygments from 2.7.2 to 2.7.4
2022-03-28 15:43:52 -03:00
Alberto Rodríguez
5cd5a084b2
Merge pull request #720 from wazuh/4.2-merge-master
Merge 4.2 into master
2022-03-28 17:00:20 +02:00
Alberto Rodríguez
bfd7e8bafc
Update CHANGELOG.md
Co-authored-by: José Fernández Aguilera <jose.fernandez@wazuh.com>
2022-03-28 16:59:51 +02:00
Gonzalo Acuña
97ea3f0078
Merge branch 'master' into 4.2-merge-master 2022-03-28 11:21:25 -03:00
Alberto Rodríguez
e007e5f94c
Merge pull request #718 from wazuh/716-Bump4.2.6-to4.2
Bump 4.2.6 to 4.2 branch
2022-03-28 15:41:49 +02:00
c-bordon
3b8730d9b1
4.2.6 Bump 2022-03-25 10:23:05 -03:00
Alberto Rodríguez
0902234edb
Merge pull request #714 from wazuh/dependabot4.3
Create dependabot.yml
2022-03-22 20:41:03 +01:00
Gonzalo Acuña
f4a41586bd
Create dependabot.yml 2022-03-22 16:33:50 -03:00
Gonzalo Acuña
3ae9ae5818
retrigger checks 2022-03-16 11:47:48 -03:00
Alberto Rodríguez
940d1e0a2e
Merge pull request #704 from wazuh/702-windows-md5
Windows agent checksum update
2022-02-17 16:41:02 +01:00
Gonzalo Acuña
d2fd3c0bf6
Windows agent checksum updated 2022-02-17 10:26:24 -03:00
Gonzalo Acuña
8fac3db151
Windows agent checksum updated 2022-02-10 15:31:07 -03:00
Gonzalo Acuña
dd1ccf8680
Merge pull request #699 from wazuh/692-Fix-Agent-Template-to-Master
Fix sca agent template issue for day, wday and time parameters to Master
2022-01-17 09:48:30 -03:00
Gonzalo Acuña
f5339074b2
Merge pull request #698 from wazuh/692-Fix-Agent-Template-to-4.2
Fix sca agent template issue for day, wday and time parameters to 4.2
2022-01-17 09:47:51 -03:00
Gonzalo Acuña
1e58febd33
Merge pull request #693 from wazuh/692-FixSCATemplateIssueto4.2
Fix sca template issue for day, wday and time parameters to 4.2
2022-01-17 09:46:20 -03:00
c-bordon
d89e0a6002
Fix agent sca template 2022-01-17 09:24:42 -03:00
c-bordon
c3c87f7470
Fix agent sca template 2022-01-17 09:23:09 -03:00
Alberto Rodríguez
91d28cfb94
Merge pull request #695 from wazuh/692-FixSCATemplateIssuetoMaster
Fix sca template issue for day, wday and time parameters to Master
2022-01-13 17:48:01 +01:00
c-bordon
baff8be563
Fix sca template issue for day, wday and time parameters to Master 2021-12-30 16:20:25 -03:00
c-bordon
627d1284f8
Fix sca template issue for day, wday and time parameters 2021-12-30 16:05:10 -03:00
Alberto Rodríguez
a18e566029
Merge pull request #682 from wazuh/680-expect-fix-master
Expect tag deleted (master)
2021-12-03 12:19:36 +01:00
Gonzalo Acuña
8aab436b72
Fixes to include 4.2 changes 2021-12-02 15:28:06 -03:00
Gonzalo Acuña
5b82bd37f7
Fixes to include 4.2 changes 2021-12-02 15:19:06 -03:00
Gonzalo Acuña
f031f0fbfb
Expect tag deleted 2021-12-02 10:09:43 -03:00
dependabot[bot]
38d42d550e
Bump ansible from 2.9.5 to 4.2.0
Bumps [ansible](https://github.com/ansible/ansible) from 2.9.5 to 4.2.0.
- [Release notes](https://github.com/ansible/ansible/releases)
- [Commits](https://github.com/ansible/ansible/commits)

---
updated-dependencies:
- dependency-name: ansible
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:12:16 +00:00
dependabot[bot]
35524e5f6c
Bump pywin32 from 227 to 301
Bumps [pywin32](https://github.com/mhammond/pywin32) from 227 to 301.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

---
updated-dependencies:
- dependency-name: pywin32
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:12:01 +00:00
dependabot[bot]
6fb7e3d1dd
Bump pygments from 2.7.2 to 2.7.4
Bumps [pygments](https://github.com/pygments/pygments) from 2.7.2 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.7.2...2.7.4)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-24 16:11:56 +00:00
Alberto R
84291baa97
Bumped to 4.4.0 2021-11-24 17:10:24 +01:00
Gonzalo Acuña
0b8a1a7032
Merge pull request #669 from wazuh/625-authd-update-in-ossec-conf
Authd options update
2021-11-23 13:10:03 -03:00
Nicolas Lastra
f6b05e25da
fix var-ossec-etc-ossec-server.conf.j2, authd module and sub module force 2021-11-18 18:27:04 -03:00
Nicolas Lastra
2649a061c5
fix parameter value in Authd config 2021-11-17 15:34:43 -03:00
Nicolas Lastra
9534838714
authd-update-in-ossec-conf 2021-11-17 15:22:16 -03:00
Gonzalo Acuña
9f82175ab4
Merge pull request #667 from wazuh/665-tag4.2.5-to-master
Merge 4.2 into master (release v4.2.5)
2021-11-16 15:59:12 -03:00
Nicolas Lastra
bb95ea167c
merge 4.2.5 in master 2021-11-16 11:35:56 -03:00
José Fernández Aguilera
6ba251de85
Merge pull request #666 from wazuh/664-bump-4.2.5
Pre release v4.2.5 Ansible
2021-11-15 20:17:49 +01:00
Nicolas Lastra
a0116db707
bump 4.2.5 2021-11-15 11:26:56 -03:00
Gonzalo Acuña
2da0f98b33
Merge pull request #660 from wazuh/659-es-start-timeout
ES start timeout added
2021-10-28 15:10:27 -03:00
Gonzalo Acuña
8f6e102324
lineinfile module corrected 2021-10-28 15:01:49 -03:00
Gonzalo Acuña
04f3ec1aab
elasticsearch_start_timeout parameter added for OD installation 2021-10-28 14:36:40 -03:00
Gonzalo Acuña
60cc77f497
ES start timeout parameterized 2021-10-28 11:55:05 -03:00
Gonzalo Acuña
81a0cdb3f1
Merge pull request #654 from wazuh/645-tag4.2.4-to-master
Release 4.2.4 to master
2021-10-21 10:58:50 -03:00