From e4adb95d7fd7d7d986b4903bb9dfe762d9f2d3bb Mon Sep 17 00:00:00 2001
From: Greg Dean <gmdean@buffalo.edu>
Date: Fri, 1 May 2020 15:02:48 -0400
Subject: [PATCH 1/3] adding index to provider_identifier column on asset table
 to improve speed

---
 .../cloud_openstack/event_asset_root_volume.json          | 8 +++++++-
 configuration/etl/etl_tables.d/cloud_common/asset.json    | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/event_asset_root_volume.json b/configuration/etl/etl_action_defs.d/cloud_openstack/event_asset_root_volume.json
index 64e640c878..4d575536f3 100644
--- a/configuration/etl/etl_action_defs.d/cloud_openstack/event_asset_root_volume.json
+++ b/configuration/etl/etl_action_defs.d/cloud_openstack/event_asset_root_volume.json
@@ -19,10 +19,16 @@
         },
 
         "joins": [
+            {
+                "name": "openstack_staging_event",
+                "schema": "${SOURCE_SCHEMA}",
+                "alias": "staging"
+            },
             {
                 "name": "event",
                 "schema": "${SOURCE_SCHEMA}",
-                "alias": "ev"
+                "alias": "ev",
+                "on": "ev.resource_id = staging.resource_id AND ev.instance_id = staging.instance_id AND ev.event_time_ts = staging.event_time_ts AND ev.event_type_id = staging.event_type_id"
             },
             {
                 "name": "instance",
diff --git a/configuration/etl/etl_tables.d/cloud_common/asset.json b/configuration/etl/etl_tables.d/cloud_common/asset.json
index d1025c7c79..df0943f081 100644
--- a/configuration/etl/etl_tables.d/cloud_common/asset.json
+++ b/configuration/etl/etl_tables.d/cloud_common/asset.json
@@ -99,6 +99,13 @@
                     "asset_id"
                 ],
                 "is_unique": true
+            },
+            {
+                "name": "idx_provider_identifier",
+                "columns": [
+                    "provider_identifier"
+                ],
+                "is_unique": false
             }
         ]
     }

From 7348ee82d1e22b87f95241072f5b5d5d1ff88f3f Mon Sep 17 00:00:00 2001
From: Greg Dean <gmdean@buffalo.edu>
Date: Mon, 4 May 2020 12:09:41 -0400
Subject: [PATCH 2/3] updated generic action for adding root volume to event
 asset table

---
 .../cloud_generic/event_asset_root_volume.json            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configuration/etl/etl_action_defs.d/cloud_generic/event_asset_root_volume.json b/configuration/etl/etl_action_defs.d/cloud_generic/event_asset_root_volume.json
index da2c353245..f65a11ae06 100644
--- a/configuration/etl/etl_action_defs.d/cloud_generic/event_asset_root_volume.json
+++ b/configuration/etl/etl_action_defs.d/cloud_generic/event_asset_root_volume.json
@@ -19,10 +19,16 @@
         },
 
         "joins": [
+            {
+                "name": "generic_cloud_staging_event",
+                "schema": "${SOURCE_SCHEMA}",
+                "alias": "staging"
+            },
             {
                 "name": "event",
                 "schema": "${SOURCE_SCHEMA}",
-                "alias": "ev"
+                "alias": "ev",
+                "on": "ev.resource_id = staging.resource_id AND ev.instance_id = staging.instance_id AND ev.event_time_ts = staging.event_time_ts AND ev.event_type_id = staging.event_type_id"
             },
             {
                 "name": "instance",

From 12517bf6b2bbc25f5ba18ede3e8d0f15c391b2d8 Mon Sep 17 00:00:00 2001
From: Greg Dean <gmdean@buffalo.edu>
Date: Mon, 4 May 2020 13:32:43 -0400
Subject: [PATCH 3/3] adding resource_id to idx_provier_identifier key on asset
 table"

---
 configuration/etl/etl_tables.d/cloud_common/asset.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configuration/etl/etl_tables.d/cloud_common/asset.json b/configuration/etl/etl_tables.d/cloud_common/asset.json
index df0943f081..e0009bd84d 100644
--- a/configuration/etl/etl_tables.d/cloud_common/asset.json
+++ b/configuration/etl/etl_tables.d/cloud_common/asset.json
@@ -103,6 +103,7 @@
             {
                 "name": "idx_provider_identifier",
                 "columns": [
+                    "resource_id",
                     "provider_identifier"
                 ],
                 "is_unique": false