Merge pull request #48 from parrobe/v2

Add in a better default dashboard for the web console

Author: arthurbarr

Dockerfile

@@ -71,6 +71,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 
 COPY *.sh /usr/local/bin/
 COPY *.mqsc /etc/mqm/
+COPY admin.json /etc/mqm/
 
 COPY mq-dev-config /etc/mqm/mq-dev-config
 

admin.json

@@ -0,0 +1 @@
+{"version":0.1,"tabs":[{"title":"IBM MQ Container","numColumns":2,"model":{"title":"","rows":[{"columns":[{"widgets":[{"type":"channel","config":{"selectedQM":"<QM>","showSysObjs":false,"sizex":1,"sizey":1,"subType":"all"},"title":"Channels on <QM>","titleTemplateUrl":"adf/templates/widget-title.html","gridsterrow":0,"gridstercol":1},{"type":"topic","config":{"selectedQM":"<QM>","showSysObjs":false,"sizex":1,"sizey":1},"title":"Topics on <QM>","titleTemplateUrl":"adf/templates/widget-title.html","gridsterrow":1,"gridstercol":1},{"type":"queue","config":{"selectedQM":"<QM>","showSysObjs":false,"sizex":1,"sizey":1,"subType":"all"},"title":"Queues on <QM>","titleTemplateUrl":"adf/templates/widget-title.html","gridsterrow":1,"gridstercol":0},{"type":"queuemanager","gridstercol":0,"gridsterrow":0,"config":{"type":"local","sizex":1,"sizey":1,"customTitle":"Queue Manager"},"title":"Queue Manager","titleTemplateUrl":"adf/templates/widget-title.html"}]}]}],"titleTemplateUrl":"adf/templates/dashboard-title.html"},"isMobile":false}]}

setup-mqm-web.sh

@@ -117,6 +117,14 @@ else
   echo "Using existing Web Server configuration."
 fi
 
+if [ ! -e "${DATA_PATH}/web/installations/${MQ_INSTALLATION}/angular.persistence/admin.json" ]; then
+  sed -i "s/<QM>/${MQ_QMGR_NAME}/g" /etc/mqm/admin.json
+  chown mqm:mqm /etc/mqm/admin.json
+  chmod 640 /etc/mqm/admin.json
+  su -c "mkdir -p ${DATA_PATH}/web/installations/${MQ_INSTALLATION}/angular.persistence" -l mqm
+  su -c "cp -PTv /etc/mqm/admin.json ${DATA_PATH}/web/installations/${MQ_INSTALLATION}/angular.persistence/admin.json" -l mqm
+fi
+
 #Run the server as mqm
 su -l mqm -c "bash strmqweb &"
 echo "Web Server started"