Commit b0bf5e9f authored by Marian Babik's avatar Marian Babik
Browse files

CREAM-CE retirement

parent 0b33288b
...@@ -79,8 +79,8 @@ def run(url, ipv6=False): ...@@ -79,8 +79,8 @@ def run(url, ipv6=False):
# Add corresponding metrics to tags # Add corresponding metrics to tags
# creates /etc/ncgx/conf.d/generated_checks.cfg # creates /etc/ncgx/conf.d/generated_checks.cfg
c = Checks() c = Checks()
c.add_all(CE_METRICS, tags=["CREAM-CE", "ARC-CE", "HTCONDOR-CE"]) c.add_all(CE_METRICS, tags=["ARC-CE", "HTCONDOR-CE"])
c.add_all(WN_METRICS.values(), tags=["CREAM-CE", "ARC-CE", "HTCONDOR-CE"]) c.add_all(WN_METRICS.values(), tags=["ARC-CE", "HTCONDOR-CE"])
c.add_all(SE_METRICS, tags=["SRM"]) c.add_all(SE_METRICS, tags=["SRM"])
c.add_all(XROOT_METRICS, tags=["XROOTD"]) c.add_all(XROOT_METRICS, tags=["XROOTD"])
# IPv6 # IPv6
...@@ -134,7 +134,7 @@ def run(url, ipv6=False): ...@@ -134,7 +134,7 @@ def run(url, ipv6=False):
for service in services: for service in services:
host = service[0] host = service[0]
flavor = service[1] flavor = service[1]
if flavor not in ["CREAM-CE", "ARC-CE", "GLOBUS", "HTCONDOR-CE"]: if flavor not in ["ARC-CE", "GLOBUS", "HTCONDOR-CE"]:
continue continue
if flavor == 'HTCONDOR-CE': if flavor == 'HTCONDOR-CE':
# special handling for HTCONDOR-CE, no queues # special handling for HTCONDOR-CE, no queues
...@@ -153,11 +153,7 @@ def run(url, ipv6=False): ...@@ -153,11 +153,7 @@ def run(url, ipv6=False):
continue continue
res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', batch, queue) res = "%s://%s/%s/%s/%s" % (FLAVOR_MAP[flavor], host, 'nosched', batch, queue)
for m in CE_STATE_METRICS: for m in CE_STATE_METRICS:
if flavor == 'CREAM-CE': if flavor == 'ARC-CE':
c.add(m, hosts=(service[0],),
params={'args': {'--resource': '%s' % res,
'--jdl-ads': '\'cream_attributes=CERequirements=\"other.GlueHostMainMemoryRAMSize==2000\"\''}})
elif flavor == 'ARC-CE':
c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res, c.add(m, hosts=(service[0],), params={'args': {'--resource': '%s' % res,
'--arc-rsl': '\'(memory=2000)\''}}) '--arc-rsl': '\'(memory=2000)\''}})
else: else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment