minio and change to global

This commit is contained in:
Mike Reeves
2020-08-04 15:54:03 -04:00
parent 549bf7ba19
commit 24ed92c9dc
85 changed files with 262 additions and 207 deletions

View File

@@ -12,8 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %}
{% set IMAGEREPO = salt['pillar.get']('static:imagerepo') %}
{% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
{% set MANAGER = salt['grains.get']('master') %}
{% set FEATURES = salt['pillar.get']('elastic:features', False) %}

View File

@@ -0,0 +1,22 @@
{%- if grains.role == 'so-heavynode' %}
{%- set MANAGER = salt['pillar.get']('elasticsearch:mainip', '') %}
{%- else %}
{%- set MANAGER = salt['pillar.get']('global:managerip', '') %}
{% endif -%}
{%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %}
{%- set access_key = salt['pillar.get']('global:access_key', '') %}
{%- set access_secret = salt['pillar.get']('global:access_secret', '') %}
input {
s3 {
access_key_id => "{{ access_key }}"
secret_access_key => "{{ access_secret }}"
endpoint => "http://{{ MANAGER }}:9595"
bucket => "logstash"
delete => true
interval => 10
codec => json
additional_settings => {
"force_path_style" => true
}
}
}

View File

@@ -1,7 +1,7 @@
{%- if grains.role == 'so-heavynode' %}
{%- set MANAGER = salt['pillar.get']('elasticsearch:mainip', '') %}
{%- else %}
{%- set MANAGER = salt['pillar.get']('static:managerip', '') %}
{%- set MANAGER = salt['pillar.get']('global:managerip', '') %}
{% endif -%}
{%- set THREADS = salt['pillar.get']('logstash_settings:ls_input_threads', '') %}

View File

@@ -0,0 +1,17 @@
{%- set MANAGER = salt['pillar.get']('global:managerip', '') -%}
{%- set access_key = salt['pillar.get']('global:access_key', '') %}
{%- set access_secret = salt['pillar.get']('global:access_secret', '') %}
output {
s3 {
access_key_id => "{{ access_key }}"
secret_access_key => "{{ access_secret}}"
endpoint => "http://{{ MANAGER }}:9595"
bucket => "logstash"
size_file => 2048
time_file => 1
codec => json
additional_settings => {
"force_path_style" => true
}
}
}

View File

@@ -1,4 +1,4 @@
{% set MANAGER = salt['pillar.get']('static:managerip', '') %}
{% set MANAGER = salt['pillar.get']('global:managerip', '') %}
{% set BATCH = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', 125) %}
output {
redis {