Skip to content

Commit aee3836

Browse files
[jamf_pro] Tidy variable descriptions and input configuration (#14227)
- Improve variable descriptions in the manifest. - Move API URL construction into the CEL so trimming has an effect. - Update stack version to 8.15.0 and set `resource.tracer.enabled` to facilitate clean-up before a future switch to the standard trace file name.
1 parent dfdf8bd commit aee3836

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

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.6.0"
3+
changes:
4+
- description: Tidy variable descriptions and input configuration.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/14227
27
- version: "0.5.3"
38
changes:
49
- description: Add `event.module` definition for the `events` data stream.

packages/jamf_pro/data_stream/inventory/agent/stream/cel.yml.hbs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
config_version: 2
22
resource:
3-
url: "{{api_host}}/api/v1/computers-inventory"
3+
url: "{{api_host}}"
44
timeout: {{http_client_timeout}}
5-
{{#if enable_request_tracer}}
65
tracer:
6+
enabled: {{enable_request_tracer}}
77
filename: "../../logs/jamf_pro-versions/http-request-trace-*.ndjson"
88
maxbackups: 5
9-
{{/if}}
109
auth:
1110
oauth2:
1211
client:
@@ -34,7 +33,7 @@ redact:
3433
program: |-
3534
request(
3635
"GET",
37-
state.url.trim_right("/") + "?" + {
36+
state.url.trim_right("/") + "/api/v1/computers-inventory?" + {
3837
"section": state.sections,
3938
"page-size": [string(state.page_size)],
4039
"sort": ["general.reportDate:asc"],

packages/jamf_pro/manifest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.1.5
22
name: jamf_pro
33
title: "Jamf Pro"
4-
version: "0.5.3"
4+
version: "0.6.0"
55
source:
66
license: "Elastic-2.0"
77
description: "Collect logs and inventory data from Jamf Pro with Elastic Agent"
@@ -11,7 +11,7 @@ categories:
1111
- custom
1212
conditions:
1313
kibana:
14-
version: "^8.13.4 || ^9.0.0"
14+
version: "^8.15.0 || ^9.0.0"
1515
elastic:
1616
subscription: "basic"
1717
screenshots:
@@ -46,19 +46,19 @@ policy_templates:
4646
description: Jamf Pro related settings
4747
vars:
4848
- name: api_host
49-
description: Jamf Pro dashboard URL like in format `https://xxxxxxxxxxxx.jamfcloud.com/`
49+
description: Jamf Pro instance URL in the format `https://yourinstancename.jamfcloud.com`
5050
type: text
51-
title: Jamf Pro API Host
51+
title: Jamf Pro instance URL
5252
required: true
5353
- name: client_id
54-
description: Jamf Pro Client ID in format 48e2543c-69c4-4333-b3af-345298187a35
54+
description: Jamf Pro Client ID in the format `48e2543c-69c4-4333-b3af-345298187a35`
5555
type: text
5656
title: Client ID
5757
required: true
5858
- name: client_secret
5959
type: password
6060
title: Client Secret
61-
description: A secret code taken from Jamf Pro in format `2BftX05NhhS21NXCvZlCvzCJTNM54xEgi8ixaaxC_GkND-8udzaz27kr1TuWeKzX`
61+
description: A secret code taken from Jamf Pro in the format `2BftX05NhhS21NXCvZlCvzCJTNM54xEgi8ixaaxC_GkND-8udzaz27kr1TuWeKzX`
6262
secret: true
6363
required: true
6464
- type: http_endpoint

0 commit comments

Comments
 (0)