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

Remove support for Elasticsearch requirement #516

Merged
merged 4 commits into from
Jun 17, 2020
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ASSETS.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ compatibility: [1.0.2, 2.0.1]
os.platform: [darwin, freebsd, linux, macos, openbsd, windows]

requirement:
elasticsearch:
versions: >7.0
kibana:
versions: >7.0
agent:
versions: >7.1

# The order of the items listed here is the order they show up in the package overview.
screenshots:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Breaking changes

* Change stream.* fields to dataset.* fields. [#492](https://github.com/elastic/package-registry/pull/492)
* Remove `solution` entry support in package manifest. [#504](https://github.com/elastic/package-registry/pull/504)
* Remove `solution` entry support in package manfiest. [#504](https://github.com/elastic/package-registry/pull/504)
* Remove support for Elasticsearch requirements [#516](https://github.com/elastic/package-registry/pull/516)
* Rename `kibana` query param to `kibana.version`. [#518](https://github.com/elastic/package-registry/pull/518)

### Bugfixes
Expand Down
4 changes: 2 additions & 2 deletions dev/packages/example/base/0.2.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ license: basic
type: integration

requirement:
elasticsearch:
kibana:
# Requires ILM which was released in 6.6.
versions: ">6.6.0"
versions: ">7.9.0"

# No icons
icons:
Expand Down
2 changes: 0 additions & 2 deletions dev/packages/example/longdocs/1.0.4/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ license: basic
requirement:
kibana:
versions: ">6.7.0"
elasticsearch:
versions: ">7.0.1"

icons:
- src: "/img/icon.svg"
Expand Down
2 changes: 0 additions & 2 deletions dev/packages/example/multiversion/1.0.3/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ license: basic
requirement:
kibana:
versions: ">6.7.0"
elasticsearch:
versions: ">7.0.1"

icons:
- src: "/img/icon.svg"
Expand Down
2 changes: 0 additions & 2 deletions dev/packages/example/multiversion/1.0.4/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ type: integration
requirement:
kibana:
versions: ">6.7.0"
elasticsearch:
versions: ">7.0.1"

icons:
- src: "/img/icon.svg"
Expand Down
2 changes: 0 additions & 2 deletions dev/packages/example/multiversion/1.1.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ license: basic
requirement:
kibana:
versions: ">6.7.0"
elasticsearch:
versions: ">7.0.1"

icons:
- src: "/img/icon.svg"
Expand Down
4 changes: 0 additions & 4 deletions dev/packages/example/yamlpipeline/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ release: beta
license: basic
type: integration

requirement:
elasticsearch:
version.min: 7.0.0

# No icons
icons:

2 changes: 1 addition & 1 deletion docs/api/example-0.0.2.tar.gz-preview.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
1995 example-0.0.2/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json
1849 example-0.0.2/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json
1920 example-0.0.2/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json
319 example-0.0.2/manifest.yml
196 example-0.0.2/manifest.yml
3 changes: 0 additions & 3 deletions docs/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
"requirement": {
"kibana": {
"versions": "\u003e=7.0.0"
},
"elasticsearch": {
"versions": "\u003e=7.0.0 \u003c=7.5.0"
}
},
"screenshots": [
Expand Down
6 changes: 0 additions & 6 deletions testdata/package/example/0.0.2/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,5 @@ categories: ["logs"]
release: beta

requirement:
elasticsearch:
versions: ">=6.0.0 <=6.8.0"
kibana:
versions: ">=6.0.0"
metricbeat:
versions: ">=6.1.0"
filebeat:
versions: ">=6.2.0"
6 changes: 0 additions & 6 deletions testdata/package/example/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ type: integration
release: ga

requirement:
elasticsearch:
versions: ">=7.0.0 <=7.5.0"
kibana:
versions: ">=7.0.0"
metricbeat:
versions: ">=7.1.0"
filebeat:
versions: ">=7.2.0"

screenshots:
- src: /img/kibana-iptables.png
Expand Down
6 changes: 0 additions & 6 deletions testdata/package/foo/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ type: solution
release: beta

requirement:
elasticsearch:
versions: ">=7.0.0 <=7.5.0"
kibana:
versions: ">=7.0.0"
metricbeat:
versions: ">=7.1.0"
filebeat:
versions: ">=7.2.0"

6 changes: 0 additions & 6 deletions testdata/public/package/example/0.0.2/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,5 @@ categories: ["logs"]
release: beta

requirement:
elasticsearch:
versions: ">=6.0.0 <=6.8.0"
kibana:
versions: ">=6.0.0"
metricbeat:
versions: ">=6.1.0"
filebeat:
versions: ">=6.2.0"
6 changes: 0 additions & 6 deletions testdata/public/package/example/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ type: integration
release: ga

requirement:
elasticsearch:
versions: ">=7.0.0 <=7.5.0"
kibana:
versions: ">=7.0.0"
metricbeat:
versions: ">=7.1.0"
filebeat:
versions: ">=7.2.0"

screenshots:
- src: /img/kibana-iptables.png
Expand Down
6 changes: 0 additions & 6 deletions testdata/public/package/foo/1.0.0/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ type: solution
release: beta

requirement:
elasticsearch:
versions: ">=7.0.0 <=7.5.0"
kibana:
versions: ">=7.0.0"
metricbeat:
versions: ">=7.1.0"
filebeat:
versions: ">=7.2.0"

10 changes: 1 addition & 9 deletions util/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ type Datasource struct {
}

type Requirement struct {
Kibana ProductRequirement `config:"kibana" json:"kibana,omitempty" yaml:"kibana"`
Elasticsearch ProductRequirement `config:"elasticsearch" json:"elasticsearch,omitempty" yaml:"elasticsearch"`
Kibana ProductRequirement `config:"kibana" json:"kibana,omitempty" yaml:"kibana"`
}

type ProductRequirement struct {
Expand Down Expand Up @@ -300,13 +299,6 @@ func (p *Package) Validate() error {
return fmt.Errorf("no description set")
}

if p.Requirement.Elasticsearch.Versions != "" {
_, err := semver.NewConstraint(p.Requirement.Elasticsearch.Versions)
if err != nil {
return fmt.Errorf("invalid Elasticsearch versions: %s, %s", p.Requirement.Elasticsearch.Versions, err)
}
}

if p.Requirement.Kibana.Versions != "" {
_, err := semver.NewConstraint(p.Requirement.Kibana.Versions)
if err != nil {
Expand Down