Skip to content

Commit c9d302f

Browse files
QxisyloloQxisylolo
authored
Merge branch 'main' into feat/add_bar_gauge
Signed-off-by: Qxisylolo <[email protected]>
2 parents 808f33d + e426a90 commit c9d302f

File tree

123 files changed

+10356
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+10356
-465
lines changed

‎changelogs/fragments/10604.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Allow customizing legend name ([#10604](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10604))

‎changelogs/fragments/10723.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Explore Field Statistics ([#10723](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10723))

‎changelogs/fragments/10729.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Add correlations tab to support linking Trace and Logs Datasets ([#10729](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10729))

‎changelogs/fragments/10736.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
test:
2+
- Add Cypress test data for trace log correlation ([#10736](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10736))

‎changelogs/fragments/10737.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Add Data scope and Schema mapping info on dataset editing page ([#10737](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10737))

‎changelogs/fragments/10740.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fix:
2+
- Correlations - fetch logs datasets from saved objects ([#10740](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10740))

‎cypress/fixtures/explore/traces/logs_otel_v1_000001.data.ndjson‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-001"}}
2+
{"@timestamp":"2025-08-28T19:26:46.422000000Z","observedTimestamp":"2025-08-28T19:26:46.422500000Z","time":"2025-08-28T19:26:46.422000000Z","body":"Processing request for owner 1 pet 1","severityText":"INFO","severityNumber":9,"traceId":"68b0ad76fc05c5a5f5e3738d42b8a735","spanId":"58f52f0436530c7c","flags":1,"attributes":{"otelServiceName":"customers-service-java","otelTraceID":"68b0ad76fc05c5a5f5e3738d42b8a735","otelSpanID":"58f52f0436530c7c","otelTraceSampled":true,"thread.name":"http-nio-8081-exec-1230","thread.id":30080},"resource":{"attributes":{"service.name":"customers-service-java","service.instance.id":"06c3cf85-3ead-4e24-a7aa-dbcb4eb7968f","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"customers-service-java-768b5df9b8-t27hm","k8s.container.name":"customers-service-java","host.name":"ip-10-0-2-205.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"customers-service-logger","version":"1.0.0"}}
3+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-002"}}
4+
{"@timestamp":"2025-08-28T19:26:46.422779536Z","observedTimestamp":"2025-08-28T19:26:46.423000000Z","time":"2025-08-28T19:26:46.422779536Z","body":"Failed to connect to pet insurance service","severityText":"ERROR","severityNumber":17,"traceId":"68b0ad76fc05c5a5f5e3738d42b8a735","spanId":"cb33dd3277a4ad06","flags":1,"attributes":{"otelServiceName":"customers-service-java","otelTraceID":"68b0ad76fc05c5a5f5e3738d42b8a735","otelSpanID":"cb33dd3277a4ad06","otelTraceSampled":true,"exception":{"type":"java.net.ConnectException","message":"Connection refused (Connection refused)","stacktrace":"java.net.ConnectException: Connection refused (Connection refused)\n\tat java.base/java.net.PlainSocketImpl.socketConnect(Native Method)"},"thread.name":"http-nio-8081-exec-1230","thread.id":30080,"http.url":"http://10.0.3.96:8000/pet-insurances/1"},"resource":{"attributes":{"service.name":"customers-service-java","service.instance.id":"06c3cf85-3ead-4e24-a7aa-dbcb4eb7968f","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"customers-service-java-768b5df9b8-t27hm","k8s.container.name":"customers-service-java","host.name":"ip-10-0-2-205.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"customers-service-logger","version":"1.0.0"}}
5+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-003"}}
6+
{"@timestamp":"2025-08-28T19:26:46.422331866Z","observedTimestamp":"2025-08-28T19:26:46.422500000Z","time":"2025-08-28T19:26:46.422331866Z","body":"Executing database query for pet lookup","severityText":"DEBUG","severityNumber":5,"traceId":"68b0ad76fc05c5a5f5e3738d42b8a735","spanId":"443d4c2b66e36f21","flags":1,"attributes":{"otelServiceName":"customers-service-java","otelTraceID":"68b0ad76fc05c5a5f5e3738d42b8a735","otelSpanID":"443d4c2b66e36f21","otelTraceSampled":true,"db.system":"hsqldb","db.operation":"SELECT","thread.name":"http-nio-8081-exec-1230","thread.id":30080},"resource":{"attributes":{"service.name":"customers-service-java","service.instance.id":"06c3cf85-3ead-4e24-a7aa-dbcb4eb7968f","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"customers-service-java-768b5df9b8-t27hm","k8s.container.name":"customers-service-java","host.name":"ip-10-0-2-205.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"customers-service-logger","version":"1.0.0"}}
7+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-004"}}
8+
{"@timestamp":"2025-08-28T19:26:46.656399146Z","observedTimestamp":"2025-08-28T19:26:46.656600000Z","time":"2025-08-28T19:26:46.656399146Z","body":"Making HTTP request to customers service","severityText":"INFO","severityNumber":9,"traceId":"68b0ad77d4d8130679c6d3432bda4515","spanId":"2cad96eff563b3c6","flags":1,"attributes":{"otelServiceName":"pet-clinic-frontend-java","otelTraceID":"68b0ad77d4d8130679c6d3432bda4515","otelSpanID":"2cad96eff563b3c6","otelTraceSampled":true,"http.method":"GET","http.url":"http://10.0.2.45:8081/owners/1","thread.name":"reactor-http-epoll-4","thread.id":84},"resource":{"attributes":{"service.name":"pet-clinic-frontend-java","service.instance.id":"7d2710ff-1798-4c50-a8dd-290c3a767b1a","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"pet-clinic-frontend-java-645d454886-pd8nn","k8s.container.name":"api-gateway-java","host.name":"ip-10-0-2-14.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"frontend-logger","version":"1.0.0"}}
9+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-005"}}
10+
{"@timestamp":"2025-08-28T19:26:46.657905525Z","observedTimestamp":"2025-08-28T19:26:46.658000000Z","time":"2025-08-28T19:26:46.657905525Z","body":"Fetching visits for pets","severityText":"INFO","severityNumber":9,"traceId":"68b0ad77d4d8130679c6d3432bda4515","spanId":"a689e68a0a61df6a","flags":1,"attributes":{"otelServiceName":"pet-clinic-frontend-java","otelTraceID":"68b0ad77d4d8130679c6d3432bda4515","otelSpanID":"a689e68a0a61df6a","otelTraceSampled":true,"code.namespace":"org.springframework.samples.petclinic.api.application.VisitsServiceClient","code.function":"getVisitsForPets","thread.name":"reactor-http-epoll-2","thread.id":80},"resource":{"attributes":{"service.name":"pet-clinic-frontend-java","service.instance.id":"7d2710ff-1798-4c50-a8dd-290c3a767b1a","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"pet-clinic-frontend-java-645d454886-pd8nn","k8s.container.name":"api-gateway-java","host.name":"ip-10-0-2-14.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"frontend-logger","version":"1.0.0"}}
11+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-006"}}
12+
{"@timestamp":"2025-08-28T19:26:44.705490000Z","observedTimestamp":"2025-08-28T19:26:44.705700000Z","time":"2025-08-28T19:26:44.705490000Z","body":"Serving static resource: angularjs library","severityText":"DEBUG","severityNumber":5,"traceId":"17b1e22140de6e92e4f109f7821d6ef3","spanId":"d3ac725d9115680e","flags":1,"attributes":{"otelServiceName":"pet-clinic-frontend-java","otelTraceID":"17b1e22140de6e92e4f109f7821d6ef3","otelSpanID":"d3ac725d9115680e","otelTraceSampled":true,"http.route":"/webjars/**","http.target":"/webjars/angularjs/angular.min.js","thread.name":"reactor-http-epoll-2","thread.id":80},"resource":{"attributes":{"service.name":"pet-clinic-frontend-java","service.instance.id":"7d2710ff-1798-4c50-a8dd-290c3a767b1a","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"pet-clinic-frontend-java-645d454886-pd8nn","k8s.container.name":"api-gateway-java","host.name":"ip-10-0-2-14.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"frontend-logger","version":"1.0.0"}}
13+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-007"}}
14+
{"@timestamp":"2025-08-28T19:26:44.767855000Z","observedTimestamp":"2025-08-28T19:26:44.768000000Z","time":"2025-08-28T19:26:44.767855000Z","body":"Request from HTC device user agent","severityText":"INFO","severityNumber":9,"traceId":"980808a94d1555cae7aa8e9e3f0d77b7","spanId":"579e25d5152b5b69","flags":1,"attributes":{"otelServiceName":"pet-clinic-frontend-java","otelTraceID":"980808a94d1555cae7aa8e9e3f0d77b7","otelSpanID":"579e25d5152b5b69","otelTraceSampled":true,"http.user_agent":"HTC Mozilla/5.0 (Linux; Android 7.0; HTC 10 Build/NRD90M)","client.address":"10.0.2.101","thread.name":"reactor-http-epoll-3","thread.id":83},"resource":{"attributes":{"service.name":"pet-clinic-frontend-java","service.instance.id":"7d2710ff-1798-4c50-a8dd-290c3a767b1a","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"pet-clinic-frontend-java-645d454886-pd8nn","k8s.container.name":"api-gateway-java","host.name":"ip-10-0-2-14.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"frontend-logger","version":"1.0.0"}}
15+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-008"}}
16+
{"@timestamp":"2025-08-28T19:26:46.421277754Z","observedTimestamp":"2025-08-28T19:26:46.421400000Z","time":"2025-08-28T19:26:46.421277754Z","body":"Repository method invoked: findPetTypes","severityText":"DEBUG","severityNumber":5,"traceId":"68b0ad763c589735c4fd4aa640743807","spanId":"a6c1408441387622","flags":1,"attributes":{"otelServiceName":"customers-service-java","otelTraceID":"68b0ad763c589735c4fd4aa640743807","otelSpanID":"a6c1408441387622","otelTraceSampled":true,"code.namespace":"org.springframework.samples.petclinic.customers.model.PetRepository","code.function":"findPetTypes","thread.name":"http-nio-8081-exec-1230","thread.id":30080},"resource":{"attributes":{"service.name":"customers-service-java","service.instance.id":"06c3cf85-3ead-4e24-a7aa-dbcb4eb7968f","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"customers-service-java-768b5df9b8-t27hm","k8s.container.name":"customers-service-java","host.name":"ip-10-0-2-205.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"customers-service-logger","version":"1.0.0"}}
17+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-009"}}
18+
{"@timestamp":"2025-08-28T19:26:46.420327035Z","observedTimestamp":"2025-08-28T19:26:46.420500000Z","time":"2025-08-28T19:26:46.420327035Z","body":"Payment client retrieving payment information","severityText":"INFO","severityNumber":9,"traceId":"68b0ad76fc05c5a5f5e3738d42b8a735","spanId":"96f9b3548af5a65b","flags":1,"attributes":{"otelServiceName":"pet-clinic-frontend-java","otelTraceID":"68b0ad76fc05c5a5f5e3738d42b8a735","otelSpanID":"96f9b3548af5a65b","otelTraceSampled":true,"owner.id":1,"pet.id":1,"code.function":"getPayments","thread.name":"reactor-http-epoll-4","thread.id":85},"resource":{"attributes":{"service.name":"pet-clinic-frontend-java","service.instance.id":"d77a68a0-cab9-48bc-b011-62c7cbd7ef21","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"pet-clinic-frontend-java-645d454886-cs8rq","k8s.container.name":"api-gateway-java","host.name":"ip-10-0-3-213.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"frontend-logger","version":"1.0.0"}}
19+
{"index":{"_index":"logs-otel-v1-000001","_id":"log-010"}}
20+
{"@timestamp":"2025-08-28T19:26:46.422225207Z","observedTimestamp":"2025-08-28T19:26:46.422400000Z","time":"2025-08-28T19:26:46.422225207Z","body":"Hibernate session finding Pet entity","severityText":"DEBUG","severityNumber":5,"traceId":"68b0ad76fc05c5a5f5e3738d42b8a735","spanId":"994b4d86a6d267a5","flags":1,"attributes":{"otelServiceName":"customers-service-java","otelTraceID":"68b0ad76fc05c5a5f5e3738d42b8a735","otelSpanID":"994b4d86a6d267a5","otelTraceSampled":true,"hibernate.entity":"org.springframework.samples.petclinic.customers.model.Pet","thread.name":"http-nio-8081-exec-1230","thread.id":30080},"resource":{"attributes":{"service.name":"customers-service-java","service.instance.id":"06c3cf85-3ead-4e24-a7aa-dbcb4eb7968f","service.version":"latest","telemetry.sdk.name":"opentelemetry","telemetry.sdk.language":"java","telemetry.sdk.version":"1.44.1","k8s.namespace.name":"pet-clinic","k8s.pod.name":"customers-service-java-768b5df9b8-t27hm","k8s.container.name":"customers-service-java","host.name":"ip-10-0-2-205.us-west-2.compute.internal","cloud.provider":"aws","cloud.region":"us-west-2"}},"instrumentationScope":{"name":"customers-service-logger","version":"1.0.0"}}

‎cypress/fixtures/explore/traces/logs_otel_v1_000001.mapping.json‎

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
{
2+
"mappings": {
3+
"properties": {
4+
"@timestamp": {
5+
"type": "date"
6+
},
7+
"observedTimestamp": {
8+
"type": "date"
9+
},
10+
"time": {
11+
"type": "date"
12+
},
13+
"body": {
14+
"type": "text",
15+
"fields": {
16+
"keyword": {
17+
"type": "keyword"
18+
}
19+
}
20+
},
21+
"severityText": {
22+
"type": "keyword"
23+
},
24+
"severityNumber": {
25+
"type": "integer"
26+
},
27+
"traceId": {
28+
"type": "keyword"
29+
},
30+
"spanId": {
31+
"type": "keyword"
32+
},
33+
"flags": {
34+
"type": "integer"
35+
},
36+
"attributes": {
37+
"type": "object",
38+
"properties": {
39+
"otelServiceName": {
40+
"type": "keyword"
41+
},
42+
"otelTraceID": {
43+
"type": "keyword"
44+
},
45+
"otelSpanID": {
46+
"type": "keyword"
47+
},
48+
"otelTraceSampled": {
49+
"type": "boolean"
50+
},
51+
"thread.name": {
52+
"type": "keyword"
53+
},
54+
"thread.id": {
55+
"type": "long"
56+
},
57+
"exception": {
58+
"type": "object",
59+
"properties": {
60+
"type": {
61+
"type": "keyword"
62+
},
63+
"message": {
64+
"type": "text"
65+
},
66+
"stacktrace": {
67+
"type": "text"
68+
}
69+
}
70+
},
71+
"http.url": {
72+
"type": "keyword"
73+
},
74+
"http.method": {
75+
"type": "keyword"
76+
},
77+
"http.route": {
78+
"type": "keyword"
79+
},
80+
"http.target": {
81+
"type": "keyword"
82+
},
83+
"http.user_agent": {
84+
"type": "text"
85+
},
86+
"db.system": {
87+
"type": "keyword"
88+
},
89+
"db.operation": {
90+
"type": "keyword"
91+
},
92+
"code.namespace": {
93+
"type": "keyword"
94+
},
95+
"code.function": {
96+
"type": "keyword"
97+
},
98+
"client.address": {
99+
"type": "ip"
100+
},
101+
"owner.id": {
102+
"type": "integer"
103+
},
104+
"pet.id": {
105+
"type": "integer"
106+
},
107+
"hibernate.entity": {
108+
"type": "keyword"
109+
}
110+
}
111+
},
112+
"resource": {
113+
"type": "object",
114+
"properties": {
115+
"attributes": {
116+
"type": "object",
117+
"properties": {
118+
"service.name": {
119+
"type": "keyword"
120+
},
121+
"service.instance.id": {
122+
"type": "keyword"
123+
},
124+
"service.version": {
125+
"type": "keyword"
126+
},
127+
"telemetry.sdk.name": {
128+
"type": "keyword"
129+
},
130+
"telemetry.sdk.language": {
131+
"type": "keyword"
132+
},
133+
"telemetry.sdk.version": {
134+
"type": "keyword"
135+
},
136+
"k8s.namespace.name": {
137+
"type": "keyword"
138+
},
139+
"k8s.pod.name": {
140+
"type": "keyword"
141+
},
142+
"k8s.container.name": {
143+
"type": "keyword"
144+
},
145+
"host.name": {
146+
"type": "keyword"
147+
},
148+
"cloud.provider": {
149+
"type": "keyword"
150+
},
151+
"cloud.region": {
152+
"type": "keyword"
153+
}
154+
}
155+
}
156+
}
157+
},
158+
"instrumentationScope": {
159+
"type": "object",
160+
"properties": {
161+
"name": {
162+
"type": "keyword"
163+
},
164+
"version": {
165+
"type": "keyword"
166+
}
167+
}
168+
}
169+
}
170+
}
171+
}

‎src/plugins/data/public/index.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export {
7272
DatasetSelectorAppearance,
7373
DetailedDataset,
7474
AdvancedSelector,
75+
ConfiguratorV2,
7576
} from './ui';
7677

7778
import {
@@ -630,3 +631,8 @@ export {
630631

631632
export { SavedQueryManagementComponent } from './ui/saved_query_management';
632633
export { SaveQueryForm, SavedQueryMeta } from './ui/saved_query_form';
634+
export {
635+
getSchemaConfigs,
636+
SchemaConfig,
637+
SchemaAttributeConfig,
638+
} from './ui/dataset_selector/configurator/schema_config';

‎src/plugins/data/public/ui/dataset_selector/advanced_selector.tsx‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@
44
*/
55

66
import React, { useState } from 'react';
7+
8+
/**
9+
* AdvancedSelector component for dataset selection and configuration.
10+
*
11+
* This component provides a two-step interface:
12+
* 1. DatasetExplorer - Browse and select datasets
13+
* 2. ConfiguratorV2 - Configure the selected dataset (language, time field, schema mappings, etc.)
14+
*
15+
* Usage with modals:
16+
* When rendering this component inside a modal, apply the className 'datasetSelector__advancedModal'
17+
* to the modal container for consistent sizing (1200px × 800px) and layout.
18+
*
19+
* Example:
20+
* ```tsx
21+
* overlays.openModal(
22+
* toMountPoint(<AdvancedSelector {...props} />),
23+
* { maxWidth: false, className: 'datasetSelector__advancedModal' }
24+
* );
25+
* ```
26+
*/
727
import {
828
BaseDataset,
929
DATA_STRUCTURE_META_TYPES,

0 commit comments

Comments
 (0)