From b4b8b91ccd360e8c0baef4a7e59972ae51a77890 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 16 Dec 2021 11:24:35 -0500
Subject: [PATCH] simplify ip logic wazuh-register-agent, mine_interval to 35
 minutes

---
 salt/salt/etc/minion.d/mine_functions.conf  |  1 +
 salt/wazuh/files/agent/wazuh-register-agent | 13 +++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/salt/salt/etc/minion.d/mine_functions.conf b/salt/salt/etc/minion.d/mine_functions.conf
index 42a543841..8570e7a86 100644
--- a/salt/salt/etc/minion.d/mine_functions.conf
+++ b/salt/salt/etc/minion.d/mine_functions.conf
@@ -1,3 +1,4 @@
+mine_interval: 35
 mine_functions:
   network.ip_addrs:
     - interface: {{ pillar.host.mainint }}
diff --git a/salt/wazuh/files/agent/wazuh-register-agent b/salt/wazuh/files/agent/wazuh-register-agent
index dac66c12b..98ab9fb13 100755
--- a/salt/wazuh/files/agent/wazuh-register-agent
+++ b/salt/wazuh/files/agent/wazuh-register-agent
@@ -1,13 +1,6 @@
-{%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone'] %}
-  {%- set ip = salt['pillar.get']('global:managerip', '') %}
-{%- elif grains['role'] == 'so-node' or grains['role'] == 'so-heavynode' %}
-  {%- set ip = salt['pillar.get']('elasticsearch:mainip', '') %}
-{%- elif grains['role'] == 'so-sensor' %}
-  {%- set ip = salt['pillar.get']('sensor:mainip', '') %}
-{%- else %}
-  {%- set mainint = salt['pillar.get']('host:mainint') %}
-  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
-{%- endif %}
+{% set mainint = salt['pillar.get']('host:mainint') -%}
+{% set ip = salt['grains.get']('ip_interfaces').get(mainint)[0] -%}
+
 #!/bin/bash
 
 ###