Skip to content

Commit 2dbd59f

Browse files
[cisco_meraki] - Update to package-spec 2.7.0 (#6439)
Updates package-spec version to 2.7.0 - Normalized `observer.mac` to array. [git-generate] go run github.com/andrewkroh/go-examples/ecs-update@latest -ecs-version=8.8.0 -ecs-git-ref=8.8 -format-version=2.7.0 packages/cisco_meraki
1 parent 4566ce5 commit 2dbd59f

File tree

10 files changed

+533
-197
lines changed

10 files changed

+533
-197
lines changed

packages/cisco_meraki/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.9.0"
3+
changes:
4+
- description: Update package-spec version to 2.7.0.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/6439
27
- version: "1.8.0"
38
changes:
49
- description: Update package to ECS 8.8.0.

packages/cisco_meraki/data_stream/events/_dev/test/pipeline/test-mx-events.json-expected.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
"name": "Main Office"
4747
},
4848
"observer": {
49-
"mac": "00-11-22-33-44-55",
49+
"mac": [
50+
"00-11-22-33-44-55"
51+
],
5052
"name": "My appliance",
5153
"product": "MX",
5254
"serial_number": "Q234-ABCD-5678",
@@ -95,7 +97,9 @@
9597
"name": "Main Office"
9698
},
9799
"observer": {
98-
"mac": "00-11-22-33-44-55",
100+
"mac": [
101+
"00-11-22-33-44-55"
102+
],
99103
"serial_number": "Q234-ABCD-5678",
100104
"vendor": "Cisco"
101105
},
@@ -153,7 +157,9 @@
153157
"name": "Main Office"
154158
},
155159
"observer": {
156-
"mac": "00-11-22-33-44-55",
160+
"mac": [
161+
"00-11-22-33-44-55"
162+
],
157163
"name": "My switch",
158164
"product": "MS",
159165
"serial_number": "Q234-ABCD-5678",

packages/cisco_meraki/data_stream/events/elasticsearch/ingest_pipeline/default.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ processors:
99
copy_from: json.deviceSerial
1010
- gsub:
1111
field: json.deviceMac
12-
target_field: observer.mac
12+
target_field: _tmp.observer.mac
1313
pattern: '[-:.]'
1414
replacement: '-'
15+
- append:
16+
field: observer.mac
17+
value: '{{{_tmp.observer.mac}}}'
18+
if: ctx?._tmp?.observer?.mac != null
1519
- set:
1620
field: observer.name
1721
copy_from: json.deviceName
@@ -262,6 +266,7 @@ processors:
262266
- cisco_meraki.event.organizationName
263267
- cisco_meraki.event.alertType
264268
- cisco_meraki.event.alertLevel
269+
- _tmp
265270
ignore_missing: true
266271
- remove:
267272
field: event.original

packages/cisco_meraki/data_stream/events/sample_event.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"@timestamp": "2018-02-11T00:00:00.123Z",
33
"agent": {
4-
"ephemeral_id": "6c6d06ce-b090-4f7c-a7e1-ac4ea241dc4b",
5-
"id": "c5f4a269-fab9-4c19-9b0f-2f270ed03375",
4+
"ephemeral_id": "077a2d93-4b1d-4908-b2d5-7c3a0218df3a",
5+
"id": "878982e9-a174-4ed8-abe3-19378c1473de",
66
"name": "docker-fleet-agent",
77
"type": "filebeat",
8-
"version": "8.5.1"
8+
"version": "8.8.0"
99
},
1010
"cisco_meraki": {
1111
"event": {
@@ -40,9 +40,9 @@
4040
"version": "8.8.0"
4141
},
4242
"elastic_agent": {
43-
"id": "c5f4a269-fab9-4c19-9b0f-2f270ed03375",
43+
"id": "878982e9-a174-4ed8-abe3-19378c1473de",
4444
"snapshot": false,
45-
"version": "8.5.1"
45+
"version": "8.8.0"
4646
},
4747
"event": {
4848
"action": "Cellular came up",
@@ -51,7 +51,7 @@
5151
"network"
5252
],
5353
"dataset": "cisco_meraki.events",
54-
"ingested": "2023-01-30T01:28:32Z",
54+
"ingested": "2023-06-01T20:29:21Z",
5555
"original": "{\"alertData\":{\"connection\":\"LTE\",\"local\":\"192.168.1.2\",\"model\":\"UML290VW\",\"provider\":\"Purview Wireless\",\"remote\":\"1.2.3.5\"},\"alertId\":\"0000000000000000\",\"alertLevel\":\"informational\",\"alertType\":\"Cellular came up\",\"alertTypeId\":\"cellular_up\",\"deviceMac\":\"00:11:22:33:44:55\",\"deviceModel\":\"MX\",\"deviceName\":\"My appliance\",\"deviceSerial\":\"Q234-ABCD-5678\",\"deviceTags\":[\"tag1\",\"tag2\"],\"deviceUrl\":\"https://n1.meraki.com//n//manage/nodes/new_list/000000000000\",\"networkId\":\"N_24329156\",\"networkName\":\"Main Office\",\"networkTags\":[],\"networkUrl\":\"https://n1.meraki.com//n//manage/nodes/list\",\"occurredAt\":\"2018-02-11T00:00:00.123450Z\",\"organizationId\":\"2930418\",\"organizationName\":\"My organization\",\"organizationUrl\":\"https://dashboard.meraki.com/o/VjjsAd/manage/organization/overview\",\"sentAt\":\"2021-10-07T08:42:00.926325Z\",\"sharedSecret\":\"secret\",\"version\":\"0.1\"}",
5656
"type": [
5757
"info",
@@ -68,7 +68,9 @@
6868
"name": "Main Office"
6969
},
7070
"observer": {
71-
"mac": "00-11-22-33-44-55",
71+
"mac": [
72+
"00-11-22-33-44-55"
73+
],
7274
"name": "My appliance",
7375
"product": "MX",
7476
"serial_number": "Q234-ABCD-5678",

0 commit comments

Comments
 (0)