consolidate cloud schema to match all across (#846) (#902)

(cherry picked from commit 07a621b) Signed-off-by: YANGDB <[email protected]> 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>
opensearch-project · Aug 15, 2023 · 398335e · 398335e
1 parent 7a4bc74
commit 398335e
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 14 deletions.
diff --git a/...adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json b/...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
@@ -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 @@
       }
     }
   }
-}
+}
diff --git a/...r/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json b/...r/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"
+                }
+              }
             }
           }
         }