Skip to content

Commit 5875dc5

Browse files
mohitjha-elasticmohitjha-elastic
committed
Merge branch 'main' of github.com:mohitjha-elastic/integrations into standarize_names_in_microsoft_integrations
Conflicts: packages/o365/changelog.yml packages/o365/manifest.yml
2 parents 855b69c + 5e6dcab commit 5875dc5

File tree

89 files changed

+7970
-144
lines changed

Some content is hidden

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

89 files changed

+7970
-144
lines changed

‎.buildkite/scripts/backport_branch.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,15 @@ updateBackportBranchContents() {
133133
# Update scripts used by mage
134134
local MAGEFILE_SCRIPTS_FOLDER="dev/citools"
135135
local TESTSREPORTER_SCRIPTS_FOLDER="dev/testsreporter"
136+
local COVERAGE_SCRIPTS_FOLDER="dev/coverage"
136137
if git ls-tree -d --name-only main:${MAGEFILE_SCRIPTS_FOLDER} > /dev/null 2>&1 ; then
137138
echo "Copying $MAGEFILE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
138139
git checkout "$SOURCE_BRANCH" -- "${MAGEFILE_SCRIPTS_FOLDER}"
140+
echo "Copying $TESTSREPORTER_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
139141
git checkout "$SOURCE_BRANCH" -- "${TESTSREPORTER_SCRIPTS_FOLDER}"
142+
echo "Copying $COVERAGE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
143+
git checkout "$SOURCE_BRANCH" -- "${COVERAGE_SCRIPTS_FOLDER}"
144+
echo "Copying magefile.go from $SOURCE_BRANCH..."
140145
git checkout "$SOURCE_BRANCH" -- "magefile.go"
141146
# Run go mod tidy to update just the dependencies related to magefile and dev scripts
142147
go mod tidy
@@ -173,7 +178,8 @@ updateBackportBranchContents() {
173178

174179
if [ "$DRY_RUN" == "true" ];then
175180
echo "DRY_RUN mode, nothing will be pushed."
176-
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
181+
# Show just the relevant files diff (go.mod, go.sum, .buildkite, dev and package to be backported)
182+
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME go.mod go.sum .buildkite/ dev/ "packages/${PACKAGE_NAME}"
177183
else
178184
echo "Pushing..."
179185
git push origin $BACKPORT_BRANCH_NAME

‎.github/workflows/updatecli/updatecli.d/bump-latest-8x-snapshot-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ sources:
2929
name: Get latest snapshot
3030
kind: json
3131
spec:
32-
file: https://storage.googleapis.com/artifacts-api/snapshots/8.x.json
32+
file: https://storage.googleapis.com/artifacts-api/snapshots/8.19.json
3333
key: .version
3434
latestSnapshotMajorMinor:
3535
name: Get latest snapshort major and minor
3636
kind: json
3737
spec:
38-
file: https://storage.googleapis.com/artifacts-api/snapshots/8.x.json
38+
file: https://storage.googleapis.com/artifacts-api/snapshots/8.19.json
3939
key: .version
4040
transformers:
4141
- findsubmatch:

‎packages/apm/agent/input/template.yml.hbs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ apm-server:
7373
ttl: {{tail_sampling_ttl}}
7474
policies: {{tail_sampling_policies}}
7575
storage_limit: {{tail_sampling_storage_limit}}
76+
discard_on_write_failure: {{tail_sampling_discard_on_write_failure}}

‎packages/apm/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: 9.1.0-preview-1747764883
2+
changes:
3+
- description: Add integration policy variable `tail_sampling_discard_on_write_failure` to configure `apm-server.sampling.tail.discard_on_write_failure`
4+
type: enhancement
5+
link: https://github.com/elastic/integrations/pull/13950
16
- version: 9.1.0-preview-1744129488
27
changes:
38
- description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl`

‎packages/apm/manifest.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.1.0
22
name: apm
33
title: Elastic APM
4-
version: 9.1.0-preview-1744129488
4+
version: 9.1.0-preview-1747764883
55
description: Monitor, detect, and diagnose complex application performance issues.
66
type: integration
77
categories: ["elastic_stack", "monitoring"]
@@ -175,6 +175,9 @@ policy_templates:
175175
- name: tail_sampling_storage_limit
176176
type: text
177177
default: "0GB"
178+
- name: tail_sampling_discard_on_write_failure
179+
type: bool
180+
default: false
178181
template_path: template.yml.hbs
179182
owner:
180183
type: elastic

‎packages/jamf_pro/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: "0.5.2"
3+
changes:
4+
- description: Fix `flattened` field types for non-object values.
5+
type: bugfix
6+
link: https://github.com/elastic/integrations/pull/13985
27
- version: "0.5.1"
38
changes:
49
- description: Fix empty string issue for date query param in filter for Jamf Pro inventory data stream.

‎packages/jamf_pro/data_stream/events/fields/fields.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
type: group
6161
fields:
6262
- name: action
63-
type: flattened
63+
type: keyword
6464
- name: patch_policy_id
6565
type: integer
6666
- name: patch_policy_name
@@ -120,7 +120,7 @@
120120
- name: name
121121
type: keyword
122122
- name: report_urls
123-
type: flattened
123+
type: keyword
124124
- name: bluetooth_mac_address
125125
type: keyword
126126
- name: icci_id
@@ -148,9 +148,9 @@
148148
- name: rest_api_operation_type
149149
type: keyword
150150
- name: group_added_user_ids
151-
type: flattened
151+
type: keyword
152152
- name: group_removed_user_ids
153-
type: flattened
153+
type: keyword
154154
- name: jssid
155155
type: integer
156156
- name: smart_group
@@ -220,7 +220,7 @@
220220
- name: payload_identifier
221221
type: keyword
222222
- name: payload_types
223-
type: flattened
223+
type: keyword
224224
- name: trigger
225225
type: keyword
226226
- name: host_address
@@ -238,11 +238,11 @@
238238
- name: group_added_devices
239239
type: flattened
240240
- name: group_added_devices_ids
241-
type: flattened
241+
type: keyword
242242
- name: group_removed_devices
243243
type: flattened
244244
- name: group_removed_devices_ids
245-
type: flattened
245+
type: keyword
246246
- name: asset_tag
247247
type: keyword
248248
- name: description

‎packages/jamf_pro/data_stream/inventory/fields/fields-disk-encryption.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
- name: file_vault2eligibility_message
2626
type: text
2727
- name: file_vault2enabled_user_names
28-
type: flattened
28+
type: keyword

‎packages/jamf_pro/data_stream/inventory/fields/fields.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585
type: group
8686
fields:
8787
- name: cached
88-
type: flattened
88+
type: keyword
8989
- name: installed_by_installer_swu
90-
type: flattened
90+
type: keyword
9191
- name: installed_by_jamf_pro
92-
type: flattened
92+
type: keyword
9393
- name: attachments
9494
type: nested
9595
- name: certificates

‎packages/jamf_pro/docs/README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ The following non-ECS fields are used in inventory documents:
227227
| jamf_pro.inventory.disk_encryption.boot_partition_encryption_details.partition_name | | keyword |
228228
| jamf_pro.inventory.disk_encryption.disk_encryption_configuration_name | | keyword |
229229
| jamf_pro.inventory.disk_encryption.file_vault2eligibility_message | | text |
230-
| jamf_pro.inventory.disk_encryption.file_vault2enabled_user_names | | flattened |
230+
| jamf_pro.inventory.disk_encryption.file_vault2enabled_user_names | | keyword |
231231
| jamf_pro.inventory.disk_encryption.individual_recovery_key_validity_status | | keyword |
232232
| jamf_pro.inventory.disk_encryption.institutional_recovery_key_present | | boolean |
233233
| jamf_pro.inventory.error.message | | text |
@@ -327,9 +327,9 @@ The following non-ECS fields are used in inventory documents:
327327
| jamf_pro.inventory.operating_system.software_update_device_id | | keyword |
328328
| jamf_pro.inventory.operating_system.supplemental_build_version | | keyword |
329329
| jamf_pro.inventory.operating_system.version | | keyword |
330-
| jamf_pro.inventory.package_receipts.cached | | flattened |
331-
| jamf_pro.inventory.package_receipts.installed_by_installer_swu | | flattened |
332-
| jamf_pro.inventory.package_receipts.installed_by_jamf_pro | | flattened |
330+
| jamf_pro.inventory.package_receipts.cached | | keyword |
331+
| jamf_pro.inventory.package_receipts.installed_by_installer_swu | | keyword |
332+
| jamf_pro.inventory.package_receipts.installed_by_jamf_pro | | keyword |
333333
| jamf_pro.inventory.plugins | | nested |
334334
| jamf_pro.inventory.printers | | nested |
335335
| jamf_pro.inventory.purchasing.apple_care_id | | keyword |
@@ -538,13 +538,13 @@ The following non-ECS fields are used in real-time event documents:
538538
| jamf_pro.events.event.device_enrollment_program_instance_id | | integer |
539539
| jamf_pro.events.event.device_name | | keyword |
540540
| jamf_pro.events.event.email_address | | keyword |
541-
| jamf_pro.events.event.event_actions.action | | flattened |
541+
| jamf_pro.events.event.event_actions.action | | keyword |
542542
| jamf_pro.events.event.group_added_devices | | flattened |
543-
| jamf_pro.events.event.group_added_devices_ids | | flattened |
544-
| jamf_pro.events.event.group_added_user_ids | | flattened |
543+
| jamf_pro.events.event.group_added_devices_ids | | keyword |
544+
| jamf_pro.events.event.group_added_user_ids | | keyword |
545545
| jamf_pro.events.event.group_removed_devices | | flattened |
546-
| jamf_pro.events.event.group_removed_devices_ids | | flattened |
547-
| jamf_pro.events.event.group_removed_user_ids | | flattened |
546+
| jamf_pro.events.event.group_removed_devices_ids | | keyword |
547+
| jamf_pro.events.event.group_removed_user_ids | | keyword |
548548
| jamf_pro.events.event.host_address | | keyword |
549549
| jamf_pro.events.event.icci_id | | keyword |
550550
| jamf_pro.events.event.imei | | keyword |
@@ -571,13 +571,13 @@ The following non-ECS fields are used in real-time event documents:
571571
| jamf_pro.events.event.patch_policy_id | | integer |
572572
| jamf_pro.events.event.patch_policy_name | | keyword |
573573
| jamf_pro.events.event.payload_identifier | | keyword |
574-
| jamf_pro.events.event.payload_types | | flattened |
574+
| jamf_pro.events.event.payload_types | | keyword |
575575
| jamf_pro.events.event.phone | | keyword |
576576
| jamf_pro.events.event.policy_id | | integer |
577577
| jamf_pro.events.event.position | | keyword |
578578
| jamf_pro.events.event.product | | keyword |
579579
| jamf_pro.events.event.real_name | | keyword |
580-
| jamf_pro.events.event.report_urls | | flattened |
580+
| jamf_pro.events.event.report_urls | | keyword |
581581
| jamf_pro.events.event.reported_ip_address | | ip |
582582
| jamf_pro.events.event.rest_api_operation_type | | keyword |
583583
| jamf_pro.events.event.room | | keyword |

0 commit comments

Comments
 (0)