hepcloud dodas updates

docker/etf-cms-dodas/config/ncgx.cfg

@@ -17,6 +17,7 @@ HOSTCERT="/opt/omd/sites/etf/etc/nagios/globus/etf_srv_cert.pem"
 PROXY_LIFETIME="24"
 PROXY_NAME="NagiosRetrieve-ETF-cms"
 PROXY_USER="nagios"
+PROXY_HOST="myproxy.cern.ch"
 
 X509_USER_PROXY_PROD="/opt/omd/sites/etf/etc/nagios/globus/userproxy.pem--cms-Role_production"
 VO_FQAN_PROD="/cms/Role=production"

docker/etf-cms-hepcloud/config/check_condor.cfg

@@ -3,8 +3,6 @@ metrics = {
       "command" : "/usr/lib64/nagios/plugins/check_js",
       "args" : {
          "--vo" : "::VO",
-         "--mb-destination" : "::MB_DESTINATION",
-         "--mb-uri" : "::MB_BROKER_HOST",
          "--add-wntar-nag-nosamcfg" : "",
          "--prefix": "org.sam.CONDOR",
          "-t" : 600,

docker/etf-cms-hepcloud/config/metrics.cfg

@@ -88,8 +88,8 @@ metrics = {
    "org.sam.CONDOR-JobState-/cms/Role=lcgadmin" : {
       "extends" : "org.sam.CONDOR-JobState",
       "depends" : "org.globus.GridProxy-Valid-/cms/Role=lcgadmin",
-      "interval" : 15,
-      "retry_interval" : 15,
+      "interval" : 5,
+      "retry_interval" : 5,
       "args" : {
           "-x" : "::CMS_PROXY_LCGADMIN",
           "--suffix" : "/cms/Role=lcgadmin",