afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #351 from wazuh/release-wazuh_3.11.2_7.5.1

Browse Source 
Release Wazuh 3.11.2 7.5.1
This commit is contained in:
Jose M. Garcia 2020-01-22 16:19:45 +01:00 committed by GitHub
commit f3849477f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 156 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,6 +1,16 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [v3.11.2_7.5.1]
### Added
- Update to Wazuh v3.11.2
### Changed
- Update templates for Python 3 compatibility ([@xr09](https://github.com/xr09)) [PR#344](https://github.com/wazuh/wazuh-ansible/pull/344)
## [v3.11.1_7.5.1] ## [v3.11.1_7.5.1]
### Added ### Added

4
VERSION
View File

@ -1,2 +1,2 @@
WAZUH-ANSIBLE_VERSION="v3.11.1" WAZUH-ANSIBLE_VERSION="v3.11.2"
REVISION="31110" REVISION="31120"

2
roles/elastic-stack/ansible-kibana/defaults/main.yml
View File

@ -6,7 +6,7 @@ elasticsearch_network_host: "127.0.0.1"
kibana_server_host: "0.0.0.0" kibana_server_host: "0.0.0.0"
kibana_server_port: "5601" kibana_server_port: "5601"
elastic_stack_version: 7.5.1 elastic_stack_version: 7.5.1
wazuh_version: 3.11.1 wazuh_version: 3.11.2
wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp
# API credentials # API credentials

140
roles/wazuh/ansible-filebeat/templates/elasticsearch.yml.j2
View File

@ -162,6 +162,7 @@
"data.dstip", "data.dstip",
"data.dstport", "data.dstport",
"data.dstuser", "data.dstuser",
"data.extra_data",
"data.hardware.serial", "data.hardware.serial",
"data.id", "data.id",
"data.integration", "data.integration",
@ -291,10 +292,37 @@
"data.vulnerability.advisories", "data.vulnerability.advisories",
"data.vulnerability.bugzilla_reference", "data.vulnerability.bugzilla_reference",
"data.vulnerability.cve", "data.vulnerability.cve",
"data.vulnerability.cvss.cvss2.base_score",
"data.vulnerability.cvss.cvss2.exploitability_score",
"data.vulnerability.cvss.cvss2.impact_score",
"data.vulnerability.cvss.cvss2.vector.access_complexity",
"data.vulnerability.cvss.cvss2.vector.attack_vector",
"data.vulnerability.cvss.cvss2.vector.authentication",
"data.vulnerability.cvss.cvss2.vector.availability",
"data.vulnerability.cvss.cvss2.vector.confidentiality_impact",
"data.vulnerability.cvss.cvss2.vector.integrity_impact",
"data.vulnerability.cvss.cvss2.vector.privileges_required",
"data.vulnerability.cvss.cvss2.vector.scope",
"data.vulnerability.cvss.cvss2.vector.user_interaction",
"data.vulnerability.cvss.cvss3.base_score",
"data.vulnerability.cvss.cvss3.exploitability_score",
"data.vulnerability.cvss.cvss3.impact_score",
"data.vulnerability.cvss.cvss3.vector.access_complexity",
"data.vulnerability.cvss.cvss3.vector.attack_vector",
"data.vulnerability.cvss.cvss3.vector.authentication",
"data.vulnerability.cvss.cvss3.vector.availability",
"data.vulnerability.cvss.cvss3.vector.confidentiality_impact",
"data.vulnerability.cvss.cvss3.vector.integrity_impact",
"data.vulnerability.cvss.cvss3.vector.privileges_required",
"data.vulnerability.cvss.cvss3.vector.scope",
"data.vulnerability.cvss.cvss3.vector.user_interaction",
"data.vulnerability.cwe_reference", "data.vulnerability.cwe_reference",
"data.vulnerability.package.architecture",
"data.vulnerability.package.condition", "data.vulnerability.package.condition",
"data.vulnerability.package.generated_cpe",
"data.vulnerability.package.name", "data.vulnerability.package.name",
"data.vulnerability.package.version", "data.vulnerability.package.version",
"data.vulnerability.rationale",
"data.vulnerability.reference", "data.vulnerability.reference",
"data.vulnerability.severity", "data.vulnerability.severity",
"data.vulnerability.state", "data.vulnerability.state",
@ -372,6 +400,8 @@
"rule.id", "rule.id",
"rule.info", "rule.info",
"rule.pci_dss", "rule.pci_dss",
"rule.hipaa",
"rule.nist_800_53",
"syscheck.audit.effective_user.id", "syscheck.audit.effective_user.id",
"syscheck.audit.effective_user.name", "syscheck.audit.effective_user.name",
"syscheck.audit.group.id", "syscheck.audit.group.id",
@ -943,6 +973,9 @@
"data": { "data": {
"type": "keyword" "type": "keyword"
}, },
"extra_data": {
"type": "keyword"
},
"system_name": { "system_name": {
"type": "keyword" "type": "keyword"
}, },
@ -1531,14 +1564,93 @@
}, },
"cvss": { "cvss": {
"properties": { "properties": {
"cvss3_score": { "cvss2": {
"type": "keyword" "properties": {
"base_score": {
"type": "keyword"
},
"exploitability_score": {
"type": "keyword"
},
"impact_score": {
"type": "keyword"
},
"vector": {
"properties": {
"access_complexity": {
"type": "keyword"
},
"attack_vector": {
"type": "keyword"
},
"authentication": {
"type": "keyword"
},
"availability": {
"type": "keyword"
},
"confidentiality_impact": {
"type": "keyword"
},
"integrity_impact": {
"type": "keyword"
},
"privileges_required": {
"type": "keyword"
},
"scope": {
"type": "keyword"
},
"user_interaction": {
"type": "keyword"
}
}
}
}
}, },
"cvss_score": { "cvss3": {
"type": "keyword" "properties": {
}, "base_score": {
"cvss_scoring_vector": { "type": "keyword"
"type": "keyword" },
"exploitability_score": {
"type": "keyword"
},
"impact_score": {
"type": "keyword"
},
"vector": {
"properties": {
"access_complexity": {
"type": "keyword"
},
"attack_vector": {
"type": "keyword"
},
"authentication": {
"type": "keyword"
},
"availability": {
"type": "keyword"
},
"confidentiality_impact": {
"type": "keyword"
},
"integrity_impact": {
"type": "keyword"
},
"privileges_required": {
"type": "keyword"
},
"scope": {
"type": "keyword"
},
"user_interaction": {
"type": "keyword"
}
}
}
}
} }
} }
}, },
@ -1547,9 +1659,15 @@
}, },
"package": { "package": {
"properties": { "properties": {
"architecture": {
"type": "keyword"
},
"condition": { "condition": {
"type": "keyword" "type": "keyword"
}, },
"generated_cpe": {
"type": "keyword"
},
"name": { "name": {
"type": "keyword" "type": "keyword"
}, },
@ -1561,6 +1679,12 @@
"published": { "published": {
"type": "date" "type": "date"
}, },
"updated": {
"type": "date"
},
"rationale": {
"type": "keyword"
},
"reference": { "reference": {
"type": "keyword" "type": "keyword"
}, },
@ -1673,4 +1797,4 @@
} }
}, },
"version": 1 "version": 1
} }

