Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Apache Integration #754

Merged
merged 25 commits into from
Aug 2, 2023
Merged

Add Apache Integration #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
db6e8c4
Modified map visualization to be region map instead of tiles
Jul 21, 2023
87bc4a6
Added user agent mapping file
Jul 21, 2023
02aa1ae
Added event.dataset field
Jul 21, 2023
89146ce
removed event.dataset
Jul 21, 2023
52d2056
Updated author
Jul 21, 2023
792cf36
Added README.md
Jul 26, 2023
42fc967
Added dashboard.png and logo.png
Jul 26, 2023
72e1c83
Updated search queries object in assets and another sample log
Jul 26, 2023
b93280e
Updated geo fields in communication mappings
Jul 26, 2023
a78b6b9
Fixed datetime format
Jul 26, 2023
c2840d1
Added geo to destination
Jul 26, 2023
aba4d06
Updated error search query object
Jul 26, 2023
9f4c849
Created Geo object in communications schema
Jul 26, 2023
0842bee
Changed user_agent to be a subfield of http
Jul 26, 2023
94d020f
Changed structure of logo and gallery
Jul 26, 2023
8a83f8f
Removed user agent from logs component
Jul 26, 2023
c65476f
Changed user_agent and os fields to be subobjects
Jul 26, 2023
3b94923
Fixed geo object
Jul 26, 2023
3d14e89
Remoted user_agent from components
Jul 26, 2023
153fdec
Added geo data to error log
Jul 26, 2023
83c7bd8
Updated name
Jul 26, 2023
2be9b98
Added ingestion pipeline info
Jul 26, 2023
37b1847
Updated README.md to remove ingestion pipeline
danieldong51 Aug 1, 2023
80fab73
Created INGESTION.md
danieldong51 Aug 1, 2023
3b10f44
Updated INGESTION.md
danieldong51 Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
View file
Open in desktop
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
Open in desktop

Large diffs are not rendered by default.

206 changes: 206 additions & 0 deletions server/adaptors/integrations/__data__/repository/apache/data/sample.json
View file
Open in desktop
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