Automate loading of job_metrics_config_file

- Move option out of parse_config_file_options
- Use path_resolves_to in schema
- Run make config-rebuild

doc/source/admin/galaxy_options.rst

@@ -3456,8 +3456,6 @@
 :Description:
     XML config file that contains the job metric collection
     configuration.
-    The value of this option will be resolved with respect to
-    <config_dir>.
 :Default: ``job_metrics_conf.xml``
 :Type: str
 

lib/galaxy/config/__init__.py

@@ -420,7 +420,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
     add_sample_file_to_defaults = {
         'build_sites_config_file',
         # 'datatypes_config_file',  # TODO: handle all items in this set, one commit at a time.
-        # 'job_metrics_config_file',
+        'job_metrics_config_file',
         # 'tool_data_table_config_path',
         # 'tool_config_file',
     }
@@ -843,7 +843,6 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
         """Backwards compatibility for config files moved to the config/ dir."""
         defaults = dict(
             datatypes_config_file=[self._in_config_dir('datatypes_conf.xml'), self._in_sample_dir('datatypes_conf.xml.sample')],
-            job_metrics_config_file=[self._in_config_dir('job_metrics_conf.xml'), self._in_sample_dir('job_metrics_conf.xml.sample')],
         )
         listify_defaults = {
             'tool_data_table_config_path': [

lib/galaxy/config/sample/galaxy.yml.sample

@@ -1685,8 +1685,6 @@ galaxy:
 
   # XML config file that contains the job metric collection
   # configuration.
-  # The value of this option will be resolved with respect to
-  # <config_dir>.
   #job_metrics_config_file: job_metrics_conf.xml
 
   # This option allows users to see the job metrics (except for

lib/galaxy/webapps/galaxy/config_schema.yml

@@ -2558,12 +2558,11 @@ mapping:
       job_metrics_config_file:
         type: str
         default: job_metrics_conf.xml
+        path_resolves_to: config_dir
         required: false
         desc: |
           XML config file that contains the job metric collection configuration.
 
-          The value of this option will be resolved with respect to <config_dir>.
-
       expose_potentially_sensitive_job_metrics:
         type: bool
         default: false