Skip to content

Commit 72b284e

Browse files
brijesh-elasticbrijesh-elastic
authored
Prevent updating fleet health status to degraded for following packages when HTTPJSON template value evaluation is empty
* atlassian_bitbucket * forgerock (Adding a 'Rate Limit Remaining' header in system test rules to prevent empty template evaluation.) * httpjson * lumos * microsoft_exchange_online_message_trace * sophos_central * tenable_sc * ti_eset * zerofox * zeronetworks This change bumps minimum Kibana version to ^8.19.4 || ~9.0.7 || ^9.1.4 and adds `do_not_log_failure: true` in set processors to avoid updating fleet health status to degraded.
1 parent 1acfa77 commit 72b284e

File tree

87 files changed

+1105
-716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1105
-716
lines changed

‎packages/atlassian_bitbucket/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: "2.6.0"
3+
changes:
4+
- description: Prevent updating fleet health status to degraded.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15584
27
- version: "2.5.0"
38
changes:
49
- description: Improve error reporting.

‎packages/atlassian_bitbucket/data_stream/audit/agent/stream/httpjson.yml.hbs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ response.split:
5252
response.pagination:
5353
- set:
5454
target: url.value
55-
value: '[[ .last_response.body.pagingInfo.nextPageLink ]]'
55+
value: '[[ if index .last_response.body.pagingInfo "nextPageLink" ]][[ .last_response.body.pagingInfo.nextPageLink ]][[ end ]]'
5656
fail_on_template_error: true
57+
do_not_log_failure: true
5758

5859
cursor:
5960
last_timestamp:

‎packages/atlassian_bitbucket/data_stream/audit/sample_event.json‎

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"@timestamp": "2021-11-27T18:10:57.316Z",
2+
"@timestamp": "2021-11-27T18:13:19.888Z",
33
"agent": {
4-
"ephemeral_id": "c1c6859f-88f5-4ae8-ad40-5c0c9fe933d1",
5-
"id": "82d0dfd8-3946-4ac0-a092-a9146a71e3f7",
6-
"name": "docker-fleet-agent",
4+
"ephemeral_id": "949c3cd9-59d0-4214-bd94-b4388d99ca39",
5+
"id": "111e6217-e5c2-49d6-88df-a1a2f716685b",
6+
"name": "elastic-agent-45713",
77
"type": "filebeat",
8-
"version": "8.0.0-beta1"
8+
"version": "8.19.4"
99
},
1010
"bitbucket": {
1111
"audit": {
@@ -25,43 +25,71 @@
2525
],
2626
"method": "Browser",
2727
"type": {
28-
"action": "Project created",
29-
"actionI18nKey": "bitbucket.service.project.audit.action.projectcreated",
28+
"action": "Project deletion requested",
29+
"actionI18nKey": "bitbucket.service.project.audit.action.projectdeletionrequested",
30+
"area": "LOCAL_CONFIG_AND_ADMINISTRATION",
3031
"category": "Projects",
31-
"categoryI18nKey": "bitbucket.service.audit.category.projects"
32+
"categoryI18nKey": "bitbucket.service.audit.category.projects",
33+
"level": "BASE"
3234
}
3335
}
3436
},
3537
"data_stream": {
3638
"dataset": "atlassian_bitbucket.audit",
37-
"namespace": "ep",
39+
"namespace": "68281",
3840
"type": "logs"
3941
},
4042
"ecs": {
4143
"version": "8.11.0"
4244
},
4345
"elastic_agent": {
44-
"id": "82d0dfd8-3946-4ac0-a092-a9146a71e3f7",
46+
"id": "111e6217-e5c2-49d6-88df-a1a2f716685b",
4547
"snapshot": false,
46-
"version": "8.0.0-beta1"
48+
"version": "8.19.4"
4749
},
4850
"event": {
49-
"action": "bitbucket.service.project.audit.action.projectcreated",
51+
"action": "bitbucket.service.project.audit.action.projectdeletionrequested",
5052
"agent_id_status": "verified",
5153
"category": [
5254
"configuration"
5355
],
54-
"created": "2021-12-24T00:39:23.076Z",
5556
"dataset": "atlassian_bitbucket.audit",
56-
"ingested": "2021-12-24T00:39:24Z",
57+
"ingested": "2025-10-05T12:01:16Z",
5758
"kind": "event",
58-
"original": "{\"affectedObjects\":[{\"id\":\"3\",\"name\":\"AT\",\"type\":\"PROJECT\"}],\"author\":{\"avatarUri\":\"\",\"id\":\"2\",\"name\":\"admin\",\"type\":\"NORMAL\",\"uri\":\"http://bitbucket.internal:7990/users/admin\"},\"changedValues\":[],\"extraAttributes\":[{\"name\":\"target\",\"nameI18nKey\":\"bitbucket.audit.attribute.legacy.target\",\"value\":\"AT\"}],\"method\":\"Browser\",\"node\":\"8767044c-1b98-4d64-82db-ef29af8c3792\",\"source\":\"10.100.100.2\",\"system\":\"http://bitbucket.internal:7990\",\"timestamp\":\"2021-11-27T18:10:57.316Z\",\"type\":{\"action\":\"Project created\",\"actionI18nKey\":\"bitbucket.service.project.audit.action.projectcreated\",\"category\":\"Projects\",\"categoryI18nKey\":\"bitbucket.service.audit.category.projects\"}}",
59+
"original": "{\"affectedObjects\":[{\"id\":\"3\",\"name\":\"AT\",\"type\":\"PROJECT\"}],\"auditType\":{\"action\":\"Project deletion requested\",\"actionI18nKey\":\"bitbucket.service.project.audit.action.projectdeletionrequested\",\"area\":\"LOCAL_CONFIG_AND_ADMINISTRATION\",\"category\":\"Projects\",\"categoryI18nKey\":\"bitbucket.service.audit.category.projects\",\"level\":\"BASE\"},\"author\":{\"id\":\"2\",\"name\":\"admin\",\"type\":\"NORMAL\"},\"changedValues\":[],\"extraAttributes\":[{\"name\":\"target\",\"nameI18nKey\":\"bitbucket.audit.attribute.legacy.target\",\"value\":\"AT\"}],\"method\":\"Browser\",\"node\":\"8767044c-1b98-4d64-82db-ef29af8c3792\",\"source\":\"10.100.100.2\",\"system\":\"http://bitbucket.internal:7990\",\"timestamp\":{\"epochSecond\":1638036799,\"nano\":888000000},\"version\":\"1.0\"}",
5960
"type": [
60-
"creation"
61+
"deletion"
6162
]
6263
},
64+
"host": {
65+
"architecture": "x86_64",
66+
"containerized": false,
67+
"hostname": "elastic-agent-45713",
68+
"ip": [
69+
"192.168.244.2",
70+
"192.168.240.8"
71+
],
72+
"mac": [
73+
"82-A2-D4-5B-A7-85",
74+
"9E-8C-8A-A2-0F-DB"
75+
],
76+
"name": "elastic-agent-45713",
77+
"os": {
78+
"kernel": "5.15.0-156-generic",
79+
"name": "Wolfi",
80+
"platform": "wolfi",
81+
"type": "linux",
82+
"version": "20230201"
83+
}
84+
},
6385
"input": {
64-
"type": "httpjson"
86+
"type": "log"
87+
},
88+
"log": {
89+
"file": {
90+
"path": "/tmp/service_logs/test-audit.log"
91+
},
92+
"offset": 0
6593
},
6694
"related": {
6795
"hosts": [
@@ -83,11 +111,10 @@
83111
},
84112
"tags": [
85113
"preserve_original_event",
86-
"forwarded",
87114
"bitbucket-audit"
88115
],
89116
"user": {
90117
"id": "2",
91118
"name": "admin"
92119
}
93-
}
120+
}

