Skip to content

Commit

Permalink
Add Apache Integration (#754) (#799)
Browse files Browse the repository at this point in the history 
* Modified map visualization to be region map instead of tiles



* Added user agent mapping file



* Added event.dataset field



* removed event.dataset



* Updated author



* Added README.md



* Added dashboard.png and logo.png



* Updated search queries object in assets and another sample log



* Updated geo fields in communication mappings



* Fixed datetime format



* Added geo to destination



* Updated error search query object



* Created Geo object in communications schema



* Changed user_agent to be a subfield of http



* Changed structure of logo and gallery



* Removed user agent from logs component



* Changed user_agent and os fields to be subobjects



* Fixed geo object



* Remoted user_agent from components



* Added geo data to error log



* Updated name



* Added ingestion pipeline info



* Updated README.md to remove ingestion pipeline



* Created INGESTION.md



* Updated INGESTION.md



---------




(cherry picked from commit ffaed2c)

Signed-off-by: Daniel Dong <danieldong51@amazon.com>
Signed-off-by: Dan Dong <58446449+danieldong51@users.noreply.github.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>
Co-authored-by: Daniel Dong <danieldong51@amazon.com>
  • Loading branch information
@opensearch-trigger-bot @github-actions
3 people authored Aug 3, 2023
1 parent 4702a5c commit 06a6165
Show file tree
Hide file tree
Showing 10 changed files with 963 additions and 0 deletions.
45 changes: 45 additions & 0 deletions server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "apache",
"version": "1.0.0",
"displayName": "Apache Dashboard",
"description": "Apache web logs collector",
"license": "Apache-2.0",
"type": "logs",
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_s3/info",
"statics": {
"logo": {
"annotation": "Apache Logo",
"path": "logo.png"
},
"gallery": [
{
"annotation": "Apache Dashboard",
"path": "dashboard1.png"
}
]
},
"components": [
{
"name": "communication",
"version": "1.0.0"
},
{
"name": "http",
"version": "1.0.0"
},
{
"name": "logs",
"version": "1.0.0"
}
],
"assets": {
"savedObjects": {
"name": "apache",
"version": "1.0.0"
}
},
"sampleData": {
"path": "sample.json"
}
}
11 changes: 11 additions & 0 deletions server/adaptors/integrations/__data__/repository/apache/assets/apache-1.0.0.ndjson
View file

Large diffs are not rendered by default.

206 changes: 206 additions & 0 deletions server/adaptors/integrations/__data__/repository/apache/data/sample.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
[
{
"observedTimestamp": "2023-07-21T16:52:08.000Z",
"http": {
"response": {
"status_code": 406,
"bytes": 6141
},
"url": "/strategize",
"flavor": "1.1",
"request": {
"method": "GET"
},
"user_agent": {
"original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
"name": "Chrome",
"version": "114.0.0",
"os": {
"name": "Mac OS X",
"full": "Mac OS X 10.15.7",
"version": "10.15.7",
"device": {
"name": "Mac"
}
}
}
},
"attributes": {
"data_stream": {
"dataset": "apache.access",
"namespace": "production",
"type": "logs"
}
},
"event": {
"result": "success",
"category": "web",
"name": "access",
"type": "access",
"domain": "apache.access",
"kind": "event"
},
"communication": {
"source": {
"address": "127.0.0.1",
"ip": "42.204.151.42",
"geo": {
"country": "China",
"country_iso_code": "CN"
}
}
},
"body": "15.248.1.132 - - [21/Jun/2023:21:35:24 +0000] \"GET / HTTP/1.1\" 403 45 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36\"",
"traceId": "d09d293a27c9a754f2bf0196b5a1c9bc",
"spanId": "18ba0e515e42dad0",
"@timestamp": "2023-07-21T16:52:08.000Z"
},
{
"observedTimestamp": "2023-07-21T16:52:08.000Z",
"http": {
"response": {
"status_code": 406,
"bytes": 6141
},
"url": "/strategize",
"flavor": "1.1",
"request": {
"method": "GET"
},
"user_agent": {
"original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
"name": "Chrome",
"version": "114.0.0",
"os": {
"name": "Mac OS X",
"full": "Mac OS X 10.15.7",
"version": "10.15.7",
"device": {
"name": "Mac"
}
}
}
},
"attributes": {
"data_stream": {
"dataset": "apache.access",
"namespace": "production",
"type": "logs"
}
},
"event": {
"result": "success",
"category": "web",
"name": "access",
"type": "access",
"domain": "apache.access",
"kind": "event"
},
"communication": {
"source": {
"address": "127.0.0.1",
"ip": "42.204.151.42",
"geo": {
"country": "China",
"country_iso_code": "CN"
}
}
},

"body": "15.248.1.132 - - [21/Jun/2023:21:35:24 +0000] \"GET / HTTP/1.1\" 403 45 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36\"",
"traceId": "d09d293a27c9a754f2bf0196b5a1c9bc",
"spanId": "18ba0e515e42dad0",
"@timestamp": "2023-07-21T16:52:08.000Z"
},
{
"observedTimestamp": "2023-07-25:52:08.000Z",
"http": {
"response": {
"status_code": 400,
"bytes": 6141
},
"url": "/strategize",
"flavor": "1.1",
"request": {
"method": "GET"
},
"user_agent": {
"original": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
"name": "Chrome",
"version": "114.0.0",
"os": {
"name": "Mac OS X",
"full": "Mac OS X 10.15.7",
"version": "10.15.7",
"device": {
"name": "Mac"
}
}
}
},
"attributes": {
"data_stream": {
"dataset": "apache.access",
"namespace": "production",
"type": "logs"
}
},
"event": {
"result": "success",
"category": "web",
"name": "access",
"type": "access",
"domain": "apache.access",
"kind": "event"
},
"communication": {
"source": {
"address": "127.0.0.1",
"ip": "42.204.151.42",
"geo": {
"country": "United States",
"country_iso_code": "US"
}
}
},
"body": "15.248.1.132 - - [21/Jun/2023:21:35:24 +0000] \"GET / HTTP/1.1\" 403 45 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36\"",
"traceId": "d09d293a27c9a754f2bf0196b5a1c9bc",
"spanId": "18ba0e515e42dad0",
"@timestamp": "2023-07-21T16:52:08.000Z"
},
{
"attributes": {
"data_stream": {
"dataset": "apache.error",
"namespace": "production",
"type": "logs"
}
},
"observedTimestamp": "2023-07-21T16:52:08.000Z",
"@timestamp": "2023-07-21T16:52:08.000Z",
"severity": {
"text": "cgid:error"
},
"communication": {
"source": {
"address": "127.0.0.1",
"ip": "42.204.151.42",
"geo": {
"country": "France",
"country_iso_code": "FR"
}
}
},
"event": {
"result": "error",
"category": "web",
"name": "error",
"type": "error",
"domain": "apache.error",
"kind": "error"
},
"traceId": "d09d293a27c9a754f2bf0196b5a1c9bc",
"spanId": "18ba0e515e42dad0",
"body": "[Sat Aug 12 04:05:51 2006] [notice] Apache/1.3.11 (Unix) mod_perl/1.21 configured -- resuming normal operations"
}
]
Loading

0 comments on commit 06a6165

Please sign in to comment.