Logging inside all containers

Author: ivan-khvostishkov

sagemaker_ssh_helper/sm-helper-functions

@@ -180,8 +180,15 @@ function _print_sm_studio_python() {
   echo -n "$SM_STUDIO_PYTHON"
 }
 
+function _is_ssh_ide_inside_studio() {
+  [[ -f /opt/ml/metadata/resource-metadata.json ]]
+}
+
+
 function _assert_is_ssh_ide_inside_studio() {
-  if [[ ! -f /opt/ml/metadata/resource-metadata.json ]]; then
+  if _is_ssh_ide_inside_studio; then
+    :  # all good
+  else
     echo "sm-ssh-ide: ERROR: must be running inside SageMaker Studio"
     exit 2
   fi
@@ -198,7 +205,8 @@ function _locale_gen() {
 
 function _start_syslogd() {
   if _is_centos; then
-    /usr/sbin/rsyslogd
+    nohup /usr/sbin/rsyslogd &
+    nohup /usr/lib/systemd/systemd-journald &
   else
     service rsyslog start || (echo "ERROR: Failed to start syslogd service")
   fi

sagemaker_ssh_helper/sm-setup-ssh

@@ -43,8 +43,17 @@ if [[ "$1" == "configure" ]]; then
   fi
 
   # Sending all system logs to CloudWatch (helps to troubleshoot sshd issues)
-  find /etc/rsyslog.conf /etc/rsyslog.d/ -type f \
-    -exec sed -i -e 's~/var/log/~/var/log/apps/app_container.log__~' {} \;
+  if _is_ssh_ide_inside_studio; then
+    find /etc/rsyslog.conf /etc/rsyslog.d/ -type f \
+      -exec sed -i -e 's~/var/log/~/var/log/apps/app_container.log__~' {} \;
+  else
+    find /etc/rsyslog.conf /etc/rsyslog.d/ -type f \
+      -exec sed -i -e 's~/var/log/.*~/proc/1/fd/1~' {} \;
+    # shellcheck disable=SC2016
+    sed -i -e 's~^$PrivDropToUser~#$PrivDropToUser~' /etc/rsyslog.conf
+    # shellcheck disable=SC2016
+    sed -i -e 's~^$PrivDropToGroup~#$PrivDropToGroup~' /etc/rsyslog.conf
+  fi
 
   sed -i -e 's~^ClientAliveInterval~#ClientAliveInterval~' /etc/ssh/sshd_config
   echo "ClientAliveInterval 15" >> /etc/ssh/sshd_config