From 770f154dc152449e56e3b085270e88ae5bbb0d79 Mon Sep 17 00:00:00 2001 From: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:20:15 -0600 Subject: [PATCH] Deprecate experimental third-party API import option (#11524) - Deprecated the experimental third-party API (Splunk) import option in apache, nginx, system, windows, and zeek packages. --- packages/apache/changelog.yml | 5 +++++ packages/apache/manifest.yml | 6 +++--- packages/nginx/changelog.yml | 5 +++++ packages/nginx/manifest.yml | 6 +++--- packages/system/changelog.yml | 5 +++++ packages/system/manifest.yml | 6 +++--- packages/windows/_dev/build/docs/README.md | 2 +- packages/windows/changelog.yml | 5 +++++ packages/windows/docs/README.md | 2 +- packages/windows/manifest.yml | 6 +++--- packages/zeek/changelog.yml | 5 +++++ packages/zeek/manifest.yml | 6 +++--- 12 files changed, 42 insertions(+), 17 deletions(-) diff --git a/packages/apache/changelog.yml b/packages/apache/changelog.yml index c4322be11a5..90603cbc9b5 100644 --- a/packages/apache/changelog.yml +++ b/packages/apache/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.26.0" + changes: + - description: "Deprecate third-party REST API import option." + type: enhancement + link: https://github.com/elastic/integrations/pull/11524 - version: "1.25.0" changes: - description: "Allow configuration of ignoring older events in apache access log datastream." diff --git a/packages/apache/manifest.yml b/packages/apache/manifest.yml index 0f1b16e9f35..e53a44c802f 100644 --- a/packages/apache/manifest.yml +++ b/packages/apache/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.1.4 name: apache title: Apache HTTP Server -version: "1.25.0" +version: "1.26.0" source: license: Elastic-2.0 description: Collect logs and metrics from Apache servers with Elastic Agent. @@ -45,8 +45,8 @@ policy_templates: required: false show_user: false - type: httpjson - title: Collect logs from third-party REST API (experimental) - description: Collect logs from third-party REST API (experimental) + title: Collect logs from third-party REST API (deprecated) + description: Collect logs from third-party REST API (deprecated) vars: - name: url type: text diff --git a/packages/nginx/changelog.yml b/packages/nginx/changelog.yml index 582b3c4379a..9a1ffa3b3eb 100644 --- a/packages/nginx/changelog.yml +++ b/packages/nginx/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.24.0" + changes: + - description: Deprecate third-party REST API import option. + type: enhancement + link: https://github.com/elastic/integrations/pull/11524 - version: "1.23.0" changes: - description: Add processor support for stubstatus data stream. diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml index 42627044e6c..337f8d15d8f 100644 --- a/packages/nginx/manifest.yml +++ b/packages/nginx/manifest.yml @@ -1,7 +1,7 @@ format_version: "3.0.2" name: nginx title: Nginx -version: "1.23.0" +version: "1.24.0" description: Collect logs and metrics from Nginx HTTP servers with Elastic Agent. type: integration categories: @@ -39,8 +39,8 @@ policy_templates: title: Collect logs from Nginx instances description: Collecting Nginx access and error logs - type: httpjson - title: Collect logs from third-party REST API (experimental) - description: Collect logs from third-party REST API (experimental) + title: Collect logs from third-party REST API (deprecated) + description: Collect logs from third-party REST API (deprecated) vars: - name: url type: text diff --git a/packages/system/changelog.yml b/packages/system/changelog.yml index 246ba6f964f..83bbd4cb6ac 100644 --- a/packages/system/changelog.yml +++ b/packages/system/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.62.0" + changes: + - description: Deprecate third-party REST API import option. + type: enhancement + link: https://github.com/elastic/integrations/pull/11524 - version: "1.61.1" changes: - description: Parse `winlog.event_data.AccessList` and `winlog.event_data.AccessMask` into a list of values diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml index 91af582999b..f154690fd5b 100644 --- a/packages/system/manifest.yml +++ b/packages/system/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.0.2 name: system title: System -version: "1.61.1" +version: "1.62.0" description: Collect system logs and metrics from your servers with Elastic Agent. type: integration categories: @@ -46,8 +46,8 @@ policy_templates: show_user: true description: The proc filesystem base directory. - type: httpjson - title: Collect logs from third-party REST API (experimental) - description: Collect logs from third-party REST API (experimental) + title: Collect logs from third-party REST API (deprecated) + description: Collect logs from third-party REST API (deprecated) vars: - name: url type: text diff --git a/packages/windows/_dev/build/docs/README.md b/packages/windows/_dev/build/docs/README.md index 9ca616e48e4..0820864144e 100644 --- a/packages/windows/_dev/build/docs/README.md +++ b/packages/windows/_dev/build/docs/README.md @@ -38,7 +38,7 @@ see the {{ url "getting-started-observability" "Getting started" }} guide. Note: Because the Windows integration always applies to the local server, the `hosts` config option is not needed. -### Ingesting Windows Events via Splunk +### Ingesting Windows Events via Splunk (Deprecated) This integration allows you to seamlessly ingest data from a Splunk Enterprise instance. The integration uses the {{ url "filebeat-input-httpjson" "`httpjson` input" }} in Elastic Agent to run a Splunk search via the Splunk REST API and then extract the raw event from the results. diff --git a/packages/windows/changelog.yml b/packages/windows/changelog.yml index 4117e2c36de..07b9449a156 100644 --- a/packages/windows/changelog.yml +++ b/packages/windows/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.3.0" + changes: + - description: Deprecate third-party REST API import option. + type: enhancement + link: https://github.com/elastic/integrations/pull/11524 - version: "2.2.0" changes: - description: Improve Windows Defender ECS mappings and make data stream GA diff --git a/packages/windows/docs/README.md b/packages/windows/docs/README.md index 80fc819215f..9ddcd3ebd65 100644 --- a/packages/windows/docs/README.md +++ b/packages/windows/docs/README.md @@ -38,7 +38,7 @@ see the [Getting started](https://www.elastic.co/guide/en/welcome-to-elastic/cur Note: Because the Windows integration always applies to the local server, the `hosts` config option is not needed. -### Ingesting Windows Events via Splunk +### Ingesting Windows Events via Splunk (Deprecated) This integration allows you to seamlessly ingest data from a Splunk Enterprise instance. The integration uses the [`httpjson` input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-httpjson.html) in Elastic Agent to run a Splunk search via the Splunk REST API and then extract the raw event from the results. diff --git a/packages/windows/manifest.yml b/packages/windows/manifest.yml index 2d8696ba01d..2ef256d6cb1 100644 --- a/packages/windows/manifest.yml +++ b/packages/windows/manifest.yml @@ -1,6 +1,6 @@ name: windows title: Windows -version: 2.2.0 +version: 2.3.0 description: Collect logs and metrics from Windows OS and services with Elastic Agent. type: integration categories: @@ -38,8 +38,8 @@ policy_templates: title: Collect Windows perfmon and service metrics description: Collecting perfmon and service metrics from Windows instances - type: httpjson - title: Collect logs from third-party REST API (experimental) - description: Collect logs from third-party REST API (experimental) + title: Collect logs from third-party REST API (deprecated) + description: Collect logs from third-party REST API (deprecated) vars: - name: url type: text diff --git a/packages/zeek/changelog.yml b/packages/zeek/changelog.yml index 6b7eb4bcb45..95b6de507b4 100644 --- a/packages/zeek/changelog.yml +++ b/packages/zeek/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.25.0" + changes: + - description: Deprecate third-party REST API import option. + type: enhancement + link: https://github.com/elastic/integrations/pull/11524 - version: "2.24.4" changes: - description: Use triple-brace Mustache templating when referencing variables in ingest pipelines. diff --git a/packages/zeek/manifest.yml b/packages/zeek/manifest.yml index d33eb868a3a..05014841216 100644 --- a/packages/zeek/manifest.yml +++ b/packages/zeek/manifest.yml @@ -1,6 +1,6 @@ name: zeek title: Zeek -version: "2.24.4" +version: "2.25.0" description: Collect logs from Zeek with Elastic Agent. type: integration icons: @@ -39,8 +39,8 @@ policy_templates: - /opt/zeek/logs/current - /usr/local/var/spool/zeek - type: httpjson - title: Collect logs from third-party REST API (experimental) - description: Collect logs from third-party REST API (experimental) + title: Collect logs from third-party REST API (deprecated) + description: Collect logs from third-party REST API (deprecated) vars: - name: url type: text