diff options
| author | Andrea Restle-Lay <andrearestlelay@gmail.com> | 2024-12-16 18:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-16 18:10:59 +0100 |
| commit | 86d202456aee4b0f2db23f619d4e95849e9553a9 (patch) | |
| tree | e7ccd4a9a697ba434e771417e71e6223ed15492a | |
| parent | Pull the correct collection plugin for the product (#15658) (diff) | |
| download | awx-86d202456aee4b0f2db23f619d4e95849e9553a9.tar.xz awx-86d202456aee4b0f2db23f619d4e95849e9553a9.zip | |
host_metrics date fix to make summary dates (datetime.datetime) comparable to month: datetime.date (#15704)
* host_metrics date fix
* AAP-36839 Remove excess comments
* fix extra date() conversion
* actual fix
* datetime is a library, use datetime.datetime
---------
Co-authored-by: Andrea Restle-Lay <arestlel@arestlel-thinkpadx1carbongen9.rht.csb>
| -rw-r--r-- | awx/main/tasks/host_metrics.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/awx/main/tasks/host_metrics.py b/awx/main/tasks/host_metrics.py index 750cd199c5..e5f1263ad1 100644 --- a/awx/main/tasks/host_metrics.py +++ b/awx/main/tasks/host_metrics.py @@ -221,7 +221,7 @@ class HostMetricSummaryMonthlyTask: self.records_to_update.append(summary) return summary - def _find_summary(self, month): + def _find_summary(self, month: datetime.date): """ Existing summaries are ordered by month ASC. This method is called with month in ascending order too => only 1 traversing is enough @@ -229,6 +229,8 @@ class HostMetricSummaryMonthlyTask: summary = None while not summary and self.existing_summaries_idx < self.existing_summaries_cnt: tmp = self.existing_summaries[self.existing_summaries_idx] + if isinstance(tmp, datetime.datetime): + tmp = tmp.date() if tmp.date < month: self.existing_summaries_idx += 1 elif tmp.date == month: |