‎packages/atlassian_bitbucket/docs/README.md‎

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ An example event for `audit` looks as following:
4242

4343
```json
4444
{
45-
"@timestamp": "2021-11-27T18:10:57.316Z",
45+
"@timestamp": "2021-11-27T18:13:19.888Z",
4646
"agent": {
47-
"ephemeral_id": "c1c6859f-88f5-4ae8-ad40-5c0c9fe933d1",
48-
"id": "82d0dfd8-3946-4ac0-a092-a9146a71e3f7",
49-
"name": "docker-fleet-agent",
47+
"ephemeral_id": "949c3cd9-59d0-4214-bd94-b4388d99ca39",
48+
"id": "111e6217-e5c2-49d6-88df-a1a2f716685b",
49+
"name": "elastic-agent-45713",
5050
"type": "filebeat",
51-
"version": "8.0.0-beta1"
51+
"version": "8.19.4"
5252
},
5353
"bitbucket": {
5454
"audit": {
@@ -68,43 +68,71 @@ An example event for `audit` looks as following:
6868
],
6969
"method": "Browser",
7070
"type": {
71-
"action": "Project created",
72-
"actionI18nKey": "bitbucket.service.project.audit.action.projectcreated",
71+
"action": "Project deletion requested",
72+
"actionI18nKey": "bitbucket.service.project.audit.action.projectdeletionrequested",
73+
"area": "LOCAL_CONFIG_AND_ADMINISTRATION",
7374
"category": "Projects",
74-
"categoryI18nKey": "bitbucket.service.audit.category.projects"
75+
"categoryI18nKey": "bitbucket.service.audit.category.projects",
76+
"level": "BASE"
7577
}
7678
}
7779
},
7880
"data_stream": {
7981
"dataset": "atlassian_bitbucket.audit",
80-
"namespace": "ep",
82+
"namespace": "68281",
8183
"type": "logs"
8284
},
8385
"ecs": {
8486
"version": "8.11.0"
8587
},
8688
"elastic_agent": {
87-
"id": "82d0dfd8-3946-4ac0-a092-a9146a71e3f7",
89+
"id": "111e6217-e5c2-49d6-88df-a1a2f716685b",
8890
"snapshot": false,
89-
"version": "8.0.0-beta1"
91+
"version": "8.19.4"
9092
},
9193
"event": {
92-
"action": "bitbucket.service.project.audit.action.projectcreated",
94+
"action": "bitbucket.service.project.audit.action.projectdeletionrequested",
9395
"agent_id_status": "verified",
9496
"category": [
9597
"configuration"
9698
],
97-
"created": "2021-12-24T00:39:23.076Z",
9899
"dataset": "atlassian_bitbucket.audit",
99-
"ingested": "2021-12-24T00:39:24Z",
100+
"ingested": "2025-10-05T12:01:16Z",
100101
"kind": "event",
101-
"original": "{\"affectedObjects\":[{\"id\":\"3\",\"name\":\"AT\",\"type\":\"PROJECT\"}],\"author\":{\"avatarUri\":\"\",\"id\":\"2\",\"name\":\"admin\",\"type\":\"NORMAL\",\"uri\":\"http://bitbucket.internal:7990/users/admin\"},\"changedValues\":[],\"extraAttributes\":[{\"name\":\"target\",\"nameI18nKey\":\"bitbucket.audit.attribute.legacy.target\",\"value\":\"AT\"}],\"method\":\"Browser\",\"node\":\"8767044c-1b98-4d64-82db-ef29af8c3792\",\"source\":\"10.100.100.2\",\"system\":\"http://bitbucket.internal:7990\",\"timestamp\":\"2021-11-27T18:10:57.316Z\",\"type\":{\"action\":\"Project created\",\"actionI18nKey\":\"bitbucket.service.project.audit.action.projectcreated\",\"category\":\"Projects\",\"categoryI18nKey\":\"bitbucket.service.audit.category.projects\"}}",
102+
"original": "{\"affectedObjects\":[{\"id\":\"3\",\"name\":\"AT\",\"type\":\"PROJECT\"}],\"auditType\":{\"action\":\"Project deletion requested\",\"actionI18nKey\":\"bitbucket.service.project.audit.action.projectdeletionrequested\",\"area\":\"LOCAL_CONFIG_AND_ADMINISTRATION\",\"category\":\"Projects\",\"categoryI18nKey\":\"bitbucket.service.audit.category.projects\",\"level\":\"BASE\"},\"author\":{\"id\":\"2\",\"name\":\"admin\",\"type\":\"NORMAL\"},\"changedValues\":[],\"extraAttributes\":[{\"name\":\"target\",\"nameI18nKey\":\"bitbucket.audit.attribute.legacy.target\",\"value\":\"AT\"}],\"method\":\"Browser\",\"node\":\"8767044c-1b98-4d64-82db-ef29af8c3792\",\"source\":\"10.100.100.2\",\"system\":\"http://bitbucket.internal:7990\",\"timestamp\":{\"epochSecond\":1638036799,\"nano\":888000000},\"version\":\"1.0\"}",
102103
"type": [
103-
"creation"
104+
"deletion"
104105
]
105106
},
107+
"host": {
108+
"architecture": "x86_64",
109+
"containerized": false,
110+
"hostname": "elastic-agent-45713",
111+
"ip": [
112+
"192.168.244.2",
113+
"192.168.240.8"
114+
],
115+
"mac": [
116+
"82-A2-D4-5B-A7-85",
117+
"9E-8C-8A-A2-0F-DB"
118+
],
119+
"name": "elastic-agent-45713",
120+
"os": {
121+
"kernel": "5.15.0-156-generic",
122+
"name": "Wolfi",
123+
"platform": "wolfi",
124+
"type": "linux",
125+
"version": "20230201"
126+
}
127+
},
106128
"input": {
107-
"type": "httpjson"
129+
"type": "log"
130+
},
131+
"log": {
132+
"file": {
133+
"path": "/tmp/service_logs/test-audit.log"
134+
},
135+
"offset": 0
108136
},
109137
"related": {
110138
"hosts": [
@@ -126,7 +154,6 @@ An example event for `audit` looks as following:
126154
},
127155
"tags": [
128156
"preserve_original_event",
129-
"forwarded",
130157
"bitbucket-audit"
131158
],
132159
"user": {

‎packages/atlassian_bitbucket/manifest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
format_version: "3.0.2"
22
name: atlassian_bitbucket
33
title: Atlassian Bitbucket
4-
version: "2.5.0"
4+
version: "2.6.0"
55
description: Collect logs from Atlassian Bitbucket with Elastic Agent.
66
type: integration
77
categories:
88
- security
99
- productivity_security
1010
conditions:
1111
kibana:
12-
version: "^8.13.0 || ^9.0.0"
12+
version: "^8.19.4 || ~9.0.7 || ^9.1.4"
1313
icons:
1414
- src: /img/bitbucket-logo.svg
1515
title: Bitbucket Logo

0 commit comments

Comments
 (0)