backend/satellite_tools/reports/data/entitlements | 42 ++++++++++++++++++++++
backend/spacewalk-backend.spec | 34 +++++++++++++++++
rel-eng/packages/spacewalk-backend | 2 -
3 files changed, 76 insertions(+), 2 deletions(-)
New commits:
commit 01651a58452d0efd8c1ddb3232b3e83daac81208
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 5 10:07:59 2009 +0200
Automatic commit of package [spacewalk-backend] release [0.6.29-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4bd53ae..5bae3f0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.6.28
+Version: 0.6.29
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -579,6 +579,38 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Aug 05 2009 Jan Pazdziora 0.6.29-1
+- reporting: add the entitlements report
+- enhancing logging mechanism for spacewalk-repo-sync (jsherril(a)redhat.com)
+- Merge branch 'master' into repo-sync (jsherril(a)redhat.com)
+- Patch: Selinux Context support for config files (joshua.roys(a)gtri.gatech.edu)
+- merge conflict (jsherril(a)redhat.com)
+- adding newline to error message output (jsherril(a)redhat.com)
+- fixing small method call in reposync (jsherril(a)redhat.com)
+- fixing specfile to create directory for reposync (jsherril(a)redhat.com)
+- fixing small whitespace error with reposync (jsherril(a)redhat.com)
+- adding better logging for spacewalk-repo-sync (jsherril(a)redhat.com)
+- 467281 - Instead of checksing for the start now we cechk if tools is in the
+ channel label. This is not a perfect solution but atleast covers few more
+ cases. An ideal solution would be to add some kind of a relation ship between
+ parent and child signifying that this is a tools channel for a given parent.
+ (pkilambi(a)redhat.com)
+- 505559 - spacewalk-debug now captures database tablespace usage report
+ (pkilambi(a)redhat.com)
+- making the logging a bit cleaner (jsherril(a)redhat.com)
+- fixing some import things to actually work on an installed system
+ (jsherril(a)redhat.com)
+- adding logging, cache clearing, and a few fixes to reposync
+ (jsherril(a)redhat.com)
+- adding makefile to repo_plugins (pkilambi(a)redhat.com)
+- updating spacewalk backend spec file with reposync stuff
+ (pkilambi(a)redhat.com)
+- updating Makefile with reposync files (pkilambi(a)redhat.com)
+- some clean up on repo sync stuff (pkilambi(a)redhat.com)
+- adding repo sync task and other UI bits for spacewalk repo sync
+ (jsherril(a)redhat.com)
+- backend/satellite_tools/repo_plugins/yum_src.py (jsherril(a)redhat.com)
+
* Wed Jul 29 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.6.28-1
-
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f5f347c..5a80b49 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.6.28-1 backend/
+0.6.29-1 backend/
commit 02909510452b40413df577f961699220bdba146a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 5 10:06:18 2009 +0200
reporting: add the entitlements report.
Currently, fields
organization_id
organization
entitlement_type
entitlement
used
are shown, for system and channel entitlements.
diff --git a/backend/satellite_tools/reports/data/entitlements
b/backend/satellite_tools/reports/data/entitlements
new file mode 100755
index 0000000..23ba37b
--- /dev/null
+++ b/backend/satellite_tools/reports/data/entitlements
@@ -0,0 +1,42 @@
+
+columns:
+
+ organization_id
+ organization
+ entitlement_type
+ entitlement
+ used
+
+multival_columns:
+
+ organization_id
+ entitlement_type
+ entitlement
+
+sql:
+
+ select organization_id,
+ web_customer.name as organization,
+ entitlement_type,
+ entitlement,
+ used
+ from (
+ select rhnprivatechannelfamily.org_id as organization_id,
+ 'channel' as entitlement_type,
+ rhnchannelfamily.name as entitlement,
+ rhnprivatechannelfamily.current_members as used
+ 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
+ from rhnservergroup, rhnservergrouptype
+ where rhnservergroup.group_type = rhnservergrouptype.id
+ ) entitlements, web_customer
+ where entitlements.organization_id = web_customer.id
+ order by entitlements.organization_id,
+ case when entitlement_type = 'channel' then 1 else 0 end,
+ entitlement
+