added support for arc-ce endpoint URL

docker/etf-cms/config/grid-env.sh

@@ -6,5 +6,5 @@ export MYPROXY_SERVER="myproxy.cern.ch"
 export LCG_LOCATION="/usr"
 export GRID_ENV_LOCATION="/usr/libexec"
 export LCG_GFAL_INFOSYS="top-bdii.cern.ch:2170"
-export ETF_NAGIOS_HOST=ETF_NAGIOS_HOSTXX
+export ETF_NAGIOS_HOST="ETF_NAGIOS_HOSTXX"
 

docker/etf-cms/config/grid-env_ipv6.sh

@@ -8,4 +8,4 @@ export GRID_ENV_LOCATION="/usr/libexec"
 export LCG_GFAL_INFOSYS="top-bdii.cern.ch:2170"
 export GLOBUS_FTP_CLIENT_IPV6="true"
 export GLOBUS_IO_IPV6="true"
-export ETF_NAGIOS_HOST=ETF_NAGIOS_HOSTXX
+export ETF_NAGIOS_HOST="ETF_NAGIOS_HOSTXX"

nagios/config/etf_plugin_cms.py

@@ -57,7 +57,7 @@ def run(url, ipv6=False):
     # list of tuples (hostname, flavor, endpoint)
     feed = VOFeed(url)
     services = feed.get_services()
-    
+
     # Add hosts, each tagged with corresponding flavors
     # creates /etc/ncgx/conf.d/generated_hosts.cfg
     h = Hosts()
@@ -114,9 +114,9 @@ def run(url, ipv6=False):
     # SAME* environment needed by the legacy/SFT tests
     with open('/tmp/etf-env.sh', 'w') as etf_env:
         etf_env.write('ETF_TESTS={}\n'.format(
-                            ','.join(['etf/probes/org.cms/testjob/tests/'+m for m in WN_METRICS.keys()])))
+            ','.join(['etf/probes/org.cms/testjob/tests/' + m for m in WN_METRICS.keys()])))
         etf_env.write('ETF_LEGACY={}\n'.format(
-                            ','.join(['etf/probes/org.cms/testjob/tests/' + m for m in WN_METRICS_LEGACY])))
+            ','.join(['etf/probes/org.cms/testjob/tests/' + m for m in WN_METRICS_LEGACY])))
         for code, value in SAME_CODES.items():
             etf_env.write('SAME_{}={}\n'.format(code, value))
         etf_env.write('SAME_VO=cms\n')
@@ -131,6 +131,7 @@ def run(url, ipv6=False):
     for service in services:
         host = service[0]
         flavor = service[1]
+        endpoint = service[2] if len(service) > 2 else None
         if flavor not in ["ARC-CE", "GLOBUS", "HTCONDOR-CE"]:
             continue
         if flavor == 'HTCONDOR-CE':
@@ -149,10 +150,16 @@ def run(url, ipv6=False):
                 log.warning("Unable to determine type for flavour %s" % flavor)
                 continue
             res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', batch, queue)
-            if flavor == 'ARC-CE':   # ARC native client
-                c.add('org.sam.ARC-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
-                      params={'args': {'--resource': '%s' % res, '--arc-rsl': '\'(memory=2000)\'',
-                                       '--arc-debug': 'VERBOSE', '--arc-sub-type': 'emies'}})
+            if flavor == 'ARC-CE':  # ARC native client
+                if endpoint:
+                    c.add('org.sam.ARC-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
+                          params={'args': {'--resource': '%s' % res, '--arc-rsl': '\'(memory=2000)\'',
+                                           '--arc-debug': 'VERBOSE', '--arc-sub-type': 'emies',
+                                           '--arc-ce': 'https://{}/arex'.format(endpoint)}})
+                else:
+                    c.add('org.sam.ARC-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
+                          params={'args': {'--resource': '%s' % res, '--arc-rsl': '\'(memory=2000)\'',
+                                           '--arc-debug': 'VERBOSE', '--arc-sub-type': 'emies'}})
                 continue
             # GLOBUS ?
             log.warning("Unexpected host/flavor: {} {}".format(host, flavor))
@@ -162,5 +169,5 @@ def run(url, ipv6=False):
             res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', 'nobatch', 'noqueue')
             c.add('org.sam.CONDOR-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
                   params={'args': {'--resource': '%s' % res}})
-            
+
     c.serialize()