From 15cd0c6b49914af7a08cde98b65f1b9de7d8b7d7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 18 May 2020 10:41:39 -0400 Subject: [PATCH 1/3] change strelka ip for sensor nodes --- salt/strelka/files/backend/backend.yaml | 7 ++++++- salt/strelka/files/filestream/filestream.yaml | 7 ++++++- salt/strelka/files/frontend/frontend.yaml | 7 ++++++- salt/strelka/files/manager/manager.yaml | 8 +++++++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml index 40ea1b5b3..0333afb18 100644 --- a/salt/strelka/files/backend/backend.yaml +++ b/salt/strelka/files/backend/backend.yaml @@ -1,4 +1,9 @@ -{%- set ip = salt['pillar.get']('static:masterip', '') %} +{%- if grains.role == 'so-sensor' -%} + {%- set mainint = salt['pillar.get']('sensor:mainint') %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} +{%- else %} + {%- set ip = salt['pillar.get']('static:masterip') %} +{%- endif -%} logging_cfg: '/etc/strelka/logging.yaml' limits: max_files: 5000 diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml index 0475840c9..34ec48052 100644 --- a/salt/strelka/files/filestream/filestream.yaml +++ b/salt/strelka/files/filestream/filestream.yaml @@ -1,4 +1,9 @@ -{%- set ip = salt['pillar.get']('static:masterip', '') %} +{%- if grains.role == 'so-sensor' -%} + {%- set mainint = salt['pillar.get']('sensor:mainint') %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} +{%- else %} + {%- set ip = salt['pillar.get']('static:masterip') %} +{%- endif -%} conn: server: '{{ ip }}:57314' cert: '' diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml index 1c7b15175..0e02b708e 100644 --- a/salt/strelka/files/frontend/frontend.yaml +++ b/salt/strelka/files/frontend/frontend.yaml @@ -1,4 +1,9 @@ -{%- set ip = salt['pillar.get']('static:masterip', '') %} +{%- if grains.role == 'so-sensor' -%} + {%- set mainint = salt['pillar.get']('sensor:mainint') %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} +{%- else %} + {%- set ip = salt['pillar.get']('static:masterip') %} +{%- endif -%} server: ":57314" coordinator: addr: '{{ ip }}:6380' diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml index 16a4c697b..b8ffc038f 100644 --- a/salt/strelka/files/manager/manager.yaml +++ b/salt/strelka/files/manager/manager.yaml @@ -1,4 +1,10 @@ -{%- set ip = salt['pillar.get']('static:masterip', '') %} + +{%- if grains.role == 'so-sensor' -%} + {%- set mainint = salt['pillar.get']('sensor:mainint') %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} +{%- else %} + {%- set ip = salt['pillar.get']('static:masterip') %} +{%- endif -%} coordinator: addr: '{{ ip }}:6380' db: 0 From 037bedb0c0816ac16b16595cda4b0b8c1a10a8f1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 18 May 2020 10:48:02 -0400 Subject: [PATCH 2/3] remove whitespace at top of file --- salt/strelka/files/manager/manager.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml index b8ffc038f..17351e8a7 100644 --- a/salt/strelka/files/manager/manager.yaml +++ b/salt/strelka/files/manager/manager.yaml @@ -1,4 +1,3 @@ - {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} From eebe0eb618d8c1228c0fd7c169b30e74d3f8876c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 18 May 2020 10:54:07 -0400 Subject: [PATCH 3/3] get the first ip for the ip_interfaces:mainint grain --- salt/strelka/files/backend/backend.yaml | 2 +- salt/strelka/files/filestream/filestream.yaml | 2 +- salt/strelka/files/frontend/frontend.yaml | 2 +- salt/strelka/files/manager/manager.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml index 0333afb18..76a2ae3af 100644 --- a/salt/strelka/files/backend/backend.yaml +++ b/salt/strelka/files/backend/backend.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml index 34ec48052..c45fd8644 100644 --- a/salt/strelka/files/filestream/filestream.yaml +++ b/salt/strelka/files/filestream/filestream.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml index 0e02b708e..56df323f9 100644 --- a/salt/strelka/files/frontend/frontend.yaml +++ b/salt/strelka/files/frontend/frontend.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml index 17351e8a7..8a5966ac9 100644 --- a/salt/strelka/files/manager/manager.yaml +++ b/salt/strelka/files/manager/manager.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%}