Fix sensoroni Agent

This commit is contained in:
Mike Reeves
2022-09-19 10:22:32 -04:00
parent 61f3479d92
commit f4508aa534
4 changed files with 16 additions and 22 deletions

View File

@@ -1,10 +1,7 @@
{%- set URLBASE = salt['pillar.get']('global:url_base') %}
{%- set DESCRIPTION = salt['pillar.get']('sensoroni:node_description', '') %}
{%- set MODEL = salt['grains.get']('sosmodel', '') %}
{%- set ADDRESS = salt['pillar.get']('sensoroni:node_address') %}
{% from 'vars/globals.map.jinja' import GLOBALS %}
{%- set ANALYZE_TIMEOUT_MS = salt['pillar.get']('sensoroni:analyze_timeout_ms', 900000) %}
{%- set ANALYZE_PARALLEL_LIMIT = salt['pillar.get']('sensoroni:analyze_parallel_limit', 5) %}
{%- set SENSORONIKEY = salt['pillar.get']('sensoroni:sensoronikey', '') %}
{%- set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) %}
{%- set ROLE = grains.id.split('_') | last %}
{%- if ROLE in ['eval', 'standalone', 'sensor', 'heavynode'] %}
@@ -23,13 +20,13 @@
"logFilename": "/opt/sensoroni/logs/sensoroni.log",
"logLevel":"info",
"agent": {
"nodeId": "{{ grains.host | lower }}",
"role": "{{ grains.role }}",
"description": {{ DESCRIPTION | tojson }},
"address": "{{ ADDRESS }}",
"model": "{{ MODEL }}",
"nodeId": "{{ GLOBALS.hostname | lower }}",
"role": "{{ GLOBALS.role }}",
"description": {{ GLOBALS.description | tojson }},
"address": "{{ GLOBALS.node_ip }}",
"model": "{{ GLOBLAS.so_model }}",
"pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
"serverUrl": "https://{{ URLBASE }}/sensoroniagents",
"serverUrl": "https://{{ GLOBALS.url_base }}/sensoroniagents",
"verifyCert": false,
"modules": {
{%- if ANALYZEENABLED %}
@@ -40,7 +37,7 @@
{%- endif %}
"importer": {},
"statickeyauth": {
"apiKey": "{{ SENSORONIKEY }}"
"apiKey": "{{ GLOBALS.sensoroni_key }}"
{%- if STENOENABLED %}
},
"stenoquery": {

View File

@@ -1,6 +1,4 @@
{% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
{% set MANAGER = salt['grains.get']('master') %}
{% from 'vars/globals.map.jinja' import GLOBALS %}
sensoroniconfdir:
file.directory:
@@ -43,7 +41,7 @@ analyzerscripts:
so-sensoroni:
docker_container.running:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-soc:{{ VERSION }}
- image: {{ GLOBALS.manager }}:5000/{{ GLOBALS.image_repo }}/so-soc:{{ GLOBALS.so_version }}
- network_mode: host
- binds:
- /opt/so/conf/steno/certs:/etc/stenographer/certs:rw