rel-eng/packages/spacewalk-reports | 2 +-
reporting/reports/data/splice-export | 7 +++++--
reporting/spacewalk-reports.spec | 6 +++++-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 66fa19fd680a4220429f40d60cef4fafe64351af
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jul 23 15:48:18 2013 -0400
Automatic commit of package [spacewalk-reports] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index aabbdb9..f373fe6 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-2.0.1-1 reporting/
+2.1.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 334fae4..98a3bcc 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Jul 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.1-1
+- 987640 - Add new field to splice-export report
+- Bumping package versions for 2.1.
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.1-1
- Bumping package versions for 2.0.
commit 96cc6685990697aac54f69e8d5a044f02d0619b5
Author: Christopher Duryee <cduryee(a)redhat.com>
Date: Tue Jul 23 15:48:03 2013 -0400
987640 - Add new field to splice-export report
diff --git a/reporting/reports/data/splice-export b/reporting/reports/data/splice-export
index 9e487d2..acb6ceb 100644
--- a/reporting/reports/data/splice-export
+++ b/reporting/reports/data/splice-export
@@ -30,6 +30,7 @@ columns:
hardware Hardware information
memory Memory info
sockets Socket count
+ is_virtualized Virtualization status (irrespective of host/guest mapping)
multival_columns:
@@ -44,7 +45,7 @@ sql:
select server_id, organization, org_id, name, hostname, ip_address, ipv6_address,
registered_by,
registration_time, last_checkin_time,
software_channel,
- entitlements, system_group, virtual_host, architecture, hardware, memory,
sockets
+ entitlements, system_group, virtual_host, architecture, hardware, memory,
sockets, is_virtualized
from (
select rhnserver.id as server_id,
rhnserver.name as name,
@@ -74,7 +75,9 @@ sql:
) as memory,
(
select rhncpu.nrsocket from rhncpu where rhncpu.server_id = rhnserver.id
- ) as sockets
+ ) as sockets,
+ (case when (select rhnVirtualInstance.virtual_system_id from rhnVirtualInstance
where rhnVirtualInstance.virtual_system_id=rhnserver.id) is null then 'No' else
'Yes' end
+ ) as is_virtualized
from rhnserver left outer join
(
select server_id, hostname, ipaddr, ip6addr