diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index a5fac52e379..e08d201d1c4 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -1381,7 +1381,10 @@ ~~~~~~~~~~~~~~~~ :Description: - Enable AWS estimate. + This flag enables an AWS cost estimate for every job based on + their runtime matrices. CPU, RAM and runtime usage is mapped + against AWS pricing table. Please note, that those numbers are + only estimates. :Default: ``false`` :Type: bool @@ -3849,6 +3852,7 @@ map group names to parameter descriptions (additional types of mappings via these files could be implemented but haven't yet - for instance using workflow tags to do the mapping). + Sample default path 'config/workflow_resource_mapper_conf.yml' :Default: ``None`` :Type: str diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index 0ee1b288884..26e8eae68ba 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -761,7 +761,9 @@ galaxy: # Enable InteractiveTools. #interactivetools_enable: false - # Enable AWS estimate. + # This flag enables an AWS cost estimate for every job based on their + # runtime matrices. CPU, RAM and runtime usage is mapped against AWS + # pricing table. Please note, that those numbers are only estimates. #aws_estimate: false # Proxy host - assumed to just be hosted on the same hostname and port @@ -1887,6 +1889,7 @@ galaxy: # to parameter descriptions (additional types of mappings via these # files could be implemented but haven't yet - for instance using # workflow tags to do the mapping). + # Sample default path 'config/workflow_resource_mapper_conf.yml' #workflow_resource_params_mapper: null # Optional configuration file similar to `job_config_file` to specify diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml index 631e424a30a..cd00a4a9607 100644 --- a/lib/galaxy/webapps/galaxy/config_schema.yml +++ b/lib/galaxy/webapps/galaxy/config_schema.yml @@ -1031,7 +1031,9 @@ mapping: default: false required: false desc: | - Enable AWS estimate. + This flag enables an AWS cost estimate for every job based on their runtime matrices. + CPU, RAM and runtime usage is mapped against AWS pricing table. + Please note, that those numbers are only estimates. interactivetools_proxy_host: type: str @@ -2849,6 +2851,8 @@ mapping: descriptions (additional types of mappings via these files could be implemented but haven't yet - for instance using workflow tags to do the mapping). + Sample default path 'config/workflow_resource_mapper_conf.yml' + workflow_schedulers_config_file: type: str default: workflow_schedulers_conf.xml