Minor collector fixes, GUI updates

F5Networks · Oct 24, 2022 · 65dcc47 · 65dcc47
1 parent 09b6ba8
commit 65dcc47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/contrib/GUI/psql/psql-schema.sql b/contrib/GUI/psql/psql-schema.sql
@@ -189,22 +189,24 @@ create table if not exists sw_on_hw (
 	id			serial unique,
 	archive_uid		uuid,
 	contract_id		integer,
+	sku_prefix		varchar(4),
 	rating_platform_module	varchar(32),
 	as_of_date		varchar(16),
 	quantity		integer,
 	dss_create_time		varchar(32),
 	trash_flag		boolean,
 	trash_reason		varchar(256),
 
-	primary key (archive_uid,contract_id,rating_platform_module),
+	primary key (archive_uid,contract_id,sku_prefix,rating_platform_module),
 	foreign key (archive_uid) references archives(uid),
 	foreign key (contract_id) references edw_contracts(id)
 );
 
 drop view all_sw_on_hw;
 create view all_sw_on_hw as
 select
-	edw_customers.end_customer_name,sw_on_hw.archive_uid,edw_contracts.legal_contract,sw_on_hw.rating_platform_module,sw_on_hw.as_of_date,
+	edw_customers.end_customer_name,sw_on_hw.archive_uid,edw_contracts.legal_contract,sw_on_hw.sku_prefix,
+	sw_on_hw.rating_platform_module,sw_on_hw.as_of_date,
 	sw_on_hw.quantity,sw_on_hw.dss_create_time,sw_on_hw.trash_flag,sw_on_hw.trash_reason
 from
 	sw_on_hw,edw_contracts,edw_customers

diff --git a/f5tt/bigiq.py b/f5tt/bigiq.py
@@ -577,6 +577,8 @@ def bigIqFullSwOnHwjson(fullJSON=None):
     fullJSON,code = bigIqInventory(mode='JSON')
 
   swonhw,code = bigIqSwOnHwjson(fullJSON)
+  swonhw.pop('report')
+
 
   fullJSON['report'] = utils.getVersionJson(reportType='Full Software on Hardware',dataplane='BIG-IQ')
   fullJSON['swonhw'] = swonhw