rel-eng/packages/spacewalk-reports | 2
reporting/reports/data/cloned-channels | 27 +++++++
reporting/reports/data/host-guests | 26 ++++++
reporting/reports/data/splice-export | 124 +++++++++++++++++++++++++++++++++
reporting/spacewalk-reports.spec | 6 +
5 files changed, 183 insertions(+), 2 deletions(-)
New commits:
commit 779c25e48777bb1f7e580bacc83a505f7fb2271c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri May 24 15:25:59 2013 -0400
Automatic commit of package [spacewalk-reports] release [1.10.6-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index f6282b4..beb374a 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.10.5-1 reporting/
+1.10.6-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index b7af14d..8710e8d 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: 1.10.5
+Version: 1.10.6
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
+* Fri May 24 2013 Stephen Herr <sherr(a)redhat.com> 1.10.6-1
+- Report for host-guest mappings for splice integration
+- Reports to support enhanced reporting
+
* Tue May 07 2013 Jan Pazdziora 1.10.5-1
- report patterns should have 644 in git
- deploying /data/* content with 644 instead 755
commit 76e5c0606408fe1f7a1f373cd742000ea58b8e5c
Author: Christopher Duryee <cduryee(a)redhat.com>
Date: Fri May 24 15:25:18 2013 -0400
Report for host-guest mappings for splice integration
diff --git a/reporting/reports/data/host-guests b/reporting/reports/data/host-guests
new file mode 100644
index 0000000..3057cc0
--- /dev/null
+++ b/reporting/reports/data/host-guests
@@ -0,0 +1,26 @@
+synopsis:
+
+ Host-Guest mapping
+
+description:
+
+ List all systems, along with their guests
+
+columns:
+
+ server_id System identifier
+ guests Guests
+
+multival_columns:
+
+ server_id
+ guests : guests
+
+sql:
+
+ select host_system_id as server_id,
+ virtual_system_id as guests
+ from rhnvirtualinstance
+ where host_system_id is not null
+ and virtual_system_id is not null
+ order by server_id;
commit 99dd3e491a435c035e5f3174436218beffd6b5c0
Author: James Slagle <jslagle(a)redhat.com>
Date: Fri May 24 15:16:00 2013 -0400
Reports to support enhanced reporting
diff --git a/reporting/reports/data/cloned-channels
b/reporting/reports/data/cloned-channels
new file mode 100644
index 0000000..dc0cd85
--- /dev/null
+++ b/reporting/reports/data/cloned-channels
@@ -0,0 +1,27 @@
+
+synopsis:
+
+ Cloned Channel report
+
+description:
+
+ List of cloned channels in the server with their original channel.
+
+columns:
+
+ original_channel_label Original channel label
+ original_channel_name Original channel name
+ new_channel_label Channel label
+ new_channel_name Channel name
+
+sql:
+
+ select oc.label original_channel_label,
+ oc.name original_channel_name,
+ nc.label new_channel_label,
+ nc.name new_channel_name
+ from rhnchannelcloned cc,
+ rhnchannel oc,
+ rhnchannel nc
+ where cc.original_id = oc.id
+ and cc.id = nc.id
diff --git a/reporting/reports/data/splice-export b/reporting/reports/data/splice-export
new file mode 100644
index 0000000..9e487d2
--- /dev/null
+++ b/reporting/reports/data/splice-export
@@ -0,0 +1,124 @@
+
+synopsis:
+
+ System data needed for splice integration for enhanced reporting.
+
+description:
+
+ List of systems registered to the server, together with
+ various hardware and software information used for enhanced reporting.
+ The structure of this report can change as needed in future releases
+ of spacewalk-reports.
+
+columns:
+
+ server_id:i System identifier
+ organization Organization
+ org_id Organization ID
+ name System Name
+ hostname Hostname, as reported by the system
+ ip_address IPv4 address, as reported by the system
+ ipv6_address IPv6 address, as reported by the system
+ registered_by User under which the system is registered
+ registration_time Registration time
+ last_checkin_time Last checkin time
+ software_channel List of channels to which the system is registered
+ entitlements List of entitlements
+ system_group List of system group to which the system belongs
+ virtual_host:i System identifier of host, if system is a guest
+ architecture Architecture of the system
+ hardware Hardware information
+ memory Memory info
+ sockets Socket count
+
+multival_columns:
+
+ server_id
+ software_channel : software_channel
+ entitlements : entitlements
+ system_group : system_group
+ virtual_host : virtual_host
+
+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
+ from (
+ select rhnserver.id as server_id,
+ rhnserver.name as name,
+ rhnserver.org_id as org_id,
+ rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address,
+ trim(rhnservernetwork.ip6addr) as ipv6_address,
+ ( select login from web_contact where rhnserver.creator_id = web_contact.id ) as
registered_by,
+ to_char(rhnserver.created, 'YYYY-MM-DD HH24:MI:SS') as
registration_time,
+ ( select to_char(checkin, 'YYYY-MM-DD HH24:MI:SS') from rhnserverinfo
where rhnserver.id = server_id ) as last_checkin_time,
+ rhnchannel.label as software_channel,
+ rhnchannel.parent_channel as parent_channel,
+ rhnchannel.id as channel_id,
+ entitlement_data.name as entitlements,
+ entitlement_data.server_group_id as entitlements_server_group_id,
+ group_data.name as system_group,
+ group_data.server_group_id as system_group_server_group_id,
+ (
+ select name from web_customer where rhnserver.org_id = web_customer.id
+ ) as organization,
+ virtual_data.host_system_id as virtual_host,
+ (
+ select rhnserverarch.name from rhnserverarch where rhnserver.server_arch_id =
rhnserverarch.id
+ ) as architecture,
+ get_hw_info_as_clob(rhnserver.id, '; ') as hardware,
+ (
+ select rhnram.ram from rhnram where rhnram.server_id = rhnserver.id
+ ) as memory,
+ (
+ select rhncpu.nrsocket from rhncpu where rhncpu.server_id = rhnserver.id
+ ) as sockets
+ from rhnserver left outer join
+ (
+ select server_id, hostname, ipaddr, ip6addr
+ from rhnservernetwork
+ where id in (
+ select min(id)
+ from rhnservernetwork
+ group by server_id
+ )
+ ) rhnservernetwork
+ on rhnserver.id = rhnservernetwork.server_id
+ left outer join rhnserverchannel
+ on rhnserver.id = rhnserverchannel.server_id
+ left outer join rhnchannel
+ on rhnserverchannel.channel_id = rhnchannel.id
+ left outer join rhnserverconfigchannel
+ on rhnserver.id = rhnserverconfigchannel.server_id
+ left outer join rhnconfigchannel
+ on rhnserverconfigchannel.config_channel_id = rhnconfigchannel.id
+ left outer join
+ (
+ select rhnservergroupmembers.server_id, rhnservergroupmembers.server_group_id,
rhnservergroup.name
+ from rhnservergroupmembers left outer join rhnservergroup
+ on rhnservergroupmembers.server_group_id = rhnservergroup.id
+ where rhnservergroup.group_type is not null
+ ) entitlement_data
+ on rhnserver.id = entitlement_data.server_id
+ left outer join
+ (
+ select rhnservergroupmembers.server_id, rhnservergroupmembers.server_group_id,
rhnservergroup.name
+ from rhnservergroupmembers left outer join rhnservergroup
+ on rhnservergroupmembers.server_group_id = rhnservergroup.id
+ where rhnservergroup.group_type is null
+ ) group_data
+ on rhnserver.id = group_data.server_id
+ left outer join
+ (
+ select host_system_id, virtual_system_id
+ from rhnvirtualinstance
+ where host_system_id is not null
+ ) virtual_data
+ on rhnserver.id = virtual_data.virtual_system_id
+ ) X
+ -- where placeholder
+ order by server_id, parent_channel nulls first, channel_id,
+ entitlements_server_group_id, system_group_server_group_id,
+ virtual_host