Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 528b2d7

Browse files
kaiyan-shengkaiyan-sheng
authoredApr 7, 2020
Cherry-pick elastic#17542 to 7.7: [Metricbeat] Fix s3 dashboard to use aws.s3.bucket.name field name (elastic#17557)
* [Metricbeat] Fix s3 dashboard to use aws.s3.bucket.name field name (elastic#17542) * Fix s3 dashboard to use aws.s3.bucket.name field name * add changelog (cherry picked from commit eec0c9c) * update changelog
1 parent c1405a3 commit 528b2d7

File tree

2 files changed

+88
-48
lines changed

2 files changed

+88
-48
lines changed
 

‎CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
187187
- Fix how we filter services by name in system/service {pull}17400[17400]
188188
- Fix cloudwatch metricset missing tags collection. {issue}17419[17419] {pull}17424[17424]
189189
- check if cpuOptions field is nil in DescribeInstances output in ec2 metricset. {pull}17418[17418]
190+
- Fix aws.s3.bucket.name terms_field in s3 overview dashboard. {pull}17542[17542]
190191
- Fix Unix socket path in memcached. {pull}17512[17512]
191192

192193
*Packetbeat*

‎x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json

Lines changed: 87 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
},
2020
"panelsJSON": [
2121
{
22-
"embeddableConfig": {},
22+
"embeddableConfig": {
23+
"title": "S3 Daily Storage Bucket Size in Bytes"
24+
},
2325
"gridData": {
2426
"h": 7,
2527
"i": "1",
@@ -29,10 +31,13 @@
2931
},
3032
"panelIndex": "1",
3133
"panelRefName": "panel_0",
32-
"version": "7.3.0"
34+
"title": "S3 Daily Storage Bucket Size in Bytes",
35+
"version": "7.7.0"
3336
},
3437
{
35-
"embeddableConfig": {},
38+
"embeddableConfig": {
39+
"title": "S3 Daily Storage Number of Objects"
40+
},
3641
"gridData": {
3742
"h": 7,
3843
"i": "2",
@@ -42,10 +47,13 @@
4247
},
4348
"panelIndex": "2",
4449
"panelRefName": "panel_1",
45-
"version": "7.3.0"
50+
"title": "S3 Daily Storage Number of Objects",
51+
"version": "7.7.0"
4652
},
4753
{
48-
"embeddableConfig": {},
54+
"embeddableConfig": {
55+
"title": "S3 Request Latency Total Request in ms"
56+
},
4957
"gridData": {
5058
"h": 7,
5159
"i": "3",
@@ -55,10 +63,13 @@
5563
},
5664
"panelIndex": "3",
5765
"panelRefName": "panel_2",
58-
"version": "7.3.0"
66+
"title": "S3 Request Latency Total Request in ms",
67+
"version": "7.7.0"
5968
},
6069
{
61-
"embeddableConfig": {},
70+
"embeddableConfig": {
71+
"title": "S3 Total Error 4xx"
72+
},
6273
"gridData": {
6374
"h": 6,
6475
"i": "4",
@@ -68,10 +79,13 @@
6879
},
6980
"panelIndex": "4",
7081
"panelRefName": "panel_3",
71-
"version": "7.3.0"
82+
"title": "S3 Total Error 4xx",
83+
"version": "7.7.0"
7284
},
7385
{
74-
"embeddableConfig": {},
86+
"embeddableConfig": {
87+
"title": "S3 Total Error 5xx"
88+
},
7589
"gridData": {
7690
"h": 6,
7791
"i": "5",
@@ -81,10 +95,13 @@
8195
},
8296
"panelIndex": "5",
8397
"panelRefName": "panel_4",
84-
"version": "7.3.0"
98+
"title": "S3 Total Error 5xx",
99+
"version": "7.7.0"
85100
},
86101
{
87-
"embeddableConfig": {},
102+
"embeddableConfig": {
103+
"title": "S3 Filters"
104+
},
88105
"gridData": {
89106
"h": 6,
90107
"i": "6",
@@ -94,10 +111,13 @@
94111
},
95112
"panelIndex": "6",
96113
"panelRefName": "panel_5",
97-
"version": "7.3.0"
114+
"title": "S3 Filters",
115+
"version": "7.7.0"
98116
},
99117
{
100-
"embeddableConfig": {},
118+
"embeddableConfig": {
119+
"title": "S3 Total Requests"
120+
},
101121
"gridData": {
102122
"h": 7,
103123
"i": "7",
@@ -107,10 +127,17 @@
107127
},
108128
"panelIndex": "7",
109129
"panelRefName": "panel_6",
110-
"version": "7.3.0"
130+
"title": "S3 Total Requests",
131+
"version": "7.7.0"
111132
}
112133
],
113-
"timeRestore": false,
134+
"refreshInterval": {
135+
"pause": true,
136+
"value": 0
137+
},
138+
"timeFrom": "now-1d",
139+
"timeRestore": true,
140+
"timeTo": "now",
114141
"title": "[Metricbeat AWS] S3 Overview",
115142
"version": 1
116143
},
@@ -156,8 +183,8 @@
156183
}
157184
],
158185
"type": "dashboard",
159-
"updated_at": "2019-09-12T21:18:24.987Z",
160-
"version": "Wzc3NjAsN10="
186+
"updated_at": "2020-04-06T16:29:50.517Z",
187+
"version": "WzkxOSwyXQ=="
161188
},
162189
{
163190
"attributes": {
@@ -190,6 +217,8 @@
190217
"id": "f703aff0-475f-11e9-a9de-e776805ecfc9"
191218
}
192219
],
220+
"default_index_pattern": "metricbeat-*",
221+
"default_timefield": "@timestamp",
193222
"drop_last_bucket": 0,
194223
"gauge_color_rules": [
195224
{
@@ -202,6 +231,7 @@
202231
"id": "61ca57f0-469d-11e7-af02-69e470af7417",
203232
"index_pattern": "metricbeat-*",
204233
"interval": "1d",
234+
"isModelInvalid": false,
205235
"series": [
206236
{
207237
"axis_position": "right",
@@ -222,7 +252,7 @@
222252
"separate_axis": 0,
223253
"split_mode": "terms",
224254
"stacked": "none",
225-
"terms_field": "aws.s3_daily_storage.bucket.name",
255+
"terms_field": "aws.s3.bucket.name",
226256
"terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417",
227257
"terms_size": "5"
228258
}
@@ -232,18 +262,18 @@
232262
"time_field": "@timestamp",
233263
"type": "top_n"
234264
},
235-
"title": "AWS S3 Daily Storage Bucket Size in Bytes",
265+
"title": "S3 Daily Storage Bucket Size in Bytes [Metricbeat AWS]",
236266
"type": "metrics"
237267
}
238268
},
239269
"id": "2dbb8f90-4760-11e9-8062-c98a86cb6f94",
240270
"migrationVersion": {
241-
"visualization": "7.0.0"
271+
"visualization": "7.4.2"
242272
},
243273
"references": [],
244274
"type": "visualization",
245-
"updated_at": "2019-09-12T21:13:42.937Z",
246-
"version": "Wzc0MzQsN10="
275+
"updated_at": "2020-04-06T16:01:45.966Z",
276+
"version": "Wzg2NCwyXQ=="
247277
},
248278
{
249279
"attributes": {
@@ -276,10 +306,13 @@
276306
"id": "01dad830-4761-11e9-bf81-69a4e579cab5"
277307
}
278308
],
309+
"default_index_pattern": "metricbeat-*",
310+
"default_timefield": "@timestamp",
279311
"drop_last_bucket": 0,
280312
"id": "61ca57f0-469d-11e7-af02-69e470af7417",
281313
"index_pattern": "metricbeat-*",
282314
"interval": "1d",
315+
"isModelInvalid": false,
283316
"series": [
284317
{
285318
"axis_position": "right",
@@ -300,7 +333,7 @@
300333
"separate_axis": 0,
301334
"split_mode": "terms",
302335
"stacked": "none",
303-
"terms_field": "aws.s3_daily_storage.bucket.name",
336+
"terms_field": "aws.s3.bucket.name",
304337
"terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417",
305338
"terms_size": "5"
306339
}
@@ -310,18 +343,18 @@
310343
"time_field": "@timestamp",
311344
"type": "top_n"
312345
},
313-
"title": "AWS S3 Daily Storage Number of Objects",
346+
"title": "S3 Daily Storage Number of Objects [Metricbeat AWS]",
314347
"type": "metrics"
315348
}
316349
},
317350
"id": "3a3914d0-4761-11e9-8062-c98a86cb6f94",
318351
"migrationVersion": {
319-
"visualization": "7.0.0"
352+
"visualization": "7.4.2"
320353
},
321354
"references": [],
322355
"type": "visualization",
323-
"updated_at": "2019-09-12T21:13:42.937Z",
324-
"version": "Wzc0MzUsN10="
356+
"updated_at": "2020-04-06T16:15:51.106Z",
357+
"version": "WzkwMywyXQ=="
325358
},
326359
{
327360
"attributes": {
@@ -354,6 +387,8 @@
354387
"id": "67cb0930-4761-11e9-bf81-69a4e579cab5"
355388
}
356389
],
390+
"default_index_pattern": "metricbeat-*",
391+
"default_timefield": "@timestamp",
357392
"drop_last_bucket": 0,
358393
"gauge_color_rules": [
359394
{
@@ -366,7 +401,8 @@
366401
"id": "61ca57f0-469d-11e7-af02-69e470af7417",
367402
"index_pattern": "metricbeat-*",
368403
"interval": "1d",
369-
"pivot_id": "aws.s3_request.bucket.name",
404+
"isModelInvalid": false,
405+
"pivot_id": "aws.s3.bucket.name",
370406
"series": [
371407
{
372408
"axis_position": "right",
@@ -393,7 +429,7 @@
393429
"separate_axis": 0,
394430
"split_mode": "terms",
395431
"stacked": "none",
396-
"terms_field": "aws.s3_request.bucket.name",
432+
"terms_field": "aws.s3.bucket.name",
397433
"terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417",
398434
"terms_size": "5"
399435
}
@@ -403,18 +439,18 @@
403439
"time_field": "@timestamp",
404440
"type": "top_n"
405441
},
406-
"title": "AWS S3 Request Latency Total Request in ms",
442+
"title": "S3 Request Latency Total Request in ms [Metricbeat AWS]",
407443
"type": "metrics"
408444
}
409445
},
410446
"id": "2b2d58b0-4762-11e9-8062-c98a86cb6f94",
411447
"migrationVersion": {
412-
"visualization": "7.0.0"
448+
"visualization": "7.4.2"
413449
},
414450
"references": [],
415451
"type": "visualization",
416-
"updated_at": "2019-09-12T21:13:42.937Z",
417-
"version": "Wzc0MzYsN10="
452+
"updated_at": "2020-04-06T16:24:42.835Z",
453+
"version": "WzkxMiwyXQ=="
418454
},
419455
{
420456
"attributes": {
@@ -484,12 +520,12 @@
484520
},
485521
"id": "81d83c70-4762-11e9-8062-c98a86cb6f94",
486522
"migrationVersion": {
487-
"visualization": "7.0.0"
523+
"visualization": "7.4.2"
488524
},
489525
"references": [],
490526
"type": "visualization",
491-
"updated_at": "2019-09-12T21:13:42.937Z",
492-
"version": "Wzc0MzcsN10="
527+
"updated_at": "2020-04-03T21:29:11.214Z",
528+
"version": "WzIwOCwyXQ=="
493529
},
494530
{
495531
"attributes": {
@@ -559,12 +595,12 @@
559595
},
560596
"id": "8b34a100-4762-11e9-8062-c98a86cb6f94",
561597
"migrationVersion": {
562-
"visualization": "7.0.0"
598+
"visualization": "7.4.2"
563599
},
564600
"references": [],
565601
"type": "visualization",
566-
"updated_at": "2019-09-12T21:13:42.937Z",
567-
"version": "Wzc0MzgsN10="
602+
"updated_at": "2020-04-03T21:29:11.214Z",
603+
"version": "WzIwOSwyXQ=="
568604
},
569605
{
570606
"attributes": {
@@ -626,12 +662,12 @@
626662
},
627663
"id": "6e3285d0-4763-11e9-8062-c98a86cb6f94",
628664
"migrationVersion": {
629-
"visualization": "7.0.0"
665+
"visualization": "7.4.2"
630666
},
631667
"references": [],
632668
"type": "visualization",
633-
"updated_at": "2019-09-12T21:18:08.498Z",
634-
"version": "Wzc3NTgsN10="
669+
"updated_at": "2020-04-03T21:29:11.214Z",
670+
"version": "WzIxMCwyXQ=="
635671
},
636672
{
637673
"attributes": {
@@ -664,10 +700,13 @@
664700
"id": "c7b9fca0-4763-11e9-b811-fd5d24a641d7"
665701
}
666702
],
703+
"default_index_pattern": "metricbeat-*",
704+
"default_timefield": "@timestamp",
667705
"drop_last_bucket": 0,
668706
"id": "61ca57f0-469d-11e7-af02-69e470af7417",
669707
"index_pattern": "metricbeat-*",
670708
"interval": "1d",
709+
"isModelInvalid": false,
671710
"series": [
672711
{
673712
"axis_position": "right",
@@ -689,7 +728,7 @@
689728
"separate_axis": 0,
690729
"split_mode": "terms",
691730
"stacked": "none",
692-
"terms_field": "aws.s3_request.bucket.name",
731+
"terms_field": "aws.s3.bucket.name",
693732
"terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417",
694733
"terms_size": "5"
695734
}
@@ -699,19 +738,19 @@
699738
"time_field": "@timestamp",
700739
"type": "top_n"
701740
},
702-
"title": "AWS S3 Total Requests",
741+
"title": "S3 Total Requests [Metricbeat AWS]",
703742
"type": "metrics"
704743
}
705744
},
706745
"id": "d186fd50-4763-11e9-8062-c98a86cb6f94",
707746
"migrationVersion": {
708-
"visualization": "7.0.0"
747+
"visualization": "7.4.2"
709748
},
710749
"references": [],
711750
"type": "visualization",
712-
"updated_at": "2019-09-12T21:13:42.937Z",
713-
"version": "Wzc0NDAsN10="
751+
"updated_at": "2020-04-06T16:25:02.532Z",
752+
"version": "WzkxMywyXQ=="
714753
}
715754
],
716-
"version": "7.3.0"
755+
"version": "7.7.0"
717756
}

0 commit comments

Comments
 (0)
Please sign in to comment.