reporting/reports/data/entitlements | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit cad979c0a66959b87ca7863250bc101b0013c2ee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 10 09:05:11 2011 +0100
683525 - adding flex_used and flex_total to the entitlements report.
diff --git a/reporting/reports/data/entitlements b/reporting/reports/data/entitlements
index 515d06f..9a31a95 100755
--- a/reporting/reports/data/entitlements
+++ b/reporting/reports/data/entitlements
@@ -17,6 +17,8 @@ columns:
entitlement System entitlement name or channel name
used How many entitlements are currently used
total The total number of entitlements
+ flex_used How many Flex entitlements are currently used
+ flex_total The total number of Flex entitlements
multival_columns:
@@ -31,13 +33,17 @@ sql:
entitlement_type,
entitlement,
used,
- total
+ total,
+ flex_used,
+ flex_total
from (
select rhnprivatechannelfamily.org_id as organization_id,
'channel' as entitlement_type,
rhnchannelfamily.name as entitlement,
rhnprivatechannelfamily.current_members as used,
- rhnprivatechannelfamily.max_members as total
+ rhnprivatechannelfamily.max_members as total,
+ rhnprivatechannelfamily.fve_current_members as flex_used,
+ rhnprivatechannelfamily.fve_max_members as flex_total
from rhnchannelfamily, rhnprivatechannelfamily
where rhnchannelfamily.id = rhnprivatechannelfamily.channel_family_id
union all
@@ -45,7 +51,9 @@ sql:
'system' as entitlement_type,
rhnservergrouptype.name as entitlement,
rhnservergroup.current_members as used,
- rhnservergroup.max_members as total
+ rhnservergroup.max_members as total,
+ null as flex_used,
+ null as flex_total
from rhnservergroup, rhnservergrouptype
where rhnservergroup.group_type = rhnservergrouptype.id
and rhnservergroup.max_members > 0
Show replies by date