Skip to content

Commit 14d25c0

Browse files
jsorianojsoriano
committed
Replace package-spec
1 parent a96769a commit 14d25c0

File tree

4 files changed

+7
-219
lines changed

4 files changed

+7
-219
lines changed

‎go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,5 @@ require (
174174
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
175175
sigs.k8s.io/yaml v1.3.0 // indirect
176176
)
177+
178+
replace github.com/elastic/package-spec/v2 => github.com/jsoriano/package-spec/v2 v2.0.0-20230830222135-333f997ace72

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ github.com/elastic/go-ucfg v0.8.6 h1:stUeyh2goTgGX+/wb9gzKvTv0YB0231LTpKUgCKj4U0
9595
github.com/elastic/go-ucfg v0.8.6/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA=
9696
github.com/elastic/gojsonschema v1.2.1 h1:cUMbgsz0wyEB4x7xf3zUEvUVDl6WCz2RKcQPul8OsQc=
9797
github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg=
98-
github.com/elastic/package-spec/v2 v2.10.0 h1:p/T/xgue/7eJW3drXqaZ/Zsjbrc2hT2w652OJ7jEmmY=
99-
github.com/elastic/package-spec/v2 v2.10.0/go.mod h1:iQ/8tKtmsIUI9zXM2x2punKb77fSX1FPcChDr8zXPR8=
10098
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
10199
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
102100
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
@@ -232,6 +230,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
232230
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
233231
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
234232
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
233+
github.com/jsoriano/package-spec/v2 v2.0.0-20230830222135-333f997ace72 h1:qaSoeqMpC9p8AIA1HvtOUWW9zbFGxPakZftHyscgBjg=
234+
github.com/jsoriano/package-spec/v2 v2.0.0-20230830222135-333f997ace72/go.mod h1:iQ/8tKtmsIUI9zXM2x2punKb77fSX1FPcChDr8zXPR8=
235235
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
236236
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
237237
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

‎internal/docs/sample_event.go

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"io"
1010
"os"
1111
"path/filepath"
12+
"sort"
1213
"strings"
1314

1415
"github.com/elastic/elastic-package/internal/formatter"
@@ -34,6 +35,7 @@ func renderSampleEvents(packageRoot, dataStreamName string) (string, error) {
3435
stripDataStreamFolderSuffix(dataStreamName))
3536
}
3637

