Skip to content

Commit c017771

Browse files
authored
Follow up changes in dashboards in mage check && fix minor issue (#27553)
## What does this PR do? This PR follows up the missing dashboard checks in `mage check`. It also addresses a minor dashboard decoding issue in `-decode` flag of `export dashboard`. Furthermore, assets from the Saved Objects API are separated into different JSON files. We went back to JSONs to make it more developer-friendly. By sticking with the more human-readable JSONs it helps people to review changes a bit better. When exporting dashboards I suggest you use the `-folder` flag. You have to specify a root folder e.g. a module name and the Beat/exporter will create a `{foldername}/_meta/kibana/7` folder for you. The assets will be separated into different directories and the name of them will be the ID of the asset. ```sh $ ./filebeat export dashboard --id Metricbeat-host-overview --folder system $ tree metricbeat/module/system/_meta/kibana/7 metricbeat/module/system/_meta/kibana/7 ├── dashboard │   ├── 79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json │   ├── c431f410-f9ac-11e9-90e8-1fb18e796788.json │   ├── CPU-slash-Memory-per-container-ecs.json │   └── Metricbeat-system-overview-ecs.json └── visualization ├── 089b85d0-1b16-11e7-b09e-037021c4f8df-ecs.json ├── 19e123b0-4d5a-11e7-aee5-fdc812cc3bec-ecs.json ├── 1aae9140-1b93-11e7-8ada-3df93aab833e-ecs.json ├── 26732e20-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json ├── 2e224660-1b19-11e7-b09e-037021c4f8df-ecs.json ├── 34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json ├── 3d65d450-a9c3-11e7-af20-67db8aecb295-ecs.json ├── 4b254630-f998-11e9-90e8-1fb18e796788.json ├── 4d546850-1b15-11e7-b09e-037021c4f8df-ecs.json ├── 4e4bb1e0-1b1b-11e7-b09e-037021c4f8df-ecs.json ├── 522ee670-1b92-11e7-bec4-a5e9ec5cab8b-ecs.json ├── 590a60f0-5d87-11e7-8884-1bb4c3b890e4-ecs.json ├── 6b7b9a40-faa1-11e6-86b1-cd7735ff7e23-ecs.json ├── 7cdb1330-4d1a-11e7-a196-69b9a7a020a9-ecs.json ├── 825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json ├── 83e12df0-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json ├── 855899e0-1b1c-11e7-b09e-037021c4f8df-ecs.json ├── 8c071e20-f999-11e9-90e8-1fb18e796788.json ├── 96976150-4d5d-11e7-aa29-87a97a796de6-ecs.json ├── 99381c80-4d60-11e7-9a4c-ed99bbcaa42b-ecs.json ├── 9c69cad0-f9b0-11e9-90e8-1fb18e796788.json ├── a30871f0-f98f-11e9-90e8-1fb18e796788.json ├── ab2d1e90-1b1a-11e7-b09e-037021c4f8df-ecs.json ├── bb3a8720-f991-11e9-90e8-1fb18e796788.json ├── bfa5e400-1b16-11e7-b09e-037021c4f8df-ecs.json ├── c5e3cf90-4d60-11e7-9a4c-ed99bbcaa42b-ecs.json ├── c6f2ffd0-4d17-11e7-a196-69b9a7a020a9-ecs.json ├── Container-Block-IO-ecs.json ├── Container-CPU-usage-ecs.json ├── Container-Memory-stats-ecs.json ├── d2e80340-4d5c-11e7-aa29-87a97a796de6-ecs.json ├── d3166e80-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json ├── d3f51850-f9b6-11e9-90e8-1fb18e796788.json ├── e0f001c0-1b18-11e7-b09e-037021c4f8df-ecs.json ├── e6e639e0-f992-11e9-90e8-1fb18e796788.json ├── fe064790-1b1f-11e7-bec4-a5e9ec5cab8b-ecs.json └── System-Navigation-ecs.json ``` ## Why is it important? It adds extra checks that make sure dashboards are formatted correctly. It also makes dashboard exporting more developer friendly.
1 parent 9a517a7 commit c017771

2,192 files changed

Lines changed: 214215 additions & 2327 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
{
2+
"attributes": {
3+
"description": "Summary of socket related syscall events.",
4+
"hits": 0,
5+
"kibanaSavedObjectMeta": {
6+
"searchSourceJSON": {
7+
"filter": [],
8+
"highlightAll": true,
9+
"query": {
10+
"language": "kuery",
11+
"query": ""
12+
},
13+
"version": true
14+
}
15+
},
16+
"optionsJSON": {
17+
"darkTheme": false,
18+
"useMargins": false
19+
},
20+
"panelsJSON": [
21+
{
22+
"embeddableConfig": {
23+
"enhancements": {},
24+
"vis": {
25+
"params": {
26+
"sort": {
27+
"columnIndex": null,
28+
"direction": null
29+
}
30+
}
31+
}
32+
},
33+
"gridData": {
34+
"h": 16,
35+
"i": "1",
36+
"w": 24,
37+
"x": 24,
38+
"y": 12
39+
},
40+
"panelIndex": "1",
41+
"panelRefName": "panel_1",
42+
"type": "visualization",
43+
"version": "7.3.0"
44+
},
45+
{
46+
"embeddableConfig": {
47+
"enhancements": {},
48+
"vis": {
49+
"params": {
50+
"sort": {
51+
"columnIndex": null,
52+
"direction": null
53+
}
54+
}
55+
}
56+
},
57+
"gridData": {
58+
"h": 20,
59+
"i": "2",
60+
"w": 24,
61+
"x": 0,
62+
"y": 28
63+
},
64+
"panelIndex": "2",
65+
"panelRefName": "panel_2",
66+
"type": "visualization",
67+
"version": "7.3.0"
68+
},
69+
{
70+
"embeddableConfig": {
71+
"enhancements": {},
72+
"vis": {
73+
"params": {
74+
"sort": {
75+
"columnIndex": null,
76+
"direction": null
77+
}
78+
}
79+
}
80+
},
81+
"gridData": {
82+
"h": 20,
83+
"i": "3",
84+
"w": 24,
85+
"x": 24,
86+
"y": 28
87+
},
88+
"panelIndex": "3",
89+
"panelRefName": "panel_3",
90+
"type": "visualization",
91+
"version": "7.3.0"
92+
},
93+
{
94+
"embeddableConfig": {
95+
"enhancements": {}
96+
},
97+
"gridData": {
98+
"h": 12,
99+
"i": "4",
100+
"w": 48,
101+
"x": 0,
102+
"y": 0
103+
},
104+
"panelIndex": "4",
105+
"panelRefName": "panel_4",
106+
"type": "visualization",
107+
"version": "7.3.0"
108+
},
109+
{
110+
"embeddableConfig": {
111+
"enhancements": {}
112+
},
113+
"gridData": {
114+
"h": 16,
115+
"i": "5",
116+
"w": 24,
117+
"x": 0,
118+
"y": 12
119+
},
120+
"panelIndex": "5",
121+
"panelRefName": "panel_5",
122+
"type": "visualization",
123+
"version": "7.3.0"
124+
}
125+
],
126+
"timeRestore": false,
127+
"title": "[Auditbeat Auditd] Sockets ECS",
128+
"version": 1
129+
},
130+
"coreMigrationVersion": "8.0.0",
131+
"id": "693a5f40-c243-11e7-8692-232bd1143e8a-ecs",
132+
"migrationVersion": {
133+
"dashboard": "7.14.0"
134+
},
135+
"references": [
136+
{
137+
"id": "faf882f0-c242-11e7-8692-232bd1143e8a-ecs",
138+
"name": "1:panel_1",
139+
"type": "visualization"
140+
},
141+
{
142+
"id": "ea483730-c246-11e7-8692-232bd1143e8a-ecs",
143+
"name": "2:panel_2",
144+
"type": "visualization"
145+
},
146+
{
147+
"id": "ceb91de0-c250-11e7-8692-232bd1143e8a-ecs",
148+
"name": "3:panel_3",
149+
"type": "visualization"
150+
},
151+
{
152+
"id": "b21e0c70-c252-11e7-8692-232bd1143e8a-ecs",
153+
"name": "4:panel_4",
154+
"type": "visualization"
155+
},
156+
{
157+
"id": "a8e20450-c256-11e7-8692-232bd1143e8a-ecs",
158+
"name": "5:panel_5",
159+
"type": "visualization"
160+
}
161+
],
162+
"type": "dashboard",
163+
"updated_at": "2021-08-04T16:35:59.895Z",
164+
"version": "WzQ5ODMsMV0="
165+
}
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
{
2+
"attributes": {
3+
"description": "Overview of kernel executions",
4+
"hits": 0,
5+
"kibanaSavedObjectMeta": {
6+
"searchSourceJSON": {
7+
"filter": [],
8+
"highlightAll": true,
9+
"query": {
10+
"language": "kuery",
11+
"query": ""
12+
},
13+
"version": true
14+
}
15+
},
16+
"optionsJSON": {
17+
"darkTheme": false,
18+
"useMargins": false
19+
},
20+
"panelsJSON": [
21+
{
22+
"embeddableConfig": {
23+
"enhancements": {}
24+
},
25+
"gridData": {
26+
"h": 12,
27+
"i": "1",
28+
"w": 16,
29+
"x": 16,
30+
"y": 0
31+
},
32+
"panelIndex": "1",
33+
"panelRefName": "panel_1",
34+
"type": "visualization",
35+
"version": "7.3.0"
36+
},
37+
{
38+
"embeddableConfig": {
39+
"enhancements": {}
40+
},
41+
"gridData": {
42+
"h": 12,
43+
"i": "3",
44+
"w": 16,
45+
"x": 32,
46+
"y": 0
47+
},
48+
"panelIndex": "3",
49+
"panelRefName": "panel_3",
50+
"type": "visualization",
51+
"version": "7.3.0"
52+
},
53+
{
54+
"embeddableConfig": {
55+
"enhancements": {}
56+
},
57+
"gridData": {
58+
"h": 12,
59+
"i": "5",
60+
"w": 16,
61+
"x": 0,
62+
"y": 0
63+
},
64+
"panelIndex": "5",
65+
"panelRefName": "panel_5",
66+
"type": "visualization",
67+
"version": "7.3.0"
68+
},
69+
{
70+
"embeddableConfig": {
71+
"enhancements": {}
72+
},
73+
"gridData": {
74+
"h": 20,
75+
"i": "6",
76+
"w": 48,
77+
"x": 0,
78+
"y": 12
79+
},
80+
"panelIndex": "6",
81+
"panelRefName": "panel_6",
82+
"type": "search",
83+
"version": "7.3.0"
84+
}
85+
],
86+
"timeRestore": false,
87+
"title": "[Auditbeat Auditd] Executions ECS",
88+
"version": 1
89+
},
90+
"coreMigrationVersion": "8.0.0",
91+
"id": "7de391b0-c1ca-11e7-8995-936807a28b16-ecs",
92+
"migrationVersion": {
93+
"dashboard": "7.14.0"
94+
},
95+
"references": [
96+
{
97+
"id": "20a8e8d0-c1c8-11e7-8995-936807a28b16-ecs",
98+
"name": "1:panel_1",
99+
"type": "visualization"
100+
},
101+
{
102+
"id": "f81a6de0-c1c1-11e7-8995-936807a28b16-ecs",
103+
"name": "3:panel_3",
104+
"type": "visualization"
105+
},
106+
{
107+
"id": "2efac370-c1ca-11e7-8995-936807a28b16-ecs",
108+
"name": "5:panel_5",
109+
"type": "visualization"
110+
},
111+
{
112+
"id": "d382f5b0-c1c6-11e7-8995-936807a28b16-ecs",
113+
"name": "6:panel_6",
114+
"type": "search"
115+
}
116+
],
117+
"type": "dashboard",
118+
"updated_at": "2021-08-04T16:35:57.797Z",
119+
"version": "WzQ5NzAsMV0="
120+
}

auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.ndjson

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)