Skip to content

Commit ce66995

Browse files
leehinmanleehinman
committed
Incorporate feedback
1 parent e7ab467 commit ce66995

File tree

46 files changed

+188
-690
lines changed

Some content is hidden

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

46 files changed

+188
-690
lines changed

‎packages/apache/data_stream/access/agent/stream/httpjson.yml.hbs‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,16 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:
2414
- set:
2515
target: url.params.search
26-
value: {{search}} | streamstats max(_indextime) AS max_indextime
16+
value: |-
17+
{{search}} | streamstats max(_indextime) AS max_indextime
2718
- set:
2819
target: url.params.output_mode
2920
value: "json"

‎packages/apache/data_stream/error/agent/stream/httpjson.yml.hbs‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,16 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:
2414
- set:
2515
target: url.params.search
26-
value: {{search}} | streamstats max(_indextime) AS max_indextime
16+
value: |-
17+
{{search}} | streamstats max(_indextime) AS max_indextime
2718
- set:
2819
target: url.params.output_mode
2920
value: "json"

‎packages/apache/manifest.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,16 @@ policy_templates:
3333
title: Collect logs from Apache instances
3434
description: Collecting Apache access and error logs
3535
- type: httpjson
36-
title: Collect Apache logs from third-party REST API
37-
description: Collecting Apache logs via third-party REST API
36+
title: Collect logs from third-party REST API (experimental)
37+
description: Collect logs from third-party REST API (experimental)
3838
vars:
39-
- name: server
39+
- name: url
4040
type: text
41-
title: Address of Splunk Enterprise Server
42-
description: hostname or IP
41+
title: URL of Splunk Enterprise Server
42+
description: i.e. scheme://host:port, path is automatic
4343
show_user: true
4444
required: true
45-
default: server.example.com
46-
- name: port
47-
type: text
48-
title: Port number of Splunk Enterprise REST API
49-
show_user: true
50-
required: true
51-
default: 8089
45+
default: https://server.example.com:8089
5246
- name: username
5347
type: text
5448
title: Splunk REST API Username
@@ -59,28 +53,13 @@ policy_templates:
5953
title: Splunk REST API Password
6054
required: true
6155
show_user: true
62-
- name: ssl.enabled
63-
type: bool
64-
title: SSL enabled
56+
- name: ssl
57+
type: yaml
58+
title: SSL Configuration
59+
description: i.e. certificate_authorities, supported_protocols, verification_mode etc.
6560
multi: false
6661
required: false
6762
show_user: false
68-
default: true
69-
- name: ssl.verification_mode
70-
type: text
71-
title: Mode of server verification
72-
description: "valid values: none, strict, certificate or full"
73-
multi: false
74-
required: false
75-
show_user: false
76-
default: full
77-
- name: ssl.certificate_authorities
78-
type: text
79-
title: List of root certificates for TLS server verification
80-
description: PEM encoded
81-
multi: true
82-
required: false
83-
show_user: false
8463
- type: apache/metrics
8564
title: Collect metrics from Apache instances
8665
description: Collecting Apache status metrics

‎packages/aws/data_stream/cloudtrail/agent/stream/httpjson.yml.hbs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:

‎packages/aws/manifest.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -240,22 +240,16 @@ policy_templates:
240240
default: "amazonaws.com"
241241
description: URL of the entry point for an AWS web service.
242242
- type: httpjson
243-
title: Collect AWS logs from third-party REST API
244-
description: "Collects AWS logs from third-party REST API"
243+
title: Collect logs from third-party REST API (experimental)
244+
description: Collect logs from third-party REST API (experimental)
245245
vars:
246-
- name: server
246+
- name: url
247247
type: text
248-
title: Address of Splunk Enterprise Server
249-
description: hostname or IP
248+
title: URL of Splunk Enterprise Server
249+
description: i.e. scheme://host:port, path is automatic
250250
show_user: true
251251
required: true
252-
default: server.example.com
253-
- name: port
254-
type: text
255-
title: Port number of Splunk Enterprise REST API
256-
show_user: true
257-
required: true
258-
default: 8089
252+
default: https://server.example.com:8089
259253
- name: username
260254
type: text
261255
title: Splunk REST API Username
@@ -266,27 +260,12 @@ policy_templates:
266260
title: Splunk REST API Password
267261
required: true
268262
show_user: true
269-
- name: ssl.enabled
270-
type: bool
271-
title: SSL enabled
272-
multi: false
273-
required: false
274-
show_user: false
275-
default: true
276-
- name: ssl.verification_mode
277-
type: text
278-
title: Mode of server verification
279-
description: "valid values: none, strict, certificate or full"
263+
- name: ssl
264+
type: yaml
265+
title: SSL Configuration
280266
multi: false
281267
required: false
282268
show_user: false
283-
default: full
284-
- name: ssl.certificate_authorities
285-
type: text
286-
title: List of root certificates for TLS server verification
287-
description: PEM encoded
288-
multi: true
289-
required: false
290-
show_user: false
269+
description: i.e. certificate_authorities, supported_protocols, verification_mode etc.
291270
owner:
292271
github: elastic/integrations

