Skip to content

Commit

Permalink
Remove old httpjson config implementation (elastic#28054)
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-gr authored and wiwen committed Nov 1, 2021
1 parent 88347b6 commit 96f3569
Show file tree
Hide file tree
Showing 74 changed files with 834 additions and 3,563 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- All filesets are disabled in the default configuration. {issue}17256[17256] {pull}27762[27762]
- Remove deprecated fields in Kafka module. {pull}27938[27938]
- Remove deprecated fields in coredns module. {pull}28196[28196]
- Remove old `httpjson` config implementation. {pull}28054[28054]

*Heartbeat*

Expand Down
91 changes: 0 additions & 91 deletions x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Example configurations:
filebeat.inputs:
# Fetch your public IP every minute.
- type: httpjson
config_version: 2
interval: 1m
request.url: https://api.ipify.org/?format=json
processors:
Expand All @@ -44,7 +43,6 @@ filebeat.inputs:
----
filebeat.inputs:
- type: httpjson
config_version: 2
request.url: http://localhost:9200/_search?scroll=5m
request.method: POST
response.split:
Expand All @@ -69,7 +67,6 @@ Example configurations with authentication:
----
filebeat.inputs:
- type: httpjson
config_version: 2
request.url: http://localhost
request.transforms:
- set:
Expand All @@ -81,7 +78,6 @@ filebeat.inputs:
----
filebeat.inputs:
- type: httpjson
config_version: 2
auth.oauth2:
client.id: 12345678901234567890abcdef
client.secret: abcdef12345678901234567890
Expand Down Expand Up @@ -217,13 +213,6 @@ In addition to the provided functions, any of the native functions for https://g
The `httpjson` input supports the following configuration options plus the
<<{beatname_lc}-input-{type}-common-options>> described later.

[float]
==== `config_version`

Defines the configuration version. Current supported versions are: `1` and `2`. Default: `1`.

NOTE: This setting defaults to `1` to avoid breaking current configurations. V1 configuration is deprecated and will be unsupported in future releases. Any new configuration should use `config_version: 2`.

[float]
==== `interval`

Expand Down Expand Up @@ -296,7 +285,6 @@ Can be set for all providers except `google`.
["source","yaml",subs="attributes"]
----
- type: httpjson
config_version: 2
auth.oauth2:
endpoint_params:
Param1:
Expand Down Expand Up @@ -374,7 +362,6 @@ Defaults to `null` (no HTTP body).
["source","yaml",subs="attributes"]
----
- type: httpjson
config_version: 2
request.method: POST
request.body:
query:
Expand Down Expand Up @@ -406,7 +393,6 @@ This specifies proxy configuration in the form of `http[s]://<user>:<password>@<
filebeat.inputs:
# Fetch your public IP every minute.
- type: httpjson
config_version: 2
interval: 1m
request.url: https://api.ipify.org/?format=json
request.proxy_url: http://proxy.example:8080
Expand Down Expand Up @@ -474,7 +460,6 @@ Can write state to: [`body.*`, `header.*`, `url.*`].
----
filebeat.inputs:
- type: httpjson
config_version: 2
request.url: http://localhost:9200/_search?scroll=5m
request.method: POST
request.transforms:
Expand Down Expand Up @@ -504,7 +489,6 @@ Can write state to: [`body.*`].
----
filebeat.inputs:
- type: httpjson
config_version: 2
request.url: http://localhost:9200/_search?scroll=5m
request.method: POST
response.transforms:
Expand Down Expand Up @@ -639,7 +623,6 @@ The config will look like:
----
filebeat.inputs:
- type: httpjson
config_version: 2
interval: 1m
request.url: https://example.com
response.split:
Expand Down Expand Up @@ -735,7 +718,6 @@ The config will look like:
----
filebeat.inputs:
- type: httpjson
config_version: 2
interval: 1m
request.url: https://example.com
response.split:
Expand Down Expand Up @@ -810,7 +792,6 @@ The config will look like:
----
filebeat.inputs:
- type: httpjson
config_version: 2
interval: 1m
request.url: https://example.com
response.split:
Expand Down Expand Up @@ -862,7 +843,6 @@ The config will look like:
----
filebeat.inputs:
- type: httpjson
config_version: 2
interval: 1m
request.url: https://example.com
response.split:
Expand Down Expand Up @@ -913,7 +893,6 @@ NOTE: Default templates do not have access to any state, only to functions.
----
filebeat.inputs:
- type: httpjson
config_version: 2
interval: 1m
request.url: https://api.ipify.org/?format=json
response.transforms:
Expand All @@ -930,76 +909,6 @@ filebeat.inputs:
target: "json"
----

[float]
==== `api_key`

Deprecated, use `request.transforms`.

[float]
==== `http_client_timeout`

Deprecated, use `request.timeout`.

[float]
==== `http_headers`

Deprecated, use `request.transforms`.

[float]
==== `http_method`

Deprecated, use `request.method`.

[float]
==== `http_request_body`

Deprecated, use `request.body`.

[float]
==== `json_objects_array`

Deprecated, use `request.split`.

[float]
==== `split_events_by`

Deprecated, use `request.split`.

[float]
==== `no_http_body`

Deprecated.

[float]
==== `pagination.*`

Deprecated, use `response.pagination`.

[float]
==== `rate_limit.*`

Deprecated, use `request.rate_limit.*`.

[float]
==== `retry.*`

Deprecated, use `request.retry.*`.

[float]
==== `ssl`

Deprecated, use `request.ssl`.

[float]
==== `url`

Deprecated, use `request.url`.

[float]
==== `oauth2.*`

Deprecated, use `auth.oauth2.*`.

==== Request life cycle

image:images/input-httpjson-lifecycle.png[Request lifecycle]
Expand Down
Loading

0 comments on commit 96f3569

Please sign in to comment.