Changeset 1202 for trunk/libIGCM/libIGCM_debug

Timestamp:

06/02/15 16:58:03 (9 years ago)

Author:

sdipsl

Message:

• send job duration in seconds. see #253
• send project name (aka gencmip6). see #255
• send group name incoming metrics will be pushed in. see #258

File:

• trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -184 +184 @@
 #D-function IGCM_debug_sendAMQP_Metrics
 #D- * Purpose: Take over AMQP C client using mail as a message recipient
-#D- * One argument : Directory where metrics.json files can be found
+#D- * Two arguments : - Directory where metrics.json files can be found
+#D- *                 - Metrics Group Name. metrics will be added to this group
 #D- * Attach encoded metrics.json files.
 
@@ -195 +196 @@
     code=7100
     # Usual AMQP message to route messages on server side
-    encodedBody=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" |  base64 -w 0 )
+    encodedBody=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"metricsGroupName\":\"${2}\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" |  base64 -w 0 )
     # send mail
     attachmentsOptions=""
@@ -596 +597 @@
         genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"activity\":\"IPSL\",\"name\":\"${config_UserChoices_JobName}\",\"cumulPeriod\":\"${CumulPeriod}\",\"experiment\":\"${config_UserChoices_ExperimentName}\",\"space\":\"${config_UserChoices_SpaceName}\",\"model\":\"${config_UserChoices_TagName}\",\"startDate\":\"${config_UserChoices_DateBegin}\",\"endDate\":\"${config_UserChoices_DateEnd}\",\"login\":\"${LOGIN}\",\"centre\":\"${CENTER}\",\"machine\":\"${MASTER}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
         # RabbitMQ message body with specific fields associated message codes treated here
-        Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+        Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"accountingProject\":\"${PROJECT}\",\"jobWarningDelay\":\"${jobWarningDelay}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
         # Fill the rabbitMQ queue (the config.card in use will be sent)
         IGCM_debug_sendAMQP activate
@@ -627 +628 @@
       genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"cumulPeriod\":\"${CumulPeriod}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
       # RabbitMQ message body with specific fields associated message codes treated here
-      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"accountingProject\":\"${PROJECT}\",\"jobWarningDelay\":\"${jobWarningDelay}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
       # Fill the rabbitMQ queue
       IGCM_debug_sendAMQP