38+
sort.Sort(sort.StringSlice(eventPaths))
3739
for i, eventPath := range eventPaths {
3840
if i > 0 {
3941
fmt.Fprintln(&builder)

‎test/packages/parallel/nginx/docs/README.md

+1-217
Original file line numberDiff line numberDiff line change
@@ -26,116 +26,8 @@ field can be overwritten with the original timezone using the add_fields process
2626

2727
Access logs collects the nginx access logs.
2828

29-
Example events for `access` look as following:
29+
An example event for `access` looks as following:
3030

31-
```json
32-
{
33-
"agent": {
34-
"hostname": "a73e7856c209",
35-
"name": "a73e7856c209",
36-
"id": "3987d2b3-b40a-4aa0-99fc-478f9d7079ea",
37-
"ephemeral_id": "6d41da1c-5f71-4bd4-b326-a8913bfaa884",
38-
"type": "filebeat",
39-
"version": "7.11.0"
40-
},
41-
"nginx": {
42-
"access": {
43-
"remote_ip_list": [
44-
"127.0.0.1"
45-
]
46-
}
47-
},
48-
"log": {
49-
"file": {
50-
"path": "/tmp/service_logs/access.log"
51-
},
52-
"offset": 0
53-
},
54-
"elastic_agent": {
55-
"id": "5ca3af72-37c3-48b6-92e8-176d154bb66f",
56-
"version": "7.11.0",
57-
"snapshot": true
58-
},
59-
"source": {
60-
"address": "127.0.0.1",
61-
"ip": "127.0.0.1"
62-
},
63-
"url": {
64-
"original": "/server-status"
65-
},
66-
"input": {
67-
"type": "log"
68-
},
69-
"@timestamp": "2020-12-03T11:41:57.000Z",
70-
"ecs": {
71-
"version": "1.6.0"
72-
},
73-
"related": {
74-
"ip": [
75-
"127.0.0.1"
76-
]
77-
},
78-
"data_stream": {
79-
"namespace": "ep",
80-
"type": "logs",
81-
"dataset": "nginx.access"
82-
},
83-
"host": {
84-
"hostname": "a73e7856c209",
85-
"os": {
86-
"kernel": "4.9.184-linuxkit",
87-
"codename": "Core",
88-
"name": "CentOS Linux",
89-
"family": "redhat",
90-
"version": "7 (Core)",
91-
"platform": "centos"
92-
},
93-
"containerized": true,
94-
"ip": [
95-
"192.168.80.6"
96-
],
97-
"name": "a73e7856c209",
98-
"id": "06c26569966fd125c15acac5d7feffb6",
99-
"mac": [
100-
"02:42:c0:a8:50:06"
101-
],
102-
"architecture": "x86_64"
103-
},
104-
"http": {
105-
"request": {
106-
"method": "get"
107-
},
108-
"response": {
109-
"status_code": 200,
110-
"body": {
111-
"bytes": 97
112-
}
113-
},
114-
"version": "1.1"
115-
},
116-
"event": {
117-
"timezone": "+00:00",
118-
"created": "2020-12-03T11:42:17.116Z",
119-
"kind": "event",
120-
"category": [
121-
"web"
122-
],
123-
"type": [
124-
"access"
125-
],
126-
"dataset": "nginx.access",
127-
"outcome": "success"
128-
},
129-
"user_agent": {
130-
"original": "curl/7.64.0",
131-
"name": "curl",
132-
"device": {
133-
"name": "Other"
134-
},
135-
"version": "7.64.0"
136-
}
137-
}
138-
```
13931
```json
14032
{
14133
"@timestamp": "2023-08-30T21:58:41.000Z",
@@ -251,114 +143,6 @@ Example events for `access` look as following:
251143
}
252144
}
253145
```
254-
```json
255-
{
256-
"agent": {
257-
"hostname": "a73e7856c209",
258-
"name": "a73e7856c209",
259-
"id": "3987d2b3-b40a-4aa0-99fc-478f9d7079ea",
260-
"ephemeral_id": "6d41da1c-5f71-4bd4-b326-a8913bfaa884",
261-
"type": "filebeat",
262-
"version": "7.11.0"
263-
},
264-
"nginx": {
265-
"access": {
266-
"remote_ip_list": [
267-
"127.0.0.1"
268-
]
269-
}
270-
},
271-
"log": {
272-
"file": {
273-
"path": "/tmp/service_logs/access.log"
274-
},
275-
"offset": 0
276-
},
277-
"elastic_agent": {
278-
"id": "5ca3af72-37c3-48b6-92e8-176d154bb66f",
279-
"version": "7.11.0",
280-
"snapshot": true
281-
},
282-
"source": {
283-
"address": "127.0.0.1",
284-
"ip": "127.0.0.1"
285-
},
286-
"url": {
287-
"original": "/server-status"
288-
},
289-
"input": {
290-
"type": "log"
291-
},
292-
"@timestamp": "2020-12-03T11:41:57.000Z",
293-
"ecs": {
294-
"version": "1.6.0"
295-
},
296-
"related": {
297-
"ip": [
298-
"127.0.0.1"
299-
]
300-
},
301-
"data_stream": {
302-
"namespace": "ep",
303-
"type": "logs",
304-
"dataset": "nginx.access"
305-
},
306-
"host": {
307-
"hostname": "a73e7856c209",
308-
"os": {
309-
"kernel": "4.9.184-linuxkit",
310-
"codename": "Core",
311-
"name": "CentOS Linux",
312-
"family": "redhat",
313-
"version": "7 (Core)",
314-
"platform": "centos"
315-
},
316-
"containerized": true,
317-
"ip": [
318-
"192.168.80.6"
319-
],
320-
"name": "a73e7856c209",
321-
"id": "06c26569966fd125c15acac5d7feffb6",
322-
"mac": [
323-
"02:42:c0:a8:50:06"
324-
],
325-
"architecture": "x86_64"
326-
},
327-
"http": {
328-
"request": {
329-
"method": "get"
330-
},
331-
"response": {
332-
"status_code": 200,
333-
"body": {
334-
"bytes": 97
335-
}
336-
},
337-
"version": "1.1"
338-
},
339-
"event": {
340-
"timezone": "+00:00",
341-
"created": "2020-12-03T11:42:17.116Z",
342-
"kind": "event",
343-
"category": [
344-
"web"
345-
],
346-
"type": [
347-
"access"
348-
],
349-
"dataset": "nginx.access",
350-
"outcome": "success"
351-
},
352-
"user_agent": {
353-
"original": "curl/7.64.0",
354-
"name": "curl",
355-
"device": {
356-
"name": "Other"
357-
},
358-
"version": "7.64.0"
359-
}
360-
}
361-
```
362146

363147
**Exported fields**
364148

0 commit comments

Comments
 (0)