Switch for running oneagenthelper, support for garden-runc 1.2.0 or h…

…igher

jobs/dynatrace-oneagent/spec

@@ -27,3 +27,6 @@ properties:
   dynatrace.applogaccess:
     description: 'Enable access to discovered application log files content'
     default: '1'
+  dynatrace.starthelper:
+    description: 'Temporary switch for starting oneagenthelper from bosh job'
+    default: '0'

jobs/dynatrace-oneagent/templates/dynatrace-oneagent.sh.erb

@@ -10,6 +10,7 @@ export API_TOKEN=<%= properties.dynatrace.apitoken %>
 export API_URL=<%= properties.dynatrace.apiurl %>
 export SSL_MODE=<%= properties.dynatrace.sslmode %>
 export APP_LOG_CONTENT_ACCESS=<%= properties.dynatrace.applogaccess %>
+export START_HELPER=<%= properties.dynatrace.starthelper %>
 
 export TMPDIR=/var/vcap/data/tmp
 
@@ -65,6 +66,27 @@ getWatchdogPid() {
         ps -ef | grep "${AGENT_WATCHDOG}" | grep "${AGENT_BIN}" | grep -v "grep" | grep -v "sudo" | awk ' { print $2 } '
 }
 
+startOneAgentHelper() {
+  #gdn is the daemon for garden-runc >= 1.2.0
+  if pgrep -x "gdn" > /dev/null
+  then
+    /opt/dynatrace/oneagent/agent/lib64/oneagenthelper -p `pgrep -x gdn` --garden &
+  fi
+
+  #guardian is the daemon for garden-runc < 1.2.0
+  if pgrep -x "guardian" > /dev/null
+  then
+    /opt/dynatrace/oneagent/agent/lib64/oneagenthelper -p `pgrep -x guardian` --garden &
+  fi
+}
+
+stopOneAgentHelper() {
+  if pgrep -x "oneagenthelper" > /dev/null
+  then
+    pkill -x oneagenthelper
+  fi
+}
+
 case $1 in
   start)
     pid=$(getWatchdogPid)
@@ -77,9 +99,9 @@ case $1 in
 
       sh $TMPDIR/Dynatrace-OneAgent-Linux.sh $ARGS INSTALL_PATH=$install_path >> $LOG_DIR/dynatrace-install.log 2>> $LOG_DIR/dynatrace-install.log
 
-      if pgrep -x "guardian" > /dev/null
-      then
-        /opt/dynatrace/oneagent/agent/lib64/oneagenthelper -p `pgrep -x guardian` --garden &
+      # Start oneagenthelper manually
+      if [ "x$START_HELPER" != "x0" ]; then
+        startOneAgentHelper
       fi
       pid=$(getWatchdogPid)
     fi
@@ -90,9 +112,9 @@ case $1 in
     if [ -f /opt/dynatrace/oneagent/agent/uninstall.sh ]; then
        sh /opt/dynatrace/oneagent/agent/uninstall.sh
     fi
-    if pgrep -x "oneagenthelper" > /dev/null
-    then
-      pkill -x oneagenthelper
+    # Stop oneagenthelper
+    if [ "x$START_HELPER" != "x0" ]; then
+      stopOneAgentHelper
     fi
 
     rm -rf /opt/dynatrace/oneagent

runtime-config-dynatrace.yml

@@ -1,6 +1,6 @@
 releases:
 - name: dynatrace-oneagent
-  version: 0.3.0
+  version: 0.3.1
 
 addons:
 - name: dynatrace-oneagent-addon
@@ -15,6 +15,7 @@ addons:
     dynatrace:
       environmentid: abc12345
       apitoken: bvQ0e--secret--2fEL9B
+      starthelper: 1
 #      apiurl: https://abc12345.sprint.dynatracelabs.com/api
 
 - name: dynatrace-oneagent-windows-addon