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

Jump to bottom

Add queries & query templates for serviceMap integration #1498

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add queries & query templates for serviceMap integration #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions docs/Integration-API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ GET _integration/repository?filter=category:logs&component:web
**Response**:
```jsoon
{
"name": "nginx",
"template-name": "nginx",
"version": {
"integ": "0.1.0",
"integration": "0.1.0",
"schema": "1.0.0",
"resource": "^1.23.0"
},
Expand Down Expand Up @@ -143,7 +143,7 @@ each representing different domain / aspect such as geographic.
{
"template-name": "nginx",
"version": {
"integ": "0.1.0",
"integration": "0.1.0",
"schema": "1.0.0",
"resource": "^1.23.0"
},
Expand Down Expand Up @@ -181,7 +181,7 @@ each representing different domain / aspect such as geographic.
}]
}
],
"repo": {
"repository": {
"github": "https://github.com/opensearch-project/observability/tree/main/integrarions/nginx"
}
}
Expand Down
6 changes: 3 additions & 3 deletions docs/Integration-structure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ nginX
{
"template_name": "nginx",
"version": {
"integ": "0.1.0",
"integration": "0.1.0",
"schema": "1.0.0",
"resource": "^1.23.0",
}
Expand Down Expand Up @@ -149,7 +149,7 @@ nginX
}]
}
],
"repo": {
"repository": {
"github": "https://github.com/opensearch-project/observability/tree/main/integrations/nginx"
}
}
Expand All @@ -159,7 +159,7 @@ nginX

```
"version": {
"integ": "0.1.0",
"integration": "0.1.0",
"schema": "1.0.0",
"resource": "^1.23.0",
}
Expand Down
69 changes: 47 additions & 22 deletions docs/schema/system/samples/integration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,59 @@
"identification": "instrumentationScope.attributes.identification",
"catalog": "observability",
"components": [
"web","http"
"web",
"http"
],
"collection":[
"collection": [
{
"logs": [{
"info": "access logs",
"input_type":"logfile",
"dataset":"nginx.access",
"labels" :["nginx","access"],
"fields-mapping" : [
{"alias":"http.url","field":"request_url"} ,
{"alias":"http.request.body.content","field":"request_body"}
]
},
"logs": [
{
"info": "access logs",
"input_type": "logfile",
"dataset": "nginx.access",
"labels": [
"nginx",
"access"
],
"fields-mapping": [
{
"template": "my-custom-http_logs",
"fields": [
{
"alias": "http.url",
"field": "request_url"
},
{
"alias": "http.request.body.content",
"field": "request_body"
}
]
}
]
},
{
"info": "error logs",
"input_type":"logfile",
"labels" :["nginx","error"],
"dataset":"nginx.error"
}]
"input_type": "logfile",
"labels": [
"nginx",
"error"
],
"dataset": "nginx.error"
}
]
},
{
"metrics": [{
"info": "status metrics",
"input_type":"metrics",
"dataset":"nginx.status",
"labels" :["nginx","status"]
}]
"metrics": [
{
"info": "status metrics",
"input_type": "metrics",
"dataset": "nginx.status",
"labels": [
"nginx",
"status"
]
}
]
}
],
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions integrations/nginx/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nginx",
"template-name": "nginx",
"version": {
"integ": "0.1.0",
"integration": "0.1.0",
"schema": "1.0.0",
"resource": "^1.23.0"
},
Expand Down Expand Up @@ -35,8 +35,8 @@
}]
}
],
"repo": {
"github": "https://github.com/opensearch-project/observability/tree/main/integrarions/nginx"
"repository": {
"url": "https://github.com/opensearch-project/observability/tree/main/integrarions/nginx"
}
}

38 changes: 38 additions & 0 deletions integrations/service-map/assets/mapping/jaeger-services.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"index_patterns": [
"jaeger-service-v1*"
],
"mappings": {
"properties": {
"operationName": {
"type": "keyword",
"ignore_above": 256
},
"serviceName": {
"type": "keyword",
"ignore_above": 256
}
},
"dynamic_templates": [
{
"span_tags_map": {
"path_match": "tag.*",
"mapping": {
"ignore_above": 256,
"type": "keyword"
}
}
},
{
"process_tags_map": {
"path_match": "process.tag.*",
"mapping": {
"ignore_above": 256,
"type": "keyword"
}
}
}
]
},
"version": 1
}
Loading