External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Additional Licensing values

Browse Source
This commit is contained in:
Martin Slemr
2023-03-23 14:16:20 +01:00
committed by Hao Liu
parent 44db4587be
commit fff6fa7d7a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/utils/licensing.py
View File

@@ -388,9 +388,13 @@ class Licenser(object):
if subscription_model == SUBSCRIPTION_USAGE_MODEL_UNIQUE_HOSTS: if subscription_model == SUBSCRIPTION_USAGE_MODEL_UNIQUE_HOSTS:
automated_instances = HostMetric.active_objects.count() automated_instances = HostMetric.active_objects.count()
first_host = HostMetric.active_objects.only('first_automation').order_by('first_automation').first() first_host = HostMetric.active_objects.only('first_automation').order_by('first_automation').first()
attrs['deleted_instances'] = HostMetric.objects.filter(deleted=True).count()
attrs['reactivated_instances'] = HostMetric.active_objects.filter(deleted_counter__gte=1).count()
else: else:
automated_instances = HostMetric.objects.count() automated_instances = 0
first_host = HostMetric.objects.only('first_automation').order_by('first_automation').first() first_host = HostMetric.objects.only('first_automation').order_by('first_automation').first()
attrs['deleted_instances'] = 0
attrs['reactivated_instances'] = 0
if first_host: if first_host:
automated_since = int(first_host.first_automation.timestamp()) automated_since = int(first_host.first_automation.timestamp())

10
awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
View File

@@ -112,6 +112,16 @@ function SubscriptionDetail() {
label={t`Hosts remaining`} label={t`Hosts remaining`}
value={license_info.free_instances} value={license_info.free_instances}
/> />
<Detail
dataCy="subscription-hosts-deleted"
label={t`Hosts deleted`}
value={license_info.deleted_instances}
/>
<Detail
dataCy="subscription-hosts-reactivated"
label={t`Active hosts previously deleted`}
value={license_info.reactivated_instances}
/>
{license_info.instance_count < 9999999 && ( {license_info.instance_count < 9999999 && (
<Detail <Detail
dataCy="subscription-hosts-available" dataCy="subscription-hosts-available"