Merge pull request #816 from ericvaandering/cms_usage_probes

Get my modifications of Rahul's copy of these probes into the image. …

docker/rucio-probes/Dockerfile

@@ -19,15 +19,10 @@ COPY src/policy/CMSRucioPolicy /opt/rucio/policy/CMSRucioPolicy
 # Make it search the policy directory. Needs a change for python upgrades
 RUN echo "/opt/rucio/policy" > /usr/local/lib/python3.9/site-packages/policy.pth
 
-
-ADD https://raw.githubusercontent.com/dynamic-entropy/probes/30daccd5c735136e812c84d85e091b438d820f7c/common/check_deletable_replicas /probes/common
-ADD https://raw.githubusercontent.com/dynamic-entropy/probes/30daccd5c735136e812c84d85e091b438d820f7c/common/check_obsolete_replicas /probes/common
-
 # TODO: Remove Tooo old? Was there a PR for them in rucio probes?
 #ADD https://raw.githubusercontent.com/ericvaandering/probes/hack_obsolete_replicas/common/check_obsolete_replicas /probes/common
 #ADD https://raw.githubusercontent.com/nsmith-/probes/hack_replicas/common/check_deletable_replicas /probes/common
 
-
 # Where from?
 # Supplanted in PR115 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_rules/common/check_expired_rules /probes/common
 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_locked/common/check_expired_locked_rules /probes/common
@@ -45,8 +40,9 @@ ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manag
 ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_unlocked_replicas /probes/common
 ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_updated_dids /probes/common
 
-# PR 134 - Should be in 34.1
-ADD https://raw.githubusercontent.com/Panos512/probes/20240307_unifies_cms_space_probe/cms/check_used_space /probes/cms
+# PR 136 - Can be merged when working
+ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_locked/cms/check_deletable_replicas /probes/cms
+ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_locked/cms/check_obsolete_replicas /probes/cms
 
 RUN chmod +x /probes/common/check_*
 RUN chmod +x /probes/cms/check_*