From 58ae3479dcd76bf6ec46de4e89370de97fb5676a Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Thu, 3 Jun 2021 10:11:10 -0400 Subject: [PATCH] Fix mispelled db filename; ensure ELASTICCURL is used for loading config objects --- salt/kibana/bin/so-kibana-config-load | 2 +- salt/manager/files/beacons.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load index 00dc7f9ff..0bbcba375 100644 --- a/salt/kibana/bin/so-kibana-config-load +++ b/salt/kibana/bin/so-kibana-config-load @@ -12,4 +12,4 @@ sed -i "s/PLACEHOLDER/{{ MANAGER }}/g" /opt/so/conf/kibana/saved_objects.ndjson wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}" # Load saved objects -curl -L -X POST "localhost:5601/api/saved_objects/_import?overwrite=true" -H "kbn-xsrf: true" --form file=@/opt/so/conf/kibana/saved_objects.ndjson >> /opt/so/log/kibana/misc.log +{{ ELASTICCURL }} -L -X POST "localhost:5601/api/saved_objects/_import?overwrite=true" -H "kbn-xsrf: true" --form file=@/opt/so/conf/kibana/saved_objects.ndjson >> /opt/so/log/kibana/misc.log diff --git a/salt/manager/files/beacons.conf b/salt/manager/files/beacons.conf index c40fe83cb..fe40170ad 100644 --- a/salt/manager/files/beacons.conf +++ b/salt/manager/files/beacons.conf @@ -1,7 +1,7 @@ beacons: watch_sqlite_db: - files: - /opt/so/conf/kratos/db/sqlite.db: + /opt/so/conf/kratos/db/db.sqlite: mask: - modify - beacon_module: inotify