From b524e573d1700b101b4dcc26e7e9e3df22a26873 Mon Sep 17 00:00:00 2001 From: d-maslyk Date: Mon, 2 Nov 2020 12:28:49 +0100 Subject: [PATCH] Update SWISNAP package to 4.0.0 (AO-17328) (#30) * Update SWISNAP package to 4.0.0 * Set default plugin trust to 0 --- Makefile | 4 ++-- conf/swisnap-init.sh | 7 ++++--- deploy/overlays/stable/daemonset/kustomization.yaml | 2 +- deploy/overlays/stable/deployment/kustomization.yaml | 2 +- deploy/overlays/stable/events-collector/kustomization.yaml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 842f282..08b8c40 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/conf/swisnap-init.sh b/conf/swisnap-init.sh index cfd4036..96fb053 100755 --- a/conf/swisnap-init.sh +++ b/conf/swisnap-init.sh @@ -2,7 +2,7 @@ # chris.rust@solarwinds.com - 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" @@ -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 diff --git a/deploy/overlays/stable/daemonset/kustomization.yaml b/deploy/overlays/stable/daemonset/kustomization.yaml index 9546902..0be2bde 100644 --- a/deploy/overlays/stable/daemonset/kustomization.yaml +++ b/deploy/overlays/stable/daemonset/kustomization.yaml @@ -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 diff --git a/deploy/overlays/stable/deployment/kustomization.yaml b/deploy/overlays/stable/deployment/kustomization.yaml index 399753b..ddc949e 100644 --- a/deploy/overlays/stable/deployment/kustomization.yaml +++ b/deploy/overlays/stable/deployment/kustomization.yaml @@ -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 diff --git a/deploy/overlays/stable/events-collector/kustomization.yaml b/deploy/overlays/stable/events-collector/kustomization.yaml index a8ebed3..806c90b 100644 --- a/deploy/overlays/stable/events-collector/kustomization.yaml +++ b/deploy/overlays/stable/events-collector/kustomization.yaml @@ -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