Backport ELB and VPC changes to 2.9 (#878)

* Copy ELB fixes from main Signed-off-by: Simeon Widdis <[email protected]> * Copy VPC fixes from main Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]>
opensearch-project · Aug 9, 2023 · b6f8d89 · b6f8d89
1 parent 7eef82a
commit b6f8d89
Show file tree

Hide file tree

Showing 6 changed files with 432 additions and 7 deletions.
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
@@ -4,7 +4,7 @@
     "displayName": "AWS ELB",
     "description": "AWS Elastic Load Balancer collector",
     "license": "Apache-2.0",
-    "type": "logs",
+    "type": "logs_elb",
     "author": "OpenSearch",
     "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_elb/info",
     "statics": {
@@ -41,7 +41,7 @@
             "version": "1.0.0"
         },
         {
-            "name": "logs",
+            "name": "logs_elb",
             "version": "1.0.0"
         }
     ],
@@ -54,4 +54,4 @@
     "sampleData": {
         "path": "sample.json"
     }
-}
+}
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json
@@ -0,0 +1,249 @@
+{
+    "index_patterns": [
+      "ss4o_logs-aws_elb-*"
+    ],
+    "data_stream": {},
+    "template": {
+      "aliases": {
+        "logs-elb": {}
+      },
+      "mappings": {
+        "_meta": {
+          "version": "1.0.0",
+          "catalog": "observability",
+          "type": "logs",
+          "component": "log",
+          "correlations": [
+            {
+              "field": "spanId",
+              "foreign-schema": "traces",
+              "foreign-field": "spanId"
+            },
+            {
+              "field": "traceId",
+              "foreign-schema": "traces",
+              "foreign-field": "traceId"
+            }
+          ]
+        },
+        "_source": {
+          "enabled": true
+        },
+        "dynamic_templates": [
+          {
+            "resources_map": {
+              "mapping": {
+                "type": "keyword"
+              },
+              "path_match": "resource.*"
+            }
+          },
+          {
+            "attributes_map": {
+              "mapping": {
+                "type": "keyword"
+              },
+              "path_match": "attributes.*"
+            }
+          },
+          {
+            "instrumentation_scope_attributes_map": {
+              "mapping": {
+                "type": "keyword"
+              },
+              "path_match": "instrumentationScope.attributes.*"
+            }
+          }
+        ],
+        "properties": {
+          "severity": {
+            "properties": {
+              "number": {
+                "type": "long"
+              },
+              "text": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              }
+            }
+          },
+          "attributes": {
+            "type": "object",
+            "properties": {
+              "data_stream": {
+                "properties": {
+                  "dataset": {
+                    "ignore_above": 128,
+                    "type": "keyword"
+                  },
+                  "namespace": {
+                    "ignore_above": 128,
+                    "type": "keyword"
+                  },
+                  "type": {
+                    "ignore_above": 56,
+                    "type": "keyword"
+                  }
+                }
+              }
+            }
+          },
+          "body": {
+            "type": "text"
+          },
+          "@message": {
+            "type": "alias",
+            "path": "body"
+          },
+          "@timestamp": {
+            "type": "date"
+          },
+          "observedTimestamp": {
+            "type": "date"
+          },
+          "observerTime": {
+            "type": "alias",
+            "path": "observedTimestamp"
+          },
+          "traceId": {
+            "ignore_above": 256,
+            "type": "keyword"
+          },
+          "spanId": {
+            "ignore_above": 256,
+            "type": "keyword"
+          },
+          "schemaUrl": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
+          },
+          "instrumentationScope": {
+            "properties": {
+              "name": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 128
+                  }
+                }
+              },
+              "version": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              },
+              "dropped_attributes_count": {
+                "type": "integer"
+              },
+              "schemaUrl": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
+              }
+            }
+          },
+          "event": {
+            "properties": {
+              "domain": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "name": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "source": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "category": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "type": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "kind": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "result": {
+                "ignore_above": 256,
+                "type": "keyword"
+              },
+              "exception": {
+                "properties": {
+                  "message": {
+                    "ignore_above": 1024,
+                    "type": "keyword"
+                  },
+                  "type": {
+                    "ignore_above": 256,
+                    "type": "keyword"
+                  },
+                  "stacktrace": {
+                    "type": "text"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "settings": {
+        "index": {
+          "mapping": {
+            "total_fields": {
+              "limit": 10000
+            }
+          },
+          "refresh_interval": "5s"
+        }
+      }
+    },
+    "composed_of": [
+      "communication",
+      "http",
+      "cloud",
+      "aws_elb",
+      "url"
+    ],
+    "version": 1,
+    "_meta": {
+      "description": "Simple Schema For Observability",
+      "catalog": "observability",
+      "type": "logs",
+      "correlations": [
+        {
+          "field": "spanId",
+          "foreign-schema": "traces",
+          "foreign-field": "spanId"
+        },
+        {
+          "field": "traceId",
+          "foreign-schema": "traces",
+          "foreign-field": "traceId"
+        }
+      ]
+    }
+  }
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
@@ -37,7 +37,7 @@
       "version": "1.0.0"
     },
     {
-      "name": "s3",
+      "name": "aws_s3",
       "version": "1.0.0"
     }
   ],

diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info/README.md
@@ -21,4 +21,6 @@ An integration is a bundle of pre-canned assets which are bundled togather in a
 AWS VPC flow logs integration includes dashboards, visualisations, queries and an index mapping.
 
 ### Dashboards
+The Dashboard uses the index alias `logs-vpc` for shortening the index name - be advised.
+
 ![](../static/dashboard1.png)