Skip to content

Commit a411a90

Browse files
ekohlekohl
authored
Merge pull request #420 from StatensPensjonskasse/finalize-voxpupuli-transition
Finalize voxpupuli transition
2 parents 804e85a + d9dd37c commit a411a90

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

‎README.md

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
# elastic/logstash
1+
# logstash
22

3-
A Puppet module for managing and configuring [Logstash](http://logstash.net/).
3+
[![Build Status](https://github.com/voxpupuli/puppet-logstash/workflows/CI/badge.svg)](https://github.com/voxpupuli/puppet-logstash/actions?query=workflow%3ACI)
4+
[![Release](https://github.com/voxpupuli/puppet-logstash/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/puppet-logstash/actions/workflows/release.yml)
5+
[![Puppet Forge](https://img.shields.io/puppetforge/v/puppet/logstash.svg)](https://forge.puppetlabs.com/puppet/logstash)
6+
[![Puppet Forge - downloads](https://img.shields.io/puppetforge/dt/puppet/logstash.svg)](https://forge.puppetlabs.com/puppet/logstash)
7+
[![Puppet Forge - endorsement](https://img.shields.io/puppetforge/e/puppet/logstash.svg)](https://forge.puppetlabs.com/puppet/logstash)
8+
[![Puppet Forge - scores](https://img.shields.io/puppetforge/f/puppet/logstash.svg)](https://forge.puppetlabs.com/puppet/logstash)
9+
[![puppetmodule.info docs](http://www.puppetmodule.info/images/badge.png)](http://www.puppetmodule.info/m/puppet-logstash)
10+
[![Apache-2 License](https://img.shields.io/github/license/voxpupuli/puppet-logstash.svg)](LICENSE)
11+
[![Donated by Elastic](https://img.shields.io/badge/donated%20by-Elastic-fb7047.svg)](#transfer-notice)
412

5-
[![Build Status](https://travis-ci.org/elastic/puppet-logstash.png?branch=master)](https://travis-ci.org/elastic/puppet-logstash)
13+
A Puppet module for managing and configuring [Logstash](https://www.elastic.co/logstash/).
614

7-
## Logstash Versions
8-
9-
This module, "elastic/logstash" supports only Logstash 5.x and 6.x. For earlier
10-
Logstash versions, support is provided by the legacy module
11-
"elasticsearch/logstash".
15+
Version 7 and newer of this module are released by Vox Pupuli. They now follow semantic versioning. Previously the module was maintained by Elastic.
1216

1317
## Requirements
1418

15-
* Puppet 4.6.1 or better.
1619
* The [stdlib](https://forge.puppetlabs.com/puppetlabs/stdlib) module.
17-
* Logstash itself requires Java 8. The "puppetlabs/java" module is recommended
18-
for installing Java. This module will not install Java.
20+
* Logstash < 7.0.0 requires Java. The [puppetlabs/java](https://forge.puppetlabs.com/modules/puppetlabs/java) module is recommended
21+
for installing Java.
1922

2023
Optional:
2124
* The [elastic_stack](https://forge.puppetlabs.com/elastic/elastic_stack) module
@@ -39,29 +42,26 @@ logstash::configfile { 'my_ls_config':
3942
```
4043

4144
## Package and service options
42-
### Choosing a Logstash minor version
43-
``` puppet
44-
class { 'logstash':
45-
version => '6.0.0',
46-
}
47-
```
48-
4945
### Choosing a Logstash major version
5046

5147
This module uses the related "elastic/elastic_stack" module to manage package
5248
repositories. Since there is a separate repository for each major version of
53-
the Elastic stack, if you don't want the default version (6), it's necessary
49+
the Elastic stack, if you don't want the default version, it's necessary
5450
to select which version to configure, like this:
5551
``` puppet
5652
class { 'elastic_stack::repo':
57-
version => 5,
53+
version => 6,
5854
}
5955
56+
include logstash
57+
```
58+
59+
### Choosing a Logstash minor version
60+
``` puppet
6061
class { 'logstash':
61-
version => '5.6.4',
62+
version => '6.8.0',
6263
}
6364
```
64-
6565
### Manual repository management
6666
You may want to manage repositories manually. You can disable
6767
automatic repository management like this:
@@ -79,21 +79,21 @@ explicit package to fetch and install.
7979
#### From an HTTP/HTTPS/FTP URL
8080
``` puppet
8181
class { 'logstash':
82-
package_url => 'https://artifacts.elastic.co/downloads/logstash/logstash-5.1.1.rpm',
82+
package_url => 'https://artifacts.elastic.co/downloads/logstash/logstash-7.17.8-x86_64.rpm',
8383
}
8484
```
8585

8686
#### From a 'puppet://' URL
8787
``` puppet
8888
class { 'logstash':
89-
package_url => 'puppet:///modules/my_module/logstash-5.1.1.rpm',
89+
package_url => 'puppet:///modules/my_module/logstash-7.17.8-x86_64.rpm',
9090
}
9191
```
9292

9393
#### From a local file on the agent
9494
``` puppet
9595
class { 'logstash':
96-
package_url => 'file:///tmp/logstash-5.1.1.rpm',
96+
package_url => 'file:///tmp/logstash-7.17.8-x86_64.rpm',
9797
}
9898
```
9999

@@ -328,5 +328,8 @@ logstash::plugin { 'logstash-input-websocket':
328328
}
329329
```
330330

331-
## Support
332-
Need help? Join us in [#logstash](https://webchat.freenode.net?channels=%23logstash) on Freenode IRC or on the https://discuss.elastic.co/c/logstash discussion forum.
331+
## Transfer Notice
332+
333+
This module was originally authored by [Elastic](https://www.elastic.co).
334+
The maintainer preferred that Vox Pupuli take ownership of the module for future improvement and maintenance.
335+
Existing pull requests and issues were transferred over, please fork and continue to contribute here instead of Elastic.

‎metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "puppet-logstash",
3-
"version": "6.1.5",
3+
"version": "7.0.0-rc0",
44
"source": "https://github.com/voxpupuli/puppet-logstash",
5-
"author": "elastic",
5+
"author": "Vox Pupuli",
66
"license": "Apache-2.0",
77
"summary": "Module for managing and configuring Logstash",
88
"project_page": "https://github.com/voxpupuli/puppet-logstash",

0 commit comments

Comments
 (0)