Skip to content

Commit 86781cb

Browse files
ijardillierijardillier
authored
Merge pull request #1 from mashhurs/add-more-template-fields-on-ijardillier
Add changelog, more missed fields and validate.
2 parents 863b735 + 41c7556 commit 86781cb

File tree

3 files changed

+151
-16
lines changed

3 files changed

+151
-16
lines changed

‎docs/changelog/127053.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 127053
2+
summary: Add missing fields to the Logstash Stack Monitoring Template
3+
area: Monitoring
4+
type: enhancement
5+
issues:
6+
- 125499

‎x-pack/plugin/core/template-resources/src/main/resources/monitoring-logstash-mb.json‎

Lines changed: 144 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,20 @@
7070
"logstash": {
7171
"properties": {
7272
"ephemeral_id": {
73-
"type": "keyword"
73+
"type": "keyword",
74+
"ignore_above": 1024
7475
},
7576
"host": {
76-
"type": "keyword"
77+
"type": "keyword",
78+
"ignore_above": 1024
7779
},
7880
"http_address": {
79-
"type": "keyword"
81+
"type": "keyword",
82+
"ignore_above": 1024
8083
},
8184
"name": {
82-
"type": "keyword"
85+
"type": "keyword",
86+
"ignore_above": 1024
8387
},
8488
"pipeline": {
8589
"properties": {
@@ -95,7 +99,8 @@
9599
"type": "boolean"
96100
},
97101
"status": {
98-
"type": "keyword"
102+
"type": "keyword",
103+
"ignore_above": 1024
99104
},
100105
"uuid": {
101106
"ignore_above": 1024,
@@ -281,14 +286,16 @@
281286
"type": "long"
282287
},
283288
"control_group": {
284-
"type": "keyword"
289+
"type": "keyword",
290+
"ignore_above": 1024
285291
}
286292
}
287293
},
288294
"cpuacct": {
289295
"properties": {
290296
"control_group": {
291-
"type": "keyword"
297+
"type": "keyword",
298+
"ignore_above": 1024
292299
},
293300
"usage_nanos": {
294301
"type": "long"
@@ -376,10 +383,71 @@
376383
"graph": {
377384
"properties": {
378385
"vertices": {
379-
"type": "object"
386+
"type": "nested",
387+
"properties": {
388+
"config_name": {
389+
"type": "keyword",
390+
"ignore_above": 1024
391+
},
392+
"explicit_id": {
393+
"type": "boolean"
394+
},
395+
"id": {
396+
"type": "keyword",
397+
"ignore_above": 1024
398+
},
399+
"meta": {
400+
"properties": {
401+
"source": {
402+
"properties": {
403+
"column": {
404+
"type": "long"
405+
},
406+
"id": {
407+
"type": "keyword",
408+
"ignore_above": 1024
409+
},
410+
"line": {
411+
"type": "long"
412+
},
413+
"protocol": {
414+
"type": "keyword",
415+
"ignore_above": 1024
416+
}
417+
}
418+
}
419+
}
420+
},
421+
"plugin_type": {
422+
"type": "keyword",
423+
"ignore_above": 1024
424+
},
425+
"type": {
426+
"type": "keyword",
427+
"ignore_above": 1024
428+
}
429+
}
380430
},
381431
"edges": {
382-
"type": "object"
432+
"type": "nested",
433+
"properties": {
434+
"from": {
435+
"type": "keyword",
436+
"ignore_above": 1024
437+
},
438+
"id": {
439+
"type": "keyword",
440+
"ignore_above": 1024
441+
},
442+
"to": {
443+
"type": "keyword",
444+
"ignore_above": 1024
445+
},
446+
"type": {
447+
"type": "keyword",
448+
"ignore_above": 1024
449+
}
450+
}
383451
}
384452
}
385453
}
@@ -414,6 +482,14 @@
414482
}
415483
}
416484
}
485+
},
486+
"cluster": {
487+
"properties": {
488+
"id": {
489+
"type": "keyword",
490+
"ignore_above": 1024
491+
}
492+
}
417493
}
418494
}
419495
},
@@ -628,12 +704,60 @@
628704
},
629705
"host": {
630706
"properties": {
631-
"name": {
707+
"architecture": {
708+
"type": "keyword",
709+
"ignore_above": 1024
710+
},
711+
"hostname": {
712+
"type": "keyword",
713+
"ignore_above": 1024
714+
},
715+
"id": {
632716
"type": "keyword",
633717
"ignore_above": 1024
634718
},
635719
"ip": {
636720
"type": "ip"
721+
},
722+
"mac": {
723+
"type": "keyword",
724+
"ignore_above": 1024
725+
},
726+
"name": {
727+
"type": "keyword",
728+
"ignore_above": 1024
729+
},
730+
"os": {
731+
"properties": {
732+
"build": {
733+
"type": "keyword",
734+
"ignore_above": 1024
735+
},
736+
"family": {
737+
"type": "keyword",
738+
"ignore_above": 1024
739+
},
740+
"kernel": {
741+
"type": "keyword",
742+
"ignore_above": 1024
743+
},
744+
"name": {
745+
"type": "keyword",
746+
"ignore_above": 1024
747+
},
748+
"platform": {
749+
"type": "keyword",
750+
"ignore_above": 1024
751+
},
752+
"type": {
753+
"type": "keyword",
754+
"ignore_above": 1024
755+
},
756+
"version": {
757+
"type": "keyword",
758+
"ignore_above": 1024
759+
}
760+
}
637761
}
638762
}
639763
},
@@ -674,19 +798,24 @@
674798
"agent": {
675799
"properties": {
676800
"ephemeral_id": {
677-
"type": "keyword"
801+
"type": "keyword",
802+
"ignore_above": 1024
678803
},
679804
"id": {
680-
"type": "keyword"
805+
"type": "keyword",
806+
"ignore_above": 1024
681807
},
682808
"name": {
683-
"type": "keyword"
809+
"type": "keyword",
810+
"ignore_above": 1024
684811
},
685812
"type": {
686-
"type": "keyword"
813+
"type": "keyword",
814+
"ignore_above": 1024
687815
},
688816
"version": {
689-
"type": "keyword"
817+
"type": "keyword",
818+
"ignore_above": 1024
690819
}
691820
}
692821
}

‎x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
7777
* writes monitoring data in ECS format as of 8.0. These templates define the ECS schema as well as alias fields for the old monitoring
7878
* mappings that point to the corresponding ECS fields.
7979
*/
80-
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 21;
80+
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 22;
8181
private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version";
8282
private static final String STACK_TEMPLATE_VERSION = "8";
8383
private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version";

0 commit comments

Comments
 (0)