From 5b708141cdf83c726b8c14269067cf63de6b02f2 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:28:32 -0400
Subject: [PATCH] consolidate cloud schema to match all across (#846) (#903)

(cherry picked from commit 07a621b49489ec70a98f668205a8b01ae0e37dea)

Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../schemas/cloud-1.0.0.mapping.json          | 54 ++++++++++++++++---
 .../aws_elb/schemas/cloud-1.0.0.mapping.json  |  8 ++-
 .../schemas/cloud-1.0.0.mapping.json          | 53 +++++++++++++++---
 3 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json
index c14bbf327a..8965129b35 100644
--- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json
@@ -9,30 +9,70 @@
       },
       "properties": {
         "cloud": {
-          "type" : "object",
           "properties": {
             "provider": {
               "type": "keyword"
             },
+            "availability_zone": {
+              "type": "keyword"
+            },
+            "region": {
+              "type": "keyword"
+            },
+            "machine": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
             "account": {
               "type": "object",
               "properties": {
                 "id": {
                   "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
                 }
               }
             },
-            "region": {
+            "platform": {
               "type": "keyword"
             },
-            "resource_id": {
-              "type": "keyword"
+            "service": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "keyword"
+                }
+              }
             },
-            "availability_zone": {
-              "type": "keyword"
+            "project": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
             },
-            "platform": {
+            "resource_id": {
               "type": "keyword"
+            },
+            "instance": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         }
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json
index ece2a2c1f4..8965129b35 100644
--- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json
@@ -38,6 +38,9 @@
                 }
               }
             },
+            "platform": {
+              "type": "keyword"
+            },
             "service": {
               "type": "object",
               "properties": {
@@ -57,6 +60,9 @@
                 }
               }
             },
+            "resource_id": {
+              "type": "keyword"
+            },
             "instance": {
               "type": "object",
               "properties": {
@@ -73,4 +79,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json
index 7e91c4c3f1..8965129b35 100644
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json
@@ -13,25 +13,66 @@
             "provider": {
               "type": "keyword"
             },
+            "availability_zone": {
+              "type": "keyword"
+            },
+            "region": {
+              "type": "keyword"
+            },
+            "machine": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
             "account": {
               "type": "object",
               "properties": {
                 "id": {
                   "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
                 }
               }
             },
-            "region": {
+            "platform": {
               "type": "keyword"
             },
-            "resource_id": {
-              "type": "keyword"
+            "service": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "keyword"
+                }
+              }
             },
-            "availability_zone": {
-              "type": "keyword"
+            "project": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
             },
-            "platform": {
+            "resource_id": {
               "type": "keyword"
+            },
+            "instance": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         }