reporting/reports/data/errata-systems
| 6 ++++--
reporting/reports/data/inventory
| 8 +++++---
schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
| 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
| 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 5f6d018e681a4011704a7dd3a47d050f09064251
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:48:59 2011 +0100
IPv6: reporting - make inventory report IPv6 aware
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
index 836b4b4..7d7687b 100755
--- a/reporting/reports/data/inventory
+++ b/reporting/reports/data/inventory
@@ -13,7 +13,8 @@ columns:
server_id:i System identifier
profile_name Profile name, as stored on server
hostname Hostname, as reported by the system
- ip_address IP address, 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
@@ -40,7 +41,7 @@ multival_columns:
sql:
- select server_id, profile_name, hostname, ip_address, registered_by,
+ select server_id, profile_name, hostname, ip_address, ipv6_address, registered_by,
registration_time, last_checkin_time, kernel_version,
packages_out_of_date, errata_out_of_date,
software_channel, configuration_channel,
@@ -48,6 +49,7 @@ sql:
from (
select rhnserver.id as server_id, rhnserver.name as profile_name,
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,
@@ -75,7 +77,7 @@ sql:
get_hw_info_as_clob(rhnserver.id, '; ') as hardware
from rhnserver left outer join
(
- select server_id, hostname, ipaddr
+ select server_id, hostname, ipaddr, ip6addr
from rhnservernetwork
where id in (
select min(id)
commit 20edad5ae3a183d0c8e38552cc427b2555098a9c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:42:22 2011 +0100
IPv6: add missing alias to FROM clausule
diff --git a/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
b/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
index 6cc1982..23549d3 100644
--- a/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
+++ b/schema/spacewalk/postgres/procs/get_hw_info_as_clob.sql
@@ -18,7 +18,7 @@ begin
from rhncpu where rhncpu.server_id = sid
union all
select 2, ni.name||'
'||coalesce(na4.address,'')||'/'||coalesce(na4.netmask,'')||'
'||ni.hw_addr val
- from rhnservernetinterface,
+ from rhnservernetinterface ni,
rhnServerNetAddress4 na4
where ni.server_id = sid
and ni.id = na4.interface_id
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
index 6cc1982..23549d3 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/122-get_hw_info_as_clob.sql.postgresql
@@ -18,7 +18,7 @@ begin
from rhncpu where rhncpu.server_id = sid
union all
select 2, ni.name||'
'||coalesce(na4.address,'')||'/'||coalesce(na4.netmask,'')||'
'||ni.hw_addr val
- from rhnservernetinterface,
+ from rhnservernetinterface ni,
rhnServerNetAddress4 na4
where ni.server_id = sid
and ni.id = na4.interface_id
commit ad68c72127cf80f744ba78c9ad59975f8d08a4c6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 24 14:36:25 2011 +0100
IPv6: reporting - make errata-systems report IPv6 aware
diff --git a/reporting/reports/data/errata-systems
b/reporting/reports/data/errata-systems
index 41e34ae..8750703 100755
--- a/reporting/reports/data/errata-systems
+++ b/reporting/reports/data/errata-systems
@@ -14,6 +14,7 @@ columns:
profile_name Profile name, as stored on server
hostname Hostname, as reported by the system
ip_address IP address, as reported by the system
+ ipv6_address IPv6 address, as reported by the system
sql:
@@ -21,11 +22,12 @@ sql:
select rhnErrata.advisory_name as advisory,
rhnServerNeededErrataCache.server_id,
rhnServer.name as profile_name,
- rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address
+ rhnservernetwork.hostname, trim(rhnservernetwork.ipaddr) as ip_address,
+ trim(rhnservernetwork.ip6addr) as ipv6_address
from rhnErrata, rhnServer,
rhnServerNeededErrataCache left outer join
(
- select server_id, hostname, ipaddr
+ select server_id, hostname, ipaddr, ip6addr
from rhnservernetwork
where id in (
select min(id)