From 1d012e67537518d5fca37853622e970963b72953 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 2 Mar 2017 15:53:55 -0600
Subject: [PATCH] initial add for instrumentation

---
 Dockerfile                  | 20 +++++++++++++++++---
 files/bin/sendtierbeacon.sh | 25 +++++++++++++++++++++++++
 files/bin/setenv.sh         |  5 +++++
 files/bin/startup.sh        | 23 +++++++++++++++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 files/bin/sendtierbeacon.sh
 create mode 100644 files/bin/setenv.sh
 create mode 100644 files/bin/startup.sh

diff --git a/Dockerfile b/Dockerfile
index 8654283f..2cfa22c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM tier/shibboleth_sp
 ARG maintainer=tier
 ARG imagename=grouper
 ARG version=2.3.0
+ARG tierversion=17020
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
@@ -11,7 +12,12 @@ LABEL ImageType="Base"
 LABEL ImageName=$imagename
 LABEL ImageOS=centos7
 LABEL Version=$version
+
 ENV VERSION=$version
+ENV TIERVERSION=$tierversion
+ENV IMAGENAME=$imagename
+ENV MAINTAINER=$maintainer
+
 ENV TOMCAT_VERSION="6.0.35"
 ENV WAIT_TIME=60
 
@@ -43,8 +49,7 @@ RUN mkdir -p /opt/grouper/$VERSION \
     updatedb
 
     #/opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties
-    
-
+	
 # The installer creates a HSQL DB which we ignore later
 
 WORKDIR /opt/grouper/$version
@@ -52,4 +57,13 @@ WORKDIR /opt/grouper/$version
 #VOLUME /opt/grouper/2.3.0/apache-tomcat-$TOMCAT_VERSION/logs
 
 EXPOSE 8080 8009 8005 
-CMD ["/opt/bin/start.sh"]
+
+ADD files/bin/setenv.sh /opt/tier/setenv.sh
+RUN chmod +x /opt/tier/setenv.sh
+ADD files/bin/startup.sh /usr/bin/startup.sh
+RUN chmod +x /usr/bin/startup.sh
+ADD files/bin/sendtierbeacon.sh /usr/bin/sendtierbeacon.sh
+RUN chmod +x /usr/bin/sendtierbeacon.sh
+
+
+CMD ["/usr/bin/startup.sh"]
diff --git a/files/bin/sendtierbeacon.sh b/files/bin/sendtierbeacon.sh
new file mode 100644
index 00000000..f9ba5c45
--- /dev/null
+++ b/files/bin/sendtierbeacon.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+LOGHOST="collector.testbed.tier.internet2.edu"
+LOGPORT="5001"
+if [ -s /opt/tier/env.bash ]; then
+  . /opt/tier/env.bash
+fi
+
+#below for syslog, F-TICKS style
+#LOGTEXT="TIERBEACON/TIER/1.0#IM=$IMAGENAME#PV=$VERSION#TR=$TIERVERSION#MT=$MAINTAINER#"
+
+#below for JSON/REST style
+LOGTEXT="{ \"msgType\" : \"TIERBEACON\", \"msgName\" : \"TIER\", \"msgVersion\" : \"1.0\", \"tbProduct\" : \"$IMAGENAME\", \"tbProductVersion\" : \"$VERSION\", \"tbTIERRelease\" : \"$TIERVERSION\", \"tbMaintainer\" : \"$MAINTAINER\" }"
+
+
+if [ -z "$TIER_BEACON_OPT_OUT" ]; then
+  #send JSON
+  echo $LOGTEXT > msgjson.txt
+  curl -s -XPOST "${LOGHOST}:${LOGPORT}/" -H 'Content-Type: application/json' -T msgjson.txt 1>/dev/null
+  rm -f msgjson.txt
+  
+  #below is for syslog, F-TICKS style
+  #`logger -n $LOGHOST -P $LOGPORT -t TIERBEACON $LOGTEXT`
+
+  echo `date`"; TIER beacon sent."
+fi
diff --git a/files/bin/setenv.sh b/files/bin/setenv.sh
new file mode 100644
index 00000000..a43bc0bd
--- /dev/null
+++ b/files/bin/setenv.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^VERSION" > /opt/tier/env.bash
+printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^TIERVERSION" >> /opt/tier/env.bash
+printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^IMAGE" >> /opt/tier/env.bash
+printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^MAINTAINER" >> /opt/tier/env.bash
diff --git a/files/bin/startup.sh b/files/bin/startup.sh
new file mode 100644
index 00000000..f76a3762
--- /dev/null
+++ b/files/bin/startup.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+CRONFILE=/opt/tier/tier-cron
+
+#set env vars for cron job
+/opt/tier/setenv.sh
+
+#build crontab file with random start time between midnight and 3:59am
+echo "#send daily beacon to TIER Central" > ${CRONFILE}
+echo "#* * * * * /usr/bin/sendtierbeacon.sh >> /var/log/cron.log 2>&1" >> ${CRONFILE}
+echo $(expr $RANDOM % 59) $(expr $RANDOM % 3) "* * * /usr/bin/sendtierbeacon.sh >> /var/log/cron.log 2>&1" >> ${CRONFILE}
+chmod 644 ${CRONFILE}
+
+#install crontab
+crontab ${CRONFILE}
+
+#create cron logfile
+touch /var/log/cron.log
+
+#start crond
+/usr/sbin/crond
+
+#from intermediate container's CMD directive
+CMD ["/opt/bin/start.sh"]
\ No newline at end of file