From b5d9c7b1272428068804b1cbbb9efab36a7ea912 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Aug 2023 13:22:53 +0000
Subject: [PATCH] consolidate http-1.0.0.mapping.json schema to match all
 across (#850)

Signed-off-by: YANGDB <yang.db.dev@gmail.com>
(cherry picked from commit 74b69c1dfdc76b130ab9fecfa8cac31a0871f933)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../nginx/schemas/http-1.0.0.mapping.json     | 266 ++++++++++--------
 1 file changed, 155 insertions(+), 111 deletions(-)

diff --git a/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json
index cf70dac93..98d933840 100644
--- a/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json
+++ b/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json
@@ -1,121 +1,165 @@
 {
-  "template": {
-    "mappings": {
-      "_meta": {
-        "version": "1.0.0",
-        "catalog": "observability",
-        "type": "logs",
-        "component": "http"
-      },
-      "dynamic_templates": [
-        {
-          "request_header_map": {
-            "mapping": {
-              "type": "keyword"
+    "template": {
+        "mappings": {
+            "_meta": {
+                "version": "1.0.0",
+                "catalog": "observability",
+                "type": "logs",
+                "component": "http"
             },
-            "path_match": "request.header.*"
-          }
-        },
-        {
-          "response_header_map": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "path_match": "response.header.*"
-          }
-        }
-      ],
-      "properties": {
-        "http": {
-          "properties": {
-            "flavor": {
-              "type": "keyword",
-              "ignore_above": 256
-            },
-            "user_agent": {
-              "type": "keyword",
-              "ignore_above": 2048
-            },
-            "url": {
-              "type": "keyword",
-              "ignore_above": 2048
-            },
-            "schema": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "target": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "route": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "client.ip": {
-              "type": "ip"
-            },
-            "resent_count": {
-              "type": "integer"
-            },
-            "request": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "text",
-                  "fields": {
-                    "keyword": {
-                      "type": "keyword",
-                      "ignore_above": 256
+            "dynamic_templates": [
+                {
+                    "request_header_map": {
+                        "mapping": {
+                            "type": "keyword"
+                        },
+                        "path_match": "request.header.*"
                     }
-                  }
                 },
-                "body.content": {
-                  "type": "text"
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "method": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                },
-                "referrer": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "mime_type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
+                {
+                    "response_header_map": {
+                        "mapping": {
+                            "type": "keyword"
+                        },
+                        "path_match": "response.header.*"
+                    }
                 }
-              }
-            },
-            "response": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "text",
-                  "fields": {
-                    "keyword": {
-                      "type": "keyword",
-                      "ignore_above": 256
+            ],
+            "properties": {
+                "http": {
+                    "properties": {
+                        "flavor": {
+                            "type": "keyword",
+                            "ignore_above": 256
+                        },
+                        "user_agent": {
+                            "type": "object",
+                            "properties": {
+                                "original": {
+                                    "type": "keyword"
+                                },
+                                "name": {
+                                    "type": "keyword"
+                                },
+                                "version": {
+                                    "type": "keyword"
+                                },
+                                "device": {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": "keyword"
+                                        }
+                                    }
+                                },
+                                "os": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "keyword"
+                                        },
+                                        "platform": {
+                                            "type": "keyword"
+                                        },
+                                        "name": {
+                                            "type": "keyword"
+                                        },
+                                        "full": {
+                                            "type": "keyword"
+                                        },
+                                        "family": {
+                                            "type": "keyword"
+                                        },
+                                        "version": {
+                                            "type": "keyword"
+                                        },
+                                        "kernel": {
+                                            "type": "keyword"
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "url": {
+                            "type": "keyword",
+                            "ignore_above": 2048
+                        },
+                        "schema": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        },
+                        "target": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        },
+                        "route": {
+                            "type": "keyword",
+                            "ignore_above": 1024
+                        },
+                        "client.ip": {
+                            "type": "ip"
+                        },
+                        "resent_count": {
+                            "type": "integer"
+                        },
+                        "request": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "text",
+                                    "fields": {
+                                        "keyword": {
+                                            "type": "keyword",
+                                            "ignore_above": 256
+                                        }
+                                    }
+                                },
+                                "body.content": {
+                                    "type": "text"
+                                },
+                                "bytes": {
+                                    "type": "long"
+                                },
+                                "method": {
+                                    "type": "keyword",
+                                    "ignore_above": 256
+                                },
+                                "referrer": {
+                                    "type": "keyword",
+                                    "ignore_above": 1024
+                                },
+                                "mime_type": {
+                                    "type": "keyword",
+                                    "ignore_above": 1024
+                                }
+                            }
+                        },
+                        "response": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "text",
+                                    "fields": {
+                                        "keyword": {
+                                            "type": "keyword",
+                                            "ignore_above": 256
+                                        }
+                                    }
+                                },
+                                "body.content": {
+                                    "type": "text"
+                                },
+                                "bytes": {
+                                    "type": "long"
+                                },
+                                "status_code": {
+                                    "type": "integer"
+                                }
+                            }
+                        }
                     }
-                  }
-                },
-                "body.content": {
-                  "type": "text"
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "status_code": {
-                  "type": "integer"
                 }
-              }
             }
-          }
         }
-      }
     }
-  }
-}
\ No newline at end of file
+}