From d82984ddf29006eb3d0fc718929d4783c1fc5ee1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 25 Apr 2022 09:49:50 -0700 Subject: [PATCH] Retire this project We've shutdown the logstash service and don't need to manage it with puppet any more. Depends-On: https://review.opendev.org/c/openstack/project-config/+/839235 Change-Id: I2b5d3ac705d246f705b4ef91f12a4895e6854fc1 --- .gitignore | 5 - Gemfile | 15 - LICENSE | 202 --------- README.md | 88 +--- Rakefile | 8 - files/es-logstash-template.json | 10 - files/logstash.default | 41 -- files/redis.conf | 417 ------------------ manifests/agent.pp | 32 -- manifests/curator.pp | 56 --- manifests/elasticsearch.pp | 30 -- manifests/filter.pp | 34 -- manifests/indexer.pp | 95 ---- manifests/init.pp | 46 -- manifests/params.pp | 12 - manifests/redis.pp | 45 -- manifests/web.pp | 67 --- metadata.json | 14 - spec/acceptance/basic_spec.rb | 28 -- spec/acceptance/fixtures/default.pp | 24 - spec/acceptance/nodesets/default.yml | 11 - spec/acceptance/nodesets/nodepool-centos7.yml | 10 - spec/acceptance/nodesets/nodepool-trusty.yml | 10 - spec/acceptance/nodesets/nodepool-xenial.yml | 10 - templates/agent.conf.erb | 9 - templates/indexer.conf.erb | 18 - templates/input.conf.erb | 12 - templates/kibana.vhost.erb | 31 -- templates/logstash.vhost.erb | 13 - templates/output.conf.erb | 5 - 30 files changed, 7 insertions(+), 1391 deletions(-) delete mode 100644 .gitignore delete mode 100644 Gemfile delete mode 100644 LICENSE delete mode 100644 Rakefile delete mode 100644 files/es-logstash-template.json delete mode 100644 files/logstash.default delete mode 100644 files/redis.conf delete mode 100644 manifests/agent.pp delete mode 100644 manifests/curator.pp delete mode 100644 manifests/elasticsearch.pp delete mode 100644 manifests/filter.pp delete mode 100644 manifests/indexer.pp delete mode 100644 manifests/init.pp delete mode 100644 manifests/params.pp delete mode 100644 manifests/redis.pp delete mode 100644 manifests/web.pp delete mode 100644 metadata.json delete mode 100644 spec/acceptance/basic_spec.rb delete mode 100644 spec/acceptance/fixtures/default.pp delete mode 100644 spec/acceptance/nodesets/default.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos7.yml delete mode 100644 spec/acceptance/nodesets/nodepool-trusty.yml delete mode 100644 spec/acceptance/nodesets/nodepool-xenial.yml delete mode 100644 templates/agent.conf.erb delete mode 100644 templates/indexer.conf.erb delete mode 100644 templates/input.conf.erb delete mode 100644 templates/kibana.vhost.erb delete mode 100644 templates/logstash.vhost.erb delete mode 100644 templates/output.conf.erb diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ea90996..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Gemfile.lock -.bundled_gems/ -log/ -junit/ -.vagrant/ diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 019213a..0000000 --- a/Gemfile +++ /dev/null @@ -1,15 +0,0 @@ -source 'https://rubygems.org' - -if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper') - gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -else - gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -end -gem_checkout_method[:require] = false - -group :development, :test, :system_tests do - gem 'puppet-openstack_infra_spec_helper', - gem_checkout_method -end - -# vim:ft=ruby diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d645695..0000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index 0868f14..3265f02 100644 --- a/README.md +++ b/README.md @@ -1,83 +1,9 @@ -# OpenStack Logstash Module +This project is no longer maintained. -## Overview +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". -Installs and configures Logstash. - -## Quick Start - -```puppet - class { 'logstash::web': - frontend => 'kibana', - discover_nodes => ['es1.example.com:9200', 'es2.example.com:9200'], - proxy_elasticsearch => true, - } -``` - -## Usage Considerations - -You will want to add security with certs and firewalls when using this -module. - -This module is recently split out of the monolithic OpenStack Infra system-config -repo. It is gaining flexibility but for now may be more opinionated than -what you really want. - -Example to bring up logstash web interface or kibana - -Example usage: - -```puppet - class { 'logstash::web': - frontend => 'kibana', - discover_nodes => ['es1.example.com:9200', 'es2.example.com:9200'], - proxy_elasticsearch => true, - } -``` - -Example to install a logstash indexer - -Example usage: - -```puppet - - class { 'logstash::indexer': - conf_template => 'my_org_module/indexer.conf.erb', - } -``` - -Where index.conf.erb looks like: - -http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/openstack_project/templates/logstash/indexer.conf.erb - -# License - -Apache 2.0 - -# Project website - -Though this project is mirrored to github, that is just a mirror. This -is a sub project under the OpenStack umbrella, and so has more process -associated with it than your typical Puppet module. - -This module is under the direction of the openstack-infra team. -Website: http://ci.openstack.org/ - -The official git repository is at: -https://git.openstack.org/cgit/openstack-infra/puppet-logstash - -Bugs can be submitted against this module at: -https://storyboard.openstack.org/#!/search?q=puppet-logstash - -And contributions should be submitted through review.openstack.org -by following http://docs.openstack.org/infra/manual/developers.html - -# Contact - -You can reach the maintainers of this module on freenode in #openstack-infra -and on the openstack-infra mailing list: - -openstack-infra@lists.openstack.org. - -Unsubscribed users' messages will be held for a short time until they are -manually released. +For any further questions, please email +service-discuss@lists.openstack.org or join #opendev on OFTC. diff --git a/Rakefile b/Rakefile deleted file mode 100644 index ff1f0d7..0000000 --- a/Rakefile +++ /dev/null @@ -1,8 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_autoloader_layout') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') -PuppetLint.configuration.send('disable_class_parameter_defaults') diff --git a/files/es-logstash-template.json b/files/es-logstash-template.json deleted file mode 100644 index c1909b2..0000000 --- a/files/es-logstash-template.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "logstash_settings" : { - "template" : "logstash*", - "settings" : { - "index.routing.allocation.total_shards_per_node" : "3", - "index.translog.flush_threshold_ops" : "50000", - "index.cache.field.type" : "soft" - } - } -} diff --git a/files/logstash.default b/files/logstash.default deleted file mode 100644 index 9f1cd9a..0000000 --- a/files/logstash.default +++ /dev/null @@ -1,41 +0,0 @@ -############################## -# Default settings for logstash -############################### - -# Override Java location -#JAVACMD=/usr/bin/java - -# Set a home directory -#LS_HOME=/var/lib/logstash - -# Arguments to pass to logstash agent -# Single worker so multiline events work -LS_OPTS="-w 1" - -# Arguments to pass to java -LS_HEAP_SIZE="2g" -#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME" - -# pidfiles aren't used for upstart; this is for sysv users. -#LS_PIDFILE=/var/run/logstash.pid - -# user id to be invoked as; for upstart: edit /etc/init/logstash.conf -#LS_USER=logstash - -# logstash logging -#LS_LOG_FILE=/var/log/logstash/logstash.log -#LS_USE_GC_LOGGING="true" - -# logstash configuration directory -#LS_CONF_DIR=/etc/logstash/conf.d - -# Open file limit; cannot be overridden in upstart -#LS_OPEN_FILES=16384 - -# Nice level -#LS_NICE=19 - -# If this is set to 1, then when `stop` is called, if the process has -# not exited within a reasonable time, SIGKILL will be sent next. -# The default behavior is to simply log a message "program stop failed; still running" -KILL_ON_STOP_TIMEOUT=0 diff --git a/files/redis.conf b/files/redis.conf deleted file mode 100644 index ec7e4d1..0000000 --- a/files/redis.conf +++ /dev/null @@ -1,417 +0,0 @@ -# Redis configuration file example - -# Note on units: when memory size is needed, it is possible to specifiy -# it in the usual form of 1k 5GB 4M and so forth: -# -# 1k => 1000 bytes -# 1kb => 1024 bytes -# 1m => 1000000 bytes -# 1mb => 1024*1024 bytes -# 1g => 1000000000 bytes -# 1gb => 1024*1024*1024 bytes -# -# units are case insensitive so 1GB 1Gb 1gB are all the same. - -# By default Redis does not run as a daemon. Use 'yes' if you need it. -# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -daemonize yes - -# When running daemonized, Redis writes a pid file in /var/run/redis.pid by -# default. You can specify a custom pid file location here. -pidfile /var/run/redis/redis-server.pid - -# Accept connections on the specified port, default is 6379. -# If port 0 is specified Redis will not listen on a TCP socket. -port 6379 - -# If you want you can bind a single interface, if the bind option is not -# specified all the interfaces will listen for incoming connections. -# -#bind 127.0.0.1 - -# Specify the path for the unix socket that will be used to listen for -# incoming connections. There is no default, so Redis will not listen -# on a unix socket when not specified. -# -# unixsocket /var/run/redis/redis.sock - -# Close the connection after a client is idle for N seconds (0 to disable) -timeout 300 - -# Set server verbosity to 'debug' -# it can be one of: -# debug (a lot of information, useful for development/testing) -# verbose (many rarely useful info, but not a mess like the debug level) -# notice (moderately verbose, what you want in production probably) -# warning (only very important / critical messages are logged) -loglevel notice - -# Specify the log file name. Also 'stdout' can be used to force -# Redis to log on the standard output. Note that if you use standard -# output for logging but daemonize, logs will be sent to /dev/null -logfile /var/log/redis/redis-server.log - -# To enable logging to the system logger, just set 'syslog-enabled' to yes, -# and optionally update the other syslog parameters to suit your needs. -# syslog-enabled no - -# Specify the syslog identity. -# syslog-ident redis - -# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. -# syslog-facility local0 - -# Set the number of databases. The default database is DB 0, you can select -# a different one on a per-connection basis using SELECT where -# dbid is a number between 0 and 'databases'-1 -databases 16 - -################################ SNAPSHOTTING ################################# -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behaviour will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving at all commenting all the "save" lines. - -save 900 1 -save 300 10 -save 60 10000 - -# Compress string objects using LZF when dump .rdb databases? -# For default that's set to 'yes' as it's almost always a win. -# If you want to save some CPU in the saving child set it to 'no' but -# the dataset will likely be bigger if you have compressible values or keys. -rdbcompression yes - -# The filename where to dump the DB -dbfilename dump.rdb - -# The working directory. -# -# The DB will be written inside this directory, with the filename specified -# above using the 'dbfilename' configuration directive. -# -# Also the Append Only File will be created inside this directory. -# -# Note that you must specify a directory here, not a file name. -dir /var/lib/redis - -################################# REPLICATION ################################# - -# Master-Slave replication. Use slaveof to make a Redis instance a copy of -# another Redis server. Note that the configuration is local to the slave -# so for example it is possible to configure the slave to save the DB with a -# different interval, or to listen to another port, and so on. -# -# slaveof - -# If the master is password protected (using the "requirepass" configuration -# directive below) it is possible to tell the slave to authenticate before -# starting the replication synchronization process, otherwise the master will -# refuse the slave request. -# -# masterauth - -# When a slave lost the connection with the master, or when the replication -# is still in progress, the slave can act in two different ways: -# -# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will -# still reply to client requests, possibly with out of data data, or the -# data set may just be empty if this is the first synchronization. -# -# 2) if slave-serve-stale data is set to 'no' the slave will reply with -# an error "SYNC with master in progress" to all the kind of commands -# but to INFO and SLAVEOF. -# -slave-serve-stale-data yes - -################################## SECURITY ################################### - -# Require clients to issue AUTH before processing any other -# commands. This might be useful in environments in which you do not trust -# others with access to the host running redis-server. -# -# This should stay commented out for backward compatibility and because most -# people do not need auth (e.g. they run their own servers). -# -# Warning: since Redis is pretty fast an outside user can try up to -# 150k passwords per second against a good box. This means that you should -# use a very strong password otherwise it will be very easy to break. -# -# requirepass foobared - -# Command renaming. -# -# It is possilbe to change the name of dangerous commands in a shared -# environment. For instance the CONFIG command may be renamed into something -# of hard to guess so that it will be still available for internal-use -# tools but not available for general clients. -# -# Example: -# -# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 -# -# It is also possilbe to completely kill a command renaming it into -# an empty string: -# -# rename-command CONFIG "" - -################################### LIMITS #################################### - -# Set the max number of connected clients at the same time. By default there -# is no limit, and it's up to the number of file descriptors the Redis process -# is able to open. The special value '0' means no limits. -# Once the limit is reached Redis will close all the new connections sending -# an error 'max number of clients reached'. -# -# maxclients 128 - -# Don't use more memory than the specified amount of bytes. -# When the memory limit is reached Redis will try to remove keys with an -# EXPIRE set. It will try to start freeing keys that are going to expire -# in little time and preserve keys with a longer time to live. -# Redis will also try to remove objects from free lists if possible. -# -# If all this fails, Redis will start to reply with errors to commands -# that will use more memory, like SET, LPUSH, and so on, and will continue -# to reply to most read-only commands like GET. -# -# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a -# 'state' server or cache, not as a real DB. When Redis is used as a real -# database the memory usage will grow over the weeks, it will be obvious if -# it is going to use too much memory in the long run, and you'll have the time -# to upgrade. With maxmemory after the limit is reached you'll start to get -# errors for write operations, and this may even lead to DB inconsistency. -# -# maxmemory - -# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory -# is reached? You can select among five behavior: -# -# volatile-lru -> remove the key with an expire set using an LRU algorithm -# allkeys-lru -> remove any key accordingly to the LRU algorithm -# volatile-random -> remove a random key with an expire set -# allkeys->random -> remove a random key, any key -# volatile-ttl -> remove the key with the nearest expire time (minor TTL) -# noeviction -> don't expire at all, just return an error on write operations -# -# Note: with all the kind of policies, Redis will return an error on write -# operations, when there are not suitable keys for eviction. -# -# At the date of writing this commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort -# -# The default is: -# -# maxmemory-policy volatile-lru - -# LRU and minimal TTL algorithms are not precise algorithms but approximated -# algorithms (in order to save memory), so you can select as well the sample -# size to check. For instance for default Redis will check three keys and -# pick the one that was used less recently, you can change the sample size -# using the following configuration directive. -# -# maxmemory-samples 3 - -############################## APPEND ONLY MODE ############################### - -# By default Redis asynchronously dumps the dataset on disk. If you can live -# with the idea that the latest records will be lost if something like a crash -# happens this is the preferred way to run Redis. If instead you care a lot -# about your data and don't want to that a single record can get lost you should -# enable the append only mode: when this mode is enabled Redis will append -# every write operation received in the file appendonly.aof. This file will -# be read on startup in order to rebuild the full dataset in memory. -# -# Note that you can have both the async dumps and the append only file if you -# like (you have to comment the "save" statements above to disable the dumps). -# Still if append only mode is enabled Redis will load the data from the -# log file at startup ignoring the dump.rdb file. -# -# IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append -# log file in background when it gets too big. - -appendonly no - -# The name of the append only file (default: "appendonly.aof") -# appendfilename appendonly.aof - -# The fsync() call tells the Operating System to actually write data on disk -# instead to wait for more data in the output buffer. Some OS will really flush -# data on disk, some other OS will just try to do it ASAP. -# -# Redis supports three different modes: -# -# no: don't fsync, just let the OS flush the data when it wants. Faster. -# always: fsync after every write to the append only log . Slow, Safest. -# everysec: fsync only if one second passed since the last fsync. Compromise. -# -# The default is "everysec" that's usually the right compromise between -# speed and data safety. It's up to you to understand if you can relax this to -# "no" that will will let the operating system flush the output buffer when -# it wants, for better performances (but if you can live with the idea of -# some data loss consider the default persistence mode that's snapshotting), -# or on the contrary, use "always" that's very slow but a bit safer than -# everysec. -# -# If unsure, use "everysec". - -# appendfsync always -appendfsync everysec -# appendfsync no - -# When the AOF fsync policy is set to always or everysec, and a background -# saving process (a background save or AOF log background rewriting) is -# performing a lot of I/O against the disk, in some Linux configurations -# Redis may block too long on the fsync() call. Note that there is no fix for -# this currently, as even performing fsync in a different thread will block -# our synchronous write(2) call. -# -# In order to mitigate this problem it's possible to use the following option -# that will prevent fsync() from being called in the main process while a -# BGSAVE or BGREWRITEAOF is in progress. -# -# This means that while another child is saving the durability of Redis is -# the same as "appendfsync none", that in pratical terms means that it is -# possible to lost up to 30 seconds of log in the worst scenario (with the -# default Linux settings). -# -# If you have latency problems turn this to "yes". Otherwise leave it as -# "no" that is the safest pick from the point of view of durability. -no-appendfsync-on-rewrite no - -################################ VIRTUAL MEMORY ############################### - -# Virtual Memory allows Redis to work with datasets bigger than the actual -# amount of RAM needed to hold the whole dataset in memory. -# In order to do so very used keys are taken in memory while the other keys -# are swapped into a swap file, similarly to what operating systems do -# with memory pages. -# -# To enable VM just set 'vm-enabled' to yes, and set the following three -# VM parameters accordingly to your needs. - -vm-enabled no -# vm-enabled yes - -# This is the path of the Redis swap file. As you can guess, swap files -# can't be shared by different Redis instances, so make sure to use a swap -# file for every redis process you are running. Redis will complain if the -# swap file is already in use. -# -# The best kind of storage for the Redis swap file (that's accessed at random) -# is a Solid State Disk (SSD). -# -# *** WARNING *** if you are using a shared hosting the default of putting -# the swap file under /tmp is not secure. Create a dir with access granted -# only to Redis user and configure Redis to create the swap file there. -vm-swap-file /var/lib/redis/redis.swap - -# vm-max-memory configures the VM to use at max the specified amount of -# RAM. Everything that deos not fit will be swapped on disk *if* possible, that -# is, if there is still enough contiguous space in the swap file. -# -# With vm-max-memory 0 the system will swap everything it can. Not a good -# default, just specify the max amount of RAM you can in bytes, but it's -# better to leave some margin. For instance specify an amount of RAM -# that's more or less between 60 and 80% of your free RAM. -vm-max-memory 0 - -# Redis swap files is split into pages. An object can be saved using multiple -# contiguous pages, but pages can't be shared between different objects. -# So if your page is too big, small objects swapped out on disk will waste -# a lot of space. If you page is too small, there is less space in the swap -# file (assuming you configured the same number of total swap file pages). -# -# If you use a lot of small objects, use a page size of 64 or 32 bytes. -# If you use a lot of big objects, use a bigger page size. -# If unsure, use the default :) -vm-page-size 32 - -# Number of total memory pages in the swap file. -# Given that the page table (a bitmap of free/used pages) is taken in memory, -# every 8 pages on disk will consume 1 byte of RAM. -# -# The total swap size is vm-page-size * vm-pages -# -# With the default of 32-bytes memory pages and 134217728 pages Redis will -# use a 4 GB swap file, that will use 16 MB of RAM for the page table. -# -# It's better to use the smallest acceptable value for your application, -# but the default is large in order to work in most conditions. -vm-pages 134217728 - -# Max number of VM I/O threads running at the same time. -# This threads are used to read/write data from/to swap file, since they -# also encode and decode objects from disk to memory or the reverse, a bigger -# number of threads can help with big objects even if they can't help with -# I/O itself as the physical device may not be able to couple with many -# reads/writes operations at the same time. -# -# The special value of 0 turn off threaded I/O and enables the blocking -# Virtual Memory implementation. -vm-max-threads 4 - -############################### ADVANCED CONFIG ############################### - -# Hashes are encoded in a special way (much more memory efficient) when they -# have at max a given numer of elements, and the biggest element does not -# exceed a given threshold. You can configure this limits with the following -# configuration directives. -hash-max-zipmap-entries 512 -hash-max-zipmap-value 64 - -# Similarly to hashes, small lists are also encoded in a special way in order -# to save a lot of space. The special representation is only used when -# you are under the following limits: -list-max-ziplist-entries 512 -list-max-ziplist-value 64 - -# Sets have a special encoding in just one case: when a set is composed -# of just strings that happens to be integers in radix 10 in the range -# of 64 bit signed integers. -# The following configuration setting sets the limit in the size of the -# set in order to use this special memory saving encoding. -set-max-intset-entries 512 - -# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in -# order to help rehashing the main Redis hash table (the one mapping top-level -# keys to values). The hash table implementation redis uses (see dict.c) -# performs a lazy rehashing: the more operation you run into an hash table -# that is rhashing, the more rehashing "steps" are performed, so if the -# server is idle the rehashing is never complete and some more memory is used -# by the hash table. -# -# The default is to use this millisecond 10 times every second in order to -# active rehashing the main dictionaries, freeing memory when possible. -# -# If unsure: -# use "activerehashing no" if you have hard latency requirements and it is -# not a good thing in your environment that Redis can reply form time to time -# to queries with 2 milliseconds delay. -# -# use "activerehashing yes" if you don't have such hard requirements but -# want to free memory asap when possible. -activerehashing yes - -################################## INCLUDES ################################### - -# Include one or more other config files here. This is useful if you -# have a standard template that goes to all redis server but also need -# to customize a few per-server settings. Include files can include -# other files, so use this wisely. -# -# include /path/to/local.conf -# include /path/to/other.conf diff --git a/manifests/agent.pp b/manifests/agent.pp deleted file mode 100644 index 489b0cb..0000000 --- a/manifests/agent.pp +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# -# = Class: logstash::agent -# -# Class to install logstash agent (shipper) -# -# == Parameters -# -# [*conf_template*] -# String. Path to agent config template. -# Default: 'logstash/agent.conf.erb' -class logstash::agent ( - $conf_template = 'logstash/agent.conf.erb', -) { - warning('This class is deprecated and logstash::indexer should be used instead') - class { '::logstash::indexer': - conf_template => $conf_template, - } -} diff --git a/manifests/curator.pp b/manifests/curator.pp deleted file mode 100644 index 0c85475..0000000 --- a/manifests/curator.pp +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2015 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# ELK curator -# -class logstash::curator ( - $cron_hour = '2', - $cron_minute = '0', - $keep_for_days = '14', - $pin_for_old_es = false, -) { - - if ($pin_for_old_es) { - package { 'elasticsearch-curator': - ensure => '0.6.2', - provider => openstack_pip, - } - } else { - package { 'elasticsearch-curator': - # Pin until we add support for the new stuff in 4.0 - ensure => '3.5.1', - provider => openstack_pip, - } - } - - cron { 'cleanup_old_es_indices': - user => 'root', - hour => $cron_hour, - minute => $cron_minute, - environment => 'PATH=/usr/bin:/usr/local/bin', - command => "curator --logfile /var/log/curator.log delete indices --older-than ${keep_for_days} --time-unit days --timestring \\%Y.\\%m.\\%d" - } - - include ::logrotate - logrotate::file { 'curator.log': - log => '/var/log/curator.log', - options => [ - 'compress', - 'missingok', - 'rotate 31', - 'daily', - 'notifempty', - ], - } -} diff --git a/manifests/elasticsearch.pp b/manifests/elasticsearch.pp deleted file mode 100644 index 4efc494..0000000 --- a/manifests/elasticsearch.pp +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# -# = Class: logstash::elasticsearch -# -# Class to install elasticsearch -# -class logstash::elasticsearch { - file { '/etc/elasticsearch/templates/logstash_settings.json': - ensure => present, - source => 'puppet:///modules/logstash/es-logstash-template.json', - replace => true, - owner => 'root', - group => 'root', - mode => '0644', - require => File['/etc/elasticsearch/templates'], - } -} diff --git a/manifests/filter.pp b/manifests/filter.pp deleted file mode 100644 index cf8880b..0000000 --- a/manifests/filter.pp +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# = Class: logstash::filter -# -# Class to install logstash filter configs -# -# == Parameters -# -# [*level*] -# String. Conf level prefix for stitching files together in order. -# [*target*] -# String. Path to actual config location will be symlinked to. -define logstash::filter ( - $level, - $target, -) { - include ::logstash - - file { "/etc/logstash/conf.d/${level}-${name}.conf": - ensure => link, - target => $target, - require => Class['logstash'], - } -} diff --git a/manifests/indexer.pp b/manifests/indexer.pp deleted file mode 100644 index a22466a..0000000 --- a/manifests/indexer.pp +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# = Class: logstash::indexer -# -# Class to install logstash indexer -# -# == Parameters -# -# [*conf_template*] -# String. (deprecated) Path to indexer config template. -# Default: undef -# [*input_template*] -# String. Path to indexer input config template. -# Default: 'logstash/input.conf.erb' -# [*output_template*] -# String. Path to indexer output config template. -# Default: 'logstash/output.conf.erb' -class logstash::indexer ( - $conf_template = undef, - $input_template = 'logstash/input.conf.erb', - $output_template = 'logstash/output.conf.erb', -) { - include ::logstash - - if $conf_template != undef { - notify { 'Using $conf_template is deprecated, please switch to $input_template, $output_template and ::logstash::filter defines.': } - - file { '/etc/logstash/conf.d/indexer.conf': - ensure => present, - content => template($conf_template), - replace => true, - owner => 'logstash', - group => 'logstash', - mode => '0644', - require => Class['logstash'], - notify => Service['logstash'], - } - } else { - file { '/etc/logstash/conf.d/indexer.conf': - ensure => absent, - } - - file { '/etc/logstash/conf.d/00-input.conf': - ensure => present, - content => template($input_template), - replace => true, - owner => 'logstash', - group => 'logstash', - mode => '0644', - require => Class['logstash'], - notify => Service['logstash'], - } - - file { '/etc/logstash/conf.d/99-output.conf': - ensure => present, - content => template($output_template), - replace => true, - owner => 'logstash', - group => 'logstash', - mode => '0644', - require => Class['logstash'], - notify => Service['logstash'], - } - } - - file { '/etc/default/logstash': - ensure => present, - source => 'puppet:///modules/logstash/logstash.default', - replace => true, - owner => 'logstash', - group => 'logstash', - mode => '0644', - require => Class['logstash'], - } - service { 'logstash': - ensure => running, - enable => true, - subscribe => [ - File['/etc/default/logstash'], - ], - require => Class['logstash'], - } -} diff --git a/manifests/init.pp b/manifests/init.pp deleted file mode 100644 index cf99ec6..0000000 --- a/manifests/init.pp +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# = Class: Logstash -# -# Class to install common logstash items. -# -class logstash { - include ::logstash::params - include ::logrotate - - archive { '/tmp/logstash-2.4.1_all.deb': - source => 'https://download.elastic.co/logstash/logstash/packages/debian/logstash-2.4.1_all.deb', - extract => false, - checksum => '7ba3b174a3ef48a7d0945d9b5c7f12c5005abb47', - checksum_type => 'sha1', - } - - if ! defined(Package[$::logstash::params::jre_package]) { - package { $::logstash::params::jre_package: - ensure => present, - } - } - - package { 'logstash': - ensure => latest, - source => '/tmp/logstash-2.4.1_all.deb', - provider => 'dpkg', - require => [ - Package['logrotate'], - Package[$::logstash::params::jre_package], - Archive['/tmp/logstash-2.4.1_all.deb'], - ] - } -} diff --git a/manifests/params.pp b/manifests/params.pp deleted file mode 100644 index 594e4b3..0000000 --- a/manifests/params.pp +++ /dev/null @@ -1,12 +0,0 @@ -# logstash::params -class logstash::params( -) { - case $::lsbdistcodename { - 'xenial': { - $jre_package = 'openjdk-8-jre-headless' - } - default: { - $jre_package = 'openjdk-7-jre-headless' - } - } -} diff --git a/manifests/redis.pp b/manifests/redis.pp deleted file mode 100644 index e62de44..0000000 --- a/manifests/redis.pp +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# -# = Class: logstash::redis -# -# Class to install redis -# -class logstash::redis { - warning('This class is deprecated and should not be used') - # TODO(clarkb): Access to redis should be controlled at a network level - # (with iptables) and with client authentication. Put this in place before - # opening redis to external clients. - - package { 'redis-server': - ensure => present, - } - - file { '/etc/redis/redis.conf': - ensure => present, - source => 'puppet:///modules/logstash/redis.conf', - replace => true, - owner => 'root', - group => 'root', - mode => '0644', - require => Package['redis-server'], - } - - service { 'redis-server': - ensure => running, - require => Package['redis-server'], - subscribe => File['/etc/redis/redis.conf'], - } -} diff --git a/manifests/web.pp b/manifests/web.pp deleted file mode 100644 index a4a9186..0000000 --- a/manifests/web.pp +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# = Class: logstash::web -# -# Class to run logstash web front end -# -# == Parameters -# -# [*vhost_name*] -# String. FQDN of the web listener -# Default: $::fqdn -# -# [*serveradmin*] -# String. Email address of the administator -# Default: webserver@${::fqdn} -# -# [*frontend*] -# String. Which kind of web frontend to use -# Default: internal -# Valid Values: 'internal', 'kibana' -# -# [*discover_nodes*] -# Array of strings. Nodes to connect to by default (kibana only) -# Default: ['localhost:9200'] -# -# [*proxy_elasticsearch*] -# Boolean. Enables using apache mod_proxy to proxy reqs to ES (kibana only) -# Default: false -# -class logstash::web ( - $discover_nodes = ['localhost:9200'], - $frontend = 'internal', - $proxy_elasticsearch = false, - $serveradmin = "webmaster@${::fqdn}", - $vhost_name = $::fqdn, -) { - case $frontend { - 'internal': { - fail('This stopped working when we moved to Kibana3 and there is no analog in logstash 2.0. Use kibana.') - } - - 'kibana': { - class { '::kibana': - version => 'js', - discover_nodes => $discover_nodes, - js_elasticsearch_prefix => '/elasticsearch/', - js_elasticsearch_url => "http://${discover_nodes[0]}", - } - } - - default: { - fail("Unknown frontend to logstash: ${frontend}.") - } - } -} diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 48f61e4..0000000 --- a/metadata.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "openstackinfra-logstash", - "version": "0.0.1", - "author": "Openstack CI", - "summary": "Puppet module for Logstash", - "license": "Apache 2.0", - "source": "https://git.openstack.org/openstack-infra/puppet-logstash.git", - "project_page": "http://docs.openstack.org/infra/system-config/", - "issues_url": "https://storyboard.openstack.org/#!/project/763", - "dependencies": [ - {"name":"openstackinfra/httpd","version_requirement":"0.x"}, - {"name":"openstackinfra/logrotate"} - ] -} diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb deleted file mode 100644 index b4a05e4..0000000 --- a/spec/acceptance/basic_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'puppet-openstack_infra_spec_helper/spec_helper_acceptance' - -describe 'puppet-logstash module', :if => ['debian', 'ubuntu'].include?(os[:family]) do - def pp_path - base_path = File.dirname(__FILE__) - File.join(base_path, 'fixtures') - end - - def default_puppet_module - module_path = File.join(pp_path, 'default.pp') - File.read(module_path) - end - - it 'should work with no errors' do - apply_manifest(default_puppet_module, catch_failures: true) - end - - it 'should be idempotent' do - apply_manifest(default_puppet_module, catch_changes: true) - end - - describe 'required services' do - describe service('logstash') do - it { should be_enabled } - it { should be_running } - end - end -end diff --git a/spec/acceptance/fixtures/default.pp b/spec/acceptance/fixtures/default.pp deleted file mode 100644 index 86eea2a..0000000 --- a/spec/acceptance/fixtures/default.pp +++ /dev/null @@ -1,24 +0,0 @@ -# This files resources are declared on elasticsearch module -# and cannot be declared on the logstash::elasticsearch -# as it cause duplication error on other tests. -# This is only needed in acceptance tests. -file { '/etc/elasticsearch': - ensure => directory, - owner => 'root', -} - -file { '/etc/elasticsearch/templates': - ensure => directory, - owner => 'root', - require => File['/etc/elasticsearch'], -} - -class { '::logstash': } - -class { '::logstash::elasticsearch': - require => Class['::logstash'], -} - -class { '::logstash::indexer': - require => Class['::logstash'], -} diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 3bb3e62..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: git diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml deleted file mode 100644 index c552874..0000000 --- a/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-70-x64: - roles: - - master - platform: el-7-x86_64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml deleted file mode 100644 index 9fc624e..0000000 --- a/spec/acceptance/nodesets/nodepool-trusty.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml deleted file mode 100644 index 99dd318..0000000 --- a/spec/acceptance/nodesets/nodepool-xenial.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-16.04-amd64: - roles: - - master - platform: ubuntu-16.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/templates/agent.conf.erb b/templates/agent.conf.erb deleted file mode 100644 index cb373ff..0000000 --- a/templates/agent.conf.erb +++ /dev/null @@ -1,9 +0,0 @@ -input { - stdin { - type => "stdin-type" - } -} - -output { - redis { host => "127.0.0.1" data_type => "list" key => "logstash" } -} diff --git a/templates/indexer.conf.erb b/templates/indexer.conf.erb deleted file mode 100644 index 386dbd3..0000000 --- a/templates/indexer.conf.erb +++ /dev/null @@ -1,18 +0,0 @@ -input { - redis { - host => "127.0.0.1" - type => "redis-input" - # these settings should match the output of the agent - data_type => "list" - key => "logstash" - - # We use json_event here since the sender is a logstash agent - format => "json_event" - } -} - -output { - elasticsearch { - host => "127.0.0.1" - } -} diff --git a/templates/input.conf.erb b/templates/input.conf.erb deleted file mode 100644 index 7621a8e..0000000 --- a/templates/input.conf.erb +++ /dev/null @@ -1,12 +0,0 @@ -input { - redis { - host => "127.0.0.1" - type => "redis-input" - # these settings should match the output of the agent - data_type => "list" - key => "logstash" - - # We use json_event here since the sender is a logstash agent - format => "json_event" - } -} diff --git a/templates/kibana.vhost.erb b/templates/kibana.vhost.erb deleted file mode 100644 index 8648f74..0000000 --- a/templates/kibana.vhost.erb +++ /dev/null @@ -1,31 +0,0 @@ - - ServerName <%= @vhost_name %> - ServerAdmin <%= @serveradmin %> - - ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log - - LogLevel warn - - CustomLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-access.log combined - - - <% if @proxy_elasticsearch == true %> - # Proxy GETs for elasticsearch .*/_aliases, .*/_status, .*/_search, - # .*/_mapping, .*/_mapping/field/.*, _cluster/health, and _nodes. - RewriteEngine on - RewriteCond %{REQUEST_METHOD} GET - RewriteRule ^/elasticsearch/((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping|(.*/)?_mapping/field/(.*)?|_cluster/health|_nodes)$ http://<%= @discover_nodes[0] %>/$1 [P] - RewriteCond %{REQUEST_METHOD} POST - RewriteRule ^/elasticsearch/(_aliases|(.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P] - RewriteCond %{REQUEST_METHOD} OPTIONS - RewriteRule ^/elasticsearch/((.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P] - /> - ProxySet connectiontimeout=15 timeout=120 - - ProxyPassReverse /elasticsearch/ http://<%= @discover_nodes[0] %>/ - <% end %> - - ProxyPass / http://127.0.0.1:5601/ retry=0 - ProxyPassReverse / http://127.0.0.1:5601/ - - diff --git a/templates/logstash.vhost.erb b/templates/logstash.vhost.erb deleted file mode 100644 index 345c649..0000000 --- a/templates/logstash.vhost.erb +++ /dev/null @@ -1,13 +0,0 @@ - - ServerName <%= @vhost_name %> - ServerAdmin <%= @serveradmin %> - - ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log - - LogLevel warn - - CustomLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-access.log combined - - ProxyPass / http://127.0.0.1:9292/ retry=0 - ProxyPassReverse / http://127.0.0.1:9292/ - diff --git a/templates/output.conf.erb b/templates/output.conf.erb deleted file mode 100644 index 14a803f..0000000 --- a/templates/output.conf.erb +++ /dev/null @@ -1,5 +0,0 @@ -output { - elasticsearch { - host => "127.0.0.1" - } -}