8
roles/wazuh/ansible-wazuh-agent/defaults/main.yml
View File

@ -1,9 +1,9 @@
--- ---
wazuh_agent_version: 3.11.1-1 wazuh_agent_version: 3.11.2-1
wazuh_agent_sources_installation: wazuh_agent_sources_installation:
enabled: false enabled: false
branch: "v3.11.1" branch: "v3.11.2"
user_language: "y" user_language: "y"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "agent" user_install_type: "agent"
@ -51,10 +51,10 @@ wazuh_winagent_config:
auth_path: C:\Program Files\ossec-agent\agent-auth.exe auth_path: C:\Program Files\ossec-agent\agent-auth.exe
# Adding quotes to auth_path_x86 since win_shell outputs error otherwise # Adding quotes to auth_path_x86 since win_shell outputs error otherwise
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
version: '3.11.1' version: '3.11.2'
revision: '1' revision: '1'
repo: https://packages.wazuh.com/3.x/windows/ repo: https://packages.wazuh.com/3.x/windows/
md5: 1e39c2ad032259cb9682c1eac3ac646a md5: 9b6e57054353e31f449ce61bf3695271
wazuh_agent_config: wazuh_agent_config:
repo: repo:
apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main' apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'

6
roles/wazuh/ansible-wazuh-manager/defaults/main.yml
View File

@ -1,12 +1,12 @@
--- ---
wazuh_manager_version: 3.11.1-1 wazuh_manager_version: 3.11.2-1
wazuh_manager_fqdn: "wazuh-server" wazuh_manager_fqdn: "wazuh-server"
wazuh_manager_package_state: present wazuh_manager_package_state: present
wazuh_manager_sources_installation: wazuh_manager_sources_installation:
enabled: false enabled: false
branch: "v3.11.1" branch: "v3.11.2"
user_language: "en" user_language: "en"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "server" user_install_type: "server"
@ -31,7 +31,7 @@ wazuh_manager_sources_installation:
wazuh_api_sources_installation: wazuh_api_sources_installation:
enabled: false enabled: false
branch: "v3.11.1" branch: "v3.11.2"
update: "y" update: "y"
remove: "y" remove: "y"
directory: null directory: null

6
roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
View File

@ -419,7 +419,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if localfile.format == 'json' and localfile.labels is defined %} {% if localfile.format == 'json' and localfile.labels is defined %}
{% for key, value in localfile.labels.iteritems() %} {% for key, value in localfile.labels.items() %}
<label key="{{ key }}">{{ value }}</label> <label key="{{ key }}">{{ value }}</label>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -457,7 +457,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if localfile.format == 'json' and localfile.labels is defined %} {% if localfile.format == 'json' and localfile.labels is defined %}
{% for key, value in localfile.labels.iteritems() %} {% for key, value in localfile.labels.items() %}
<label key="{{ key }}">{{ value }}</label> <label key="{{ key }}">{{ value }}</label>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -496,7 +496,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if localfile.format == 'json' and localfile.labels is defined %} {% if localfile.format == 'json' and localfile.labels is defined %}
{% for key, value in localfile.labels.iteritems() %} {% for key, value in localfile.labels.items() %}
<label key="{{ key }}">{{ value }}</label> <label key="{{ key }}">{{ value }}</label>
{% endfor %} {% endfor %}
{% endif %} {% endif %}

2
roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2
View File

@ -68,7 +68,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if localfile.format == 'json' and localfile.labels is defined %} {% if localfile.format == 'json' and localfile.labels is defined %}
{% for key, value in localfile.labels.iteritems() %} {% for key, value in localfile.labels.items() %}
<label key="{{ key }}">{{ value }}</label> <label key="{{ key }}">{{ value }}</label>
{% endfor %} {% endfor %}
{% endif %} {% endif %}