‎packages/nginx/data_stream/access/agent/stream/httpjson.yml.hbs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:

‎packages/nginx/data_stream/error/agent/stream/httpjson.yml.hbs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:

‎packages/nginx/manifest.yml‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,16 @@ policy_templates:
3838
title: Collect logs from Nginx instances
3939
description: Collecting Nginx access and error logs
4040
- type: httpjson
41-
title: Collect Nginx logs from third-party REST API
42-
description: Collecting Nginx logs via third-party REST API
41+
title: Collect logs from third-party REST API (experimental)
42+
description: Collect logs from third-party REST API (experimental)
4343
vars:
44-
- name: server
44+
- name: url
4545
type: text
46-
title: Address of Splunk Enterprise Server
47-
description: hostname or IP
46+
title: URL of Splunk Enterprise Server
47+
description: i.e. scheme://host:port, path is automatic
4848
show_user: true
4949
required: true
50-
default: server.example.com
51-
- name: port
52-
type: text
53-
title: Port number of Splunk Enterprise REST API
54-
show_user: true
55-
required: true
56-
default: 8089
50+
default: https://server.example.com:8089
5751
- name: username
5852
type: text
5953
title: Splunk REST API Username
@@ -64,28 +58,13 @@ policy_templates:
6458
title: Splunk REST API Password
6559
required: true
6660
show_user: true
67-
- name: ssl.enabled
68-
type: bool
69-
title: SSL enabled
61+
- name: ssl
62+
type: yaml
63+
title: SSL Configuration
64+
description: i.e. certificate_authorities, supported_protocols, verification_mode etc.
7065
multi: false
7166
required: false
7267
show_user: false
73-
default: true
74-
- name: ssl.verification_mode
75-
type: text
76-
title: Mode of server verification
77-
description: "valid values: none, strict, certificate or full"
78-
multi: false
79-
required: false
80-
show_user: false
81-
default: full
82-
- name: ssl.certificate_authorities
83-
type: text
84-
title: List of root certificates for TLS server verification
85-
description: PEM encoded
86-
multi: true
87-
required: false
88-
show_user: false
8968
- type: nginx/metrics
9069
vars:
9170
- name: hosts

‎packages/zeek/data_stream/capture_loss/agent/stream/httpjson.yml.hbs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:

‎packages/zeek/data_stream/connection/agent/stream/httpjson.yml.hbs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@ auth.basic.password: {{password}}
55
cursor:
66
index_earliest:
77
value: '[[.last_event.result.max_indextime]]'
8-
{{#if ssl.enabled}}
9-
request.url: https://{{server}}:{{port}}/services/search/jobs/export
10-
{{#if ssl.verification_mode}}
11-
ssl.verification_mode: {{ssl.verification_mode}}
12-
{{/if}}
13-
{{#if ssl.certificate_authorities}}
14-
ssl.certificate_authorites:
15-
{{#each ssl.certificate_authorities}}
16-
- {{this}}
17-
{{/each}}
18-
{{/if}}
19-
{{else}}
20-
request.url: http://{{server}}:{{port}}/services/search/jobs/export
8+
request.url: {{url}}/services/search/jobs/export
9+
{{#if ssl}}
10+
request.ssl: {{ssl}}
2111
{{/if}}
2212
request.method: POST
2313
request.transforms:

0 commit comments

Comments
 (0)