Merge pull request galexrt#7 from mje-nz/handle-other-scripts-better

Better support for running other scripts

Author: galexrt

README.md

@@ -18,9 +18,9 @@ This docker image contains the [prometheus-community/node-exporter-textfile-coll
 
 ## Usage
 
-**This Docker image needs to be run in privileged mode for most of the scripts in the `prometheus-community/node-exporter-textfile-collector-scripts` repository, e.g., for `smartctl.sh` it is needed to be able to collect the SMART values.**
+**This Docker image needs to be run in privileged mode for most of the scripts in the `prometheus-community/node-exporter-textfile-collector-scripts` repository, e.g., for `smartmon.sh` it is needed to be able to collect the SMART values.**
 
-The entrypoint script is putting the output into the directory `/var/lib/node_exporter` by default, filename `smartmon.prom`.
+The entrypoint script is putting the output into the directory `/var/lib/node_exporter`, by default filename named after which script is running.
 
 ### Variables
 

entrypoint.sh

@@ -8,15 +8,15 @@ if [ -n "$DEBUG" ]; then
 fi
 
 SCRIPT="${SCRIPT:-smartmon.sh}"
-OUTPUT_FILENAME="${OUTPUT_FILENAME:-smartmon}"
+OUTPUT_FILENAME="${OUTPUT_FILENAME:-${SCRIPT%.*}}"
 INTERVAL="${INTERVAL:-300}"
 
 if [ ! -f "/scripts/${SCRIPT}" ]; then
     echo "Script ${SCRIPT} doesn't exist. Exiting 1"
     exit 1
 fi
 
-echo "Starting smartmon.sh loop ..."
+echo "Starting ${SCRIPT} loop ..."
 while true; do
     "/scripts/${SCRIPT}" "${@}" | sponge "/var/lib/node_exporter/${OUTPUT_FILENAME}.prom"
     sleep "${INTERVAL}"