Basic deployment for notification of the MSG system, update documantation.

diff --git a/org.glite.lb.doc/src/LBAG-Installation.tex b/org.glite.lb.doc/src/LBAG-Installation.tex
index cc8b327..e6130af 100644 (file)
--- a/org.glite.lb.doc/src/LBAG-Installation.tex
+++ b/org.glite.lb.doc/src/LBAG-Installation.tex
@@ -159,7 +159,9 @@ Install and configure OS and basic services (certificates, CAs, time synchroniza
 
 YAIM configuration for \emph{glite-LB} node type 
 (\texttt{/opt/glite/yaim/bin/yaim -c -s site-info.def -n glite-LB}) 
-can be done then. Available parameters specific to LB server are:
+can be done then.
+
+Available parameters specific to LB server are:
 
 %variable&meaning&default value &further details\\
 \begin{itemize}
@@ -172,15 +174,23 @@ export data are written for use by lgcmon/R-GMA
 According to local retention policy you may want to use different purge timeouts (for example WLCG would need \texttt{--cleared 90d --aborted 90d --cancelled 90d --other 90d}).
 \item \texttt{GLITE\_LB\_EXPORT\_ENABLED} -- set to \texttt{true} for export to JP, installed glite-lb-client and glite-jp-client are needed (default: \texttt{false})
 \item \texttt{GLITE\_LB\_EXPORT\_JPPS} -- Job Provenance Primary Storage where to export purged jobs, required if export to JP is enabled
-\item \texttt{GLITE\_JP\_LOCATION} -- optional parameter for combining LB and JP subsystems on the different locations
 \item \texttt{GLITE\_LB\_RTM\_ENABLED} -- enable settings for Real Time Monitor - indexes and additional access (default: false)
 \item \texttt{GLITE\_LB\_RTM\_DN} -- DNs using to get notifications from \LB server\\
 (default: \texttt{heppc24.hep.ph.ic.ac.uk} machine certificate)
 \item \texttt{GLITE\_LB\_SUPER\_USERS} -- additional super-users (default: empty)
 \item \texttt{GLITE\_LB\_TYPE} -- type of the \LB service: server, proxy, both (default: autodetect, \LB node only: 'server', WMS node only: proxy, \LB and WMS: 'both')
-\item \texttt{GLITE\_LB\_HARVESTER\_ENABLED} -- set to \texttt{true} for sending notification, used mainly for export to MSG publish system (default: \texttt{false})
+\item \texttt{GLITE\_LB\_HARVESTER\_ENABLED} -- set to \texttt{true} for sending notifications, used mainly for legacy export to MSG publish system (default: \texttt{false})
 \item \texttt{GLITE\_LB\_HARVESTER\_MSG\_OPTIONS} -- additional options for MSG publish (default: \texttt{--wlcg})
-\item \texttt{GLITE\_LB\_INDEX\_OWNER} -- when specified, add (\texttt{true}) or drop (\texttt{false}) 'owner' index (default: 'owner' index not created or dropped)
+\item \texttt{GLITE\_LB\_INDEX\_OWNER} -- when specified, add (\texttt{true}) or drop (\texttt{false}) 'owner' index (default: 'owner' index not touched)
+\item \texttt{GLITE\_LB\_MSG\_BROKER} -- hostname and port of MSG broker, empty for disabling MSG notifications (default: empty)
+\end{itemize}
+
+Additional helper parameters for \LB:
+\begin{itemize}
+\item \texttt{GLITE\_LB\_LOCATION} -- \LB prefix (default: /opt/glite or /usr)
+\item \texttt{GLITE\_LB\_LOCATION\_ETC} -- system config directory (default: /opt/glite/etc or /etc)
+\item \texttt{GLITE\_LB\_LOCATION\_VAR} -- gLite local state directory (default: /opt/glite/var or /var/glite)
+\item \texttt{GLITE\_JP\_LOCATION} -- can be used when JP subsystem location differs from LB (default: empty)
 \end{itemize}
 
 In addition to those, YAIM LB module uses following parameters:

diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index fe9fea1..f1a71d3 100644 (file)
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -103,6 +103,7 @@ install:
        ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
        ${INSTALL} -m 755 ${EXAMPLES} ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
+       ${INSTALL} -m 644 ${top_srcdir}/config/msg.conf.example ${DESTDIR}${PREFIX}${prefix}/etc/glite-lb
 #      ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
 
 %.lo %.o: %.cpp

diff --git a/org.glite.lb.logger-msg/config/msg.conf.example b/org.glite.lb.logger-msg/config/msg.conf.example
new file mode 100644 (file)
index 0000000..19f2221
--- /dev/null
+++ b/org.glite.lb.logger-msg/config/msg.conf.example
@@ -0,0 +1,9 @@
+#
+# example configuration for export notifications to MSG system
+#
+
+[interlogd]
+plugin = activemq_cpp_plugin.so
+
+[msg]
+broker = tcp://dev.msg.cern.ch:6166

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 9c192e3..40795d9 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -43,6 +43,9 @@ GLITE_LB_PROXY_FPREFIX=${GLITE_LB_PROXY_FPREFIX:-'/tmp/glite-lbproxy-ilog_events
 PROXY_IL_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-proxy-interlogd.pid
 NOTIF_IL_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-notif-interlogd.pid
 
+msgconf="$GLITE_LB_LOCATION_ETC/glite-lb/msg.conf"
+[ -f "$msgconf" ] && GLITE_LB_NOTIF_IL_OTHER_OPTIONS="$GLITE_LB_NOTIF_IL_OTHER_OPTIONS -F $msgconf"
+
 unset creds port log4c
 
 start_daemon()

diff --git a/org.glite.lb.yaim/config/defaults/glite-lb.pre b/org.glite.lb.yaim/config/defaults/glite-lb.pre
index 214486c..6c8e2cd 100644 (file)
--- a/org.glite.lb.yaim/config/defaults/glite-lb.pre
+++ b/org.glite.lb.yaim/config/defaults/glite-lb.pre
@@ -40,6 +40,8 @@ GLITE_LB_TYPE=
 GLITE_LB_RTM_ENABLED='false'
 # Real Time Monitoring identities (separated by comma)
 GLITE_LB_RTM_DN='/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk'
+# MSG publish
+#GLITE_LB_MSG_BROKER=dev.msg.cern.ch:6166
 
 #
 # additional options

diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in
index 3c717a4..df4c36b 100644 (file)
--- a/org.glite.lb.yaim/config/functions/config_glite_lb.in
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in
@@ -364,6 +364,18 @@ $logfile {
 }
 EOF
 
+  # MSG publish
+  if [ ! -z "$GLITE_LB_MSG_BROKER" ]; then
+    cat > "$GLITE_LB_LOCATION_ETC/glite-lb/msg.conf" <<EOF
+# automatically generated by yaim
+[interlogd]
+plugin = activemq_cpp_plugin.so
+
+[msg]
+broker = tcp://$GLITE_LB_MSG_BROKER
+EOF
+  fi
+
   # Start services
   if [ ! -f @glite_etc@/gLiteservices ] ; then
     touch @glite_etc@/gLiteservices