Skip to content

Commit 38977e5

Browse files
bmorelli25bmorelli25
committed
Fix system conflicts after version bump
# Conflicts: # packages/system/changelog.yml # packages/system/manifest.yml
2 parents dcc4c8a + d2fec00 commit 38977e5

22 files changed

+1063
-13
lines changed

‎.ci/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pipeline {
1616
JOB_GCS_BUCKET = 'beats-ci-temp'
1717
JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
1818
JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
19-
ELASTIC_STACK_VERSION_PREV = "7.13.1-SNAPSHOT"
20-
ELASTIC_STACK_VERSION_PREV_PREV = "7.13.0-SNAPSHOT"
19+
ELASTIC_STACK_VERSION_PREV = "7.14.0-SNAPSHOT"
20+
ELASTIC_STACK_VERSION_PREV_PREV = "7.13.4-SNAPSHOT"
2121
}
2222
options {
2323
timeout(time: 2, unit: 'HOURS')
@@ -288,4 +288,4 @@ def getCoverageBucketURI() {
288288

289289
def getCoveragePathPrefix() {
290290
return "${env.JOB_NAME}-${env.BUILD_ID}/test-coverage/"
291-
}
291+
}

‎packages/system/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
- description: Update integration description
55
type: enhancement
66
link: https://github.com/elastic/integrations/pull/1364
7+
- version: "1.0.1"
8+
changes:
9+
- description: Move visualizations to cpu.norm.pct
10+
type: enhancement
11+
link: https://github.com/elastic/integrations/pull/1358
712
- version: "1.0.0"
813
changes:
914
- description: GA the system module

‎packages/system/kibana/visualization/system-7cdb1330-4d1a-11e7-a196-69b9a7a020a9.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"id": "1",
3131
"params": {
3232
"customLabel": "CPU usage",
33-
"field": "system.cpu.user.pct"
33+
"field": "system.cpu.user.norm.pct"
3434
},
3535
"schema": "metric",
3636
"type": "avg"

‎packages/system/kibana/visualization/system-83e12df0-1b91-11e7-bec4-a5e9ec5cab8b.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
"line_width": 1,
6262
"metrics": [
6363
{
64-
"field": "system.cpu.user.pct",
64+
"field": "system.cpu.user.norm.pct",
6565
"id": "4c9e2552-1b91-11e7-bec4-a5e9ec5cab8b",
6666
"type": "avg"
6767
},
6868
{
69-
"field": "system.cpu.system.pct",
69+
"field": "system.cpu.system.norm.pct",
7070
"id": "225c2140-5fd7-11e7-a63a-a937b7c1a7e1",
7171
"type": "avg"
7272
},

‎packages/system/kibana/visualization/system-855899e0-1b1c-11e7-b09e-037021c4f8df.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"line_width": 1,
5858
"metrics": [
5959
{
60-
"field": "system.cpu.user.pct",
60+
"field": "system.cpu.user.norm.pct",
6161
"id": "31e5afa2-1b1c-11e7-b09e-037021c4f8df",
6262
"type": "avg"
6363
}

‎packages/system/kibana/visualization/system-ab2d1e90-1b1a-11e7-b09e-037021c4f8df.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"line_width": 1,
3838
"metrics": [
3939
{
40-
"field": "system.cpu.user.pct",
40+
"field": "system.cpu.user.norm.pct",
4141
"id": "80a04952-1b19-11e7-b09e-037021c4f8df",
4242
"type": "avg"
4343
}
@@ -59,7 +59,7 @@
5959
"line_width": 1,
6060
"metrics": [
6161
{
62-
"field": "system.cpu.system.pct",
62+
"field": "system.cpu.system.norm.pct",
6363
"id": "993acf31-1b19-11e7-b09e-037021c4f8df",
6464
"type": "avg"
6565
}
@@ -81,7 +81,7 @@
8181
"line_width": 1,
8282
"metrics": [
8383
{
84-
"field": "system.cpu.nice.pct",
84+
"field": "system.cpu.nice.norm.pct",
8585
"id": "65ca5cf0-1b1a-11e7-b09e-037021c4f8df",
8686
"type": "avg"
8787
}
@@ -103,7 +103,7 @@
103103
"line_width": 1,
104104
"metrics": [
105105
{
106-
"field": "system.cpu.irq.pct",
106+
"field": "system.cpu.irq.norm.pct",
107107
"id": "741b5f21-1b1a-11e7-b09e-037021c4f8df",
108108
"type": "avg"
109109
}
@@ -125,7 +125,7 @@
125125
"line_width": 1,
126126
"metrics": [
127127
{
128-
"field": "system.cpu.softirq.pct",
128+
"field": "system.cpu.softirq.norm.pct",
129129
"id": "2efc5d41-1b1a-11e7-b09e-037021c4f8df",
130130
"type": "avg"
131131
}
@@ -147,7 +147,7 @@
147147
"line_width": 1,
148148
"metrics": [
149149
{
150-
"field": "system.cpu.iowait.pct",
150+
"field": "system.cpu.iowait.norm.pct",
151151
"id": "ae644a31-1b19-11e7-b09e-037021c4f8df",
152152
"type": "avg"
153153
}

‎packages/zerofox/_dev/build/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies:
2+
ecs:
3+
reference: [email protected]

‎packages/zerofox/_dev/build/docs/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# ZeroFox Cloud Platform Integration
2+
3+
The ZeroFox Platform integration collects and parses data from the the ZeroFox Alert APIs.
4+
5+
## Compatibility
6+
7+
This integration supports the ZeroFox API v1.0
8+
9+
### ZeroFox
10+
11+
Contains alert data received from the ZeroFox Cloud Platform
12+
13+
{{fields "alerts"}}

‎packages/zerofox/changelog.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# newer versions go on top
2+
- version: "0.1.0"
3+
changes:
4+
- description: initial release
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/971

‎packages/zerofox/data_stream/alerts/_dev/test/pipeline/test-alert.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"events": [
3+
{
4+
"@timestamp": "2016-03-03T12:00:00.000Z",
5+
"message": "{ \"alert_type\": \"search query\", \"logs\": [{ \"id\": 205171631, \"timestamp\": \"2021-04-29T18:56:52+00:00\", \"actor\": \"ZeroFox Platform Specialist\", \"subject\": \"\", \"action\": \"modify tags\" }, { \"id\": 205171630, \"timestamp\": \"2021-04-29T18:56:51+00:00\", \"actor\": \"\", \"subject\": \"\", \"action\": \"open\" } ], \"offending_content_url\": \"hxxp://abc.biz?entity=123456\", \"asset_term\": \"\", \"assignee\": \"\", \"entity\": { \"id\": 123456, \"name\": \"abc.com\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1.jpg\", \"labels\": [{ \"id\": 17700, \"name\": \"Brand\" }], \"entity_group\": { \"id\": 2857, \"name\": \"Default\" } }, \"entity_term\": \"\", \"content_created_at\": \"2017-01-10T11:00:00+00:00\", \"id\": 123456789, \"protected_account\": \"\", \"severity\": 4, \"perpetrator\": { \"name\": \"Concealed\", \"display_name\": \"Concealed\", \"id\": 123456789, \"url\": \"hxxp://abc.biz?entity=123456\", \"content\": \"Variation of protected domain abc.com found: abc.biz\", \"type\": \"page\", \"timestamp\": \"2017-01-10T11:00:00+00:00\", \"network\": \"domains\" },\"rule_group_id\": 457, \"metadata\": \"{}\", \"status\": \"Open\", \"timestamp\": \"2021-04-29T18:56:51+00:00\", \"rule_name\": \"Advanced Domain Analysis - Typosquat Match\", \"last_modified\": \"2021-04-29T18:56:52Z\", \"protected_locations\": \"\", \"darkweb_term\": \"\", \"business_network\": \"\", \"reviewed\": false, \"escalated\": false, \"network\": \"domains\", \"protected_social_object\": \"\", \"notes\": \"\", \"reviews\": [], \"content_actions\": [], \"rule_id\": 38160, \"entity_account\": \"\", \"entity_email_receiver_id\": \"\", \"tags\": [], \"asset\": { \"id\": 123456, \"name\": \"abc.com\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1.jpg\", \"labels\": [{ \"id\": 17700, \"name\": \"Brand\" }], \"entity_group\": { \"id\": 2857, \"name\": \"Default\" } } }"
6+
},
7+
{
8+
"@timestamp": "2016-03-03T12:00:00.000Z",
9+
"message": "{\"alert_type\": \"search query\", \"logs\": [{\"id\": 206587078, \"timestamp\": \"2021-05-06T13:50:48+00:00\", \"actor\": \"\", \"subject\": \"\", \"action\": \"open\"} ], \"offending_content_url\": \"https://twitter.com/NOWMG/status/1390297659475365894\", \"asset_term\": {\"id\": 673804, \"name\": \"#darksocial\", \"deleted\": false }, \"assignee\": \"\", \"entity\": {\"id\": 1181330, \"name\": \"Dark Social\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1bkyslxoujpytdallxdghafmkhpar5r58jqzsoojgjc9gs917au8uo7dehsfyrii.png\", \"labels\": [{\"id\": 2048750, \"name\": \"brand\"} ], \"entity_group\": {\"id\": 6444, \"name\": \"Default\"} }, \"entity_term\": {\"id\": 673804, \"name\": \"#darksocial\", \"deleted\": false }, \"content_created_at\": \"2021-05-06T13:29:27+00:00\", \"id\": 137814029, \"protected_account\": null, \"severity\": 1, \"perpetrator\": {\"id\": 6830162495, \"username\": \"NOWMG\", \"display_name\": \"NOW Marketing Group\", \"account_number\": \"178236715\", \"destination_account_number\": \"178236715\", \"parent_post_number\": null, \"parent_post_url\": null, \"parent_post_account_number\": null, \"post_number\": \"1390297659475365894\", \"network\": \"twitter\", \"image\": \"https://pbs.twimg.com/profile_images/1356266220065009667/dTlGFDCM.jpg\", \"url\": \"https://twitter.com/NOWMG/status/1390297659475365894\", \"type\": \"post\", \"post_type\": \"post\", \"timestamp\": \"2021-05-06T13:29:27+00:00\"}, \"rule_group_id\": null, \"asset\": {\"id\": 1181330, \"name\": \"Dark Social\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1bkyslxoujpytdallxdghafmkhpar5r58jqzsoojgjc9gs917au8uo7dehsfyrii.png\", \"labels\": [{\"id\": 2048750, \"name\": \"brand\"} ], \"entity_group\": {\"id\": 6444, \"name\": \"Default\"} }, \"entered_by\": \"\", \"metadata\": \"\", \"status\": \"Open\", \"timestamp\": \"2021-05-06T13:50:48+00:00\", \"rule_name\": \"Mentions\", \"last_modified\": \"2021-05-06T13:50:48Z\", \"protected_locations\": null, \"darkweb_term\": null, \"business_network\": null, \"reviewed\": false, \"escalated\": false, \"network\": \"twitter\", \"protected_social_object\": \"#darksocial\", \"notes\": \"\", \"reviews\": [], \"content_actions\": [], \"rule_id\": 40816, \"entity_account\": null, \"entity_email_receiver_id\": null, \"tags\": [] }"
10+
},
11+
{
12+
"@timestamp": "2016-03-03T12:00:00.000Z",
13+
"message": "{\"alert_type\": \"impersonating account\", \"logs\": [{\"id\": 206433935, \"timestamp\": \"2021-05-05T19:36:38+00:00\", \"actor\": \"[email protected]\", \"subject\": \"\", \"action\": \"review\"}, {\"id\": 206431230, \"timestamp\": \"2021-05-05T19:22:00+00:00\", \"actor\": \"[email protected]\", \"subject\": \"\", \"action\": \"open\"} ], \"offending_content_url\": \"https://twitter.com/TheDarkSocial\", \"asset_term\": null, \"assignee\": \"\", \"entity\": {\"id\": 1181330, \"name\": \"Dark Social\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1bkyslxoujpytdallxdghafmkhpar5r58jqzsoojgjc9gs917au8uo7dehsfyrii.png\", \"labels\": [{\"id\": 2048750, \"name\": \"brand\"} ], \"entity_group\": {\"id\": 6444, \"name\": \"Default\"} }, \"entity_term\": null, \"content_created_at\": \"2014-08-09T16:00:16+00:00\", \"id\": 137731395, \"protected_account\": null, \"severity\": 1, \"perpetrator\": {\"id\": 958871039, \"username\": \"TheDarkSocial\", \"display_name\": \"Dark Social\", \"account_number\": \"2719621658\", \"image\": \"https://pbs.twimg.com/profile_images/498137972940603392/45HEzP-B.jpeg\", \"network\": \"twitter\", \"url\": \"https://twitter.com/TheDarkSocial\", \"type\": \"account\", \"timestamp\": \"2014-08-09T16:00:16+00:00\"}, \"rule_group_id\": 4, \"asset\": {\"id\": 1181330, \"name\": \"Dark Social\", \"image\": \"https://cdn.zerofox.com/media/entityimages/1bkyslxoujpytdallxdghafmkhpar5r58jqzsoojgjc9gs917au8uo7dehsfyrii.png\", \"labels\": [{\"id\": 2048750, \"name\": \"brand\"} ], \"entity_group\": {\"id\": 6444, \"name\": \"Default\"} }, \"entered_by\": \"[email protected]\", \"metadata\": \"\", \"status\": \"Open\", \"timestamp\": \"2021-05-05T19:22:00+00:00\", \"rule_name\": \"Impersonation - Name\", \"last_modified\": \"2021-05-05T19:36:38Z\", \"protected_locations\": null, \"darkweb_term\": null, \"business_network\": null, \"reviewed\": true, \"escalated\": false, \"network\": \"twitter\", \"protected_social_object\": null, \"notes\": \"\", \"reviews\": [], \"content_actions\": [], \"rule_id\": 32, \"entity_account\": null, \"entity_email_receiver_id\": null, \"tags\": [] }"
14+
}
15+
]
16+
}

‎packages/zerofox/data_stream/alerts/_dev/test/pipeline/test-alert.json-config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dynamic_fields:
2+
event.ingested: ".*"
3+
fields:
4+
tags:
5+
- preserve_original_event

0 commit comments

Comments
 (0)