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.

Sign up for GitHub

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

Make Apache integration GA #1607

Merged
merged 4 commits into from
Sep 13, 2021
Merged

Make Apache integration GA #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff5748f
Make Apache integration GA
sayden Sep 9, 2021
b489be1
Update PR number
sayden Sep 9, 2021
4899531
Update data_streams to GA
sayden Sep 10, 2021
f1a533c
Remove GA tag from data streams
sayden Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/apache/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- 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
Expand Down
1 change: 0 additions & 1 deletion packages/apache/data_stream/access/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Apache access logs
release: experimental
type: logs
streams:
- input: logfile
Expand Down
1 change: 0 additions & 1 deletion packages/apache/data_stream/error/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Apache error logs
release: experimental
type: logs
streams:
- input: logfile
Expand Down
1 change: 0 additions & 1 deletion packages/apache/data_stream/status/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Apache status metrics
release: experimental
type: metrics
streams:
- input: apache/metrics
Expand Down
4 changes: 2 additions & 2 deletions packages/apache/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
format_version: 1.0.0
name: apache
title: Apache
version: 0.9.2
version: 1.0.0
license: basic
description: This Elastic integration collects logs and metrics from Apache servers
type: integration
categories:
- web
release: experimental
release: ga
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be updated in the data stream manifests too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FTR "GA" for data streams means removing the "release" property at all (according to spec).

conditions:
kibana.version: "^7.14.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: is it bound with a particular Kibana release or not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't. Why the version should be different if everything is the same? Maybe I'm missing something 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had an offline chat with Jaime, I agree we can take the risk here and leave the constraint as is (please ignore this comment).

screenshots:
Expand Down