Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update integrations #620

Merged
merged 1 commit into from
Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions test/packages/apache/_dev/build/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencies:
ecs:
reference: git@1.12
6 changes: 3 additions & 3 deletions test/packages/apache/_dev/build/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ logs created by the Apache server.

## Compatibility

The Apache datasets were tested with Apache 2.4.12 and 2.4.20 and are expected to work with
all versions >= 2.2.31 and >= 2.4.16.
The Apache datasets were tested with Apache 2.4.12 and 2.4.46 and are expected to work with
all versions >= 2.2.31 and >= 2.4.16 (independent from operating system).

## Logs

Expand All @@ -31,4 +31,4 @@ generated by the `mod_status` module.

{{event "status"}}

{{fields "status"}}
{{fields "status"}}
2 changes: 1 addition & 1 deletion test/packages/apache/_dev/deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.20}
ARG SERVICE_VERSION=${SERVICE_VERSION:-2.4.46}
FROM httpd:$SERVICE_VERSION
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y curl
Expand Down
5 changes: 1 addition & 4 deletions test/packages/apache/_dev/deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ services:
# Commented out `image:` below until we have a process to refresh the hosted images from
# Dockerfiles in this repo. Until then, we build the image locally using `build:` below.
# image: docker.elastic.co/integrations-ci/beats-apache:${SERVICE_VERSION:-2.4.20}-1
build:
context: .
args:
SERVICE_VERSION: ${SERVICE_VERSION}
build: .
ports:
- 80
volumes:
Expand Down
3 changes: 2 additions & 1 deletion test/packages/apache/_dev/deploy/docker/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ LoadModule dir_module modules/mod_dir.so
#LoadModule userdir_module modules/mod_userdir.so
LoadModule alias_module modules/mod_alias.so
#LoadModule rewrite_module modules/mod_rewrite.so
LoadModule mpm_event_module modules/mod_mpm_event.so

<IfModule unixd_module>
#
Expand Down Expand Up @@ -507,4 +508,4 @@ SSLRandomSeed connect builtin
</IfModule>


</IfModule>
</IfModule>
8 changes: 3 additions & 5 deletions test/packages/apache/_dev/deploy/variants.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
variants:
v2420:
SERVICE_VERSION: 2.4.20
v2423:
SERVICE_VERSION: 2.4.23
default: v2420
v2:
SERVICE_VERSION: 2.4.46
default: v2
109 changes: 107 additions & 2 deletions test/packages/apache/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,111 @@
# newer versions go on top
- version: "0.0.1"
- version: "999.999.999"
changes:
- description: Change test public IPs to the supported subset
type: bugfix
link: https://github.com/elastic/integrations/pull/2327
- version: "1.3.2"
changes:
- description: Fix ML module manifest query to ignore frozen and cold tiers
type: bugfix
link: https://github.com/elastic/integrations/pull/2217
- version: "1.3.1"
changes:
- description: Fix parsing of trace log levels
type: bugfix
link: https://github.com/elastic/integrations/pull/2064
- version: "1.3.0"
changes:
- description: Support Kibana 8.0
type: enhancement
link: https://github.com/elastic/integrations/pull/2122
- version: "1.2.0"
changes:
- description: Uniform with guidelines
type: enhancement
link: https://github.com/elastic/integrations/pull/2001
- version: "1.1.1"
changes:
- description: Fix logic that checks for the 'forwarded' tag
type: bugfix
link: https://github.com/elastic/integrations/pull/1794
- version: "1.1.0"
changes:
- description: Update to ECS 1.12.0
type: enhancement
link: https://github.com/elastic/integrations/pull/1686
- version: "1.0.0"
changes:
- description: Release Apache as GA
type: enhancement
link: https://github.com/elastic/integrations/pull/1607
- version: "0.9.2"
changes:
- description: Convert to generated ECS fields
type: enhancement
link: https://github.com/elastic/integrations/pull/1463
- version: '0.9.1'
changes:
- description: update to ECS 1.11.0
type: enhancement
link: https://github.com/elastic/integrations/pull/1369
- version: "0.9.0"
changes:
- description: Update integration description
type: enhancement
link: https://github.com/elastic/integrations/pull/1364
- version: "0.8.1"
changes:
- description: Add support for Splunk authorization tokens
type: enhancement
link: https://github.com/elastic/integrations/pull/1147
- version: "0.8.0"
changes:
- description: Set event.module and event.dataset
type: bugfix
link: https://github.com/elastic/integrations/pull/1230
- version: "0.7.1"
changes:
- description: Fix bug in Third Party REST API ingest pipeline
type: bugfix
link: https://github.com/elastic/integrations/pull/1201
- version: "0.7.0"
changes:
- description: Update to ECS 1.10.0 and adding items that all packages should have
type: enhancement
link: https://github.com/elastic/integrations/pull/1068
- version: "0.6.0"
changes:
- description: Render units and metric types in exported fields table
type: enhancement
link: https://github.com/elastic/integrations/pull/1028
- version: "0.5.1"
changes:
- description: Move ecs.version to the ingest pipeline and make event.original optional
type: enhancement
link: https://github.com/elastic/integrations/pull/1025
- version: "0.5.0"
changes:
- description: Adds ML jobs for finding unusual activity in HTTP access logs
type: enhancement
link: https://github.com/elastic/integrations/pull/910
- version: "0.4.1"
changes:
- description: update to ECS 1.9.0
type: enhancement
link: https://github.com/elastic/integrations/pull/832
- version: "0.3.5"
changes:
- description: Updating package owner
type: enhancement
link: https://github.com/elastic/integrations/pull/766
- version: "0.3.4"
changes:
- description: Use correct types for `source.port` and `source.ip`
type: bugfix
link: https://github.com/elastic/integrations/pull/737
- version: "0.1.0"
changes:
- description: initial release
type: enhancement # can be one of: enhancement, bugfix, breaking-change
link: https://github.com/elastic/elastic-package/pull/109
link: https://github.com/elastic/integrations/pull/98
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
::1 - - [26/Dec/2016:16:16:29 +0200] "GET /favicon.ico HTTP/1.1" 404 209
192.168.33.1 - - [26/Dec/2016:16:22:13 +0000] "GET /hello HTTP/1.1" 404 499 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0"
::1 - - [26/Dec/2016:16:16:48 +0200] "-" 408 -
172.17.0.1 - - [29/May/2017:19:02:48 +0000] "GET /stringpatch HTTP/1.1" 404 612 "-" "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2" "-"
monitoring-server - - [29/May/2017:19:02:48 +0000] "GET /status HTTP/1.1" 200 612 "-" "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2" "-"
127.0.0.1 - - [02/Feb/2019:05:38:45 +0100] "-" 408 152 "-" "-"
monitoring-server - - [29/May/2017:19:02:48 +0000] "GET /A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4 HTTP/1.1" 200 612 "-" "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2" "-"
Loading