Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redis and Filebeat fixes to point to IP #5

Merged
merged 1 commit into from
Oct 19, 2018
Merged

Redis and Filebeat fixes to point to IP #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/logstash/files/dynamic/0900_input_redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set master = grains['master'] %}
{% set master = salt['pillar.get']('static:masterip', '') %}
input {
redis {
host => '{{ master }}'
Expand Down
4 changes: 2 additions & 2 deletions salt/logstash/files/dynamic/9999_output_redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{%- if salt['grains.get']('role') == 'so-master' %}
{%- set master = salt['pillar.get']('master:mainip', '') -%}
{% set master = salt['pillar.get']('static:masterip', '') %}
{%- set nodetype = 'master' %}
{%- else %}
{%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %}
{%- set master = grains['master'] %}
{% set master = salt['pillar.get']('static:masterip', '') %}
{%- endif %}
output {
redis {
Expand Down
1 change: 1 addition & 0 deletions so-setup-network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ master_static() {
echo " proxy: $PROXY" >> /opt/so/saltstack/pillar/static.sls
echo " broversion: $BROVERSION" >> /opt/so/saltstack/pillar/static.sls
echo " ids: $NIDS" >> /opt/so/saltstack/pillar/static.sls
echo " masterip: $MAINIP" >> /opt/so/saltstack/pillar/static.sls
if [ $MASTERUPDATES == 'MASTER' ]; then
echo " masterupdate: 1" >> /opt/so/saltstack/pillar/static.sls
else
Expand Down