Merge branch 'event_monitor_name' into 'dev'

provide human-readable display name to custom event commands for automation

See merge request Shinobi-Systems/Shinobi!172

INSTALL/freenas.csh

@@ -12,7 +12,7 @@ git clone "https://gitlab.com/Shinobi-Systems/ShinobiCE"
 cd ./ShinobiCE
 echo "Adding Shinobi user to database..."
 mysql -h localhost -u root -e "source sql/user.sql"
-ehco "Shinobi database framework setup..."
+echo "Shinobi database framework setup..."
 mysql -h localhost -u root -e "source sql/framework.sql"
 echo "Securing mysql..."
 #/usr/local/bin/mysql_secure_installation

libs/events.js

@@ -55,6 +55,7 @@ module.exports = function(s,config,lang){
             .replace(/{{REGION_NAME}}/g,d.details.name)
             .replace(/{{SNAP_PATH}}/g,s.dir.streams+'/'+d.ke+'/'+d.id+'/s.jpg')
             .replace(/{{MONITOR_ID}}/g,d.id)
+            .replace(/{{MONITOR_NAME}}/g,s.group[d.ke].rawMonitorConfigurations[d.id].name)
             .replace(/{{GROUP_KEY}}/g,d.ke)
             .replace(/{{DETAILS}}/g,detailString)
         if(d.details.confidence){