chore: add fields from inventory_hosts to system_platform

RHINENG-23540

Author: RostyslavKachan

common/peewee_model.py

@@ -191,6 +191,11 @@ class SystemPlatform(BaseModelRW):
     group_set_id = ForeignKeyField(column_name="group_set_id", model=SystemGroupSet, field="id")
     tag_set_id = ForeignKeyField(column_name="tag_set_id", model=SystemTagSet, field="id")
     sap_ids = ArrayField(TextField, null=False, default=list)
+    insights_id = UUIDField(null=True)
+    updated_timestamp = DateTimeField(null=True)
+    mssql = BooleanField(null=True)
+    ansible = BooleanField(null=True)
+    rhsm_version = TextField(null=True)
 
     class Meta:
         """system_platform table metadata"""

database/schema/upgrade_scripts/160-add-fields-to-system-platform-Cyndi-migration.sql

@@ -0,0 +1,14 @@
+ALTER TABLE system_platform ADD COLUMN insights_id UUID;
+CREATE INDEX ON system_platform(insights_id);
+
+ALTER TABLE system_platform ADD COLUMN updated_timestamp TIMESTAMP WITH TIME ZONE;
+CREATE INDEX ON system_platform(updated_timestamp);
+
+ALTER TABLE system_platform ADD COLUMN mssql BOOLEAN;
+
+
+ALTER TABLE system_platform ADD COLUMN ansible BOOLEAN;
+
+
+ALTER TABLE system_platform ADD COLUMN rhsm_version TEXT;
+CREATE INDEX ON system_platform(rhsm_version);

database/schema/ve_db_postgresql.sql

@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS db_version (
 ) TABLESPACE pg_default;
 
 -- set the schema version directly in the insert statement here!!
-INSERT INTO db_version (name, version) VALUES ('schema_version', 159);
+INSERT INTO db_version (name, version) VALUES ('schema_version', 160);
 -- INSERT INTO db_version (name, version) VALUES ('schema_version', :schema_version);
 
 
@@ -229,6 +229,11 @@ CREATE TABLE IF NOT EXISTS system_platform (
   host_type TEXT,
   rule_results JSONB,
   operating_system_id INT,
+  insights_id UUID,
+  updated_timestamp TIMESTAMP WITH TIME ZONE,
+  mssql BOOLEAN,
+  ansible BOOLEAN,
+  rhsm_version TEXT,
   sap_ids TEXT[],
   group_set_id BIGINT,
   tag_set_id BIGINT,
@@ -267,6 +272,12 @@ CREATE INDEX ON system_platform(tag_set_id);
 
 CREATE INDEX ON system_platform USING gin(sap_ids);
 
+CREATE INDEX ON system_platform(insights_id);
+
+CREATE INDEX ON system_platform(updated_timestamp);
+
+CREATE INDEX ON system_platform(rhsm_version);
+
 CREATE TRIGGER system_platform_set_first_reported
   BEFORE INSERT ON system_platform
   FOR EACH ROW EXECUTE PROCEDURE set_first_reported();

listener/inventory_processor.py

@@ -336,16 +336,20 @@ async def _db_import_system(self, conn, fields: dict, org_id: str, inventory_id:
                 INSERT INTO system_platform
                 (rh_account_id, inventory_id, s3_url, vmaas_json, json_checksum, display_name,
                  stale_timestamp, stale_warning_timestamp, culled_timestamp,
-                 host_type, last_upload, stale, operating_system_id, sap_ids, group_set_id, tag_set_id)
+                 host_type, last_upload, stale, operating_system_id, sap_ids, group_set_id, tag_set_id, insights_id, updated_timestamp,
+                 mssql, ansible, rhsm_version)
                 VALUES (%(rh_account_id)s, %(inventory_id)s, %(s3_url)s, %(vmaas_json)s, %(json_checksum)s, %(display_name)s,
                         %(stale_timestamp)s, %(stale_warning_timestamp)s, %(culled_timestamp)s,
-                        %(host_type)s, %(last_upload)s, 'F', %(operating_system_id)s, %(sap_ids)s, %(group_set_id)s, %(tag_set_id)s)
+                        %(host_type)s, %(last_upload)s, 'F', %(operating_system_id)s, %(sap_ids)s, %(group_set_id)s, %(tag_set_id)s, %(insights_id)s,
+                        %(updated_timestamp)s, %(mssql)s, %(ansible)s, %(rhsm_version)s)
                 ON CONFLICT (inventory_id) DO UPDATE SET
                 rh_account_id = EXCLUDED.rh_account_id, inventory_id = EXCLUDED.inventory_id, s3_url = EXCLUDED.s3_url, vmaas_json = EXCLUDED.vmaas_json,
                 json_checksum = EXCLUDED.json_checksum, display_name = EXCLUDED.display_name, stale_timestamp = EXCLUDED.stale_timestamp,
                 stale_warning_timestamp = EXCLUDED.stale_warning_timestamp, culled_timestamp = EXCLUDED.culled_timestamp,
                 host_type = EXCLUDED.host_type, last_upload = EXCLUDED.last_upload, stale = EXCLUDED.stale, operating_system_id = EXCLUDED.operating_system_id,
