Skip to content

Commit

Permalink
Update SWISNAP package to 4.0.0 (AO-17328) (#30)
Browse files Browse the repository at this point in the history
* Update SWISNAP package to 4.0.0
* Set default plugin trust to 0
  • Loading branch information
dominik-maslyk-swi authored Nov 2, 2020
1 parent 9188c2f commit b524e57
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKERFILE_VERSION=4.1.0
SWISNAP_VERSION=3.2.0.742
DOCKERFILE_VERSION=4.2.0
SWISNAP_VERSION=4.0.0.863
TAG=$(DOCKERFILE_VERSION)-$(SWISNAP_VERSION)
USER=solarwinds
REPOSITORY=solarwinds-snap-agent-docker
Expand Down
7 changes: 4 additions & 3 deletions conf/swisnap-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# [email protected] - 20180227
set -e

SWISNAP_HOME="/opt/SolarWinds/Snap/"
SWISNAP_HOME="/opt/SolarWinds/Snap"
PLUGINS_DIR="${SWISNAP_HOME}/etc/plugins.d"
TASK_AUTOLOAD_DIR="${SWISNAP_HOME}/etc/tasks-autoload.d"
CONFIG_FILE="${SWISNAP_HOME}/etc/config.yaml"
Expand All @@ -25,15 +25,16 @@ swisnap_config_setup() {
yq w -i "${PUBLISHER_PROCESSES_CONFIG}" v2.publisher.publisher-processes.all.endpoint.token -- "${SWI_TOKEN}"

yq w -i ${CONFIG_FILE} log_path "${LOG_PATH:-/proc/self/fd/1}"
yq w -i ${CONFIG_FILE} restapi.addr 0.0.0.0
yq w -i ${CONFIG_FILE} restapi.addr "tcp://0.0.0.0:21413"

if [ -n "${LOG_LEVEL}" ]; then
yq w -i $CONFIG_FILE log_level "${LOG_LEVEL}"
fi

if [ "${SWISNAP_SECURE}" = true ]; then
yq w -i ${CONFIG_FILE} control.plugin_trust_level 1
FLAGS=("--keyring-paths" "${SWISNAP_HOME}/.gnupg/")
else
yq w -i ${CONFIG_FILE} control.plugin_trust_level 0
fi

# Use APPOPTICS_HOSTNAME as hostname_alias
Expand Down
2 changes: 1 addition & 1 deletion deploy/overlays/stable/daemonset/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ bases:

images:
- name: solarwinds/solarwinds-snap-agent-docker
newTag: 4.1.0-3.2.0.742
newTag: 4.2.0-4.0.0.863
2 changes: 1 addition & 1 deletion deploy/overlays/stable/deployment/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ bases:

images:
- name: solarwinds/solarwinds-snap-agent-docker
newTag: 4.1.0-3.2.0.742
newTag: 4.2.0-4.0.0.863
2 changes: 1 addition & 1 deletion deploy/overlays/stable/events-collector/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ bases:

images:
- name: solarwinds/solarwinds-snap-agent-docker
newTag: 4.1.0-3.2.0.742
newTag: 4.2.0-4.0.0.863

0 comments on commit b524e57

Please sign in to comment.