Dynamically set sensor checkin interval; allow overrides if var is preset

This commit is contained in:
Jason Ertel
2020-07-15 13:22:11 -04:00
parent 80e081e828
commit 0a976861f3
2 changed files with 12 additions and 1 deletions

View File

@@ -1,10 +1,11 @@
{%- set MANAGER = salt['grains.get']('master') -%} {%- set MANAGER = salt['grains.get']('master') -%}
{%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%} {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
{%- set CHECKININTERVALMS = salt['pillar.get']('pcap:sensor_checkin_interval_ms') -%}
{ {
"logFilename": "/opt/sensoroni/logs/sensoroni.log", "logFilename": "/opt/sensoroni/logs/sensoroni.log",
"logLevel":"debug", "logLevel":"debug",
"agent": { "agent": {
"pollIntervalMs": 10000, "pollIntervalMs": {{ CHECKININTERVALMS }},
"serverUrl": "https://{{ MANAGER }}/sensoroniagents", "serverUrl": "https://{{ MANAGER }}/sensoroniagents",
"verifyCert": false, "verifyCert": false,
"modules": { "modules": {

View File

@@ -923,6 +923,13 @@ manager_pillar() {
local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
SENSOR_CHECKIN_INTERVAL_MS=10000
if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
SENSOR_CHECKIN_INTERVAL_MS=1000
fi
fi
# Create the manager pillar # Create the manager pillar
printf '%s\n'\ printf '%s\n'\
"manager:"\ "manager:"\
@@ -969,6 +976,9 @@ manager_pillar() {
" lsheap: $LS_HEAP_SIZE"\ " lsheap: $LS_HEAP_SIZE"\
" ls_pipeline_workers: $num_cpu_cores"\ " ls_pipeline_workers: $num_cpu_cores"\
""\ ""\
"pcap:">> "$pillar_file"\
" sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
""\
"kratos:" >> "$pillar_file" "kratos:" >> "$pillar_file"
printf '%s\n'\ printf '%s\n'\