CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from Security-Onion-Solutions/dev

Browse Source 
last fixes
This commit is contained in:
Doug Burks
2020-02-13 15:12:12 -05:00
committed by GitHub
parent ae113c0b84 6f42c607f7
commit a1e80d8366
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
1.0.6 1.1.4

5
salt/common/telegraf/etc/telegraf.conf
View File

@@ -16,7 +16,7 @@
{%- set MASTER = grains['master'] %} {%- set MASTER = grains['master'] %}
{% set NODEIP = salt['pillar.get']('node:mainip', '') %} {% set NODEIP = salt['pillar.get']('node:mainip', '') %}
{% set HELIX_API_KEY = salt['pillar.get']('fireeye:helix:api_key', '') %} {% set HELIX_API_KEY = salt['pillar.get']('fireeye:helix:api_key', '') %}
{% set UNIQUEID = salt['pillar.get']('sensor:uniqueid', '') %}
# Global tags can be specified here in key="value" format. # Global tags can be specified here in key="value" format.
[global_tags] [global_tags]
@@ -25,6 +25,9 @@
## Environment variables can be used as tags, and throughout the config file ## Environment variables can be used as tags, and throughout the config file
# user = "$USER" # user = "$USER"
{% if grains['role'] == 'so-helix' %}
meta_cbid = {{ UNIQUEID }}
{% endif %}
# Configuration for telegraf agent # Configuration for telegraf agent
[agent] [agent]

2
salt/logstash/conf/pipelines/eval/0800_input_eval.conf
View File

@@ -182,7 +182,7 @@ input {
type => "ossec" type => "ossec"
} }
file { file {
path => "/wazuh/archives/archive.json" path => "/wazuh/archives/archives.json"
type => "ossec_archive" type => "ossec_archive"
} }
file { file {