External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 18:51:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove --until option

Browse Source
This commit is contained in:
Aparna Karve
2023-03-22 09:00:33 -07:00
committed by John Westcott IV
parent 8ec6e556a1
commit c30c9cbdbe
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/management/commands/host_metric.py
View File

@@ -185,7 +185,6 @@ class Command(BaseCommand):
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument('--since', type=datetime.datetime.fromisoformat, help='Start Date in ISO format YYYY-MM-DD') parser.add_argument('--since', type=datetime.datetime.fromisoformat, help='Start Date in ISO format YYYY-MM-DD')
parser.add_argument('--until', type=datetime.datetime.fromisoformat, help='End Date in ISO format YYYY-MM-DD')
parser.add_argument('--json', type=str, const='host_metric', nargs='?', help='Select output as JSON for host_metric or host_metric_summary_monthly') parser.add_argument('--json', type=str, const='host_metric', nargs='?', help='Select output as JSON for host_metric or host_metric_summary_monthly')
parser.add_argument('--csv', type=str, const='host_metric', nargs='?', help='Select output as CSV for host_metric or host_metric_summary_monthly') parser.add_argument('--csv', type=str, const='host_metric', nargs='?', help='Select output as CSV for host_metric or host_metric_summary_monthly')
parser.add_argument('--tarball', action='store_true', help=f'Package CSV files into a tar with upto {CSV_PREFERRED_ROW_COUNT} rows') parser.add_argument('--tarball', action='store_true', help=f'Package CSV files into a tar with upto {CSV_PREFERRED_ROW_COUNT} rows')
@@ -193,25 +192,17 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
since = options.get('since') since = options.get('since')
until = options.get('until')
if since is not None and since.tzinfo is None: if since is not None and since.tzinfo is None:
since = since.replace(tzinfo=datetime.timezone.utc) since = since.replace(tzinfo=datetime.timezone.utc)
if until is not None and until.tzinfo is None:
until = until.replace(tzinfo=datetime.timezone.utc)
filter_kwargs = {} filter_kwargs = {}
if since is not None: if since is not None:
filter_kwargs['last_automation__gte'] = since filter_kwargs['last_automation__gte'] = since
if until is not None:
filter_kwargs['last_automation__lte'] = until
filter_kwargs_host_metrics_summary = {} filter_kwargs_host_metrics_summary = {}
if since is not None: if since is not None:
filter_kwargs_host_metrics_summary['date__gte'] = since filter_kwargs_host_metrics_summary['date__gte'] = since
if until is not None:
filter_kwargs_host_metrics_summary['date__lte'] = until
if options['rows_per_file'] and options.get('rows_per_file') > CSV_PREFERRED_ROW_COUNT: if options['rows_per_file'] and options.get('rows_per_file') > CSV_PREFERRED_ROW_COUNT:
print(f"rows_per_file exceeds the allowable limit of {CSV_PREFERRED_ROW_COUNT}.") print(f"rows_per_file exceeds the allowable limit of {CSV_PREFERRED_ROW_COUNT}.")