Skip to content

Commit d93ea36

Browse files
authored
Merge branch 'main' into maxfilepertrigger-integration
2 parents f23a317 + a9610da commit d93ea36

File tree

11 files changed

+64
-27
lines changed

11 files changed

+64
-27
lines changed

common/constants/trace_analytics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const TRACE_ANALYTICS_PLOTS_DATE_FORMAT = 'MMM D, YYYY HH:mm:ss.SSS';
1212
export const SERVICE_MAP_MAX_NODES = 500;
1313
// size limit when requesting edge related queries, not necessarily the number of edges
1414
export const SERVICE_MAP_MAX_EDGES = 1000;
15-
export const TRACES_MAX_NUM = 3000;
15+
export const TRACES_MAX_NUM = 500;
1616
export const TRACE_ANALYTICS_DOCUMENTATION_LINK =
1717
'https://opensearch.org/docs/latest/observability-plugin/trace/index/';
1818

public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ exports[`Log Config component renders empty log config 1`] = `
9090
"getCenter$": [MockFunction],
9191
"getLeft$": [MockFunction],
9292
"getLeftBottom$": [MockFunction],
93+
"getPrimaryHeaderRight$": [MockFunction],
9394
"getRight$": [MockFunction],
9495
"registerCenter": [MockFunction],
9596
"registerLeft": [MockFunction],
9697
"registerLeftBottom": [MockFunction],
98+
"registerPrimaryHeaderRight": [MockFunction],
9799
"registerRight": [MockFunction],
98100
},
99101
"navGroup": Object {
@@ -760,10 +762,12 @@ exports[`Log Config component renders with query 1`] = `
760762
"getCenter$": [MockFunction],
761763
"getLeft$": [MockFunction],
762764
"getLeftBottom$": [MockFunction],
765+
"getPrimaryHeaderRight$": [MockFunction],
763766
"getRight$": [MockFunction],
764767
"registerCenter": [MockFunction],
765768
"registerLeft": [MockFunction],
766769
"registerLeftBottom": [MockFunction],
770+
"registerPrimaryHeaderRight": [MockFunction],
767771
"registerRight": [MockFunction],
768772
},
769773
"navGroup": Object {

public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ exports[`Service Config component renders empty service config 1`] = `
9090
"getCenter$": [MockFunction],
9191
"getLeft$": [MockFunction],
9292
"getLeftBottom$": [MockFunction],
93+
"getPrimaryHeaderRight$": [MockFunction],
9394
"getRight$": [MockFunction],
9495
"registerCenter": [MockFunction],
9596
"registerLeft": [MockFunction],
9697
"registerLeftBottom": [MockFunction],
98+
"registerPrimaryHeaderRight": [MockFunction],
9799
"registerRight": [MockFunction],
98100
},
99101
"navGroup": Object {
@@ -1454,10 +1456,12 @@ exports[`Service Config component renders with one service selected 1`] = `
14541456
"getCenter$": [MockFunction],
14551457
"getLeft$": [MockFunction],
14561458
"getLeftBottom$": [MockFunction],
1459+
"getPrimaryHeaderRight$": [MockFunction],
14571460
"getRight$": [MockFunction],
14581461
"registerCenter": [MockFunction],
14591462
"registerLeft": [MockFunction],
14601463
"registerLeftBottom": [MockFunction],
1464+
"registerPrimaryHeaderRight": [MockFunction],
14611465
"registerRight": [MockFunction],
14621466
},
14631467
"navGroup": Object {

public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,12 @@ exports[`Trace Config component renders empty trace config 1`] = `
8989
"getCenter$": [MockFunction],
9090
"getLeft$": [MockFunction],
9191
"getLeftBottom$": [MockFunction],
92+
"getPrimaryHeaderRight$": [MockFunction],
9293
"getRight$": [MockFunction],
9394
"registerCenter": [MockFunction],
9495
"registerLeft": [MockFunction],
9596
"registerLeftBottom": [MockFunction],
97+
"registerPrimaryHeaderRight": [MockFunction],
9698
"registerRight": [MockFunction],
9799
},
98100
"navGroup": Object {
@@ -1015,10 +1017,12 @@ exports[`Trace Config component renders with one trace selected 1`] = `
10151017
"getCenter$": [MockFunction],
10161018
"getLeft$": [MockFunction],
10171019
"getLeftBottom$": [MockFunction],
1020+
"getPrimaryHeaderRight$": [MockFunction],
10181021
"getRight$": [MockFunction],
10191022
"registerCenter": [MockFunction],
10201023
"registerLeft": [MockFunction],
10211024
"registerLeftBottom": [MockFunction],
1025+
"registerPrimaryHeaderRight": [MockFunction],
10221026
"registerRight": [MockFunction],
10231027
},
10241028
"navGroup": Object {

public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,10 +1237,12 @@ exports[`Panels View Component renders panel view container with visualizations
12371237
"getCenter$": [MockFunction],
12381238
"getLeft$": [MockFunction],
12391239
"getLeftBottom$": [MockFunction],
1240+
"getPrimaryHeaderRight$": [MockFunction],
12401241
"getRight$": [MockFunction],
12411242
"registerCenter": [MockFunction],
12421243
"registerLeft": [MockFunction],
12431244
"registerLeftBottom": [MockFunction],
1245+
"registerPrimaryHeaderRight": [MockFunction],
12441246
"registerRight": [MockFunction],
12451247
},
12461248
"navGroup": Object {
@@ -3144,10 +3146,12 @@ exports[`Panels View Component renders panel view container with visualizations
31443146
"getCenter$": [MockFunction],
31453147
"getLeft$": [MockFunction],
31463148
"getLeftBottom$": [MockFunction],
3149+
"getPrimaryHeaderRight$": [MockFunction],
31473150
"getRight$": [MockFunction],
31483151
"registerCenter": [MockFunction],
31493152
"registerLeft": [MockFunction],
31503153
"registerLeftBottom": [MockFunction],
3154+
"registerPrimaryHeaderRight": [MockFunction],
31513155
"registerRight": [MockFunction],
31523156
},
31533157
"navGroup": Object {
@@ -3605,10 +3609,12 @@ exports[`Panels View Component renders panel view container without visualizatio
36053609
"getCenter$": [MockFunction],
36063610
"getLeft$": [MockFunction],
36073611
"getLeftBottom$": [MockFunction],
3612+
"getPrimaryHeaderRight$": [MockFunction],
36083613
"getRight$": [MockFunction],
36093614
"registerCenter": [MockFunction],
36103615
"registerLeft": [MockFunction],
36113616
"registerLeftBottom": [MockFunction],
3617+
"registerPrimaryHeaderRight": [MockFunction],
36123618
"registerRight": [MockFunction],
36133619
},
36143620
"navGroup": Object {
@@ -5396,10 +5402,12 @@ exports[`Panels View Component renders panel view container without visualizatio
53965402
"getCenter$": [MockFunction],
53975403
"getLeft$": [MockFunction],
53985404
"getLeftBottom$": [MockFunction],
5405+
"getPrimaryHeaderRight$": [MockFunction],
53995406
"getRight$": [MockFunction],
54005407
"registerCenter": [MockFunction],
54015408
"registerLeft": [MockFunction],
54025409
"registerLeftBottom": [MockFunction],
5410+
"registerPrimaryHeaderRight": [MockFunction],
54035411
"registerRight": [MockFunction],
54045412
},
54055413
"navGroup": Object {

public/components/custom_panels/panel_modules/panel_grid/__tests__/__snapshots__/panel_grid.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,12 @@ exports[`Panel Grid Component renders panel grid component with empty visualizat
247247
"getCenter$": [MockFunction],
248248
"getLeft$": [MockFunction],
249249
"getLeftBottom$": [MockFunction],
250+
"getPrimaryHeaderRight$": [MockFunction],
250251
"getRight$": [MockFunction],
251252
"registerCenter": [MockFunction],
252253
"registerLeft": [MockFunction],
253254
"registerLeftBottom": [MockFunction],
255+
"registerPrimaryHeaderRight": [MockFunction],
254256
"registerRight": [MockFunction],
255257
},
256258
"navGroup": Object {

public/components/metrics/view/__tests__/__snapshots__/metrics_grid.test.tsx.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,12 @@ exports[`Metrics Grid Component renders Metrics Grid Component 1`] = `
100100
"getCenter$": [MockFunction],
101101
"getLeft$": [MockFunction],
102102
"getLeftBottom$": [MockFunction],
103+
"getPrimaryHeaderRight$": [MockFunction],
103104
"getRight$": [MockFunction],
104105
"registerCenter": [MockFunction],
105106
"registerLeft": [MockFunction],
106107
"registerLeftBottom": [MockFunction],
108+
"registerPrimaryHeaderRight": [MockFunction],
107109
"registerRight": [MockFunction],
108110
},
109111
"navGroup": Object {
@@ -277,10 +279,12 @@ exports[`Metrics Grid Component renders Metrics Grid Component 1`] = `
277279
"getCenter$": [MockFunction],
278280
"getLeft$": [MockFunction],
279281
"getLeftBottom$": [MockFunction],
282+
"getPrimaryHeaderRight$": [MockFunction],
280283
"getRight$": [MockFunction],
281284
"registerCenter": [MockFunction],
282285
"registerLeft": [MockFunction],
283286
"registerLeftBottom": [MockFunction],
287+
"registerPrimaryHeaderRight": [MockFunction],
284288
"registerRight": [MockFunction],
285289
},
286290
"navGroup": Object {

public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,12 @@ exports[`Dashboard component renders dashboard 1`] = `
103103
"getCenter$": [MockFunction],
104104
"getLeft$": [MockFunction],
105105
"getLeftBottom$": [MockFunction],
106+
"getPrimaryHeaderRight$": [MockFunction],
106107
"getRight$": [MockFunction],
107108
"registerCenter": [MockFunction],
108109
"registerLeft": [MockFunction],
109110
"registerLeftBottom": [MockFunction],
111+
"registerPrimaryHeaderRight": [MockFunction],
110112
"registerRight": [MockFunction],
111113
},
112114
"navGroup": Object {
@@ -496,10 +498,12 @@ exports[`Dashboard component renders dashboard 1`] = `
496498
"getCenter$": [MockFunction],
497499
"getLeft$": [MockFunction],
498500
"getLeftBottom$": [MockFunction],
501+
"getPrimaryHeaderRight$": [MockFunction],
499502
"getRight$": [MockFunction],
500503
"registerCenter": [MockFunction],
501504
"registerLeft": [MockFunction],
502505
"registerLeftBottom": [MockFunction],
506+
"registerPrimaryHeaderRight": [MockFunction],
503507
"registerRight": [MockFunction],
504508
},
505509
"navGroup": Object {
@@ -1361,10 +1365,12 @@ exports[`Dashboard component renders empty dashboard 1`] = `
13611365
"getCenter$": [MockFunction],
13621366
"getLeft$": [MockFunction],
13631367
"getLeftBottom$": [MockFunction],
1368+
"getPrimaryHeaderRight$": [MockFunction],
13641369
"getRight$": [MockFunction],
13651370
"registerCenter": [MockFunction],
13661371
"registerLeft": [MockFunction],
13671372
"registerLeftBottom": [MockFunction],
1373+
"registerPrimaryHeaderRight": [MockFunction],
13681374
"registerRight": [MockFunction],
13691375
},
13701376
"navGroup": Object {
@@ -1753,10 +1759,12 @@ exports[`Dashboard component renders empty dashboard 1`] = `
17531759
"getCenter$": [MockFunction],
17541760
"getLeft$": [MockFunction],
17551761
"getLeftBottom$": [MockFunction],
1762+
"getPrimaryHeaderRight$": [MockFunction],
17561763
"getRight$": [MockFunction],
17571764
"registerCenter": [MockFunction],
17581765
"registerLeft": [MockFunction],
17591766
"registerLeftBottom": [MockFunction],
1767+
"registerPrimaryHeaderRight": [MockFunction],
17601768
"registerRight": [MockFunction],
17611769
},
17621770
"navGroup": Object {
@@ -2618,10 +2626,12 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
26182626
"getCenter$": [MockFunction],
26192627
"getLeft$": [MockFunction],
26202628
"getLeftBottom$": [MockFunction],
2629+
"getPrimaryHeaderRight$": [MockFunction],
26212630
"getRight$": [MockFunction],
26222631
"registerCenter": [MockFunction],
26232632
"registerLeft": [MockFunction],
26242633
"registerLeftBottom": [MockFunction],
2634+
"registerPrimaryHeaderRight": [MockFunction],
26252635
"registerRight": [MockFunction],
26262636
},
26272637
"navGroup": Object {
@@ -3012,10 +3022,12 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
30123022
"getCenter$": [MockFunction],
30133023
"getLeft$": [MockFunction],
30143024
"getLeftBottom$": [MockFunction],
3025+
"getPrimaryHeaderRight$": [MockFunction],
30153026
"getRight$": [MockFunction],
30163027
"registerCenter": [MockFunction],
30173028
"registerLeft": [MockFunction],
30183029
"registerLeftBottom": [MockFunction],
3030+
"registerPrimaryHeaderRight": [MockFunction],
30193031
"registerRight": [MockFunction],
30203032
},
30213033
"navGroup": Object {

public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,12 @@ exports[`Services component renders empty services page 1`] = `
103103
"getCenter$": [MockFunction],
104104
"getLeft$": [MockFunction],
105105
"getLeftBottom$": [MockFunction],
106+
"getPrimaryHeaderRight$": [MockFunction],
106107
"getRight$": [MockFunction],
107108
"registerCenter": [MockFunction],
108109
"registerLeft": [MockFunction],
109110
"registerLeftBottom": [MockFunction],
111+
"registerPrimaryHeaderRight": [MockFunction],
110112
"registerRight": [MockFunction],
111113
},
112114
"navGroup": Object {
@@ -334,10 +336,12 @@ exports[`Services component renders empty services page 1`] = `
334336
"getCenter$": [MockFunction],
335337
"getLeft$": [MockFunction],
336338
"getLeftBottom$": [MockFunction],
339+
"getPrimaryHeaderRight$": [MockFunction],
337340
"getRight$": [MockFunction],
338341
"registerCenter": [MockFunction],
339342
"registerLeft": [MockFunction],
340343
"registerLeftBottom": [MockFunction],
344+
"registerPrimaryHeaderRight": [MockFunction],
341345
"registerRight": [MockFunction],
342346
},
343347
"navGroup": Object {
@@ -2543,10 +2547,12 @@ exports[`Services component renders jaeger services page 1`] = `
25432547
"getCenter$": [MockFunction],
25442548
"getLeft$": [MockFunction],
25452549
"getLeftBottom$": [MockFunction],
2550+
"getPrimaryHeaderRight$": [MockFunction],
25462551
"getRight$": [MockFunction],
25472552
"registerCenter": [MockFunction],
25482553
"registerLeft": [MockFunction],
25492554
"registerLeftBottom": [MockFunction],
2555+
"registerPrimaryHeaderRight": [MockFunction],
25502556
"registerRight": [MockFunction],
25512557
},
25522558
"navGroup": Object {
@@ -2774,10 +2780,12 @@ exports[`Services component renders jaeger services page 1`] = `
27742780
"getCenter$": [MockFunction],
27752781
"getLeft$": [MockFunction],
27762782
"getLeftBottom$": [MockFunction],
2783+
"getPrimaryHeaderRight$": [MockFunction],
27772784
"getRight$": [MockFunction],
27782785
"registerCenter": [MockFunction],
27792786
"registerLeft": [MockFunction],
27802787
"registerLeftBottom": [MockFunction],
2788+
"registerPrimaryHeaderRight": [MockFunction],
27812789
"registerRight": [MockFunction],
27822790
},
27832791
"navGroup": Object {
@@ -4245,10 +4253,12 @@ exports[`Services component renders services page 1`] = `
42454253
"getCenter$": [MockFunction],
42464254
"getLeft$": [MockFunction],
42474255
"getLeftBottom$": [MockFunction],
4256+
"getPrimaryHeaderRight$": [MockFunction],
42484257
"getRight$": [MockFunction],
42494258
"registerCenter": [MockFunction],
42504259
"registerLeft": [MockFunction],
42514260
"registerLeftBottom": [MockFunction],
4261+
"registerPrimaryHeaderRight": [MockFunction],
42524262
"registerRight": [MockFunction],
42534263
},
42544264
"navGroup": Object {
@@ -4475,10 +4485,12 @@ exports[`Services component renders services page 1`] = `
44754485
"getCenter$": [MockFunction],
44764486
"getLeft$": [MockFunction],
44774487
"getLeftBottom$": [MockFunction],
4488+
"getPrimaryHeaderRight$": [MockFunction],
44784489
"getRight$": [MockFunction],
44794490
"registerCenter": [MockFunction],
44804491
"registerLeft": [MockFunction],
44814492
"registerLeftBottom": [MockFunction],
4493+
"registerPrimaryHeaderRight": [MockFunction],
44824494
"registerRight": [MockFunction],
44834495
},
44844496
"navGroup": Object {

0 commit comments

Comments
 (0)