-                sap_ids = EXCLUDED.sap_ids, group_set_id = EXCLUDED.group_set_id, tag_set_id = EXCLUDED.tag_set_id
+                sap_ids = EXCLUDED.sap_ids, group_set_id = EXCLUDED.group_set_id, tag_set_id = EXCLUDED.tag_set_id,
+                insights_id = EXCLUDED.insights_id, updated_timestamp = EXCLUDED.updated_timestamp,
+                mssql = EXCLUDED.mssql, ansible = EXCLUDED.ansible, rhsm_version = EXCLUDED.rhsm_version
                 RETURNING (xmax = 0) AS inserted, unchanged_since, last_evaluation, id, when_deleted
             """
         else:
@@ -364,7 +368,12 @@ async def _db_import_system(self, conn, fields: dict, org_id: str, inventory_id:
                     operating_system_id = %(operating_system_id)s,
                     sap_ids = %(sap_ids)s,
                     group_set_id = %(group_set_id)s,
-                    tag_set_id = %(tag_set_id)s
+                    tag_set_id = %(tag_set_id)s,
+                    insights_id = %(insights_id)s,
+                    updated_timestamp = %(updated_timestamp)s,
+                    mssql = %(mssql)s,
+                    ansible = %(ansible)s,
+                    rhsm_version = %(rhsm_version)s
                 WHERE id = %(system_id)s
                 RETURNING (xmax = 0) AS inserted, unchanged_since, last_evaluation, id, when_deleted
             """
@@ -480,7 +489,16 @@ async def _process_upload(self, msg: InventoryMsg):
                     groups_checksum, group_set_id = await self._db_system_group_set_lookup(conn, msg.msg["host"]["groups"])
                     tags_checksum, tag_set_id = await self._db_system_tag_set_lookup(conn, msg.msg["host"]["tags"])
                     system_profile = msg.msg["host"].get("system_profile", {})
-                    sap_ids = system_profile.get("workloads", {}).get("sap", {}).get("sids", [])
+                    workloads = system_profile.get("workloads", {})
+                    sap_ids = workloads.get("sap", {}).get("sids", [])
+                    mssql = bool(workloads.get("mssql"))
+                    ansible = bool(workloads.get("ansible"))
+                    rhsm_version = system_profile.get("rhsm", {}).get("version")
+                    insert_fields["insights_id"] = msg.msg["host"].get("insights_id")
+                    insert_fields["updated_timestamp"] = msg.msg["host"].get("updated")
+                    insert_fields["mssql"] = mssql
+                    insert_fields["ansible"] = ansible
+                    insert_fields["rhsm_version"] = rhsm_version
                     insert_fields["sap_ids"] = sap_ids
                     insert_fields["operating_system_id"] = operating_system_id
                     insert_fields["group_set_id"] = group_set_id