updated all ARC-CEs to native client

nagios/config/etf_plugin_cms.py

@@ -14,9 +14,6 @@ FLAVOR_MAP = {'CREAM-CE': 'cream',
               'GLOBUS': 'gt',
               'OSG-CE': 'gt'}
 
-CE_STATE_METRICS = [
-    'org.sam.CONDOR-JobState-/cms/Role=lcgadmin']
-
 CE_METRICS = (
     'org.sam.CONDOR-JobSubmit-/cms/Role=lcgadmin',)
 
@@ -138,9 +135,9 @@ def run(url, ipv6=False):
             continue
         if flavor == 'HTCONDOR-CE':
             # special handling for HTCONDOR-CE, no queues
-            for m in CE_STATE_METRICS:
-                c.add(m, hosts=(service[0],), params={'args': {'--resource': 'htcondor://%s' % service[0],
-                                                               '--jdl-ads': '\'+maxMemory=2000\''}})
+            c.add('org.sam.CONDOR-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
+                  params={'args': {'--resource': 'htcondor://%s' % service[0],
+                                   '--jdl-ads': '\'+maxMemory=2000\''}})
             continue
         ce_resources = feed.get_ce_resources(host, flavor)
         if ce_resources:
@@ -152,21 +149,18 @@ 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)
-            # special handling: native ARC client
-            if flavor == 'ARC-CE' and host in ['ce0004.m45.ihep.su', 'ce0005.m45.ihep.su']:
+            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'}})
                 continue
-            for m in CE_STATE_METRICS:
-                if flavor == 'ARC-CE':
-                    c.add(m, hosts=(service[0],),   params={'args': {'--resource': '%s' % res,
-                                                                     '--arc-rsl': '\'(memory=2000)\''}})
-                else:
-                    c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res}})
+            # GLOBUS ?
+            log.warning("Unexpected host/flavor: {} {}".format(host, flavor))
+            c.add('org.sam.CONDOR-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
+                  params={'args': {'--resource': '%s' % res}})
         else:
             res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', 'nobatch', 'noqueue')
-            for m in CE_STATE_METRICS:
-                c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res}})
+            c.add('org.sam.CONDOR-JobState-/cms/Role=lcgadmin', hosts=(service[0],),
+                  params={'args': {'--resource': '%s' % res}})
             
     c.serialize()