backend/satellite_tools/reports/data/entitlements | 11 ++++++++---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 5d294802f716338224dd911d9fb8864b6aaf6d75
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 11:20:08 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.8.10-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5522a81..d788672 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.9
+Version: 0.8.10
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -597,6 +597,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Dec 14 2009 Jan Pazdziora 0.8.10-1
+- reporting: add column total to the entitlements report
+
* Mon Dec 14 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.9-1
- fixed satellite-sync errata import
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 7ce7113..2b81d8f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.9-1 backend/
+0.8.10-1 backend/
commit 56d0f35155b12973121d1dadd257f10ee6f68682
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 11:19:31 2009 +0100
reporting: add column total to show total entitlements in the entitlements report.
diff --git a/backend/satellite_tools/reports/data/entitlements
b/backend/satellite_tools/reports/data/entitlements
index c9eb2f8..515d06f 100755
--- a/backend/satellite_tools/reports/data/entitlements
+++ b/backend/satellite_tools/reports/data/entitlements
@@ -16,6 +16,7 @@ columns:
entitlement_type 'system' or 'channel'
entitlement System entitlement name or channel name
used How many entitlements are currently used
+ total The total number of entitlements
multival_columns:
@@ -29,21 +30,25 @@ sql:
web_customer.name as organization,
entitlement_type,
entitlement,
- used
+ used,
+ total
from (
select rhnprivatechannelfamily.org_id as organization_id,
'channel' as entitlement_type,
rhnchannelfamily.name as entitlement,
- rhnprivatechannelfamily.current_members as used
+ rhnprivatechannelfamily.current_members as used,
+ rhnprivatechannelfamily.max_members as total
from rhnchannelfamily, rhnprivatechannelfamily
where rhnchannelfamily.id = rhnprivatechannelfamily.channel_family_id
union all
select rhnservergroup.org_id as organization_id,
'system' as entitlement_type,
rhnservergrouptype.name as entitlement,
- rhnservergroup.current_members as used
+ rhnservergroup.current_members as used,
+ rhnservergroup.max_members as total
from rhnservergroup, rhnservergrouptype
where rhnservergroup.group_type = rhnservergrouptype.id
+ and rhnservergroup.max_members > 0
) entitlements, web_customer
where entitlements.organization_id = web_customer.id
order by entitlements.organization_id,