You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2022/07/24 00:54:46 UTC
[bigtop] branch master updated: BIGTOP-3759: Remove ELK from Bigtop 3.2.0 stack (#962)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 18af82c5 BIGTOP-3759: Remove ELK from Bigtop 3.2.0 stack (#962)
18af82c5 is described below
commit 18af82c58b322e7b2c44db3410af4bccde4b90db
Author: 吴治国 <ch...@startdt.com>
AuthorDate: Sun Jul 24 08:54:41 2022 +0800
BIGTOP-3759: Remove ELK from Bigtop 3.2.0 stack (#962)
---
MAINTAINERS.txt | 1 -
bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 3 -
bigtop-deploy/puppet/manifests/cluster.pp | 13 -
.../puppet/modules/elasticsearch/manifests/init.pp | 53 -
.../elasticsearch/templates/elasticsearch.yml | 106 -
.../puppet/modules/kibana/manifests/init.pp | 46 -
.../kibana/templates/kibana.example.org.crt | 24 -
.../kibana/templates/kibana.example.org.key | 28 -
.../puppet/modules/kibana/templates/kibana.yml | 105 -
.../puppet/modules/kibana/templates/start-kibana | 138 --
.../puppet/modules/logstash/manifests/init.pp | 28 -
.../src/common/elasticsearch/do-component-build | 23 -
.../src/common/elasticsearch/elasticsearch.default | 65 -
.../src/common/elasticsearch/elasticsearch.init | 220 --
.../common/elasticsearch/install_elasticsearch.sh | 148 --
.../common/elasticsearch/patch0-log4j2-2.17.1.diff | 107 -
.../src/common/kibana/do-component-build | 31 -
.../src/common/kibana/install_kibana.sh | 129 --
.../src/common/kibana/patch0-kibana-platform.diff | 26 -
.../src/common/kibana/patch1-kibana-git-init.diff | 23 -
.../src/common/kibana/patch2-remove-husky.diff | 12 -
.../common/kibana/patch4-kibana-os-platform.diff | 11 -
.../src/common/logstash/do-component-build | 62 -
.../src/common/logstash/install_logstash.sh | 135 --
.../src/common/logstash/log4j2.properties | 31 -
.../src/common/logstash/logstash.default | 18 -
.../common/logstash/patch0-logstash-for-arm64.diff | 2394 --------------------
.../logstash/patch1-gem-version-compatibility.diff | 18 -
.../patch2-pin-logstash-output-elasticsearch.diff | 13 -
.../src/common/logstash/patch3-log4j2-2.17.1.diff | 148 --
bigtop-packages/src/deb/elasticsearch/changelog | 1 -
bigtop-packages/src/deb/elasticsearch/compat | 1 -
bigtop-packages/src/deb/elasticsearch/control | 30 -
bigtop-packages/src/deb/elasticsearch/copyright | 15 -
.../deb/elasticsearch/elasticsearch-doc.install | 2 -
.../src/deb/elasticsearch/elasticsearch.install | 5 -
.../src/deb/elasticsearch/elasticsearch.postinst | 39 -
.../src/deb/elasticsearch/elasticsearch.postrm | 57 -
.../src/deb/elasticsearch/elasticsearch.preinst | 67 -
.../src/deb/elasticsearch/elasticsearch.prerm | 41 -
bigtop-packages/src/deb/elasticsearch/rules | 42 -
.../src/deb/elasticsearch/source/format | 1 -
bigtop-packages/src/deb/kibana/compat | 1 -
bigtop-packages/src/deb/kibana/control | 30 -
bigtop-packages/src/deb/kibana/copyright | 15 -
bigtop-packages/src/deb/kibana/kibana.install | 3 -
bigtop-packages/src/deb/kibana/kibana.postinst | 39 -
bigtop-packages/src/deb/kibana/kibana.postrm | 51 -
bigtop-packages/src/deb/kibana/kibana.preinst | 67 -
bigtop-packages/src/deb/kibana/kibana.prerm | 38 -
bigtop-packages/src/deb/kibana/rules | 39 -
bigtop-packages/src/deb/kibana/source/format | 1 -
bigtop-packages/src/deb/logstash/compat | 1 -
bigtop-packages/src/deb/logstash/control | 31 -
bigtop-packages/src/deb/logstash/copyright | 15 -
bigtop-packages/src/deb/logstash/format | 1 -
bigtop-packages/src/deb/logstash/logstash.install | 3 -
bigtop-packages/src/deb/logstash/logstash.postinst | 42 -
bigtop-packages/src/deb/logstash/logstash.postrm | 52 -
bigtop-packages/src/deb/logstash/logstash.preinst | 65 -
bigtop-packages/src/deb/logstash/logstash.prerm | 55 -
bigtop-packages/src/deb/logstash/rules | 38 -
bigtop-packages/src/deb/logstash/source/format | 1 -
.../src/rpm/elasticsearch/SPECS/elasticsearch.spec | 115 -
bigtop-packages/src/rpm/kibana/SPECS/kibana.spec | 98 -
.../src/rpm/logstash/SPECS/logstash.spec | 112 -
.../smoke-tests/elasticsearch/build.gradle | 43 -
.../smoke-tests/kibana/TestKibanaSmoke.groovy | 51 -
bigtop-tests/smoke-tests/kibana/build.gradle | 35 -
.../smoke-tests/logstash/TestLogstashSmoke.groovy | 46 -
bigtop-tests/smoke-tests/logstash/build.gradle | 35 -
.../smoke-tests/logstash/resources/generator.conf | 7 -
bigtop-tests/test-artifacts/elasticsearch/pom.xml | 39 -
.../itest/elasticsearch/smoke/TestBase.groovy | 46 -
.../itest/elasticsearch/smoke/TestDocument.groovy | 72 -
.../itest/elasticsearch/smoke/TestInfo.groovy | 43 -
.../test-execution/smokes/elasticsearch/pom.xml | 58 -
bigtop.bom | 29 +-
build.gradle | 2 -
provisioner/docker/docker-hadoop.sh | 10 -
provisioner/utils/smoke-tests.sh | 3 -
81 files changed, 1 insertion(+), 5891 deletions(-)
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 93cf97af..7924dff5 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -27,4 +27,3 @@ tez: evans ye, oflebbe
vagrant recipes: jay vyas, evans ye
ycsb: youngwoo kim
zookeeper: sean mackrory, rvs
-elasticsearch: hernan vivani
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index 731aed1d..76e3eedf 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -211,6 +211,3 @@ gpdb::common::master_db_port: "5432"
gpdb::common::segment_db_port_prefix: "4000"
ambari::agent::server_host: "%{hiera('bigtop::hadoop_head_node')}"
-
-# Elasticsearch
-elasticsearch::bootstrap::system_call_filter: true
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index 51115a50..b016d6f6 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -134,16 +134,6 @@ $roles_map = {
livy => {
master => ["livy-server"],
},
- elasticsearch => {
- master => ["elasticsearch-server"],
- worker => ["elasticsearch-server"],
- },
- logstash => {
- client => ["logstash-client"],
- },
- kibana => {
- client => ["kibana-client"],
- },
}
class hadoop_cluster_node (
@@ -208,9 +198,6 @@ class node_with_roles ($roles = hiera("bigtop::roles")) inherits hadoop_cluster_
"gpdb",
"ambari",
"bigtop_utils",
- "elasticsearch",
- "logstash",
- "kibana",
]
node_with_roles::deploy_module { $modules:
diff --git a/bigtop-deploy/puppet/modules/elasticsearch/manifests/init.pp b/bigtop-deploy/puppet/modules/elasticsearch/manifests/init.pp
deleted file mode 100644
index 0c8cf007..00000000
--- a/bigtop-deploy/puppet/modules/elasticsearch/manifests/init.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# The ASF licenses this file to You 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 elasticsearch {
-
- class deploy ($roles) {
- if ("elasticsearch-server" in $roles) {
- include elasticsearch::server
- }
- }
-
- class server() {
- # make sure elasticsearch is installed
- package { "elasticsearch":
- ensure => latest
- }
- # read nodes in this cluster
- $elasticsearch_cluster_nodes = hiera('hadoop_cluster_node::cluster_nodes')
- # minimum number of eligible master nodes, usually calced with N/2+1
- $elasticsearch_cluster_min_master = size($elasticsearch_cluster_nodes)/2 + 1
- # check if system_call_filter is available during bootstrap
- $elasticsearch_bootstrap_system_call_filter = hiera('elasticsearch::bootstrap::system_call_filter')
-
- # set values in elasticsearch.yaml
- file { "/etc/elasticsearch/conf/elasticsearch.yml":
- content => template("elasticsearch/elasticsearch.yml"),
- require => Package["elasticsearch"]
- }
-
- exec { "daemon-reload":
- path => ["/bin", "/usr/bin"],
- command => "systemctl daemon-reload",
- require => [ Package["elasticsearch"] ]
- }
-
- service { "elasticsearch":
- ensure => running,
- require => [ Package["elasticsearch"], Exec["daemon-reload"] ],
- subscribe => File["/etc/elasticsearch/conf/elasticsearch.yml"],
- hasrestart => true,
- hasstatus => true
- }
-
- }
-}
diff --git a/bigtop-deploy/puppet/modules/elasticsearch/templates/elasticsearch.yml b/bigtop-deploy/puppet/modules/elasticsearch/templates/elasticsearch.yml
deleted file mode 100644
index df9ee60a..00000000
--- a/bigtop-deploy/puppet/modules/elasticsearch/templates/elasticsearch.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-# The ASF licenses this file to You 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.
-
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-# Before you set out to tweak and tune the configuration, make sure you
-# understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please consult the documentation for further information on configuration options:
-# https://www.elastic.co/guide/en/elasticsearch/reference/index.html
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-cluster.name: bigtop-es
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-node.name: <%= @hostname %>
-node.master: true
-node.data: true
-#
-# Add custom attributes to the node:
-#
-#node.attr.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-#path.data: /path/to/data
-#
-# Path to log files:
-#
-#path.logs: /path/to/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-#bootstrap.memory_lock: true
-#
-# Make sure that the heap size is set to about half the memory available
-# on the system and that the owner of the process is allowed to use this
-# limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-network.host: 0.0.0.0
-#
-# Set a custom port for HTTP:
-#
-#http.port: 9200
-#
-# For more information, consult the network module documentation.
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when new node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-discovery.zen.ping.unicast.hosts: <%= @elasticsearch_cluster_nodes %>
-#
-# Prevent the "split brain" by configuring the majority of nodes (total number of master-eligible nodes / 2 + 1):
-#
-discovery.zen.minimum_master_nodes: <%= @elasticsearch_cluster_min_master %>
-#
-# For more information, consult the zen discovery module documentation.
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-gateway.recover_after_nodes: <%= @elasticsearch_cluster_min_master %>
-#
-# For more information, consult the gateway module documentation.
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Require explicit names when deleting indices:
-#
-#action.destructive_requires_name: true
-
-# Disable this setting at your own risk to run ES on the platform which is not officially supported, e.g., ppc64le.
-# See https://www.elastic.co/guide/en/elasticsearch/reference/5.6/system-call-filter-check.html for details.
-bootstrap.system_call_filter: <%= @elasticsearch_bootstrap_system_call_filter %>
diff --git a/bigtop-deploy/puppet/modules/kibana/manifests/init.pp b/bigtop-deploy/puppet/modules/kibana/manifests/init.pp
deleted file mode 100644
index a61da00e..00000000
--- a/bigtop-deploy/puppet/modules/kibana/manifests/init.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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 kibana {
- class deploy ($roles) {
- if ("kibana-client" in $roles) {
- include kibana::client
- }
- }
-
- class client {
- package { "kibana":
- ensure => latest,
- }
-
- file { "/usr/lib/kibana/config/kibana.yml":
- content => template("kibana/kibana.yml"),
- require => Package["kibana"]
- }
- file { "/usr/lib/kibana/config/kibana.example.org.crt":
- content => template("kibana/kibana.example.org.crt"),
- require => Package["kibana"]
- }
- file { "/usr/lib/kibana/config/kibana.example.org.key":
- content => template("kibana/kibana.example.org.key"),
- require => Package["kibana"]
- }
- file { "/usr/lib/kibana/bin/start-kibana":
- content => template("kibana/start-kibana"),
- require => Package["kibana"],
- mode => '0775'
- }
- }
-}
diff --git a/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.crt b/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.crt
deleted file mode 100644
index 11125eae..00000000
--- a/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID/TCCAuWgAwIBAgIJALVJyrUvH8uGMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-VQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTEd
-MBsGA1UECgwURXhhbXBsZSBPcmdhbml6YXRpb24xGzAZBgNVBAMMEmtpYmFuYS5l
-eGFtcGxlLm9yZzEiMCAGCSqGSIb3DQEJARYTZXhhbXBsZUBleGFtcGxlLm9yZzAe
-Fw0xNjA5MTgwMzU4NTNaFw0yNjA5MTYwMzU4NTNaMIGUMQswCQYDVQQGEwJBVTER
-MA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTEdMBsGA1UECgwU
-RXhhbXBsZSBPcmdhbml6YXRpb24xGzAZBgNVBAMMEmtpYmFuYS5leGFtcGxlLm9y
-ZzEiMCAGCSqGSIb3DQEJARYTZXhhbXBsZUBleGFtcGxlLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK3AKz7Jq8CGR75NcbuUKiLTJhSS0/TBGA9M
-k+OmradT5qWhFKbxUDoMwT4YpUTzkUGUzkGEVbUsrKK4XaYXldRoHOm8mS0aBErk
-g2ffmpi+TiGk5LHykZ0avmYeEsqVESAjVEMuU3fWJzZd4NfUcTKsBA7Ccqfnb3CB
-TS5fbAz/zw1K//XR5ZNCEBOsFD+0oFGKTNLCeMBCwccFNyVI2mNZpDA++HilNiQj
-TEJytBXGcMVZaS+Tc0vENfVWHAAtVdk8+dd6jkpNnDhK1W1TB7HvhScewyEGh9yb
-cK5asE8TBebEvUIrPaVFz+ef/o3lRev0Gq1QUYAoaG7ps9JlDcsCAwEAAaNQME4w
-HQYDVR0OBBYEFIKSLrYMY9fXpCS7OGnyxhS7JzRrMB8GA1UdIwQYMBaAFIKSLrYM
-Y9fXpCS7OGnyxhS7JzRrMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-ABiu7+GH8WGNPqPUUHP17HHYK41xAyYoKSzCrELKmFLphYhnUQA6EeBY8rjYr3X0
-Z2O0F9J6Cik/kG/uBYW0Oi8PQ0EeSZwzvd+CsAc2EJAryOBpafWRXa2XrOtFkKjq
-jKWHSa0QJsBALiu8+JVfcwXYshbhmdVBxrktxMoY9WpGI7EcZkf77SW5enY4LtSF
-wuRr2lv29YADsa/Q7JV2I4oAbWUjW3513mR5JsefHPk7hXZbRCXqUxFTmWpnDomF
-HDeEDAdSgMgzODnbU/qHI9tmP6iDaCTz/eVfyCMKGYA0oIX1j5GdJ6HXK1OHafJK
-W/M9gDRhQKU0bTXC2CoEOAs=
------END CERTIFICATE-----
diff --git a/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.key b/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.key
deleted file mode 100644
index db46f0d4..00000000
--- a/bigtop-deploy/puppet/modules/kibana/templates/kibana.example.org.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCtwCs+yavAhke+
-TXG7lCoi0yYUktP0wRgPTJPjpq2nU+aloRSm8VA6DME+GKVE85FBlM5BhFW1LKyi
-uF2mF5XUaBzpvJktGgRK5INn35qYvk4hpOSx8pGdGr5mHhLKlREgI1RDLlN31ic2
-XeDX1HEyrAQOwnKn529wgU0uX2wM/88NSv/10eWTQhATrBQ/tKBRikzSwnjAQsHH
-BTclSNpjWaQwPvh4pTYkI0xCcrQVxnDFWWkvk3NLxDX1VhwALVXZPPnXeo5KTZw4
-StVtUwex74UnHsMhBofcm3CuWrBPEwXmxL1CKz2lRc/nn/6N5UXr9BqtUFGAKGhu
-6bPSZQ3LAgMBAAECggEAKE5S+d7ItAGydOf8QTpux+NZix5Agx+kGDB4gi/xSsbA
-051ZcBy8sqqwzVnkROmHwcHmUvaC92NkrN6+AsCn5j08r9ArbHYDlugJv7f0YgiL
-kWxyDQGrW9mPX5sMWuhXr6/iZS9C96K7N/ZxKUBD/jA/RLlA5chfZqboI6DJLP5s
-u03ZW4toaGItLZtPxF07eElE4MGG/TbkoBZ5t79Y98TJP2oO95IpPQa8omqQcDEM
-w0DsbV/dJV9AtyZBfmIRNaG5beiIUH26OQzUJP7FP2eIN4F/CAXLdlMnHtQA1XJz
-QRwMxbfBQ+JfKD7YWedqivrjR0iPMx80M4HSU9DFaQKBgQDa+7F7zDRy4WU0GtfP
-g+ArDUMjQv5pTXA0b2hKjHJRXM3LVo5qNJYWlirHtPjkVL4BJSY+iVl9/lfV2Xrf
-gDXQLcUhABx5HNzZ5p+NyDHWrpZamFkfw9wLwQHXZGG8I+dla/iToHRWEH2QYxdz
-VvfntpyE7XbxzhPPiS5haHGerwKBgQDLHxPn/jm2dSHa6jAidJXFJCMblcDuwIBy
-7Cm7vnRro9Mbx/hZkRPXYWHQ/4WEVlWO9Sgkf4ambPSmdFg8ksQwBBd+l3K5K4Un
-2AIL/PqgZg+anoEYYn1sqiWSc+YiO2GiRaHh5wOWtekEBBH9HcYkmKIXm3JHVdSw
-SpQsryxppQKBgDi7qqDLJ+93a7PTHIRbwzEEL5esHKOFd4NuNZPSzS89HugGVcE4
-PIY/g3fX7/+f4NYFHOJozTGyOmlh/c53tfloUkEZeUb7blBZyo5+BkN7WeLAw55S
-LOkyqNp33EZU+vcwwObmVB2UCiPlOEceif2TNvvNVdqRrFpBTS3ZVE5rAoGAJivk
-9cgU2HESt60i9paqPq4X2us9oqCSgwZWoW2dO01CMwpVZZ+Z9vPaCgi68q+2zHLN
-5G4Cw+vd3honKtr5+3wJXkTfzmSbVW2GlPIpt1L2w7vdztNTdsRS4z7clLpMEs67
-KVTcm8n7zEFnkAW0YtQ8Qet4gmdi3O5nAi65TfECgYEA0Pw2X4R37IrYM7tFDJSz
-zDF4mRmk2qfhHBd8IaIDBpsXSgLcVRduro4HBzf/JeCt8rvw3VMLEFyqwyszpHro
-xNnqPvbMPMCtOvUcr1VtXnO7CzaFNCJrfjYdV8vmDgvbYmBEHzG+LGbnVZIBUhQa
-igVjtqU1uT83+VpR703IcBI=
------END PRIVATE KEY-----
diff --git a/bigtop-deploy/puppet/modules/kibana/templates/kibana.yml b/bigtop-deploy/puppet/modules/kibana/templates/kibana.yml
deleted file mode 100644
index b80cca50..00000000
--- a/bigtop-deploy/puppet/modules/kibana/templates/kibana.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# Kibana is served by a back end server. This setting specifies the port to use.
-#server.port: 5601
-
-# Specifies the address to which the Kibana server will bind. IP addresses and host names are both valid values.
-# The default is 'localhost', which usually means remote machines will not be able to connect.
-# To allow connections from remote users, set this parameter to a non-loopback address.
-#server.host: "localhost"
-server.host: "0"
-
-# Enables you to specify a path to mount Kibana at if you are running behind a proxy. This only affects
-# the URLs generated by Kibana, your proxy is expected to remove the basePath value before forwarding requests
-# to Kibana. This setting cannot end in a slash.
-#server.basePath: ""
-
-# The maximum payload size in bytes for incoming server requests.
-#server.maxPayloadBytes: 1048576
-
-# The Kibana server's name. This is used for display purposes.
-#server.name: "your-hostname"
-
-# The URL of the Elasticsearch instance to use for all your queries.
-#elasticsearch.url: "http://localhost:9200"
-
-# When this setting's value is true Kibana uses the hostname specified in the server.host
-# setting. When the value of this setting is false, Kibana uses the hostname of the host
-# that connects to this Kibana instance.
-#elasticsearch.preserveHost: true
-
-# Kibana uses an index in Elasticsearch to store saved searches, visualizations and
-# dashboards. Kibana creates a new index if the index doesn't already exist.
-#kibana.index: ".kibana"
-
-# The default application to load.
-#kibana.defaultAppId: "discover"
-
-# If your Elasticsearch is protected with basic authentication, these settings provide
-# the username and password that the Kibana server uses to perform maintenance on the Kibana
-# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which
-# is proxied through the Kibana server.
-#elasticsearch.username: elastic
-#elasticsearch.password: changeme
-
-# Enables SSL and paths to the PEM-format SSL certificate and SSL key files, respectively.
-# These settings enable SSL for outgoing requests from the Kibana server to the browser.
-#server.ssl.enabled: false
-server.ssl.certificate: /usr/lib/kibana/config/kibana.example.org.crt
-server.ssl.key: /usr/lib/kibana/config/kibana.example.org.key
-
-# Optional settings that provide the paths to the PEM-format SSL certificate and key files.
-# These files validate that your Elasticsearch backend uses the same key files.
-#elasticsearch.ssl.certificate: /path/to/your/client.crt
-#elasticsearch.ssl.key: /path/to/your/client.key
-
-# Optional setting that enables you to specify a path to the PEM file for the certificate
-# authority for your Elasticsearch instance.
-#elasticsearch.ssl.certificateAuthorities: [ "/path/to/your/CA.pem" ]
-
-# To disregard the validity of SSL certificates, change this setting's value to 'none'.
-#elasticsearch.ssl.verificationMode: full
-
-# Time in milliseconds to wait for Elasticsearch to respond to pings. Defaults to the value of
-# the elasticsearch.requestTimeout setting.
-#elasticsearch.pingTimeout: 1500
-
-# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value
-# must be a positive integer.
-#elasticsearch.requestTimeout: 30000
-
-# List of Kibana client-side headers to send to Elasticsearch. To send *no* client-side
-# headers, set this value to [] (an empty list).
-#elasticsearch.requestHeadersWhitelist: [ authorization ]
-
-# Header names and values that are sent to Elasticsearch. Any custom headers cannot be overwritten
-# by client-side headers, regardless of the elasticsearch.requestHeadersWhitelist configuration.
-#elasticsearch.customHeaders: {}
-
-# Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable.
-#elasticsearch.shardTimeout: 0
-
-# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying.
-#elasticsearch.startupTimeout: 5000
-
-# Specifies the path where Kibana creates the process ID file.
-#pid.file: /var/run/kibana.pid
-
-# Enables you specify a file where Kibana stores log output.
-#logging.dest: stdout
-
-# Set the value of this setting to true to suppress all logging output.
-#logging.silent: false
-
-# Set the value of this setting to true to suppress all logging output other than error messages.
-#logging.quiet: false
-
-# Set the value of this setting to true to log all events, including system usage information
-# and all requests.
-#logging.verbose: false
-
-# Set the interval in milliseconds to sample system and process performance
-# metrics. Minimum is 100ms. Defaults to 5000.
-#ops.interval: 5000
-
-# The default locale. This locale can be used in certain circumstances to substitute any missing
-# translations.
-#i18n.defaultLocale: "en"
diff --git a/bigtop-deploy/puppet/modules/kibana/templates/start-kibana b/bigtop-deploy/puppet/modules/kibana/templates/start-kibana
deleted file mode 100755
index 487dd94e..00000000
--- a/bigtop-deploy/puppet/modules/kibana/templates/start-kibana
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-# Run Kibana, using environment variables to set longopts defining Kibana's
-# configuration.
-#
-# eg. Setting the environment variable:
-#
-# ELASTICSEARCH_STARTUPTIMEOUT=60
-#
-# will cause Kibana to be invoked with:
-#
-# --elasticsearch.startupTimeout=60
-
-kibana_vars=(
- console.enabled
- console.proxyConfig
- console.proxyFilter
- elasticsearch.customHeaders
- elasticsearch.password
- elasticsearch.pingTimeout
- elasticsearch.preserveHost
- elasticsearch.requestHeadersWhitelist
- elasticsearch.requestTimeout
- elasticsearch.shardTimeout
- elasticsearch.ssl.ca
- elasticsearch.ssl.cert
- elasticsearch.ssl.certificate
- elasticsearch.ssl.certificateAuthorities
- elasticsearch.ssl.key
- elasticsearch.ssl.keyPassphrase
- elasticsearch.ssl.verificationMode
- elasticsearch.ssl.verify
- elasticsearch.startupTimeout
- elasticsearch.tribe.customHeaders
- elasticsearch.tribe.password
- elasticsearch.tribe.pingTimeout
- elasticsearch.tribe.requestHeadersWhitelist
- elasticsearch.tribe.requestTimeout
- elasticsearch.tribe.ssl.ca
- elasticsearch.tribe.ssl.cert
- elasticsearch.tribe.ssl.certificate
- elasticsearch.tribe.ssl.key
- elasticsearch.tribe.ssl.verify
- elasticsearch.tribe.url
- elasticsearch.tribe.username
- elasticsearch.url
- elasticsearch.username
- kibana.defaultAppId
- kibana.index
- logging.dest
- logging.quiet
- logging.silent
- logging.verbose
- ops.interval
- pid.file
- server.basePath
- server.defaultRoute
- server.host
- server.maxPayloadBytes
- server.name
- server.port
- server.ssl.cert
- server.ssl.certificate
- server.ssl.certificateAuthorities
- server.ssl.cipherSuites
- server.ssl.clientAuthentication
- server.ssl.enabled
- server.ssl.key
- server.ssl.keyPassphrase
- server.ssl.supportedProtocols
- status.allowAnonymous
- status.v6ApiFormat
- tilemap.options.attribution
- tilemap.options.maxZoom
- tilemap.options.minZoom
- tilemap.options.subdomains
- tilemap.url
- xpack.graph.enabled
- xpack.ml.enabled
- xpack.monitoring.elasticsearch.password
- xpack.monitoring.elasticsearch.url
- xpack.monitoring.elasticsearch.username
- xpack.monitoring.enabled
- xpack.monitoring.kibana.collection.enabled
- xpack.monitoring.kibana.collection.interval
- xpack.monitoring.max_bucket_size
- xpack.monitoring.min_interval_seconds
- xpack.monitoring.node_resolver
- xpack.monitoring.report_stats
- xpack.monitoring.ui.container.elasticsearch.enabled
- xpack.reporting.capture.concurrency
- xpack.reporting.capture.loadDelay
- xpack.reporting.capture.settleTime
- xpack.reporting.capture.timeout
- xpack.reporting.enabled
- xpack.reporting.encryptionKey
- xpack.reporting.kibanaApp
- xpack.reporting.kibanaServer.hostname
- xpack.reporting.kibanaServer.port
- xpack.reporting.kibanaServer.protocol
- xpack.reporting.queue.indexInterval
- xpack.reporting.queue.pollInterval
- xpack.reporting.queue.timeout
- xpack.security.cookieName
- xpack.security.enabled
- xpack.security.encryptionKey
- xpack.security.secureCookies
- xpack.security.sessionTimeout
-)
-
-longopts=''
-for kibana_var in ${kibana_vars[*]}; do
- # 'elasticsearch.url' -> 'ELASTICSEARCH_URL'
- env_var=$(echo ${kibana_var^^} | tr . _)
-
- # Indirectly lookup env var values via the name of the var.
- # REF: http://tldp.org/LDP/abs/html/bashver2.html#EX78
- value=${!env_var}
- if [[ -n $value ]]; then
- longopt="--${kibana_var}=${value}"
- longopts+=" ${longopt}"
- fi
-done
-
-# The virtual file /proc/self/cgroup should list the current cgroup
-# membership. For each hierarchy, you can follow the cgroup path from
-# this file to the cgroup filesystem (usually /sys/fs/cgroup/) and
-# introspect the statistics for the cgroup for the given
-# hierarchy. Alas, Docker breaks this by mounting the container
-# statistics at the root while leaving the cgroup paths as the actual
-# paths. Therefore, Kibana provides a mechanism to override
-# reading the cgroup path from /proc/self/cgroup and instead uses the
-# cgroup path defined the configuration properties
-# cpu.cgroup.path.override and cpuacct.cgroup.path.override.
-# Therefore, we set this value here so that cgroup statistics are
-# available for the container this process will run in.
-
-exec /usr/lib/kibana/bin/kibana --cpu.cgroup.path.override=/ --cpuacct.cgroup.path.override=/ ${longopts} &
diff --git a/bigtop-deploy/puppet/modules/logstash/manifests/init.pp b/bigtop-deploy/puppet/modules/logstash/manifests/init.pp
deleted file mode 100644
index 2306ac1f..00000000
--- a/bigtop-deploy/puppet/modules/logstash/manifests/init.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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 deploy ($roles) {
- if ("logstash-client" in $roles) {
- include logstash::client
- }
- }
-
- class client {
- package { "logstash":
- ensure => latest,
- }
- }
-}
diff --git a/bigtop-packages/src/common/elasticsearch/do-component-build b/bigtop-packages/src/common/elasticsearch/do-component-build
deleted file mode 100644
index 4226e4a1..00000000
--- a/bigtop-packages/src/common/elasticsearch/do-component-build
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -ex
-
-. `dirname ${0}`/bigtop.bom
-
-./gradlew assemble -Dbuild.snapshot=false
-mkdir build
-tar -C build --strip-components=1 -xzf distribution/tar/build/distributions/elasticsearch-*.tar.gz
diff --git a/bigtop-packages/src/common/elasticsearch/elasticsearch.default b/bigtop-packages/src/common/elasticsearch/elasticsearch.default
deleted file mode 100644
index 5aede47b..00000000
--- a/bigtop-packages/src/common/elasticsearch/elasticsearch.default
+++ /dev/null
@@ -1,65 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch home directory
-ES_HOME=/usr/lib/elasticsearch
-
-# Elasticsearch Java path
-#JAVA_HOME=
-
-# Elasticsearch configuration directory
-CONF_DIR=/etc/elasticsearch/conf
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Elasticsearch PID directory
-#PID_DIR=/var/run/elasticsearch
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-# Configure restart on package upgrade (true, every other setting will lead to not restarting)
-#RESTART_ON_UPGRADE=true
-
-################################
-# Elasticsearch service
-################################
-
-# SysV init.d
-#
-# When executing the init script, this user will be used to run the elasticsearch service.
-# The default value is 'elasticsearch' and is declared in the init.d file.
-# Note that this setting is only used by the init script. If changed, make sure that
-# the configured user can read and write into the data, work, plugins and log directories.
-# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
-#ES_USER=elasticsearch
-#ES_GROUP=elasticsearch
-
-# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
-ES_STARTUP_SLEEP_TIME=5
-
-################################
-# System properties
-################################
-
-# Specifies the maximum file descriptor number that can be opened by this process
-# When using Systemd, this setting is ignored and the LimitNOFILE defined in
-# /usr/lib/systemd/system/elasticsearch.service takes precedence
-#MAX_OPEN_FILES=65536
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml.
-# When using systemd, LimitMEMLOCK must be set in a unit file such as
-# /etc/systemd/system/elasticsearch.service.d/override.conf.
-#MAX_LOCKED_MEMORY=unlimited
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-# When using Systemd, this setting is ignored and the 'vm.max_map_count'
-# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
-#MAX_MAP_COUNT=262144
diff --git a/bigtop-packages/src/common/elasticsearch/elasticsearch.init b/bigtop-packages/src/common/elasticsearch/elasticsearch.init
deleted file mode 100755
index 3d229ffa..00000000
--- a/bigtop-packages/src/common/elasticsearch/elasticsearch.init
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-# Startup script for Elasticsearch
-#
-### BEGIN INIT INFO
-# Provides: elasticsearch
-# Required-Start: $network $remote_fs $named
-# Required-Stop: $network $remote_fs $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Elasticsearch start-stop-daemon
-# Description: Elasticsearch start-stop-daemon
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-if [ -f /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-fi
-
-# Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-NAME=elasticsearch
-DESC="Elasticsearch Server"
-DEFAULT=${BIGTOP_DEFAULTS_DIR}/${NAME}
-
-if [ `id -u` -ne 0 ]; then
- echo "You need root privileges to run this script"
- exit 1
-fi
-
-if [ -r /etc/default/rcS ]; then
- . /etc/default/rcS
-fi
-
-
-# The following variables can be overwritten in $DEFAULT
-
-ES_USER=elasticsearch
-ES_GROUP=elasticsearch
-
-# Directory where the Elasticsearch binary distribution resides
-ES_HOME=/usr/lib/${NAME}
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-# Maximum number of open files
-MAX_OPEN_FILES=65536
-
-# Maximum amount of locked memory
-#MAX_LOCKED_MEMORY=
-
-# Elasticsearch log directory
-LOG_DIR=/var/log/${NAME}
-
-# Elasticsearch data directory
-DATA_DIR=/var/lib/${NAME}
-
-# Elasticsearch configuration directory
-CONF_DIR=/etc/${NAME}/conf
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-MAX_MAP_COUNT=262144
-
-# Elasticsearch PID file directory
-PID_DIR="/var/run/elasticsearch"
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/${NAME} ] && . ${BIGTOP_DEFAULTS_DIR}/${NAME}
-
-if [ "${ES_USER}" != "elasticsearch" ] || [ "${ES_GROUP}" != "elasticsearch" ]; then
- echo "WARNING: ES_USER and ES_GROUP are deprecated and will be removed in the next major version of Elasticsearch, got: [${ES_USER}:${ES_GROUP}]"
-fi
-
-# Define other required variables
-PID_FILE="${PID_DIR}/${NAME}.pid"
-DAEMON=${ES_HOME}/bin/elasticsearch
-DAEMON_OPTS="-d -p ${PID_FILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-
-if [ -z "$ES_JVM_OPTIONS" ]; then
- for jvm_options in "$CONF_DIR"/jvm.options; do
- if [ -r "$jvm_options" ]; then
- ES_JVM_OPTIONS=$jvm_options
- break
- fi
- done
-fi
-export ES_JAVA_OPTS
-export JAVA_HOME
-export ES_INCLUDE
-export ES_JVM_OPTIONS
-
-
-checkJava() {
- if [ -x "${JAVA_HOME}/bin/java" ]; then
- JAVA="${JAVA_HOME}/bin/java"
- else
- JAVA=`which java`
- fi
-
- if [ ! -x "${JAVA}" ]; then
- echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
- exit 1
- fi
-}
-
-case "$1" in
- start)
- checkJava
-
- pid=`pidofproc -p $PID_FILE $NAME`
- if [ -n "$pid" ] ; then
- log_warning_msg "Already running."
- exit 0
- fi
-
- # Ensure that the PID_DIR exists (it is cleaned at OS startup time)
- if [ -n "${PID_DIR}" ] && [ ! -e "${PID_DIR}" ]; then
- mkdir -p ${PID_DIR} && chown ${ES_USER}:${ES_GROUP} ${PID_DIR}
- fi
- if [ -n "${PID_FILE}" ] && [ ! -e "${PID_FILE}" ]; then
- touch ${PID_FILE} && chown ${ES_USER}:${ES_GROUP} ${PID_FILE}
- fi
-
- if [ -n "${MAX_OPEN_FILES}" ]; then
- ulimit -n ${MAX_OPEN_FILES}
- fi
-
- if [ -n "${MAX_LOCKED_MEMORY}" ]; then
- ulimit -l ${MAX_LOCKED_MEMORY}
- fi
-
- if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count -a "${MAX_MAP_COUNT}" -gt $(cat /proc/sys/vm/max_map_count) ]; then
- sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
- fi
-
- # Start Daemon
- echo -n $"Starting $DESC ..."
- /sbin/runuser ${ES_USER} -s /bin/bash -c "${DAEMON} ${DAEMON_OPTS}"
- return=$?
- if [ $return -eq 0 ]; then
- i=0
- timeout=10
- # Wait for the process to be properly started before exiting
- until { kill -0 `cat "${PID_FILE}"`; } >/dev/null 2>&1
- do
- sleep 2
- i=$(($i + 1))
- if [ $i -gt $timeout ]; then
- log_failure_msg 1
- exit 1
- fi
- done
- fi
- log_success_msg
- exit $return
- ;;
- stop)
- echo -n "Stopping ${DESC}"
-
- if [ -f "${PID_FILE}" ]; then
- killproc -p "${PID_FILE}" $NAME
- if [ $? -eq 1 ]; then
- log_warning_msg "${DESC} is not running but pid file exists, cleaning up"
- elif [ $? -eq 3 ]; then
- PID="`cat ${PID_FILE}`"
- log_failure_msg "Failed to stop $DESC (pid $PID)"
- exit 1
- fi
- rm -f "${PID_FILE}"
- else
- log_warning_msg "(not running)"
- fi
- ;;
- status)
- status="0"
- pidofproc -p $PID_FILE $NAME >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$DESC is running"
- elif [ "$status" = 4 ]; then
- log_failure_msg "could not access PID file for ${DESC}"
- else
- log_failure_msg "$DESC is not running"
- fi
- exit $status
- ;;
- restart|force-reload)
- if [ -f "${PID_FILE}" ]; then
- $0 stop
- fi
- $0 start
- ;;
- *)
- log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/bigtop-packages/src/common/elasticsearch/install_elasticsearch.sh b/bigtop-packages/src/common/elasticsearch/install_elasticsearch.sh
deleted file mode 100755
index 652f3ebb..00000000
--- a/bigtop-packages/src/common/elasticsearch/install_elasticsearch.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --distro-dir=DIR path to distro specific files (debian/RPM)
- --build-dir=DIR path to dist dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/elasticsearch]
- --lib-dir=DIR path to install bits [/usr/lib/elasticsearch]
- --installed-lib-dir=DIR path where lib-dir will end up on target system
- --bin-dir=DIR path to install bins [/usr/bin]
- --examples-dir=DIR path to install examples [doc-dir/examples]
- ... [ see source for more similar options ]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'distro-dir:' \
- -l 'doc-dir:' \
- -l 'lib-dir:' \
- -l 'installed-lib-dir:' \
- -l 'bin-dir:' \
- -l 'initd-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --distro-dir)
- DISTRO_DIR=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --installed-lib-dir)
- INSTALLED_LIB_DIR=$2 ; shift 2
- ;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --initd-dir)
- INITD_DIR=$2 ; shift 2
- ;;
- --)
- shift; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR DISTRO_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-done
-
-MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-DOC_DIR=${DOC_DIR:-/usr/share/doc/elasticsearch}
-LIB_DIR=${LIB_DIR:-/usr/lib/elasticsearch}
-INITD_DIR=${INITD_DIR:-/etc/init.d}
-INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/elasticsearch}
-BIN_DIR=${BIN_DIR:-/usr/bin}
-CONF_DIR=${CONF_DIR:-/etc/elasticsearch/conf}
-DEFAULT_DIR=${ETC_DIR:-/etc/default}
-
-VAR_DIR=$PREFIX/var
-
-install -d -m 0755 $PREFIX/$LIB_DIR
-cp -ra ${BUILD_DIR}/lib $PREFIX/$LIB_DIR/lib
-
-install -d -m 0755 $PREFIX/$LIB_DIR/modules
-cp -ra ${BUILD_DIR}/modules/* $PREFIX/$LIB_DIR/modules
-
-install -d -m 0755 $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch.in.sh $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch-keystore $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch-plugin $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch-systemd-pre-exec $PREFIX/$LIB_DIR/bin
-cp -a ${BUILD_DIR}/bin/elasticsearch-translog $PREFIX/$LIB_DIR/bin
-chmod 755 $PREFIX/$LIB_DIR/bin/*
-
-install -d -m 0755 $PREFIX/$LIB_DIR/plugins
-install -d -m 0755 $PREFIX/$LIB_DIR/licenses
-cp -a ${BUILD_DIR}/LICENSE.txt $PREFIX/$LIB_DIR/licenses/
-
-# copy service script
-install -d -m 0755 $PREFIX/${INITD_DIR}
-cp ${DISTRO_DIR}/elasticsearch.init $PREFIX/${INITD_DIR}/elasticsearch
-chmod 755 $PREFIX/${INITD_DIR}/elasticsearch
-
-# Copy in the configuration files
-install -d -m 0755 $PREFIX/$DEFAULT_DIR
-cp ${DISTRO_DIR}/elasticsearch.default $PREFIX/$DEFAULT_DIR/elasticsearch
-
-install -d -m 0755 $PREFIX/${CONF_DIR}.dist
-cp ${BUILD_DIR}/config/elasticsearch.yml $PREFIX/${CONF_DIR}.dist
-cp ${BUILD_DIR}/config/jvm.options $PREFIX/${CONF_DIR}.dist
-cp ${BUILD_DIR}/config/log4j2.properties $PREFIX/${CONF_DIR}.dist
-install -d -m 0755 $PREFIX/${CONF_DIR}.dist/scripts
-
-# precreating /var layout
-install -d -m 0755 $VAR_DIR/log/elasticsearch
-install -d -m 0755 $VAR_DIR/run/elasticsearch
-install -d -m 0755 $VAR_DIR/lib/elasticsearch
diff --git a/bigtop-packages/src/common/elasticsearch/patch0-log4j2-2.17.1.diff b/bigtop-packages/src/common/elasticsearch/patch0-log4j2-2.17.1.diff
deleted file mode 100644
index d7c914be..00000000
--- a/bigtop-packages/src/common/elasticsearch/patch0-log4j2-2.17.1.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/buildSrc/version.properties b/buildSrc/version.properties
-index fea5aea..9b731d0 100644
---- a/buildSrc/version.properties
-+++ b/buildSrc/version.properties
-@@ -7,7 +7,7 @@ jts = 1.13
- jackson = 2.8.6
- snakeyaml = 1.15
- # when updating log4j, please update also docs/java-api/index.asciidoc
--log4j = 2.11.1
-+log4j = 2.17.1
- slf4j = 1.6.2
-
- # when updating the JNA version, also update the version in buildSrc/build.gradle
-diff --git a/core/build.gradle b/core/build.gradle
-index 6a634c8..0f36e39 100644
---- a/core/build.gradle
-+++ b/core/build.gradle
-@@ -223,13 +223,11 @@ thirdPartyAudit.excludes = [
- 'org.apache.commons.compress.utils.IOUtils',
- 'org.apache.commons.csv.CSVFormat',
- 'org.apache.commons.csv.QuoteMode',
-- 'org.apache.kafka.clients.producer.Callback',
- 'org.apache.kafka.clients.producer.KafkaProducer',
- 'org.apache.kafka.clients.producer.Producer',
- 'org.apache.kafka.clients.producer.ProducerRecord',
- 'org.apache.kafka.clients.producer.RecordMetadata',
- 'org.codehaus.stax2.XMLStreamWriter2',
-- 'org.jctools.queues.MessagePassingQueue$Consumer',
- 'org.jctools.queues.MpscArrayQueue',
- 'org.osgi.framework.AdaptPermission',
- 'org.osgi.framework.AdminPermission',
-diff --git a/core/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/core/licenses/log4j-1.2-api-2.11.1.jar.sha1
-deleted file mode 100644
-index 575d75d..0000000
---- a/core/licenses/log4j-1.2-api-2.11.1.jar.sha1
-+++ /dev/null
-@@ -1 +0,0 @@
--3aba3398fe064a3eab4331f88161c7480e848418
-\ No newline at end of file
-diff --git a/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/core/licenses/log4j-1.2-api-2.17.1.jar.sha1
-new file mode 100644
-index 0000000..e589ba5
---- /dev/null
-+++ b/core/licenses/log4j-1.2-api-2.17.1.jar.sha1
-@@ -0,0 +1 @@
-+aaf998968370edf738322fb750fbda118055508b
-\ No newline at end of file
-diff --git a/core/licenses/log4j-api-2.11.1.jar.sha1 b/core/licenses/log4j-api-2.11.1.jar.sha1
-deleted file mode 100644
-index 4b1bfff..0000000
---- a/core/licenses/log4j-api-2.11.1.jar.sha1
-+++ /dev/null
-@@ -1 +0,0 @@
--268f0fe4df3eefe052b57c87ec48517d64fb2a10
-\ No newline at end of file
-diff --git a/core/licenses/log4j-api-2.17.1.jar.sha1 b/core/licenses/log4j-api-2.17.1.jar.sha1
-new file mode 100644
-index 0000000..400d6bd
---- /dev/null
-+++ b/core/licenses/log4j-api-2.17.1.jar.sha1
-@@ -0,0 +1 @@
-+bbd791e9c8c9421e45337c4fe0a10851c086e36c
-\ No newline at end of file
-diff --git a/core/licenses/log4j-core-2.11.1.jar.sha1 b/core/licenses/log4j-core-2.11.1.jar.sha1
-deleted file mode 100644
-index 2fb8589..0000000
---- a/core/licenses/log4j-core-2.11.1.jar.sha1
-+++ /dev/null
-@@ -1 +0,0 @@
--592a48674c926b01a9a747c7831bcd82a9e6d6e4
-\ No newline at end of file
-diff --git a/core/licenses/log4j-core-2.17.1.jar.sha1 b/core/licenses/log4j-core-2.17.1.jar.sha1
-new file mode 100644
-index 0000000..933b970
---- /dev/null
-+++ b/core/licenses/log4j-core-2.17.1.jar.sha1
-@@ -0,0 +1 @@
-+fe6e7a32c1228884b9691a744f953a55d0dd8ead
-\ No newline at end of file
-diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
-index fb0b1e1..fa75d94 100644
---- a/plugins/repository-hdfs/build.gradle
-+++ b/plugins/repository-hdfs/build.gradle
-@@ -561,7 +561,6 @@ thirdPartyAudit.excludes = [
-
- 'org.apache.log4j.AsyncAppender',
- 'org.apache.log4j.helpers.ISO8601DateFormat',
-- 'org.apache.log4j.spi.ThrowableInformation',
-
- // New optional dependencies in 2.8
- 'com.nimbusds.jose.JWSObject$State',
-diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
-deleted file mode 100644
-index 6178556..0000000
---- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
-+++ /dev/null
-@@ -1 +0,0 @@
--4b41b53a3a2d299ce381a69d165381ca19f62912
-\ No newline at end of file
-diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
-new file mode 100644
-index 0000000..fad46c4
---- /dev/null
-+++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
-@@ -0,0 +1 @@
-+1ec25ce0254749c94549ea9c3cea34bd0488c9c6
-\ No newline at end of file
diff --git a/bigtop-packages/src/common/kibana/do-component-build b/bigtop-packages/src/common/kibana/do-component-build
deleted file mode 100644
index ed46bfd5..00000000
--- a/bigtop-packages/src/common/kibana/do-component-build
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -ex
-
-. `dirname ${0}`/bigtop.bom
-
-# Install the specific version of nodejs defined in Kibana
-git config --global url."https://".insteadOf git://
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-
-nvm install $(cat .node-version)
-npm install
-npm rebuild node-sass
-npm run build -- --skip-os-packages --release
diff --git a/bigtop-packages/src/common/kibana/install_kibana.sh b/bigtop-packages/src/common/kibana/install_kibana.sh
deleted file mode 100644
index 72c56704..00000000
--- a/bigtop-packages/src/common/kibana/install_kibana.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --distro-dir=DIR path to distro specific files (debian/RPM)
- --build-dir=DIR path to dist dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/elasticsearch]
- --lib-dir=DIR path to install bits [/usr/lib/elasticsearch]
- --installed-lib-dir=DIR path where lib-dir will end up on target system
- --bin-dir=DIR path to install bins [/usr/bin]
- --examples-dir=DIR path to install examples [doc-dir/examples]
- ... [ see source for more similar options ]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'distro-dir:' \
- -l 'doc-dir:' \
- -l 'lib-dir:' \
- -l 'installed-lib-dir:' \
- -l 'bin-dir:' \
- -l 'initd-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --distro-dir)
- DISTRO_DIR=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --)
- shift; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR DISTRO_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-done
-
-MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-DOC_DIR=${DOC_DIR:-/usr/share/doc/kibana}
-LIB_DIR=${LIB_DIR:-/usr/lib/kibana}
-BIN_DIR=${BIN_DIR:-/usr/bin}
-ETC_DIR=${ETC_DIR:-/etc/kibana}
-CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
-INITD_DIR=${INITD_DIR:-/etc/init.d}
-
-VAR_DIR=$PREFIX/var
-
-install -d -m 0755 $PREFIX/$MAN_DIR
-install -d -m 0755 $PREFIX/$DOC_DIR
-install -d -m 0755 $PREFIX/$LIB_DIR
-install -d -m 0755 $PREFIX/$ETC_DIR
-install -d -m 0755 $PREFIX/$CONF_DIR
-install -d -m 0755 $PREFIX/$BIN_DIR
-
-# Copy to LIB_DIR
-ARCH=$(uname -m)
-if [ "${ARCH}" = "x86_64" ];then
- cp -ar $BUILD_DIR/kibana-*-linux-x86_64/* $PREFIX/$LIB_DIR/
-fi
-if [ "${ARCH}" = "aarch64" ];then
- cp -ar $BUILD_DIR/kibana-*-linux-arm64/* $PREFIX/$LIB_DIR/
-fi
-if [ "${ARCH}" = "ppc64le" ];then
- cp -ar $BUILD_DIR/kibana-*-linux-ppc64*/* $PREFIX/$LIB_DIR/
-fi
-
-
-chmod 755 $PREFIX/$LIB_DIR/* -R
-
-# Copy configuration files
-cp -a $PREFIX/$LIB_DIR/config/* $PREFIX/$CONF_DIR
-ln -s $ETC_DIR/conf $PREFIX/$CONF_DIR
-
-install -d -m 0755 $VAR_DIR/log/kibana
-install -d -m 0755 $VAR_DIR/run/kibana
-install -d -m 0755 $VAR_DIR/lib/kibana
diff --git a/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff b/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff
deleted file mode 100644
index 54c5fd18..00000000
--- a/bigtop-packages/src/common/kibana/patch0-kibana-platform.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kibana-5.4.1/tasks/config/platforms.js 2017-05-27 12:53:15.000000000 +0000
-+++ kibana-5.4.1/tasks/config/platforms.js 2021-07-14 21:37:50.423345645 +0000
-@@ -12,6 +12,8 @@
- 'darwin-x64',
- 'linux-x64',
- 'linux-x86',
-+ 'linux-arm64',
-+ 'linux-ppc64le',
- 'windows-x86'
- ].map(function (baseName) {
- const win = baseName === 'windows-x86';
-@@ -42,10 +44,14 @@
- let rpmArch;
- if (name.match('linux')) {
- debArch = name.match('x86_64') ? 'amd64' : 'i386';
-+ debArch = name.match('arm64') ? 'arm64' : debArch;
-+ debArch = name.match('ppc64le') ? 'ppc64le' : debArch;
- debName = `kibana-${version}-${debArch}.deb`;
- debPath = resolve(rootPath, `target/${debName}`);
-
- rpmArch = name.match('x86_64') ? 'x86_64' : 'i686';
-+ rpmArch = name.match('arm64') ? 'arm64' : rpmArch;
-+ rpmArch = name.match('ppc64le') ? 'ppc64le' : rpmArch;
- rpmName = `kibana-${version}-${rpmArch}.rpm`;
- rpmPath = resolve(rootPath, `target/${rpmName}`);
- }
diff --git a/bigtop-packages/src/common/kibana/patch1-kibana-git-init.diff b/bigtop-packages/src/common/kibana/patch1-kibana-git-init.diff
deleted file mode 100644
index 37db400c..00000000
--- a/bigtop-packages/src/common/kibana/patch1-kibana-git-init.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tasks/config/build.js b/tasks/config/build.js
-index 5005717095..83075d85d8 100644
---- a/tasks/config/build.js
-+++ b/tasks/config/build.js
-@@ -4,16 +4,9 @@ const platform = require('os').platform();
- export default (grunt) => {
- const pkgVersion = grunt.config.get('pkg.version');
-
-- const sha = String(exec('git rev-parse HEAD')).trim();
-+ const sha = "725943bf9e3ca6f5e7d286ded25b0207fc68caaa";
- const version = buildVersion(grunt.option('release'), pkgVersion);
-- let number;
--
-- if (/^win/.test(platform)) {
-- // Windows does not have the wc process and `find /C /V ""` does not consistently work
-- number = String(exec('git log --format="%h"')).split('\n').length;
-- } else {
-- number = parseFloat(String(exec('git log --format="%h" | wc -l')).trim());
-- }
-+ let number = 15104;
-
- return { sha, number, version };
- };
diff --git a/bigtop-packages/src/common/kibana/patch2-remove-husky.diff b/bigtop-packages/src/common/kibana/patch2-remove-husky.diff
deleted file mode 100644
index bc538f2d..00000000
--- a/bigtop-packages/src/common/kibana/patch2-remove-husky.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/package.json b/package.json
-index 045675a2115..41910145543 100644
---- a/package.json
-+++ b/package.json
-@@ -238,7 +238,6 @@
- "history": "2.1.1",
- "html": "1.0.0",
- "html-loader": "0.4.3",
-- "husky": "0.8.1",
- "image-diff": "1.6.0",
- "istanbul-instrumenter-loader": "0.1.3",
- "jest": "19.0.0",
diff --git a/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff b/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff
deleted file mode 100644
index aec4dec5..00000000
--- a/bigtop-packages/src/common/kibana/patch4-kibana-os-platform.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kibana-5.4.1/tasks/build/os_packages.js 2017-05-27 12:53:15.000000000 +0000
-+++ kibana-5.4.1/tasks/build/os_packages.js 2021-07-14 21:37:50.423345645 +0000
-@@ -14,7 +14,7 @@
- grunt.file.mkdir(targetDir);
-
- config.get('platforms')
-- .filter(({ name }) => /linux-x86(_64)?$/.test(name))
-+ .filter(({ name }) => /linux-(x86|x86_64|arm64|ppc64le)?$/.test(name))
- .forEach(({ buildDir, debArch, rpmArch }) => {
- const baseOptions = [
- '--force',
diff --git a/bigtop-packages/src/common/logstash/do-component-build b/bigtop-packages/src/common/logstash/do-component-build
deleted file mode 100644
index 28384f92..00000000
--- a/bigtop-packages/src/common/logstash/do-component-build
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -ex
-
-. `dirname $0`/bigtop.bom
-
-export RELEASE=1
-export LANG="en_US.UTF-8"
-
-if [ -f /etc/os-release ]; then
- . /etc/os-release
-fi
-
-# IPv6 issues in docker containers:
-# https://rvm.io/rvm/security#ipv6-issues
-case ${ID}-${VERSION_ID} in
- ubuntu-18*)
- gpg2 --list-keys
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
- ;;
-esac
-
-# Install ruby-2.4.0 to build Logstash
-curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import -
-curl -sSL https://get.rvm.io | bash -s stable
-if ((UID == 0))
-then
- [ -s /usr/local/rvm/scripts/rvm ] && source /usr/local/rvm/scripts/rvm
-else
- [ -s $HOME/.rvm/scripts/rvm ] && source $HOME/.rvm/scripts/rvm
-fi
-
-# BIGTOP-3394
-# Disable unnecessary autolibs installation
-# for rvm fail to "try_sudo" to install autolibs
-# dependencies under user:'jenkins'
-rvm autolibs disable
-rvm install ruby-2.4.0 && rvm use 2.4.0
-
-# Specify childprocess to 3.0.0. The latest release 4.0.0 is not compatible with 5.4.1.
-sed -i "s/^.*childprocess.*$/gem \"childprocess\"\, \"3\.0\.0\"/" Gemfile
-
-rake bootstrap
-rake plugin:install-default
-rake artifact:tar
-
-# Remove ruby-2.4.0 to make build-environment consistent
-rvm remove ruby-2.4.0
diff --git a/bigtop-packages/src/common/logstash/install_logstash.sh b/bigtop-packages/src/common/logstash/install_logstash.sh
deleted file mode 100644
index f1f5bd49..00000000
--- a/bigtop-packages/src/common/logstash/install_logstash.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --distro-dir=DIR path to distro specific files (debian/RPM)
- --build-dir=DIR path to dist dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/elasticsearch]
- --lib-dir=DIR path to install bits [/usr/lib/elasticsearch]
- --installed-lib-dir=DIR path where lib-dir will end up on target system
- --bin-dir=DIR path to install bins [/usr/bin]
- --examples-dir=DIR path to install examples [doc-dir/examples]
- ... [ see source for more similar options ]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'distro-dir:' \
- -l 'doc-dir:' \
- -l 'lib-dir:' \
- -l 'installed-lib-dir:' \
- -l 'bin-dir:' \
- -l 'initd-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --distro-dir)
- DISTRO_DIR=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --installed-lib-dir)
- INSTALLED_LIB_DIR=$2 ; shift 2
- ;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --initd-dir)
- INITD_DIR=$2 ; shift 2
- ;;
- --)
- shift; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR DISTRO_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-done
-
-MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-DOC_DIR=${DOC_DIR:-/usr/share/doc/logstash}
-LIB_DIR=${LIB_DIR:-/usr/lib/logstash}
-ETC_DIR=${ETC_DIR:-/etc/logstash}
-CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
-
-VAR_DIR=$PREFIX/var
-
-install -d -m 0755 $PREFIX/$MAN_DIR
-install -d -m 0755 $PREFIX/$DOC_DIR
-install -d -m 0755 $PREFIX/$LIB_DIR
-install -d -m 0755 $PREFIX/$LIB_DIR/bin
-install -d -m 0755 $PREFIX/$ETC_DIR
-install -d -m 0755 $PREFIX/$CONF_DIR
-
-# Extract files and copy to LIB_DIR
-tar zxf $BUILD_DIR/logstash-*.tar.gz -C $BUILD_DIR
-
-cp -a $BUILD_DIR/logstash-*/bin/* $PREFIX/$LIB_DIR/bin
-cp -ar $BUILD_DIR/logstash-*/lib $PREFIX/$LIB_DIR
-cp -ar $BUILD_DIR/logstash-*/data $PREFIX/$LIB_DIR
-cp -ar $BUILD_DIR/logstash-*/logstash-core $PREFIX/$LIB_DIR
-cp -ar $BUILD_DIR/logstash-*/logstash-core-plugin-api $PREFIX/$LIB_DIR
-cp -ar $BUILD_DIR/logstash-*/vendor $PREFIX/$LIB_DIR
-
-cp $BUILD_DIR/logstash-*/Gemfile* $PREFIX/$LIB_DIR
-chmod 755 $PREFIX/$LIB_DIR/* -R
-
-# Copy configuration files
-cp -a $BUILD_DIR/logstash-*/config/* $PREFIX/$CONF_DIR
-cp ${DISTRO_DIR}/log4j2.properties $PREFIX/$CONF_DIR
-ln -s $ETC_DIR/conf $PREFIX/$CONF_DIR
-
-install -d -m 0755 $VAR_DIR/log/logstash
-install -d -m 0755 $VAR_DIR/run/logstash
-install -d -m 0755 $VAR_DIR/lib/logstash
diff --git a/bigtop-packages/src/common/logstash/log4j2.properties b/bigtop-packages/src/common/logstash/log4j2.properties
deleted file mode 100644
index 8fff3a85..00000000
--- a/bigtop-packages/src/common/logstash/log4j2.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-status = error
-name = LogstashPropertiesConfig
-
-appender.console.type = Console
-appender.console.name = plain_console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
-
-appender.json_console.type = Console
-appender.json_console.name = json_console
-appender.json_console.layout.type = JSONLayout
-appender.json_console.layout.compact = true
-appender.json_console.layout.eventEol = true
-
-rootLogger.level = ${sys:ls.log.level}
-rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
diff --git a/bigtop-packages/src/common/logstash/logstash.default b/bigtop-packages/src/common/logstash/logstash.default
deleted file mode 100644
index a930fdf8..00000000
--- a/bigtop-packages/src/common/logstash/logstash.default
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-export LOGSTASH_HOME="/usr/lib/logstash"
-export LOGSTASH_CONF_DIR="/etc/logstash/conf"
-export LOGSTASH_DATA_DIR="/usr/lib/logstash/data"
diff --git a/bigtop-packages/src/common/logstash/patch0-logstash-for-arm64.diff b/bigtop-packages/src/common/logstash/patch0-logstash-for-arm64.diff
deleted file mode 100644
index 212ae9ab..00000000
--- a/bigtop-packages/src/common/logstash/patch0-logstash-for-arm64.diff
+++ /dev/null
@@ -1,2394 +0,0 @@
-diff -ruaN logstash-5.4.1/bin/bundle linaro-logstash-5.4.1/bin/bundle
---- logstash-5.4.1/bin/bundle 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/bin/bundle 2020-03-02 11:03:48.740336076 +0800
-@@ -10,7 +10,8 @@
-
- require_relative "../lib/bootstrap/environment"
- ::Gem.clear_paths
--::Gem.paths = ENV['GEM_HOME'] = ENV['GEM_PATH'] = LogStash::Environment.logstash_gem_home
-+ENV['GEM_HOME'] = ENV['GEM_PATH'] = LogStash::Environment.logstash_gem_home
-+::Gem.paths = ENV
-
- ENV["BUNDLE_GEMFILE"] = LogStash::Environment::GEMFILE_PATH
-
-diff -ruaN logstash-5.4.1/Gemfile linaro-logstash-5.4.1/Gemfile
---- logstash-5.4.1/Gemfile 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/Gemfile 2020-03-02 11:03:48.740336076 +0800
-@@ -11,13 +11,13 @@
- gem "ci_reporter_rspec", "1.0.0", :group => :development
- gem "simplecov", :group => :development
- gem "tins", "1.6", :group => :development
--gem "rspec", "~> 3.1.0", :group => :development
-+gem "rspec", "~> 3.5", :group => :development
- gem "logstash-devutils", :group => :development
- gem "benchmark-ips", :group => :development
- gem "octokit", "3.8.0", :group => :build
- gem "stud", "~> 0.0.22", :group => :build
- gem "fpm", "~> 1.3.3", :group => :build
--gem "rubyzip", "~> 1.1.7", :group => :build
-+gem "rubyzip", "~> 1.2.1", :group => :build
- gem "gems", "~> 0.8.3", :group => :build
- gem "rack-test", :require => "rack/test", :group => :development
- gem "flores", "~> 0.0.6", :group => :development
-@@ -117,3 +117,25 @@
- gem "logstash-output-udp"
- gem "logstash-output-webhdfs"
- gem "logstash-filter-dissect"
-+gem "logstash-filter-multiline"
-+gem "logstash-patterns-core", ">= 0"
-+gem "pry", ">= 0"
-+gem "rspec-wait", ">= 0"
-+gem "childprocess", ">= 0"
-+gem "ftw", "~> 0.0.42"
-+gem "rspec-sequencing", ">= 0"
-+gem "gmetric", ">= 0"
-+gem "gelf", "= 1.3.2"
-+gem "timecop", ">= 0"
-+gem "jdbc-derby", ">= 0"
-+gem "jar-dependencies", "~> 0.3.2"
-+gem "addressable", "~> 2.3.0"
-+gem "json", ">= 0"
-+gem "gzip", ">= 0"
-+gem "elasticsearch", ">= 0"
-+gem "sinatra", ">= 0"
-+gem "webrick", ">= 0"
-+gem "poseidon", ">= 0"
-+gem "snappy", ">= 0"
-+gem "webmock", "~> 1.21.0"
-+gem "amazing_print", "= 1.2.1"
-diff -ruaN logstash-5.4.1/Gemfile.jruby-1.9.lock linaro-logstash-5.4.1/Gemfile.jruby-1.9.lock
---- logstash-5.4.1/Gemfile.jruby-1.9.lock 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/Gemfile.jruby-1.9.lock 1970-01-01 08:00:00.000000000 +0800
-@@ -1,731 +0,0 @@
--PATH
-- remote: ./logstash-core
-- specs:
-- logstash-core (5.4.1-java)
-- chronic_duration (= 0.10.6)
-- clamp (~> 0.6.5)
-- concurrent-ruby (= 1.0.0)
-- filesize (= 0.0.4)
-- gems (~> 0.8.3)
-- i18n (= 0.6.9)
-- jar-dependencies
-- jrjackson (~> 0.4.0)
-- jrmonitor (~> 0.4.2)
-- jruby-openssl (= 0.9.16)
-- minitar (~> 0.5.4)
-- pry (~> 0.10.1)
-- puma (~> 2.16)
-- ruby-maven (~> 3.3.9)
-- rubyzip (~> 1.1.7)
-- sinatra (~> 1.4, >= 1.4.6)
-- stud (~> 0.0.19)
-- thread_safe (~> 0.3.5)
-- treetop (< 1.5.0)
--
--PATH
-- remote: ./logstash-core-plugin-api
-- specs:
-- logstash-core-plugin-api (2.1.12-java)
-- logstash-core (= 5.4.1)
--
--GEM
-- remote: https://rubygems.org/
-- specs:
-- addressable (2.3.8)
-- arr-pm (0.0.10)
-- cabin (> 0)
-- atomic (1.1.99-java)
-- avl_tree (1.2.1)
-- atomic (~> 1.1)
-- awesome_print (1.7.0)
-- aws-sdk (2.3.22)
-- aws-sdk-resources (= 2.3.22)
-- aws-sdk-core (2.3.22)
-- jmespath (~> 1.0)
-- aws-sdk-resources (2.3.22)
-- aws-sdk-core (= 2.3.22)
-- aws-sdk-v1 (1.67.0)
-- json (~> 1.4)
-- nokogiri (~> 1)
-- backports (3.8.0)
-- benchmark-ips (2.7.2)
-- bindata (2.4.0)
-- buftok (0.2.0)
-- builder (3.2.3)
-- cabin (0.9.0)
-- childprocess (0.6.3)
-- ffi (~> 1.0, >= 1.0.11)
-- chronic_duration (0.10.6)
-- numerizer (~> 0.1.1)
-- ci_reporter (2.0.0)
-- builder (>= 2.1.2)
-- ci_reporter_rspec (1.0.0)
-- ci_reporter (~> 2.0)
-- rspec (>= 2.14, < 4)
-- cinch (2.3.3)
-- clamp (0.6.5)
-- coderay (1.1.1)
-- concurrent-ruby (1.0.0-java)
-- diff-lcs (1.3)
-- docile (1.1.5)
-- docker-api (1.31.0)
-- excon (>= 0.38.0)
-- json
-- domain_name (0.5.20170404)
-- unf (>= 0.0.5, < 1.0.0)
-- dotenv (2.2.1)
-- edn (1.1.1)
-- elasticsearch (5.0.4)
-- elasticsearch-api (= 5.0.4)
-- elasticsearch-transport (= 5.0.4)
-- elasticsearch-api (5.0.4)
-- multi_json
-- elasticsearch-transport (5.0.4)
-- faraday
-- multi_json
-- equalizer (0.0.10)
-- excon (0.55.0)
-- faraday (0.9.2)
-- multipart-post (>= 1.2, < 3)
-- ffi (1.9.18-java)
-- file-dependencies (0.1.6)
-- minitar
-- filesize (0.0.4)
-- filewatch (0.9.0)
-- fivemat (1.3.3)
-- flores (0.0.7)
-- fpm (1.3.3)
-- arr-pm (~> 0.0.9)
-- backports (>= 2.6.2)
-- cabin (>= 0.6.0)
-- childprocess
-- clamp (~> 0.6)
-- ffi
-- json (>= 1.7.7)
-- gelfd (0.2.0)
-- gem_publisher (1.5.0)
-- gems (0.8.3)
-- hitimes (1.2.4-java)
-- http (0.9.9)
-- addressable (~> 2.3)
-- http-cookie (~> 1.0)
-- http-form_data (~> 1.0.1)
-- http_parser.rb (~> 0.6.0)
-- http-cookie (1.0.3)
-- domain_name (~> 0.5)
-- http-form_data (1.0.1)
-- http_parser.rb (0.6.0-java)
-- i18n (0.6.9)
-- insist (1.0.0)
-- jar-dependencies (0.3.11)
-- jls-grok (0.11.4)
-- cabin (>= 0.6.0)
-- jls-lumberjack (0.0.26)
-- concurrent-ruby
-- jmespath (1.3.1)
-- jrjackson (0.4.2-java)
-- jrmonitor (0.4.2)
-- jruby-openssl (0.9.16-java)
-- jruby-stdin-channel (0.2.0-java)
-- json (1.8.6-java)
-- kramdown (1.13.2)
-- logstash-codec-cef (4.1.2-java)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-collectd (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-dots (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-edn (3.0.2)
-- edn
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-edn_lines (3.0.2)
-- edn
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-es_bulk (3.0.3)
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-fluent (3.1.1-java)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- msgpack-jruby
-- logstash-codec-graphite (3.0.2)
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-json (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-json_lines (3.0.2)
-- logstash-codec-line (>= 2.1.0)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-line (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-msgpack (3.0.2-java)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- msgpack-jruby
-- logstash-codec-multiline (3.0.3)
-- jls-grok (~> 0.11.1)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-patterns-core
-- logstash-codec-netflow (3.4.0)
-- bindata (>= 1.5.0)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-plain (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-codec-rubydebug (3.0.2)
-- awesome_print
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-devutils (1.3.1-java)
-- fivemat
-- gem_publisher
-- insist (= 1.0.0)
-- kramdown
-- logstash-core-plugin-api (>= 2.0, <= 2.99)
-- minitar
-- rake
-- rspec (~> 3.0)
-- rspec-wait
-- stud (>= 0.0.20)
-- logstash-filter-clone (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-csv (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-date (3.1.5)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-dissect (1.0.8)
-- jar-dependencies
-- logstash-core-plugin-api (>= 2.1.1, <= 2.99)
-- logstash-filter-dns (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- lru_redux (~> 1.1.0)
-- logstash-filter-drop (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-fingerprint (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- murmurhash3
-- logstash-filter-geoip (4.0.4-java)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-grok (3.4.0)
-- jls-grok (~> 0.11.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-patterns-core
-- logstash-filter-json (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-kv (4.0.0)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-metrics (4.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- metriks
-- thread_safe
-- logstash-filter-mutate (3.1.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-ruby (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-date
-- logstash-filter-sleep (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-split (3.1.1)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-syslog_pri (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-throttle (4.0.1)
-- atomic
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- thread_safe
-- logstash-filter-urldecode (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-useragent (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- lru_redux (~> 1.1.0)
-- user_agent_parser (>= 2.0.0)
-- logstash-filter-uuid (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-xml (4.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- nokogiri
-- xml-simple
-- logstash-input-beats (3.1.15-java)
-- concurrent-ruby (>= 0.9.2, <= 1.0.0)
-- jar-dependencies (~> 0.3.4)
-- logstash-codec-multiline (>= 2.0.5)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- thread_safe (~> 0.3.5)
-- logstash-input-couchdb_changes (3.1.1)
-- json
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (>= 0.0.22)
-- logstash-input-elasticsearch (4.0.3)
-- elasticsearch (>= 5.0.3, < 6.0.0)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-exec (3.1.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-file (4.0.0)
-- addressable
-- filewatch (~> 0.8, >= 0.8.1)
-- logstash-codec-multiline (~> 3.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-ganglia (3.1.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-gelf (3.0.2)
-- gelfd (= 0.2.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-generator (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-graphite (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-tcp
-- logstash-input-heartbeat (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud
-- logstash-input-http (3.0.4)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- puma (~> 2.16, >= 2.16.0)
-- rack (~> 1)
-- stud
-- logstash-input-http_poller (3.1.1)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-http_client (>= 2.2.4, < 5.0.0)
-- rufus-scheduler (~> 3.0.9)
-- stud (~> 0.0.22)
-- logstash-input-imap (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- mail (~> 2.6.3)
-- mime-types (= 2.6.2)
-- stud (~> 0.0.22)
-- logstash-input-irc (3.0.2)
-- cinch
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-jdbc (4.2.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- rufus-scheduler
-- sequel
-- tzinfo
-- tzinfo-data
-- logstash-input-kafka (5.1.7)
-- logstash-codec-json
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (>= 0.0.22, < 0.1.0)
-- logstash-input-log4j (3.0.5-java)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-lumberjack (3.1.1)
-- concurrent-ruby
-- jls-lumberjack (~> 0.0.26)
-- logstash-codec-multiline (~> 3.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-pipe (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-rabbitmq (5.2.3)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-rabbitmq_connection (>= 4.2.2, < 5.0.0)
-- logstash-input-redis (3.1.2)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- redis
-- logstash-input-s3 (3.1.4)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws
-- stud (~> 0.0.18)
-- logstash-input-snmptrap (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- snmp
-- logstash-input-sqs (3.0.3)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws (>= 1.0.0)
-- logstash-input-stdin (3.2.2)
-- concurrent-ruby
-- jruby-stdin-channel
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-syslog (3.2.0)
-- concurrent-ruby
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-date
-- logstash-filter-grok
-- stud (>= 0.0.22, < 0.1.0)
-- thread_safe
-- logstash-input-tcp (4.1.0)
-- logstash-codec-json
-- logstash-codec-json_lines
-- logstash-codec-line
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-twitter (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (>= 0.0.22, < 0.1)
-- twitter (= 5.15.0)
-- logstash-input-udp (3.1.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud (~> 0.0.22)
-- logstash-input-unix (3.0.3)
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-xmpp (3.1.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- xmpp4r (= 0.5)
-- logstash-mixin-aws (4.2.1)
-- aws-sdk (~> 2.3.0)
-- aws-sdk-v1 (>= 1.61.0)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-http_client (4.0.3)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- manticore (>= 0.5.2, < 1.0.0)
-- logstash-mixin-rabbitmq_connection (4.3.0-java)
-- march_hare (~> 3.0.0)
-- stud (~> 0.0.22)
-- logstash-output-cloudwatch (3.0.4)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws (>= 1.0.0)
-- rufus-scheduler (~> 3.0.9)
-- logstash-output-csv (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-filter-json
-- logstash-input-generator
-- logstash-output-file
-- logstash-output-elasticsearch (7.3.1-java)
-- cabin (~> 0.6)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- manticore (>= 0.5.4, < 1.0.0)
-- stud (~> 0.0, >= 0.0.17)
-- logstash-output-file (4.0.1)
-- logstash-codec-json_lines
-- logstash-codec-line
-- logstash-core-plugin-api (>= 2.0.0, < 2.99)
-- logstash-output-graphite (3.1.1)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-http (4.2.0)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-http_client (>= 2.2.1, < 5.0.0)
-- logstash-output-irc (3.0.2)
-- cinch
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-kafka (5.1.6)
-- logstash-codec-json
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-nagios (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-null (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-pagerduty (3.0.3)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-pipe (3.0.2)
-- logstash-codec-plain
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-rabbitmq (4.0.7-java)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-rabbitmq_connection (>= 4.3.0, < 5.0.0)
-- logstash-output-redis (3.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- redis
-- stud
-- logstash-output-s3 (4.0.7)
-- concurrent-ruby
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws
-- stud (~> 0.0.22)
-- logstash-output-sns (4.0.3)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws (>= 1.0.0)
-- logstash-output-sqs (4.0.1)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-mixin-aws (>= 1.0.0)
-- logstash-output-statsd (3.1.1)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-input-generator
-- statsd-ruby (= 1.2.0)
-- logstash-output-stdout (3.1.0)
-- logstash-codec-line
-- logstash-core-plugin-api (>= 1.60.1, < 2.99)
-- logstash-output-tcp (4.0.0)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- stud
-- logstash-output-udp (3.0.2)
-- logstash-codec-json
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- logstash-output-webhdfs (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- snappy (= 0.0.12)
-- webhdfs
-- logstash-output-xmpp (3.0.2)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- xmpp4r (= 0.5)
-- logstash-patterns-core (4.1.0)
-- logstash-core-plugin-api (>= 1.60, <= 2.99)
-- lru_redux (1.1.0)
-- mail (2.6.5)
-- mime-types (>= 1.16, < 4)
-- manticore (0.6.1-java)
-- march_hare (3.0.0-java)
-- memoizable (0.4.2)
-- thread_safe (~> 0.3, >= 0.3.1)
-- method_source (0.8.2)
-- metriks (0.9.9.8)
-- atomic (~> 1.0)
-- avl_tree (~> 1.2.0)
-- hitimes (~> 1.1)
-- mime-types (2.6.2)
-- minitar (0.5.4)
-- msgpack-jruby (1.4.1-java)
-- multi_json (1.12.1)
-- multipart-post (2.0.0)
-- murmurhash3 (0.1.6-java)
-- mustache (0.99.8)
-- naught (1.1.0)
-- netrc (0.11.0)
-- nokogiri (1.7.1-java)
-- numerizer (0.1.1)
-- octokit (3.8.0)
-- sawyer (~> 0.6.0, >= 0.5.3)
-- paquet (0.2.1)
-- pleaserun (0.0.29)
-- cabin (> 0)
-- clamp
-- dotenv
-- insist
-- mustache (= 0.99.8)
-- stud
-- polyglot (0.3.5)
-- pry (0.10.4-java)
-- coderay (~> 1.1.0)
-- method_source (~> 0.8.1)
-- slop (~> 3.4)
-- spoon (~> 0.0)
-- puma (2.16.0-java)
-- rack (1.6.5)
-- rack-protection (1.5.3)
-- rack
-- rack-test (0.6.3)
-- rack (>= 1.0)
-- rake (12.0.0)
-- redis (3.3.3)
-- rest-client (1.8.0)
-- http-cookie (>= 1.0.2, < 2.0)
-- mime-types (>= 1.16, < 3.0)
-- netrc (~> 0.7)
-- rspec (3.1.0)
-- rspec-core (~> 3.1.0)
-- rspec-expectations (~> 3.1.0)
-- rspec-mocks (~> 3.1.0)
-- rspec-core (3.1.7)
-- rspec-support (~> 3.1.0)
-- rspec-expectations (3.1.2)
-- diff-lcs (>= 1.2.0, < 2.0)
-- rspec-support (~> 3.1.0)
-- rspec-mocks (3.1.3)
-- rspec-support (~> 3.1.0)
-- rspec-support (3.1.2)
-- rspec-wait (0.0.9)
-- rspec (>= 3, < 4)
-- ruby-maven (3.3.12)
-- ruby-maven-libs (~> 3.3.9)
-- ruby-maven-libs (3.3.9)
-- ruby-progressbar (1.8.1)
-- rubyzip (1.1.7)
-- rufus-scheduler (3.0.9)
-- tzinfo
-- sawyer (0.6.0)
-- addressable (~> 2.3.5)
-- faraday (~> 0.8, < 0.10)
-- sequel (4.46.0)
-- simple_oauth (0.3.1)
-- simplecov (0.14.1)
-- docile (~> 1.1.0)
-- json (>= 1.8, < 3)
-- simplecov-html (~> 0.10.0)
-- simplecov-html (0.10.0)
-- sinatra (1.4.8)
-- rack (~> 1.5)
-- rack-protection (~> 1.4)
-- tilt (>= 1.3, < 3)
-- slop (3.6.0)
-- snappy (0.0.12-java)
-- snappy-jars (~> 1.1.0)
-- snappy-jars (1.1.0.1.2-java)
-- snmp (1.2.0)
-- spoon (0.0.6)
-- ffi
-- statsd-ruby (1.2.0)
-- stud (0.0.22)
-- term-ansicolor (1.3.2)
-- tins (~> 1.0)
-- thread_safe (0.3.6-java)
-- tilt (2.0.7)
-- tins (1.6.0)
-- treetop (1.4.15)
-- polyglot
-- polyglot (>= 0.3.1)
-- twitter (5.15.0)
-- addressable (~> 2.3)
-- buftok (~> 0.2.0)
-- equalizer (= 0.0.10)
-- faraday (~> 0.9.0)
-- http (>= 0.4, < 0.10)
-- http_parser.rb (~> 0.6.0)
-- json (~> 1.8)
-- memoizable (~> 0.4.0)
-- naught (~> 1.0)
-- simple_oauth (~> 0.3.0)
-- tzinfo (1.2.3)
-- thread_safe (~> 0.1)
-- tzinfo-data (1.2017.2)
-- tzinfo (>= 1.0.0)
-- unf (0.1.4-java)
-- user_agent_parser (2.3.0)
-- webhdfs (0.8.0)
-- addressable
-- xml-simple (1.1.5)
-- xmpp4r (0.5)
--
--PLATFORMS
-- java
--
--DEPENDENCIES
-- benchmark-ips
-- builder (~> 3.2.2)
-- ci_reporter_rspec (= 1.0.0)
-- docker-api (= 1.31.0)
-- file-dependencies (= 0.1.6)
-- flores (~> 0.0.6)
-- fpm (~> 1.3.3)
-- gems (~> 0.8.3)
-- logstash-codec-cef
-- logstash-codec-collectd
-- logstash-codec-dots
-- logstash-codec-edn
-- logstash-codec-edn_lines
-- logstash-codec-es_bulk
-- logstash-codec-fluent
-- logstash-codec-graphite
-- logstash-codec-json
-- logstash-codec-json_lines
-- logstash-codec-line
-- logstash-codec-msgpack
-- logstash-codec-multiline
-- logstash-codec-netflow
-- logstash-codec-plain
-- logstash-codec-rubydebug
-- logstash-core!
-- logstash-core-plugin-api!
-- logstash-devutils
-- logstash-filter-clone
-- logstash-filter-csv
-- logstash-filter-date
-- logstash-filter-dissect
-- logstash-filter-dns
-- logstash-filter-drop
-- logstash-filter-fingerprint
-- logstash-filter-geoip
-- logstash-filter-grok
-- logstash-filter-json
-- logstash-filter-kv
-- logstash-filter-metrics
-- logstash-filter-mutate
-- logstash-filter-ruby
-- logstash-filter-sleep
-- logstash-filter-split
-- logstash-filter-syslog_pri
-- logstash-filter-throttle
-- logstash-filter-urldecode
-- logstash-filter-useragent
-- logstash-filter-uuid
-- logstash-filter-xml
-- logstash-input-beats
-- logstash-input-couchdb_changes
-- logstash-input-elasticsearch
-- logstash-input-exec
-- logstash-input-file
-- logstash-input-ganglia
-- logstash-input-gelf
-- logstash-input-generator
-- logstash-input-graphite
-- logstash-input-heartbeat
-- logstash-input-http
-- logstash-input-http_poller
-- logstash-input-imap
-- logstash-input-irc
-- logstash-input-jdbc
-- logstash-input-kafka (~> 5)
-- logstash-input-log4j
-- logstash-input-lumberjack
-- logstash-input-pipe
-- logstash-input-rabbitmq
-- logstash-input-redis
-- logstash-input-s3
-- logstash-input-snmptrap
-- logstash-input-sqs
-- logstash-input-stdin
-- logstash-input-syslog
-- logstash-input-tcp
-- logstash-input-twitter
-- logstash-input-udp
-- logstash-input-unix
-- logstash-input-xmpp
-- logstash-output-cloudwatch
-- logstash-output-csv
-- logstash-output-elasticsearch
-- logstash-output-file
-- logstash-output-graphite
-- logstash-output-http
-- logstash-output-irc
-- logstash-output-kafka (~> 5)
-- logstash-output-nagios
-- logstash-output-null
-- logstash-output-pagerduty
-- logstash-output-pipe
-- logstash-output-rabbitmq
-- logstash-output-redis
-- logstash-output-s3
-- logstash-output-sns
-- logstash-output-sqs
-- logstash-output-statsd
-- logstash-output-stdout
-- logstash-output-tcp
-- logstash-output-udp
-- logstash-output-webhdfs
-- logstash-output-xmpp
-- octokit (= 3.8.0)
-- paquet (~> 0.2.0)
-- pleaserun (~> 0.0.28)
-- rack-test
-- rest-client (= 1.8.0)
-- rspec (~> 3.1.0)
-- ruby-progressbar (~> 1.8.1)
-- rubyzip (~> 1.1.7)
-- simplecov
-- stud (~> 0.0.22)
-- term-ansicolor (~> 1.3.2)
-- tins (= 1.6)
-diff -ruaN logstash-5.4.1/.gitignore linaro-logstash-5.4.1/.gitignore
---- logstash-5.4.1/.gitignore 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/.gitignore 2020-03-02 11:03:48.736336108 +0800
-@@ -33,6 +33,7 @@
- qa/.vagrant
- qa/acceptance/.vagrant
- qa/Gemfile.lock
-+Gemfile.jruby-2.3.lock
- *.ipr
- *.iws
- *.iml
-diff -ruaN logstash-5.4.1/lib/bootstrap/bundler.rb linaro-logstash-5.4.1/lib/bootstrap/bundler.rb
---- logstash-5.4.1/lib/bootstrap/bundler.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/bootstrap/bundler.rb 2020-03-02 11:03:48.760335911 +0800
-@@ -46,7 +46,8 @@
- # make sure we use our own installed bundler
- LogStash::Rubygems.patch!
- ::Gem.clear_paths
-- ::Gem.paths = ENV['GEM_HOME'] = ENV['GEM_PATH'] = Environment.logstash_gem_home
-+ ENV['GEM_HOME'] = ENV['GEM_PATH'] = Environment.logstash_gem_home
-+ ::Gem.paths = ENV
-
- # set BUNDLE_GEMFILE ENV before requiring bundler to avoid bundler recurse and load unrelated Gemfile(s)
- ENV["BUNDLE_GEMFILE"] = Environment::GEMFILE_PATH
-@@ -86,7 +87,8 @@
- # require "logstash/patches/rubygems" # patch rubygems before clear_paths
- LogStash::Rubygems.patch!
- ::Gem.clear_paths
-- ::Gem.paths = ENV['GEM_HOME'] = ENV['GEM_PATH'] = LogStash::Environment.logstash_gem_home
-+ ENV['GEM_HOME'] = ENV['GEM_PATH'] = LogStash::Environment.logstash_gem_home
-+ ::Gem.paths = ENV
-
- # set BUNDLE_GEMFILE ENV before requiring bundler to avoid bundler recurse and load unrelated Gemfile(s).
- # in the context of calling Bundler::CLI this is not really required since Bundler::CLI will look at
-@@ -95,6 +97,12 @@
-
- require "bundler"
- require "bundler/cli"
-+
-+ lock_template = ::File.join(ENV["LOGSTASH_HOME"], "Gemfile.jruby-2.3.lock.release")
-+ if ::File.exists?(lock_template) && !::File.exists?(Environment::LOCKFILE)
-+ FileUtils.copy(lock_template, Environment::LOCKFILE)
-+ end
-+
- LogStash::Bundler.patch!
-
- # force Rubygems sources to our Gemfile sources
-diff -ruaN logstash-5.4.1/lib/bootstrap/environment.rb linaro-logstash-5.4.1/lib/bootstrap/environment.rb
---- logstash-5.4.1/lib/bootstrap/environment.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/bootstrap/environment.rb 2020-03-02 11:03:48.760335911 +0800
-@@ -18,7 +18,7 @@
- GEMFILE_PATH = ::File.join(LOGSTASH_HOME, "Gemfile")
- LOCAL_GEM_PATH = ::File.join(LOGSTASH_HOME, 'vendor', 'local_gems')
- CACHE_PATH = ::File.join(LOGSTASH_HOME, "vendor", "cache")
-- LOCKFILE = Pathname.new(::File.join(LOGSTASH_HOME, "Gemfile.jruby-1.9.lock"))
-+ LOCKFILE = Pathname.new(::File.join(LOGSTASH_HOME, "Gemfile.jruby-2.3.lock"))
- GEMFILE = Pathname.new(::File.join(LOGSTASH_HOME, "Gemfile"))
-
- # @return [String] the ruby version string bundler uses to craft its gem path
-diff -ruaN logstash-5.4.1/lib/pluginmanager/bundler/logstash_injector.rb linaro-logstash-5.4.1/lib/pluginmanager/bundler/logstash_injector.rb
---- logstash-5.4.1/lib/pluginmanager/bundler/logstash_injector.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/pluginmanager/bundler/logstash_injector.rb 2020-03-02 11:03:48.760335911 +0800
-@@ -7,6 +7,7 @@
- require "bundler/injector"
- require "bundler/shared_helpers"
- require "pluginmanager/gemfile"
-+require "rubygems/specification"
- require "pathname"
-
-
-@@ -23,6 +24,12 @@
- module Bundler
- class LogstashInjector < ::Bundler::Injector
- def self.inject!(new_deps, options = { :gemfile => LogStash::Environment::GEMFILE, :lockfile => LogStash::Environment::LOCKFILE })
-+ # Make sure all the available Specifications
-+ # are loaded before trying to inject any new gems
-+ # If we dont do this, we will have a stale index that wont have the gems
-+ # that we just have installed.
-+ ::Gem::Specification.reset
-+
- gemfile = options.delete(:gemfile)
- lockfile = options.delete(:lockfile)
-
-diff -ruaN logstash-5.4.1/lib/pluginmanager/custom_gem_indexer.rb linaro-logstash-5.4.1/lib/pluginmanager/custom_gem_indexer.rb
---- logstash-5.4.1/lib/pluginmanager/custom_gem_indexer.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/pluginmanager/custom_gem_indexer.rb 1970-01-01 08:00:00.000000000 +0800
-@@ -1,63 +0,0 @@
--# encoding: utf-8
--require "pluginmanager/ui"
--require "stud/temporary"
--
--module LogStash module PluginManager
-- class CustomGemIndexer
-- GEMS_DIR = "gems"
--
-- class << self
-- # Copy the file to a specific format that `Gem::Indexer` can understand
-- # See `#update_in_memory_index`
-- def copy_to_local_source(temporary_directory)
-- local_source = Stud::Temporary.pathname
-- local_source_gems = ::File.join(local_source, GEMS_DIR)
--
-- FileUtils.mkdir_p(local_source_gems)
-- PluginManager.ui.debug("Creating the index structure format from #{temporary_directory} to #{local_source}")
--
-- Dir.glob(::File.join(temporary_directory, "**", "*.gem")).each do |file|
-- destination = ::File.join(local_source_gems, ::File.basename(file))
-- FileUtils.cp(file, destination)
-- end
--
-- local_source
-- end
--
-- # *WARNING*: Bundler need to not be activated at this point because it won't find anything that
-- # is not defined in the gemfile/lock combo
-- #
-- # This takes a folder with a special structure, will generate an index
-- # similar to what rubygems do and make them available in the local program,
-- # we use this **side effect** to validate theses gems with the current gemfile/lock.
-- # Bundler will assume they are system gems and will use them when doing resolution checks.
-- #
-- #.
-- # ├── gems
-- # │ ├── addressable-2.4.0.gem
-- # │ ├── cabin-0.9.0.gem
-- # │ ├── ffi-1.9.14-java.gem
-- # │ ├── gemoji-1.5.0.gem
-- # │ ├── launchy-2.4.3-java.gem
-- # │ ├── logstash-output-elasticsearch-5.2.0-java.gem
-- # │ ├── logstash-output-secret-0.1.0.gem
-- # │ ├── manticore-0.6.0-java.gem
-- # │ ├── spoon-0.0.6.gem
-- # │ └── stud-0.0.22.gem
-- #
-- # Right now this work fine, but I think we could also use Bundler's SourceList classes to handle the same thing
-- def update_in_memory_index!(local_source)
-- PluginManager.ui.debug("Generating indexes in #{local_source}")
-- indexer = ::Gem::Indexer.new(local_source, { :build_modern => true})
-- indexer.ui = ::Gem::SilentUI.new unless ENV["DEBUG"]
-- indexer.generate_index
-- end
--
-- def index(path)
-- local_source = copy_to_local_source(path)
-- update_in_memory_index!(local_source)
-- local_source
-- end
-- end
-- end
--end end
-diff -ruaN logstash-5.4.1/lib/pluginmanager/gem_installer.rb linaro-logstash-5.4.1/lib/pluginmanager/gem_installer.rb
---- logstash-5.4.1/lib/pluginmanager/gem_installer.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/pluginmanager/gem_installer.rb 2020-03-02 11:03:48.760335911 +0800
-@@ -10,7 +10,7 @@
- # - Generate the specifications
- # - Copy the data in the right folders
- class GemInstaller
-- GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "1.9"))
-+ GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "2.3.0"))
- SPECIFICATIONS_DIR = "specifications"
- GEMS_DIR = "gems"
- CACHE_DIR = "cache"
-@@ -28,7 +28,7 @@
- create_destination_folders
- extract_files
- write_specification
-- display_post_install_message
-+ post_install_message
- copy_gem_file_to_cache
- end
-
-@@ -69,8 +69,8 @@
- end
- end
-
-- def display_post_install_message
-- PluginManager.ui.info(spec.post_install_message) if display_post_install_message?
-+ def post_install_message
-+ spec.post_install_message if display_post_install_message?
- end
-
- def display_post_install_message?
-diff -ruaN logstash-5.4.1/lib/pluginmanager/pack_installer/local.rb linaro-logstash-5.4.1/lib/pluginmanager/pack_installer/local.rb
---- logstash-5.4.1/lib/pluginmanager/pack_installer/local.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/lib/pluginmanager/pack_installer/local.rb 2020-03-02 11:03:48.760335911 +0800
-@@ -2,7 +2,6 @@
- require "pluginmanager/ui"
- require "pluginmanager/bundler/logstash_injector"
- require "pluginmanager/gem_installer"
--require "pluginmanager/custom_gem_indexer"
- require "pluginmanager/errors"
- require "pluginmanager/pack_installer/pack"
- require "bootstrap/util/compress"
-@@ -29,24 +28,26 @@
- pack = LogStash::PluginManager::PackInstaller::Pack.new(uncompressed_path)
- raise PluginManager::InvalidPackError, "The pack must contains at least one plugin" unless pack.valid?
-
-- local_source = LogStash::PluginManager::CustomGemIndexer.index(uncompressed_path)
-+ # Install the gems to make them available locally when bundler does his local resolution
-+ post_install_messages = []
-+ pack.gems.each do |packed_gem|
-+ PluginManager.ui.debug("Installing, #{packed_gem.name}, version: #{packed_gem.version} file: #{packed_gem.file}")
-+ post_install_messages << LogStash::PluginManager::GemInstaller::install(packed_gem.file, packed_gem.plugin?)
-+ end
-
- # Try to add the gems to the current gemfile and lock file, if successful
- # both of them will be updated. This injector is similar to Bundler's own injector class
- # minus the support for additionals source and doing local resolution only.
- ::Bundler::LogstashInjector.inject!(pack)
-
-- # When successful its safe to install the gem and their specifications in the bundle directory
-- pack.gems.each do |packed_gem|
-- PluginManager.ui.debug("Installing, #{packed_gem.name}, version: #{packed_gem.version} file: #{packed_gem.file}")
-- LogStash::PluginManager::GemInstaller::install(packed_gem.file, packed_gem.plugin?)
-+ post_install_messages.compact.each do |message|
-+ PluginManager.ui.info(message)
- end
- PluginManager.ui.info("Install successful")
- rescue ::Bundler::BundlerError => e
- raise PluginManager::InstallError.new(e), "An error occurred went installing plugins"
- ensure
- FileUtils.rm_rf(uncompressed_path) if uncompressed_path && Dir.exist?(uncompressed_path)
-- FileUtils.rm_rf(local_source) if local_source && Dir.exist?(local_source)
- end
-
- private
-diff -ruaN logstash-5.4.1/logstash-core/build.gradle linaro-logstash-5.4.1/logstash-core/build.gradle
---- logstash-5.4.1/logstash-core/build.gradle 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/build.gradle 2020-03-02 11:03:48.760335911 +0800
-@@ -120,7 +120,7 @@
- testCompile 'org.apache.logging.log4j:log4j-api:2.6.2:tests'
- testCompile 'junit:junit:4.12'
- testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
-- provided 'org.jruby:jruby-core:1.7.25'
-+ provided 'org.jruby:jruby-core:9.1.9.0'
- }
-
- // See http://www.gradle.org/docs/current/userguide/gradle_wrapper.html
-diff -ruaN logstash-5.4.1/logstash-core/lib/logstash/config/mixin.rb linaro-logstash-5.4.1/logstash-core/lib/logstash/config/mixin.rb
---- logstash-5.4.1/logstash-core/lib/logstash/config/mixin.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/lib/logstash/config/mixin.rb 2020-03-02 11:03:48.764335879 +0800
-@@ -10,7 +10,6 @@
- require "filesize"
-
- LogStash::Environment.load_locale!
--
- # This module is meant as a mixin to classes wishing to be configurable from
- # config files
- #
-@@ -33,13 +32,13 @@
- # }
- #
- module LogStash::Config::Mixin
-+ include LogStash::Util::EnvironmentVariables
- attr_accessor :config
- attr_accessor :original_params
-
- PLUGIN_VERSION_1_0_0 = LogStash::Util::PluginVersion.new(1, 0, 0)
- PLUGIN_VERSION_0_9_0 = LogStash::Util::PluginVersion.new(0, 9, 0)
-
-- ENV_PLACEHOLDER_REGEX = /\$\{(?<name>\w+)(\:(?<default>[^}]*))?\}/
-
- # This method is called when someone does 'include LogStash::Config'
- def self.included(base)
-@@ -47,22 +46,6 @@
- base.extend(LogStash::Config::Mixin::DSL)
- end
-
-- # Recursive method to replace environment variable references in parameters
-- def deep_replace(value)
-- if (value.is_a?(Hash))
-- value.each do |valueHashKey, valueHashValue|
-- value[valueHashKey.to_s] = deep_replace(valueHashValue)
-- end
-- else
-- if (value.is_a?(Array))
-- value.each_index do | valueArrayIndex|
-- value[valueArrayIndex] = deep_replace(value[valueArrayIndex])
-- end
-- else
-- return replace_env_placeholders(value)
-- end
-- end
-- end
-
- def config_init(params)
- # Validation will modify the values inside params if necessary.
-@@ -158,28 +141,10 @@
- @config = params
- end # def config_init
-
-- # Replace all environment variable references in 'value' param by environment variable value and return updated value
-- # Process following patterns : $VAR, ${VAR}, ${VAR:defaultValue}
-- def replace_env_placeholders(value)
-- return value unless value.is_a?(String)
--
-- value.gsub(ENV_PLACEHOLDER_REGEX) do |placeholder|
-- # Note: Ruby docs claim[1] Regexp.last_match is thread-local and scoped to
-- # the call, so this should be thread-safe.
-- #
-- # [1] http://ruby-doc.org/core-2.1.1/Regexp.html#method-c-last_match
-- name = Regexp.last_match(:name)
-- default = Regexp.last_match(:default)
--
-- replacement = ENV.fetch(name, default)
-- if replacement.nil?
-- raise LogStash::ConfigurationError, "Cannot evaluate `#{placeholder}`. Environment variable `#{name}` is not set and there is no default value given."
-- end
-- replacement
-- end
-- end # def replace_env_placeholders
--
- module DSL
-+
-+ include LogStash::Util::EnvironmentVariables
-+
- attr_accessor :flags
-
- # If name is given, set the name and return it.
-@@ -425,6 +390,8 @@
- # (see LogStash::Inputs::File for example)
- result = nil
-
-+ value = deep_replace(value)
-+
- if validator.nil?
- return true, value
- elsif validator.is_a?(Array)
-diff -ruaN logstash-5.4.1/logstash-core/lib/logstash/settings.rb linaro-logstash-5.4.1/logstash-core/lib/logstash/settings.rb
---- logstash-5.4.1/logstash-core/lib/logstash/settings.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/lib/logstash/settings.rb 2020-03-02 11:03:48.768335846 +0800
-@@ -2,10 +2,12 @@
- require "logstash/util/loggable"
- require "fileutils"
- require "logstash/util/byte_value"
-+require "logstash/util/environment_variables"
- require "logstash/util/time_value"
-
- module LogStash
- class Settings
-+ include LogStash::Util::EnvironmentVariables
-
- def initialize
- @settings = {}
-@@ -107,7 +109,10 @@
-
- def from_yaml(yaml_path)
- settings = read_yaml(::File.join(yaml_path, "logstash.yml"))
-- self.merge(flatten_hash(settings), true)
-+ self.merge(
-+ deep_replace(flatten_hash(settings)),
-+ true
-+ )
- self
- end
-
-diff -ruaN logstash-5.4.1/logstash-core/lib/logstash/util/environment_variables.rb linaro-logstash-5.4.1/logstash-core/lib/logstash/util/environment_variables.rb
---- logstash-5.4.1/logstash-core/lib/logstash/util/environment_variables.rb 1970-01-01 08:00:00.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/lib/logstash/util/environment_variables.rb 2020-03-02 11:03:48.768335846 +0800
-@@ -0,0 +1,42 @@
-+# encoding: utf-8
-+module ::LogStash::Util::EnvironmentVariables
-+
-+ ENV_PLACEHOLDER_REGEX = /\${(?<name>[a-zA-Z_.][a-zA-Z0-9_.]*)(:(?<default>[^}]*))?}/
-+
-+ # Recursive method to replace environment variable references in parameters
-+ def deep_replace(value)
-+ if value.is_a?(Hash)
-+ value.each do |valueHashKey, valueHashValue|
-+ value[valueHashKey.to_s] = deep_replace(valueHashValue)
-+ end
-+ else
-+ if value.is_a?(Array)
-+ value.each_index do | valueArrayIndex|
-+ value[valueArrayIndex] = deep_replace(value[valueArrayIndex])
-+ end
-+ else
-+ return replace_env_placeholders(value)
-+ end
-+ end
-+ end
-+ # Replace all environment variable references in 'value' param by environment variable value and return updated value
-+ # Process following patterns : $VAR, ${VAR}, ${VAR:defaultValue}
-+ def replace_env_placeholders(value)
-+ return value unless value.is_a?(String)
-+
-+ value.gsub(ENV_PLACEHOLDER_REGEX) do |placeholder|
-+ # Note: Ruby docs claim[1] Regexp.last_match is thread-local and scoped to
-+ # the call, so this should be thread-safe.
-+ #
-+ # [1] http://ruby-doc.org/core-2.1.1/Regexp.html#method-c-last_match
-+ name = Regexp.last_match(:name)
-+ default = Regexp.last_match(:default)
-+
-+ replacement = ENV.fetch(name, default)
-+ if replacement.nil?
-+ raise LogStash::ConfigurationError, "Cannot evaluate `#{placeholder}`. Environment variable `#{name}` is not set and there is no default value given."
-+ end
-+ replacement
-+ end
-+ end # def replace_env_placeholders
-+end
-diff -ruaN logstash-5.4.1/logstash-core/logstash-core.gemspec linaro-logstash-5.4.1/logstash-core/logstash-core.gemspec
---- logstash-5.4.1/logstash-core/logstash-core.gemspec 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/logstash-core.gemspec 2020-03-02 11:03:48.768335846 +0800
-@@ -27,7 +27,7 @@
- gem.add_runtime_dependency "concurrent-ruby", "1.0.0"
- gem.add_runtime_dependency "sinatra", '~> 1.4', '>= 1.4.6'
- gem.add_runtime_dependency 'puma', '~> 2.16'
-- gem.add_runtime_dependency "jruby-openssl", "0.9.16" # >= 0.9.13 Required to support TLSv1.2
-+ gem.add_runtime_dependency "jruby-openssl", "0.9.20" # >= 0.9.13 Required to support TLSv1.2
- gem.add_runtime_dependency "chronic_duration", "0.10.6"
- gem.add_runtime_dependency "jrmonitor", '~> 0.4.2'
-
-@@ -40,7 +40,7 @@
-
- # filetools and rakelib
- gem.add_runtime_dependency "minitar", "~> 0.5.4"
-- gem.add_runtime_dependency "rubyzip", "~> 1.1.7"
-+ gem.add_runtime_dependency "rubyzip", "~> 1.2.1"
- gem.add_runtime_dependency "thread_safe", "~> 0.3.5" #(Apache 2.0 license)
-
- gem.add_runtime_dependency "jrjackson", "~> 0.4.0" #(Apache 2.0 license)
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/config/mixin_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/config/mixin_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/config/mixin_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/config/mixin_spec.rb 2020-03-02 11:03:48.768335846 +0800
-@@ -369,11 +369,13 @@
- before do
- ENV["FunString"] = "fancy"
- ENV["FunBool"] = "true"
-+ ENV["SERVER_LS_TEST_ADDRESS"] = "some.host.address.tld"
- end
-
- after do
- ENV.delete("FunString")
- ENV.delete("FunBool")
-+ ENV.delete("SERVER_LS_TEST_ADDRESS")
- end
-
- subject do
-@@ -397,6 +399,16 @@
- expect(subject.nestedArray).to(be == { "level1" => [{ "key1" => "http://fancy:8080/blah.txt" }, { "key2" => "http://fancy:8080/foo.txt" }] })
- expect(subject.deepHash).to(be == { "level1" => { "level2" => { "level3" => { "key1" => "http://fancy:8080/blah.txt" } } } })
- end
-+
-+ it "should validate settings after interpolating ENV variables" do
-+ expect {
-+ Class.new(LogStash::Filters::Base) do
-+ include LogStash::Config::Mixin
-+ config_name "test"
-+ config :server_address, :validate => :uri
-+ end.new({"server_address" => "${SERVER_LS_TEST_ADDRESS}"})
-+ }.not_to raise_error
-+ end
- end
-
- context "should support $ in values" do
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/filters/base_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/filters/base_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/filters/base_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/filters/base_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -24,7 +24,7 @@
- end
-
- it "should provide class public API" do
-- [:register, :filter, :multi_filter, :execute, :threadsafe?, :filter_matched, :filter?, :close].each do |method|
-+ [:register, :filter, :multi_filter, :execute, :threadsafe?, :close].each do |method|
- expect(subject).to respond_to(method)
- end
- end
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -6,13 +6,13 @@
- describe LogStash::Timestamp do
-
- it "should parse its own iso8601 output" do
-- t = Time.now
-+ t = DateTime.now.to_time
- ts = LogStash::Timestamp.new(t)
- expect(LogStash::Timestamp.parse_iso8601(ts.to_iso8601).to_i).to eq(t.to_i)
- end
-
- it "should coerce iso8601 string" do
-- t = Time.now
-+ t = DateTime.now.to_time
- ts = LogStash::Timestamp.new(t)
- expect(LogStash::Timestamp.coerce(ts.to_iso8601).to_i).to eq(t.to_i)
- end
-@@ -57,27 +57,27 @@
- end
-
- it "should allow unary operation +" do
-- current = Time.now
-+ current = DateTime.now.to_time
- t = LogStash::Timestamp.new(current) + 10
- expect(t).to eq(current + 10)
- end
-
- describe "subtraction" do
- it "should work on a timestamp object" do
-- t = Time.now
-+ t = DateTime.now.to_time
- current = LogStash::Timestamp.new(t)
- future = LogStash::Timestamp.new(t + 10)
- expect(future - current).to eq(10)
- end
-
- it "should work on with time object" do
-- current = Time.now
-+ current = DateTime.now.to_time
- t = LogStash::Timestamp.new(current + 10)
- expect(t - current).to eq(10)
- end
-
- it "should work with numeric value" do
-- current = Time.now
-+ current = DateTime.now.to_time
- t = LogStash::Timestamp.new(current + 10)
- expect(t - 10).to eq(current)
- end
-@@ -96,15 +96,15 @@
- end
-
- context "numeric casting methods" do
-- let (:now) {Time.now}
-+ let (:now) {DateTime.now.to_time}
- subject { LogStash::Timestamp.new(now) }
-
- it "should support to_i" do
-- expect(subject.to_i).to eq(now.to_i)
-+ expect(subject.to_i).to be_kind_of(Integer)
- end
-
- it "should support to_f" do
-- expect(subject.to_f).to eq(now.to_f)
-+ expect(subject.to_f).to be_kind_of(Float)
- end
- end
-
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/runner_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/runner_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/runner_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/runner_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -8,10 +8,6 @@
- require "logstash/logging/json"
- require "json"
-
--class NullRunner
-- def run(args); end
--end
--
- describe LogStash::Runner do
-
- subject { LogStash::Runner }
-@@ -184,13 +180,13 @@
- let(:queue_override_path) { "/tmp/queue-override_path" }
-
- it "should set data paths" do
-+ LogStash::SETTINGS.set("path.queue", queue_override_path)
-+
- expect(LogStash::Agent).to receive(:new) do |settings|
- expect(settings.get("path.data")).to eq(test_data_path)
- expect(settings.get("path.queue")).to eq(queue_override_path)
- end
-
-- LogStash::SETTINGS.set("path.queue", queue_override_path)
--
- args = ["--path.data", test_data_path, "-e", pipeline_string]
- subject.run("bin/logstash", args)
- end
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/settings/writable_directory_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/settings/writable_directory_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/settings/writable_directory_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/settings/writable_directory_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -18,7 +18,7 @@
- shared_examples "failure" do
- before { subject.set(path) }
- it "should fail" do
-- expect { subject.validate_value }.to raise_error
-+ expect { subject.validate_value }.to raise_error E
- end
- end
-
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/setting_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/setting_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/setting_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/setting_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -80,7 +80,7 @@
- end
- context "when the argument's class does not match @klass" do
- it "should throw an exception" do
-- expect { subject.set("not a number") }.to raise_error
-+ expect { subject.set("not a number") }.to raise_error ArgumentError
- end
- end
- context "when strict=false" do
-@@ -131,7 +131,7 @@
- context "when validation fails" do
- let(:new_value) { "very very very very very big text" }
- it "should raise an exception" do
-- expect { subject.set(new_value) }.to raise_error
-+ expect { subject.set(new_value) }.to raise_error ArgumentError
- end
- it "should not change the value" do
- subject.set(new_value) rescue nil
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/settings_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/settings_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/settings_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/settings_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -1,5 +1,6 @@
- # encoding: utf-8
- require "spec_helper"
-+require "logstash/util/environment_variables"
- require "logstash/settings"
- require "fileutils"
-
-@@ -146,4 +147,94 @@
- end
- end
- end
-+
-+ describe "#from_yaml" do
-+
-+ context "env placeholders in flat logstash.yml" do
-+
-+ after do
-+ ENV.delete('SOME_LOGSTASH_SPEC_ENV_VAR')
-+ ENV.delete('some.logstash.spec.env.var')
-+ end
-+
-+ subject do
-+ settings = described_class.new
-+ settings.register(LogStash::Setting::String.new("interpolated", "missing"))
-+ settings.register(LogStash::Setting::String.new("with_dot", "missing"))
-+ settings
-+ end
-+
-+ let(:values) {{
-+ "interpolated" => "${SOME_LOGSTASH_SPEC_ENV_VAR}",
-+ "with_dot" => "${some.logstash.spec.env.var}"
-+ }}
-+ let(:yaml_path) do
-+ p = Stud::Temporary.pathname
-+ FileUtils.mkdir_p(p)
-+
-+ ::File.open(::File.join(p, "logstash.yml"), "w+") do |f|
-+ f.write(YAML.dump(values))
-+ end
-+ p
-+ end
-+
-+ it "can interpolate environment into settings" do
-+ expect(subject.get('interpolated')).to eq("missing")
-+ expect(subject.get('with_dot')).to eq("missing")
-+ ENV['SOME_LOGSTASH_SPEC_ENV_VAR'] = "correct_setting"
-+ ENV['some.logstash.spec.env.var'] = "correct_setting_for_dotted"
-+ subject.from_yaml(yaml_path)
-+ expect(subject.get('interpolated')).to eq("correct_setting")
-+ expect(subject.get('with_dot')).to eq("correct_setting_for_dotted")
-+ end
-+ end
-+ end
-+
-+ context "env placeholders in nested logstash.yml" do
-+
-+ before do
-+ ENV['lsspecdomain'] = "domain1"
-+ ENV['lsspecdomain2'] = "domain2"
-+ end
-+
-+ after do
-+ ENV.delete('lsspecdomain')
-+ ENV.delete('lsspecdomain2')
-+ end
-+
-+ subject do
-+ settings = described_class.new
-+ settings.register(LogStash::Setting::ArrayCoercible.new("host", String, []))
-+ settings.register(LogStash::Setting::ArrayCoercible.new("modules", Hash, []))
-+ settings
-+ end
-+
-+ let(:values) {{
-+ "host" => ["dev1.${lsspecdomain}", "dev2.${lsspecdomain}"],
-+ "modules" => [
-+ {"name" => "${lsspecdomain}", "testing" => "${lsspecdomain}"},
-+ {"name" => "${lsspecdomain2}", "testing" => "${lsspecdomain2}"}
-+ ]
-+ }}
-+ let(:yaml_path) do
-+ p = Stud::Temporary.pathname
-+ FileUtils.mkdir_p(p)
-+
-+ ::File.open(::File.join(p, "logstash.yml"), "w+") do |f|
-+ f.write(YAML.dump(values))
-+ end
-+ p
-+ end
-+
-+ it "can interpolate environment into settings" do
-+ expect(subject.get('host')).to match_array([])
-+ expect(subject.get('modules')).to match_array([])
-+ subject.from_yaml(yaml_path)
-+ expect(subject.get('host')).to match_array(["dev1.domain1", "dev2.domain1"])
-+ expect(subject.get('modules')).to match_array([
-+ {"name" => "domain1", "testing" => "domain1"},
-+ {"name" => "domain2", "testing" => "domain2"}
-+ ])
-+ end
-+ end
- end
-diff -ruaN logstash-5.4.1/logstash-core/spec/logstash/timestamp_spec.rb linaro-logstash-5.4.1/logstash-core/spec/logstash/timestamp_spec.rb
---- logstash-5.4.1/logstash-core/spec/logstash/timestamp_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/spec/logstash/timestamp_spec.rb 2020-03-02 11:03:48.772335813 +0800
-@@ -12,7 +12,7 @@
- t = LogStash::Timestamp.now
- expect(t.time.to_i).to be_within(1).of Time.now.to_i
-
-- now = Time.now.utc
-+ now = DateTime.now.to_time.utc
- t = LogStash::Timestamp.new(now)
- expect(t.time).to eq(now)
-
-diff -ruaN logstash-5.4.1/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java linaro-logstash-5.4.1/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java
---- logstash-5.4.1/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java 2020-03-02 11:03:48.776335780 +0800
-@@ -59,7 +59,7 @@
- context.runtime.newArgumentError("expected queue AckedQueue");
- }
-
-- this.batch = new Batch(((RubyArray)events).getList(), ((RubyArray)seqNums).getList(), ((JrubyAckedQueueExtLibrary.RubyAckedQueue)queue).getQueue());
-+ //this.batch = new Batch(((RubyArray)events).getList(), ((RubyArray)seqNums).getList(), ((JrubyAckedQueueExtLibrary.RubyAckedQueue)queue).getQueue());
-
- return context.nil;
- }
-diff -ruaN logstash-5.4.1/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java linaro-logstash-5.4.1/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java
---- logstash-5.4.1/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java 2020-03-02 11:03:48.776335780 +0800
-@@ -130,6 +130,12 @@
- return ruby_to_iso8601(context);
- }
-
-+ @JRubyMethod(name = "inspect")
-+ public IRubyObject ruby_inspect(ThreadContext context)
-+ {
-+ return ruby_to_iso8601(context);
-+ }
-+
- @JRubyMethod(name = "to_iso8601")
- public IRubyObject ruby_to_iso8601(ThreadContext context)
- {
-@@ -206,15 +212,8 @@
- {
- RubyTime t;
- if (args.length == 1) {
-- IRubyObject epoch = args[0];
--
-- if (epoch instanceof RubyBigDecimal) {
-- // bug in JRuby prevents correctly parsing a BigDecimal fractional part, see https://github.com/elastic/logstash/issues/4565
-- double usec = ((RubyBigDecimal)epoch).frac().convertToFloat().getDoubleValue() * 1000000;
-- t = (RubyTime)RubyTime.at(context, context.runtime.getTime(), ((RubyBigDecimal)epoch).to_int(), new RubyFloat(context.runtime, usec));
-- } else {
-- t = (RubyTime)RubyTime.at(context, context.runtime.getTime(), epoch);
-- }
-+ // JRuby 9K has fixed the problem iwth BigDecimal precision see https://github.com/elastic/logstash/issues/4565
-+ t = (RubyTime)RubyTime.at(context, context.runtime.getTime(), args[0]);
- } else {
- t = (RubyTime)RubyTime.at(context, context.runtime.getTime(), args[0], args[1]);
- }
-diff -ruaN logstash-5.4.1/NOTICE.TXT linaro-logstash-5.4.1/NOTICE.TXT
---- logstash-5.4.1/NOTICE.TXT 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/NOTICE.TXT 2020-03-02 11:03:48.740336076 +0800
-@@ -82,541 +82,7 @@
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- ==========================================================================
--RubyGem: geoip Version: 1.6.3
--[ Note that while the core GeoIP library is licensed under the
--LGPL, the libGeoIPUpdate library depends on md5.c and types.h
--which are licensed under the GPL. ]
--
--
-- GNU LESSER GENERAL PUBLIC LICENSE
-- Version 2.1, February 1999
--
-- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- Everyone is permitted to copy and distribute verbatim copies
-- of this license document, but changing it is not allowed.
--
--[This is the first released version of the Lesser GPL. It also counts
-- as the successor of the GNU Library Public License, version 2, hence
-- the version number 2.1.]
--
-- Preamble
--
-- The licenses for most software are designed to take away your
--freedom to share and change it. By contrast, the GNU General Public
--Licenses are intended to guarantee your freedom to share and change
--free software--to make sure the software is free for all its users.
--
-- This license, the Lesser General Public License, applies to some
--specially designated software packages--typically libraries--of the
--Free Software Foundation and other authors who decide to use it. You
--can use it too, but we suggest you first think carefully about whether
--this license or the ordinary General Public License is the better
--strategy to use in any particular case, based on the explanations below.
--
-- When we speak of free software, we are referring to freedom of use,
--not price. Our General Public Licenses are designed to make sure that
--you have the freedom to distribute copies of free software (and charge
--for this service if you wish); that you receive source code or can get
--it if you want it; that you can change the software and use pieces of
--it in new free programs; and that you are informed that you can do
--these things.
--
-- To protect your rights, we need to make restrictions that forbid
--distributors to deny you these rights or to ask you to surrender these
--rights. These restrictions translate to certain responsibilities for
--you if you distribute copies of the library or if you modify it.
--
-- For example, if you distribute copies of the library, whether gratis
--or for a fee, you must give the recipients all the rights that we gave
--you. You must make sure that they, too, receive or can get the source
--code. If you link other code with the library, you must provide
--complete object files to the recipients, so that they can relink them
--with the library after making changes to the library and recompiling
--it. And you must show them these terms so they know their rights.
--
-- We protect your rights with a two-step method: (1) we copyright the
--library, and (2) we offer you this license, which gives you legal
--permission to copy, distribute and/or modify the library.
--
-- To protect each distributor, we want to make it very clear that
--there is no warranty for the free library. Also, if the library is
--modified by someone else and passed on, the recipients should know
--that what they have is not the original version, so that the original
--author's reputation will not be affected by problems that might be
--introduced by others.
--
-- Finally, software patents pose a constant threat to the existence of
--any free program. We wish to make sure that a company cannot
--effectively restrict the users of a free program by obtaining a
--restrictive license from a patent holder. Therefore, we insist that
--any patent license obtained for a version of the library must be
--consistent with the full freedom of use specified in this license.
--
-- Most GNU software, including some libraries, is covered by the
--ordinary GNU General Public License. This license, the GNU Lesser
--General Public License, applies to certain designated libraries, and
--is quite different from the ordinary General Public License. We use
--this license for certain libraries in order to permit linking those
--libraries into non-free programs.
--
-- When a program is linked with a library, whether statically or using
--a shared library, the combination of the two is legally speaking a
--combined work, a derivative of the original library. The ordinary
--General Public License therefore permits such linking only if the
--entire combination fits its criteria of freedom. The Lesser General
--Public License permits more lax criteria for linking other code with
--the library.
--
-- We call this license the "Lesser" General Public License because it
--does Less to protect the user's freedom than the ordinary General
--Public License. It also provides other free software developers Less
--of an advantage over competing non-free programs. These disadvantages
--are the reason we use the ordinary General Public License for many
--libraries. However, the Lesser license provides advantages in certain
--special circumstances.
--
-- For example, on rare occasions, there may be a special need to
--encourage the widest possible use of a certain library, so that it becomes
--a de-facto standard. To achieve this, non-free programs must be
--allowed to use the library. A more frequent case is that a free
--library does the same job as widely used non-free libraries. In this
--case, there is little to gain by limiting the free library to free
--software only, so we use the Lesser General Public License.
--
-- In other cases, permission to use a particular library in non-free
--programs enables a greater number of people to use a large body of
--free software. For example, permission to use the GNU C Library in
--non-free programs enables many more people to use the whole GNU
--operating system, as well as its variant, the GNU/Linux operating
--system.
--
-- Although the Lesser General Public License is Less protective of the
--users' freedom, it does ensure that the user of a program that is
--linked with the Library has the freedom and the wherewithal to run
--that program using a modified version of the Library.
--
-- The precise terms and conditions for copying, distribution and
--modification follow. Pay close attention to the difference between a
--"work based on the library" and a "work that uses the library". The
--former contains code derived from the library, whereas the latter must
--be combined with the library in order to run.
--
-- GNU LESSER GENERAL PUBLIC LICENSE
-- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--
-- 0. This License Agreement applies to any software library or other
--program which contains a notice placed by the copyright holder or
--other authorized party saying it may be distributed under the terms of
--this Lesser General Public License (also called "this License").
--Each licensee is addressed as "you".
--
-- A "library" means a collection of software functions and/or data
--prepared so as to be conveniently linked with application programs
--(which use some of those functions and data) to form executables.
--
-- The "Library", below, refers to any such software library or work
--which has been distributed under these terms. A "work based on the
--Library" means either the Library or any derivative work under
--copyright law: that is to say, a work containing the Library or a
--portion of it, either verbatim or with modifications and/or translated
--straightforwardly into another language. (Hereinafter, translation is
--included without limitation in the term "modification".)
--
-- "Source code" for a work means the preferred form of the work for
--making modifications to it. For a library, complete source code means
--all the source code for all modules it contains, plus any associated
--interface definition files, plus the scripts used to control compilation
--and installation of the library.
--
-- Activities other than copying, distribution and modification are not
--covered by this License; they are outside its scope. The act of
--running a program using the Library is not restricted, and output from
--such a program is covered only if its contents constitute a work based
--on the Library (independent of the use of the Library in a tool for
--writing it). Whether that is true depends on what the Library does
--and what the program that uses the Library does.
--
-- 1. You may copy and distribute verbatim copies of the Library's
--complete source code as you receive it, in any medium, provided that
--you conspicuously and appropriately publish on each copy an
--appropriate copyright notice and disclaimer of warranty; keep intact
--all the notices that refer to this License and to the absence of any
--warranty; and distribute a copy of this License along with the
--Library.
--
-- You may charge a fee for the physical act of transferring a copy,
--and you may at your option offer warranty protection in exchange for a
--fee.
--
-- 2. You may modify your copy or copies of the Library or any portion
--of it, thus forming a work based on the Library, and copy and
--distribute such modifications or work under the terms of Section 1
--above, provided that you also meet all of these conditions:
--
-- a) The modified work must itself be a software library.
--
-- b) You must cause the files modified to carry prominent notices
-- stating that you changed the files and the date of any change.
--
-- c) You must cause the whole of the work to be licensed at no
-- charge to all third parties under the terms of this License.
--
-- d) If a facility in the modified Library refers to a function or a
-- table of data to be supplied by an application program that uses
-- the facility, other than as an argument passed when the facility
-- is invoked, then you must make a good faith effort to ensure that,
-- in the event an application does not supply such function or
-- table, the facility still operates, and performs whatever part of
-- its purpose remains meaningful.
--
-- (For example, a function in a library to compute square roots has
-- a purpose that is entirely well-defined independent of the
-- application. Therefore, Subsection 2d requires that any
-- application-supplied function or table used by this function must
-- be optional: if the application does not supply it, the square
-- root function must still compute square roots.)
--
--These requirements apply to the modified work as a whole. If
--identifiable sections of that work are not derived from the Library,
--and can be reasonably considered independent and separate works in
--themselves, then this License, and its terms, do not apply to those
--sections when you distribute them as separate works. But when you
--distribute the same sections as part of a whole which is a work based
--on the Library, the distribution of the whole must be on the terms of
--this License, whose permissions for other licensees extend to the
--entire whole, and thus to each and every part regardless of who wrote
--it.
--
--Thus, it is not the intent of this section to claim rights or contest
--your rights to work written entirely by you; rather, the intent is to
--exercise the right to control the distribution of derivative or
--collective works based on the Library.
--
--In addition, mere aggregation of another work not based on the Library
--with the Library (or with a work based on the Library) on a volume of
--a storage or distribution medium does not bring the other work under
--the scope of this License.
--
-- 3. You may opt to apply the terms of the ordinary GNU General Public
--License instead of this License to a given copy of the Library. To do
--this, you must alter all the notices that refer to this License, so
--that they refer to the ordinary GNU General Public License, version 2,
--instead of to this License. (If a newer version than version 2 of the
--ordinary GNU General Public License has appeared, then you can specify
--that version instead if you wish.) Do not make any other change in
--these notices.
--
-- Once this change is made in a given copy, it is irreversible for
--that copy, so the ordinary GNU General Public License applies to all
--subsequent copies and derivative works made from that copy.
--
-- This option is useful when you wish to copy part of the code of
--the Library into a program that is not a library.
--
-- 4. You may copy and distribute the Library (or a portion or
--derivative of it, under Section 2) in object code or executable form
--under the terms of Sections 1 and 2 above provided that you accompany
--it with the complete corresponding machine-readable source code, which
--must be distributed under the terms of Sections 1 and 2 above on a
--medium customarily used for software interchange.
--
-- If distribution of object code is made by offering access to copy
--from a designated place, then offering equivalent access to copy the
--source code from the same place satisfies the requirement to
--distribute the source code, even though third parties are not
--compelled to copy the source along with the object code.
--
-- 5. A program that contains no derivative of any portion of the
--Library, but is designed to work with the Library by being compiled or
--linked with it, is called a "work that uses the Library". Such a
--work, in isolation, is not a derivative work of the Library, and
--therefore falls outside the scope of this License.
--
-- However, linking a "work that uses the Library" with the Library
--creates an executable that is a derivative of the Library (because it
--contains portions of the Library), rather than a "work that uses the
--library". The executable is therefore covered by this License.
--Section 6 states terms for distribution of such executables.
--
-- When a "work that uses the Library" uses material from a header file
--that is part of the Library, the object code for the work may be a
--derivative work of the Library even though the source code is not.
--Whether this is true is especially significant if the work can be
--linked without the Library, or if the work is itself a library. The
--threshold for this to be true is not precisely defined by law.
--
-- If such an object file uses only numerical parameters, data
--structure layouts and accessors, and small macros and small inline
--functions (ten lines or less in length), then the use of the object
--file is unrestricted, regardless of whether it is legally a derivative
--work. (Executables containing this object code plus portions of the
--Library will still fall under Section 6.)
--
-- Otherwise, if the work is a derivative of the Library, you may
--distribute the object code for the work under the terms of Section 6.
--Any executables containing that work also fall under Section 6,
--whether or not they are linked directly with the Library itself.
--
-- 6. As an exception to the Sections above, you may also combine or
--link a "work that uses the Library" with the Library to produce a
--work containing portions of the Library, and distribute that work
--under terms of your choice, provided that the terms permit
--modification of the work for the customer's own use and reverse
--engineering for debugging such modifications.
--
-- You must give prominent notice with each copy of the work that the
--Library is used in it and that the Library and its use are covered by
--this License. You must supply a copy of this License. If the work
--during execution displays copyright notices, you must include the
--copyright notice for the Library among them, as well as a reference
--directing the user to the copy of this License. Also, you must do one
--of these things:
--
-- a) Accompany the work with the complete corresponding
-- machine-readable source code for the Library including whatever
-- changes were used in the work (which must be distributed under
-- Sections 1 and 2 above); and, if the work is an executable linked
-- with the Library, with the complete machine-readable "work that
-- uses the Library", as object code and/or source code, so that the
-- user can modify the Library and then relink to produce a modified
-- executable containing the modified Library. (It is understood
-- that the user who changes the contents of definitions files in the
-- Library will not necessarily be able to recompile the application
-- to use the modified definitions.)
--
-- b) Use a suitable shared library mechanism for linking with the
-- Library. A suitable mechanism is one that (1) uses at run time a
-- copy of the library already present on the user's computer system,
-- rather than copying library functions into the executable, and (2)
-- will operate properly with a modified version of the library, if
-- the user installs one, as long as the modified version is
-- interface-compatible with the version that the work was made with.
--
-- c) Accompany the work with a written offer, valid for at
-- least three years, to give the same user the materials
-- specified in Subsection 6a, above, for a charge no more
-- than the cost of performing this distribution.
--
-- d) If distribution of the work is made by offering access to copy
-- from a designated place, offer equivalent access to copy the above
-- specified materials from the same place.
--
-- e) Verify that the user has already received a copy of these
-- materials or that you have already sent this user a copy.
--
-- For an executable, the required form of the "work that uses the
--Library" must include any data and utility programs needed for
--reproducing the executable from it. However, as a special exception,
--the materials to be distributed need not include anything that is
--normally distributed (in either source or binary form) with the major
--components (compiler, kernel, and so on) of the operating system on
--which the executable runs, unless that component itself accompanies
--the executable.
--
-- It may happen that this requirement contradicts the license
--restrictions of other proprietary libraries that do not normally
--accompany the operating system. Such a contradiction means you cannot
--use both them and the Library together in an executable that you
--distribute.
--
-- 7. You may place library facilities that are a work based on the
--Library side-by-side in a single library together with other library
--facilities not covered by this License, and distribute such a combined
--library, provided that the separate distribution of the work based on
--the Library and of the other library facilities is otherwise
--permitted, and provided that you do these two things:
--
-- a) Accompany the combined library with a copy of the same work
-- based on the Library, uncombined with any other library
-- facilities. This must be distributed under the terms of the
-- Sections above.
--
-- b) Give prominent notice with the combined library of the fact
-- that part of it is a work based on the Library, and explaining
-- where to find the accompanying uncombined form of the same work.
--
-- 8. You may not copy, modify, sublicense, link with, or distribute
--the Library except as expressly provided under this License. Any
--attempt otherwise to copy, modify, sublicense, link with, or
--distribute the Library is void, and will automatically terminate your
--rights under this License. However, parties who have received copies,
--or rights, from you under this License will not have their licenses
--terminated so long as such parties remain in full compliance.
--
-- 9. You are not required to accept this License, since you have not
--signed it. However, nothing else grants you permission to modify or
--distribute the Library or its derivative works. These actions are
--prohibited by law if you do not accept this License. Therefore, by
--modifying or distributing the Library (or any work based on the
--Library), you indicate your acceptance of this License to do so, and
--all its terms and conditions for copying, distributing or modifying
--the Library or works based on it.
--
-- 10. Each time you redistribute the Library (or any work based on the
--Library), the recipient automatically receives a license from the
--original licensor to copy, distribute, link with or modify the Library
--subject to these terms and conditions. You may not impose any further
--restrictions on the recipients' exercise of the rights granted herein.
--You are not responsible for enforcing compliance by third parties with
--this License.
--
-- 11. If, as a consequence of a court judgment or allegation of patent
--infringement or for any other reason (not limited to patent issues),
--conditions are imposed on you (whether by court order, agreement or
--otherwise) that contradict the conditions of this License, they do not
--excuse you from the conditions of this License. If you cannot
--distribute so as to satisfy simultaneously your obligations under this
--License and any other pertinent obligations, then as a consequence you
--may not distribute the Library at all. For example, if a patent
--license would not permit royalty-free redistribution of the Library by
--all those who receive copies directly or indirectly through you, then
--the only way you could satisfy both it and this License would be to
--refrain entirely from distribution of the Library.
--
--If any portion of this section is held invalid or unenforceable under any
--particular circumstance, the balance of the section is intended to apply,
--and the section as a whole is intended to apply in other circumstances.
--
--It is not the purpose of this section to induce you to infringe any
--patents or other property right claims or to contest validity of any
--such claims; this section has the sole purpose of protecting the
--integrity of the free software distribution system which is
--implemented by public license practices. Many people have made
--generous contributions to the wide range of software distributed
--through that system in reliance on consistent application of that
--system; it is up to the author/donor to decide if he or she is willing
--to distribute software through any other system and a licensee cannot
--impose that choice.
--
--This section is intended to make thoroughly clear what is believed to
--be a consequence of the rest of this License.
--
-- 12. If the distribution and/or use of the Library is restricted in
--certain countries either by patents or by copyrighted interfaces, the
--original copyright holder who places the Library under this License may add
--an explicit geographical distribution limitation excluding those countries,
--so that distribution is permitted only in or among countries not thus
--excluded. In such case, this License incorporates the limitation as if
--written in the body of this License.
--
-- 13. The Free Software Foundation may publish revised and/or new
--versions of the Lesser General Public License from time to time.
--Such new versions will be similar in spirit to the present version,
--but may differ in detail to address new problems or concerns.
--
--Each version is given a distinguishing version number. If the Library
--specifies a version number of this License which applies to it and
--"any later version", you have the option of following the terms and
--conditions either of that version or of any later version published by
--the Free Software Foundation. If the Library does not specify a
--license version number, you may choose any version ever published by
--the Free Software Foundation.
--
-- 14. If you wish to incorporate parts of the Library into other free
--programs whose distribution conditions are incompatible with these,
--write to the author to ask for permission. For software which is
--copyrighted by the Free Software Foundation, write to the Free
--Software Foundation; we sometimes make exceptions for this. Our
--decision will be guided by the two goals of preserving the free status
--of all derivatives of our free software and of promoting the sharing
--and reuse of software generally.
--
-- NO WARRANTY
--
-- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
--WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
--EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
--OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
--KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
--IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
--LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
--THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
--
-- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
--WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
--AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
--FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
--CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
--LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
--RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
--FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
--SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
--DAMAGES.
--
-- END OF TERMS AND CONDITIONS
--
-- How to Apply These Terms to Your New Libraries
--
-- If you develop a new library, and you want it to be of the greatest
--possible use to the public, we recommend making it free software that
--everyone can redistribute and change. You can do so by permitting
--redistribution under these terms (or, alternatively, under the terms of the
--ordinary General Public License).
--
-- To apply these terms, attach the following notices to the library. It is
--safest to attach them to the start of each source file to most effectively
--convey the exclusion of warranty; and each file should have at least the
--"copyright" line and a pointer to where the full notice is found.
--
-- <one line to give the library's name and a brief idea of what it does.>
-- Copyright (C) <year> <name of author>
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--
--Also add information on how to contact you by electronic and paper mail.
--
--You should also get your employer (if you work as a programmer) or your
--school, if any, to sign a "copyright disclaimer" for the library, if
--necessary. Here is a sample; alter the names:
--
-- Yoyodyne, Inc., hereby disclaims all copyright interest in the
-- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
--
-- <signature of Ty Coon>, 1 April 1990
-- Ty Coon, President of Vice
--
--That's all there is to it!
--
--
--
--==========================================================================
--RubyGem: user_agent_parser Version: 2.3.0
--Copyright (c) 2012 Tim Lucas
--
--Permission is hereby granted, free of charge, to any person obtaining
--a copy of this software and associated documentation files (the
--"Software"), to deal in the Software without restriction, including
--without limitation the rights to use, copy, modify, merge, publish,
--distribute, sublicense, and/or sell copies of the Software, and to
--permit persons to whom the Software is furnished to do so, subject to
--the following conditions:
--
--The above copyright notice and this permission notice shall be
--included in all copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
--LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
--OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
--WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--==========================================================================
--RubyGem: elasticsearch Version: 1.1.2
-+RubyGem: elasticsearch Version: 5.0.4
- Copyright 2013 Elasticsearch
-
- Licensed under the Apache License, Version 2.0 (the "License");
-@@ -861,7 +327,7 @@
-
-
- ==========================================================================
--RubyGem: mail Version: 2.6.5
-+RubyGem: mail Version: 2.6.6
- Copyright (c) 2009-2017 Mikel Lindsaar
-
- Permission is hereby granted, free of charge, to any person obtaining
-@@ -908,7 +374,7 @@
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- ==========================================================================
--RubyGem: sequel Version: 4.46.0
-+RubyGem: sequel Version: 4.47.0
- Copyright (c) 2007-2008 Sharon Rosner
- Copyright (c) 2008-2017 Jeremy Evans
-
-@@ -1019,8 +485,35 @@
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- ==========================================================================
--RubyGem: jar-dependencies Version: 0.3.11
--Copyright (c) 2014 Christian Meier
-+RubyGem: http-form_data Version: 1.0.1
-+Copyright (c) 2015 Aleksey V Zapparov
-+
-+MIT License
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+==========================================================================
-+RubyGem: public_suffix Version: 1.4.6
-+Copyright (c) 2009-2014 Simone Carletti <we...@weppos.net>
-+
-+MIT License
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
-diff -ruaN logstash-5.4.1/qa/acceptance/spec/spec_helper.rb linaro-logstash-5.4.1/qa/acceptance/spec/spec_helper.rb
---- logstash-5.4.1/qa/acceptance/spec/spec_helper.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/qa/acceptance/spec/spec_helper.rb 2020-03-02 11:03:48.780335747 +0800
-@@ -5,6 +5,14 @@
- require_relative 'config_helper'
- require_relative "../../platform_config"
-
-+# This is a non obvious hack,
-+# EllipticalCurve are not completely implemented in JRuby 9k and the new version of SSH from the standard library
-+# use them.
-+#
-+# Details: https://github.com/jruby/jruby-openssl/issues/105
-+Net::SSH::Transport::Algorithms::ALGORITHMS.values.each { |algs| algs.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
-+Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
-+
- ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
- $LOAD_PATH.unshift File.join(ROOT, 'logstash-core/lib')
-
-diff -ruaN logstash-5.4.1/qa/integration/services/logstash_service.rb linaro-logstash-5.4.1/qa/integration/services/logstash_service.rb
---- logstash-5.4.1/qa/integration/services/logstash_service.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/qa/integration/services/logstash_service.rb 2020-03-02 11:03:48.796335616 +0800
-@@ -201,7 +201,7 @@
- end
-
- def lock_file
-- File.join(@logstash_home, "Gemfile.jruby-1.9.lock")
-+ File.join(@logstash_home, "Gemfile.jruby-2.3.lock")
- end
-
- class PluginCli
-diff -ruaN logstash-5.4.1/qa/integration/specs/01_logstash_bin_smoke_spec.rb linaro-logstash-5.4.1/qa/integration/specs/01_logstash_bin_smoke_spec.rb
---- logstash-5.4.1/qa/integration/specs/01_logstash_bin_smoke_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/qa/integration/specs/01_logstash_bin_smoke_spec.rb 2020-03-02 11:03:48.796335616 +0800
-@@ -174,10 +174,10 @@
- }
- start_ls.call()
- # we use a try since logstash may have started but the webserver may not yet
-- first_id = try(num_retries) { get_id }
-+ first_id = Stud.try(num_retries.times, Errno::ECONNREFUSED) { get_id }
- @ls1.teardown
- start_ls.call()
-- second_id = try(num_retries) { get_id }
-+ second_id = Stud.try(num_retries.times, Errno::ECONNREFUSED) { get_id }
- expect(first_id).to eq(second_id)
- end
- end
-diff -ruaN logstash-5.4.1/qa/integration/specs/cli/prepare_offline_pack_spec.rb linaro-logstash-5.4.1/qa/integration/specs/cli/prepare_offline_pack_spec.rb
---- logstash-5.4.1/qa/integration/specs/cli/prepare_offline_pack_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/qa/integration/specs/cli/prepare_offline_pack_spec.rb 2020-03-02 11:03:48.796335616 +0800
-@@ -48,7 +48,7 @@
-
- unpacked = unpack(temporary_zip_file)
-
-- filters = @logstash_plugin.list(plugins_to_pack.first).stderr_and_stdout.split("\n")
-+ filters = @logstash_plugin.list(plugins_to_pack.first).stderr_and_stdout.split("\n").delete_if { |f| f =~ /cext/ }
-
- expect(unpacked.plugins.collect(&:name)).to include(*filters)
- expect(unpacked.plugins.size).to eq(filters.size)
-diff -ruaN logstash-5.4.1/rakelib/artifacts.rake linaro-logstash-5.4.1/rakelib/artifacts.rake
---- logstash-5.4.1/rakelib/artifacts.rake 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/rakelib/artifacts.rake 2020-03-02 11:03:48.800335584 +0800
-@@ -38,7 +38,7 @@
- # See more in https://github.com/elastic/logstash/issues/4818
- "vendor/??*/**/.mvn/**/*",
- "Gemfile",
-- "Gemfile.jruby-1.9.lock",
-+ "Gemfile.jruby-2.3.lock",
- ]
- end
-
-@@ -274,6 +274,10 @@
- require "fpm/errors" # TODO(sissel): fix this in fpm
- require "fpm/package/dir"
- require "fpm/package/gem" # TODO(sissel): fix this in fpm; rpm needs it.
-+ require "childprocess/jruby/pump"
-+ # TODO(ph): Cabin is closing the fd when it reach EOF, childprocess will attempt to write to it and hit an IOError.
-+ # This will make a the thread dies, in 1.7.25 we had a Thread Death
-+ require_relative "childprocess_patch"
-
- dir = FPM::Package::Dir.new
-
-diff -ruaN logstash-5.4.1/rakelib/childprocess_patch.rb linaro-logstash-5.4.1/rakelib/childprocess_patch.rb
---- logstash-5.4.1/rakelib/childprocess_patch.rb 1970-01-01 08:00:00.000000000 +0800
-+++ linaro-logstash-5.4.1/rakelib/childprocess_patch.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -0,0 +1,20 @@
-+# This is a patch for childprocess and this is due to ruby-cabin/fpm interaction.
-+# When we use the logger.pipe construct and the IO reach EOF we close the IO.
-+# The problem Childprocess will try to flush to it and hit an IOError making the software crash in JRuby 9k.
-+#
-+# In JRuby 1.7.25 we hit a thread death.
-+#
-+module ChildProcess
-+ module JRuby
-+ class Pump
-+ alias_method :old_pump, :pump
-+
-+ def ignore_close_io
-+ old_pump
-+ rescue IOError
-+ end
-+
-+ alias_method :pump, :ignore_close_io
-+ end
-+ end
-+end
-diff -ruaN logstash-5.4.1/rakelib/vendor.rake linaro-logstash-5.4.1/rakelib/vendor.rake
---- logstash-5.4.1/rakelib/vendor.rake 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/rakelib/vendor.rake 2020-03-02 11:03:48.800335584 +0800
-@@ -1,6 +1,6 @@
- namespace "vendor" do
- VERSIONS = {
-- "jruby" => { "version" => "1.7.25", "sha1" => "cd15aef419f97cff274491e53fcfb8b88ec36785" },
-+ "jruby" => { "version" => "9.1.9.0", "sha1" => "b062fe6e411e4dab52ac7a25078b63e831471f9b" },
- }
-
- def vendor(*args)
-diff -ruaN logstash-5.4.1/spec/spec_helper.rb linaro-logstash-5.4.1/spec/spec_helper.rb
---- logstash-5.4.1/spec/spec_helper.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/spec/spec_helper.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -22,6 +22,9 @@
- end
- end
-
-+# Refactor the suite to https://github.com/elastic/logstash/issues/7148
-+RSpec::Expectations.configuration.on_potential_false_positives = :nothing
-+
- RSpec.configure do |c|
- Flores::RSpec.configure(c)
- c.before do
-diff -ruaN logstash-5.4.1/spec/unit/license_spec.rb linaro-logstash-5.4.1/spec/unit/license_spec.rb
---- logstash-5.4.1/spec/unit/license_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/spec/unit/license_spec.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -1,6 +1,6 @@
- # encoding: utf-8
- require_relative '../spec_helper'
--require 'rakelib/default_plugins'
-+require_relative '../../rakelib/default_plugins'
-
- describe "Project licenses" do
-
-diff -ruaN logstash-5.4.1/spec/unit/plugin_manager/gem_installer_spec.rb linaro-logstash-5.4.1/spec/unit/plugin_manager/gem_installer_spec.rb
---- logstash-5.4.1/spec/unit/plugin_manager/gem_installer_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/spec/unit/plugin_manager/gem_installer_spec.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -36,15 +36,13 @@
-
- context "when we want the message" do
- it "display the message" do
-- expect(LogStash::PluginManager.ui).to receive(:info).with(message)
-- subject.install(simple_gem, true, temporary_gem_home)
-+ expect(subject.install(simple_gem, true, temporary_gem_home)).to eq(message)
- end
- end
-
- context "when we dont want the message" do
- it "doesn't display the message" do
-- expect(LogStash::PluginManager.ui).not_to receive(:info).with(message)
-- subject.install(simple_gem, false, temporary_gem_home)
-+ expect(subject.install(simple_gem, false, temporary_gem_home)).to be_nil
- end
- end
- end
-diff -ruaN logstash-5.4.1/spec/unit/plugin_manager/pack_installer/local_spec.rb linaro-logstash-5.4.1/spec/unit/plugin_manager/pack_installer/local_spec.rb
---- logstash-5.4.1/spec/unit/plugin_manager/pack_installer/local_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/spec/unit/plugin_manager/pack_installer/local_spec.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -53,14 +53,6 @@
-
- expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtest/, anything)
- expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtestdep/, anything)
--
-- # Since the Gem::Indexer have side effect and we have more things loaded
-- # I have to disable it in the tests
-- mock_indexer = double("Gem::Indexer")
-- allow(mock_indexer).to receive(:ui=).with(anything)
-- expect(mock_indexer).to receive(:generate_index)
-- expect(::Gem::Indexer).to receive(:new).with(be_kind_of(String), hash_including(:build_modern => true)).and_return(mock_indexer)
--
- expect { subject.execute }.not_to raise_error
- end
- end
-diff -ruaN logstash-5.4.1/spec/unit/util/retryable_spec.rb linaro-logstash-5.4.1/spec/unit/util/retryable_spec.rb
---- logstash-5.4.1/spec/unit/util/retryable_spec.rb 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/spec/unit/util/retryable_spec.rb 2020-03-02 11:03:48.800335584 +0800
-@@ -56,7 +56,7 @@
-
- expect do
- subject.retryable(:on_retry => callback){i += 1; raise E}
-- end.to raise_error
-+ end.to raise_error E
-
- expect(i).to eq(2)
-
-@@ -86,7 +86,7 @@
-
- expect do
- subject.retryable(:tries => n, :on_retry => callback){i += 1; raise E}
-- end.to raise_error
-+ end.to raise_error E
-
- expect(i).to eq(n + 1)
-
-@@ -136,4 +136,4 @@
- end.to raise_error(E)
- end
- end
--end
-\ No newline at end of file
-+end
-diff -ruaN logstash-5.4.1/.travis.yml linaro-logstash-5.4.1/.travis.yml
---- logstash-5.4.1/.travis.yml 2017-05-18 23:13:07.000000000 +0800
-+++ linaro-logstash-5.4.1/.travis.yml 2020-03-02 11:03:48.736336108 +0800
-@@ -5,17 +5,17 @@
- - vendor/bundle
- - ~/.gradle/
- rvm:
-- - jruby-1.7.25
-+ - jruby-9.1.9.0
- jdk:
- - oraclejdk8
- env:
-- - INTEGRATION=false SPEC_OPTS="--order rand --format documentation"
-- - INTEGRATION=true SPEC_OPTS="--order rand --format documentation"
-- - INTEGRATION=false FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation"
-- - INTEGRATION=true FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation"
-+ - INTEGRATION=false SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
-+ - INTEGRATION=true SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
-+ - INTEGRATION=false FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
-+ - INTEGRATION=true FEATURE_FLAG=persistent_queues SPEC_OPTS="--order rand --format documentation" JRUBY_OPTS='--server -Xcompile.invokedynamic=false'
- before_install:
- # Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617
-- - gem uninstall -i /home/travis/.rvm/gems/jruby-1.7.25@global bundler
-+ - gem uninstall -i /home/travis/.rvm/gems/jruby-9.1.9.0@global bundler
- - gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document --quiet
- install:
- - rake test:install-core
diff --git a/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff b/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff
deleted file mode 100644
index e532b0f1..00000000
--- a/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index e6b55ded0..ee2f4ef0a 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -25,6 +25,7 @@ gem "term-ansicolor", "~> 1.3.2", :group => :development
- gem "docker-api", "1.31.0", :group => :development
- gem "rest-client", "1.8.0", :group => :development
- gem "pleaserun", "~>0.0.28"
-+gem "redis", "<= 4.4.0"
- gem "logstash-input-heartbeat"
- gem "logstash-codec-collectd"
- gem "logstash-output-xmpp"
-@@ -139,3 +139,5 @@ gem "poseidon", ">= 0"
- gem "snappy", ">= 0"
- gem "webmock", "~> 1.21.0"
- gem "amazing_print", "= 1.2.1"
-+gem "nokogiri", "~> 1.10.0"
-+gem "msgpack", "<= 1.4.1"
diff --git a/bigtop-packages/src/common/logstash/patch2-pin-logstash-output-elasticsearch.diff b/bigtop-packages/src/common/logstash/patch2-pin-logstash-output-elasticsearch.diff
deleted file mode 100644
index 205b17c9..00000000
--- a/bigtop-packages/src/common/logstash/patch2-pin-logstash-output-elasticsearch.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index c206ff423..104624a83 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -96,7 +96,7 @@ gem "logstash-input-kafka", "~> 5"
- gem "logstash-input-beats"
- gem "logstash-output-cloudwatch"
- gem "logstash-output-csv"
--gem "logstash-output-elasticsearch"
-+gem "logstash-output-elasticsearch", "11.0.2"
- gem "logstash-output-file"
- gem "logstash-output-graphite"
- gem "logstash-output-http"
diff --git a/bigtop-packages/src/common/logstash/patch3-log4j2-2.17.1.diff b/bigtop-packages/src/common/logstash/patch3-log4j2-2.17.1.diff
deleted file mode 100644
index 04c52aa8..00000000
--- a/bigtop-packages/src/common/logstash/patch3-log4j2-2.17.1.diff
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index 5d96255..6895ce3 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -73,12 +73,10 @@ gem "logstash-input-ganglia"
- gem "logstash-input-gelf"
- gem "logstash-input-generator"
- gem "logstash-input-graphite"
--gem "logstash-input-http"
- gem "logstash-input-http_poller"
- gem "logstash-input-imap"
- gem "logstash-input-irc"
- gem "logstash-input-jdbc"
--gem "logstash-input-log4j"
- gem "logstash-input-lumberjack"
- gem "logstash-input-pipe"
- gem "logstash-input-rabbitmq"
-@@ -93,8 +91,6 @@ gem "logstash-input-twitter"
- gem "logstash-input-udp"
- gem "logstash-input-unix"
- gem "logstash-input-xmpp"
--gem "logstash-input-kafka", "~> 5"
--gem "logstash-input-beats"
- gem "logstash-output-cloudwatch"
- gem "logstash-output-csv"
- gem "logstash-output-elasticsearch", "11.0.2"
-@@ -102,7 +98,6 @@ gem "logstash-output-file"
- gem "logstash-output-graphite"
- gem "logstash-output-http"
- gem "logstash-output-irc"
--gem "logstash-output-kafka", "~> 5"
- gem "logstash-output-nagios"
- gem "logstash-output-null"
- gem "logstash-output-pagerduty"
-diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
-index 2968c3a..c8bd292 100644
---- a/logstash-core/build.gradle
-+++ b/logstash-core/build.gradle
-@@ -110,14 +110,14 @@ idea {
- }
-
- dependencies {
-- compile 'org.apache.logging.log4j:log4j-api:2.6.2'
-- compile 'org.apache.logging.log4j:log4j-core:2.6.2'
-+ compile 'org.apache.logging.log4j:log4j-api:2.17.1'
-+ compile 'org.apache.logging.log4j:log4j-core:2.17.1'
- compile 'com.fasterxml.jackson.core:jackson-core:2.7.4'
- compile 'com.fasterxml.jackson.core:jackson-databind:2.7.4'
- compile 'com.fasterxml.jackson.module:jackson-module-afterburner:2.7.4'
- compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.7.4'
-- testCompile 'org.apache.logging.log4j:log4j-core:2.6.2:tests'
-- testCompile 'org.apache.logging.log4j:log4j-api:2.6.2:tests'
-+ testCompile 'org.apache.logging.log4j:log4j-core:2.17.1:tests'
-+ testCompile 'org.apache.logging.log4j:log4j-api:2.17.1:tests'
- testCompile 'junit:junit:4.12'
- testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
- provided 'org.jruby:jruby-core:9.1.9.0'
-diff --git a/logstash-core/gemspec_jars.rb b/logstash-core/gemspec_jars.rb
-index 2459f5d..9f27b11 100644
---- a/logstash-core/gemspec_jars.rb
-+++ b/logstash-core/gemspec_jars.rb
-@@ -2,8 +2,8 @@
- # runtime dependencies to generate this gemspec dependencies file to be eval'ed by the gemspec
- # for the jar-dependencies requirements.
-
--gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2"
--gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2"
-+gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.17.1"
-+gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.17.1"
- gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.7.4"
- gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.7.4"
- gem.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.7.4"
-diff --git a/logstash-core/lib/logstash-core_jars.rb b/logstash-core/lib/logstash-core_jars.rb
-index 8ccd269..c9a9818 100644
---- a/logstash-core/lib/logstash-core_jars.rb
-+++ b/logstash-core/lib/logstash-core_jars.rb
-@@ -2,9 +2,9 @@
- begin
- require 'jar_dependencies'
- rescue LoadError
-- require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar'
-+ require 'org/apache/logging/log4j/log4j-core/2.17.1/log4j-core-2.17.1.jar'
- require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.7.4/jackson-module-afterburner-2.7.4.jar'
-- require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
-+ require 'org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1.jar'
- require 'com/fasterxml/jackson/core/jackson-core/2.7.4/jackson-core-2.7.4.jar'
- require 'com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar'
- require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.7.4/jackson-dataformat-cbor-2.7.4.jar'
-@@ -12,9 +12,9 @@ rescue LoadError
- end
-
- if defined? Jars
-- require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.6.2' )
-+ require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.17.1' )
- require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.4' )
-- require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
-+ require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.17.1' )
- require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.4' )
- require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.0' )
- require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.7.4' )
-diff --git a/rakelib/plugins-metadata.json b/rakelib/plugins-metadata.json
-index a2356db..ef976ef 100644
---- a/rakelib/plugins-metadata.json
-+++ b/rakelib/plugins-metadata.json
-@@ -329,7 +329,7 @@
- "skip-list": false
- },
- "logstash-input-http": {
-- "default-plugins": true,
-+ "default-plugins": false,
- "core-specs": false,
- "test-jar-dependencies": false,
- "test-vendor-plugins": false,
-@@ -364,7 +364,7 @@
- "skip-list": true
- },
- "logstash-input-log4j": {
-- "default-plugins": true,
-+ "default-plugins": false,
- "core-specs": false,
- "test-jar-dependencies": false,
- "test-vendor-plugins": false,
-@@ -469,14 +469,14 @@
- "skip-list": false
- },
- "logstash-input-kafka": {
-- "default-plugins": true,
-+ "default-plugins": false,
- "core-specs": false,
- "test-jar-dependencies": true,
- "test-vendor-plugins": false,
- "skip-list": false
- },
- "logstash-input-beats": {
-- "default-plugins": true,
-+ "default-plugins": false,
- "core-specs": false,
- "test-jar-dependencies": false,
- "test-vendor-plugins": false,
-@@ -532,7 +532,7 @@
- "skip-list": false
- },
- "logstash-output-kafka": {
-- "default-plugins": true,
-+ "default-plugins": false,
- "core-specs": false,
- "test-jar-dependencies": false,
- "test-vendor-plugins": false,
diff --git a/bigtop-packages/src/deb/elasticsearch/changelog b/bigtop-packages/src/deb/elasticsearch/changelog
deleted file mode 100644
index d4858cd4..00000000
--- a/bigtop-packages/src/deb/elasticsearch/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated
diff --git a/bigtop-packages/src/deb/elasticsearch/compat b/bigtop-packages/src/deb/elasticsearch/compat
deleted file mode 100644
index 7f8f011e..00000000
--- a/bigtop-packages/src/deb/elasticsearch/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/bigtop-packages/src/deb/elasticsearch/control b/bigtop-packages/src/deb/elasticsearch/control
deleted file mode 100644
index b6402d9c..00000000
--- a/bigtop-packages/src/deb/elasticsearch/control
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-Source: elasticsearch
-Section: web
-Priority: extra
-Maintainer: Apache Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Version: 5.6.17
-Standards-Version: 3.8.0
-Homepage: https://www.elastic.co/
-
-Package: elasticsearch
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Elasticsearch is a search engine based on the Lucene library.
- It provides a distributed, multitenant-capable full-text search engine
- with an HTTP web interface and schema-free JSON documents.
diff --git a/bigtop-packages/src/deb/elasticsearch/copyright b/bigtop-packages/src/deb/elasticsearch/copyright
deleted file mode 100644
index f56e2051..00000000
--- a/bigtop-packages/src/deb/elasticsearch/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: https://github.com/elastic/elasticsearch
-Upstream-Name: Elasticsearch
-
-Files: *
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch-doc.install b/bigtop-packages/src/deb/elasticsearch/elasticsearch-doc.install
deleted file mode 100644
index 3ee3c398..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#DOCS#
-/usr/share/doc/elasticsearch-doc
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch.install b/bigtop-packages/src/deb/elasticsearch/elasticsearch.install
deleted file mode 100644
index 520ec25c..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch.install
+++ /dev/null
@@ -1,5 +0,0 @@
-/etc/init.d/elasticsearch
-/etc/default/elasticsearch
-/etc/elasticsearch
-/usr/lib/elasticsearch
-/var
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch.postinst b/bigtop-packages/src/deb/elasticsearch/elasticsearch.postinst
deleted file mode 100644
index 998abb77..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch.postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-ES_USER="elasticsearch"
-ES_GROUP="elasticsearch"
-
-case "$1" in
- configure)
- # Install config alternatives
- update-alternatives --install /etc/elasticsearch/conf elasticsearch-conf /etc/elasticsearch/conf.dist 30
- chown ${ES_USER}:${ES_GROUP} /var/{lib,log,run}/elasticsearch
- chown -R root:${ES_GROUP} /etc/elasticsearch
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch.postrm b/bigtop-packages/src/deb/elasticsearch/elasticsearch.postrm
deleted file mode 100644
index 95dd9957..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch.postrm
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-ES_USER="elasticsearch"
-ES_GROUP="elasticsearch"
-LOG_DIR="/var/log/elasticsearch"
-PLUGINS_DIR="/usr/lib/elasticsearch/plugins"
-PID_DIR="/var/run/elasticsearch"
-DATA_DIR="/var/lib/elasticsearch"
-CONF_DIR="/etc/elasticsearch"
-
-case "$1" in
- remove|purge)
- ES_ENV_FILE="/etc/default/elasticsearch"
- if [ -f "$ES_ENV_FILE" ]; then
- . "$ES_ENV_FILE"
- fi
- rm -rf "$LOG_DIR"
- rm -rf "$PLUGINS_DIR"
- [ -d "$DATA_DIR" ] && rmdir --ignore-fail-on-non-empty "$DATA_DIR"
- [ -d "$CONF_DIR" ] && rmdir --ignore-fail-on-non-empty "$CONF_DIR"
- if id "$ES_USER" > /dev/null 2>&1 ; then
- userdel "$ES_USER"
- fi
-
- if getent group "$ES_GROUP" > /dev/null 2>&1 ; then
- groupdel "$ES_GROUP"
- fi
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch.preinst b/bigtop-packages/src/deb/elasticsearch/elasticsearch.preinst
deleted file mode 100644
index 8d2b3789..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch.preinst
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# preinst script for elasticsearch
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-ES_USER="elasticsearch"
-ES_GROUP="elasticsearch"
-
-case "$1" in
- install|upgrade)
- # Create elasticsearch group if not existing
- getent group "$ES_GROUP" >/dev/null || groupadd -r "$ES_GROUP"
- # Create elasticsearch user if not existing
- if ! getent passwd "$ES_USER" >/dev/null; then
- # Adding system user: elasticsearch
- adduser \
- --system \
- --ingroup "$ES_GROUP" \
- --home /var/lib/elasticsearch \
- --gecos "Elasticsearch" \
- --disabled-password \
- --shell /bin/false \
- "$ES_USER" >/dev/null
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/elasticsearch/elasticsearch.prerm b/bigtop-packages/src/deb/elasticsearch/elasticsearch.prerm
deleted file mode 100644
index f9560b9c..00000000
--- a/bigtop-packages/src/deb/elasticsearch/elasticsearch.prerm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- systemctl --no-reload stop elasticsearch.service
- systemctl disable elasticsearch.service > /dev/null 2>&1 || true
- update-rc.d elasticsearch remove >/dev/null || true
- update-alternatives --remove elasticsearch-conf /etc/elasticsearch/conf.dist || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/elasticsearch/rules b/bigtop-packages/src/deb/elasticsearch/rules
deleted file mode 100755
index 6b610f15..00000000
--- a/bigtop-packages/src/deb/elasticsearch/rules
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/make -f
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- # we'll just use the build from the tarball.
- env FULL_VERSION=${ELASTICSEARCH_BASE_VERSION} bash -x debian/do-component-build
-
-override_dh_auto_install:
- sh -x debian/install_elasticsearch.sh \
- --build-dir=build/ \
- --doc-dir=/usr/share/doc/elasticsearch-doc \
- --distro-dir=debian \
- --prefix=debian/tmp
- install -d -m 0755 debian/tmp/etc/init.d
-
-override_dh_installchangelogs:
- dh_installchangelogs -Xchanges
diff --git a/bigtop-packages/src/deb/elasticsearch/source/format b/bigtop-packages/src/deb/elasticsearch/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/bigtop-packages/src/deb/elasticsearch/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/deb/kibana/compat b/bigtop-packages/src/deb/kibana/compat
deleted file mode 100644
index ec635144..00000000
--- a/bigtop-packages/src/deb/kibana/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/bigtop-packages/src/deb/kibana/control b/bigtop-packages/src/deb/kibana/control
deleted file mode 100644
index 8940b821..00000000
--- a/bigtop-packages/src/deb/kibana/control
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-Source: kibana
-Section: web
-Priority: extra
-Maintainer: Apache Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Version: 5.4.1
-Standards-Version: 3.8.0
-Homepage: https://www.elastic.co/
-
-Package: kibana
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Kibana is a free and open user interface that
- lets you visualize your Elasticsearch data and navigate
- the Elastic Stack.
diff --git a/bigtop-packages/src/deb/kibana/copyright b/bigtop-packages/src/deb/kibana/copyright
deleted file mode 100644
index 764f3563..00000000
--- a/bigtop-packages/src/deb/kibana/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: https://github.com/elastic/kibana
-Upstream-Name: Kibana
-
-Files: *
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/kibana/kibana.install b/bigtop-packages/src/deb/kibana/kibana.install
deleted file mode 100644
index dea0d1a4..00000000
--- a/bigtop-packages/src/deb/kibana/kibana.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/kibana
-/usr/lib/kibana
-/var
diff --git a/bigtop-packages/src/deb/kibana/kibana.postinst b/bigtop-packages/src/deb/kibana/kibana.postinst
deleted file mode 100644
index f36e1117..00000000
--- a/bigtop-packages/src/deb/kibana/kibana.postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-KBN_USER="kibana"
-KBN_GROUP="kibana"
-
-case "$1" in
- configure)
- # Install config alternatives
- update-alternatives --install /etc/kibana/conf kibana-conf /etc/kibana/conf.dist 30
- chown ${KBN_USER}:${KBN_GROUP} /var/{lib,log,run}/kibana
- chown -R root:${KBN_GROUP} /etc/kibana
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/kibana/kibana.postrm b/bigtop-packages/src/deb/kibana/kibana.postrm
deleted file mode 100644
index b4af476f..00000000
--- a/bigtop-packages/src/deb/kibana/kibana.postrm
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-KBN_USER="kibana"
-KBN_GROUP="kibana"
-LOG_DIR="/var/log/kibana"
-PID_DIR="/var/run/kibana"
-DATA_DIR="/var/lib/kibana"
-CONF_DIR="/etc/kibana"
-
-case "$1" in
- remove|purge)
- rm -rf "$LOG_DIR"
- [ -d "$DATA_DIR" ] && rmdir --ignore-fail-on-non-empty "$DATA_DIR"
- [ -d "$CONF_DIR" ] && rmdir --ignore-fail-on-non-empty "$CONF_DIR"
- if id "$KBN_USER" > /dev/null 2>&1 ; then
- userdel "$KBN_USER"
- fi
-
- if getent group "$KBN_GROUP" > /dev/null 2>&1 ; then
- groupdel "$KBN_GROUP"
- fi
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/kibana/kibana.preinst b/bigtop-packages/src/deb/kibana/kibana.preinst
deleted file mode 100644
index 04ccc8a0..00000000
--- a/bigtop-packages/src/deb/kibana/kibana.preinst
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# preinst script for kibana
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-KBN_USER="kibana"
-KBN_GROUP="kibana"
-
-case "$1" in
- install|upgrade)
- # Create kibana group if not existing
- getent group "$KBN_GROUP" >/dev/null || groupadd -r "$KBN_GROUP"
- # Create kibana user if not existing
- if ! getent passwd "$KBN_USER" >/dev/null; then
- # Adding system user: kibana
- adduser \
- --system \
- --ingroup "$KBN_GROUP" \
- --home /var/lib/kibana \
- --gecos "Kibana" \
- --disabled-password \
- --shell /bin/false \
- "$KBN_USER" >/dev/null
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/kibana/kibana.prerm b/bigtop-packages/src/deb/kibana/kibana.prerm
deleted file mode 100644
index 06424ae7..00000000
--- a/bigtop-packages/src/deb/kibana/kibana.prerm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --remove kibana-conf /etc/kibana/conf.dist || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/kibana/rules b/bigtop-packages/src/deb/kibana/rules
deleted file mode 100755
index d2c63613..00000000
--- a/bigtop-packages/src/deb/kibana/rules
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- bash -x debian/do-component-build
-
-override_dh_auto_install:
- sh -x debian/install_kibana.sh \
- --build-dir=build/ \
- --distro-dir=debian \
- --prefix=debian/tmp
-
-override_dh_installchangelogs:
- dh_installchangelogs -Xchanges
diff --git a/bigtop-packages/src/deb/kibana/source/format b/bigtop-packages/src/deb/kibana/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/bigtop-packages/src/deb/kibana/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/deb/logstash/compat b/bigtop-packages/src/deb/logstash/compat
deleted file mode 100644
index ec635144..00000000
--- a/bigtop-packages/src/deb/logstash/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/bigtop-packages/src/deb/logstash/control b/bigtop-packages/src/deb/logstash/control
deleted file mode 100644
index 97fa33ca..00000000
--- a/bigtop-packages/src/deb/logstash/control
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-Source: logstash
-Section: misc
-Priority: extra
-Maintainer: Apache Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Version: 5.4.1
-Standards-Version: 3.8.0
-Homepage: https://www.elastic.co/
-
-Package: logstash
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Logstash is an open source, server-side data
- processing pipeline that ingests data from a multitude of
- sources simultaneously, transforms it, and then sends it
- to your favorite "stash."
diff --git a/bigtop-packages/src/deb/logstash/copyright b/bigtop-packages/src/deb/logstash/copyright
deleted file mode 100644
index 3c13abb2..00000000
--- a/bigtop-packages/src/deb/logstash/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: https://github.com/elastic/logstash
-Upstream-Name: none
-
-Files: *
-Copyright: 2014 - 2015, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/bigtop-packages/src/deb/logstash/format b/bigtop-packages/src/deb/logstash/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/bigtop-packages/src/deb/logstash/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/deb/logstash/logstash.install b/bigtop-packages/src/deb/logstash/logstash.install
deleted file mode 100644
index 4962fcdf..00000000
--- a/bigtop-packages/src/deb/logstash/logstash.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/logstash
-/etc/logstash
-/var
diff --git a/bigtop-packages/src/deb/logstash/logstash.postinst b/bigtop-packages/src/deb/logstash/logstash.postinst
deleted file mode 100644
index 69d38c24..00000000
--- a/bigtop-packages/src/deb/logstash/logstash.postinst
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# postinst script for logstash
-
-set -e
-
-LS_USER="logstash"
-LS_GROUP="logstash"
-
-case "$1" in
- configure)
- # Install config alternatives
- update-alternatives --install /etc/logstash/conf logstash-conf /etc/logstash/conf.dist 30
- chown ${LS_USER}:${LS_GROUP} /var/{lib,log,run}/logstash
- chown -R root:${LS_GROUP} /etc/logstash
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/logstash/logstash.postrm b/bigtop-packages/src/deb/logstash/logstash.postrm
deleted file mode 100644
index 0a8d4974..00000000
--- a/bigtop-packages/src/deb/logstash/logstash.postrm
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-set -e
-
-LS_USER="logstash"
-LS_GROUP="logstash"
-LOG_DIR="/var/log/logstash"
-
-PID_DIR="/var/run/logstash"
-DATA_DIR="/var/lib/logstash"
-CONF_DIR="/etc/logstash"
-
-case "$1" in
- remove|purge)
- rm -rf "$LOG_DIR"
- [ -d "$DATA_DIR" ] && rmdir --ignore-fail-on-non-empty "$DATA_DIR"
- [ -d "$CONF_DIR" ] && rmdir --ignore-fail-on-non-empty "$CONF_DIR"
- if id "$LS_USER" > /dev/null 2>&1 ; then
- userdel "$LS_USER"
- fi
-
- if getent group "$LS_GROUP" > /dev/null 2>&1 ; then
- groupdel "$LS_GROUP"
- fi
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/logstash/logstash.preinst b/bigtop-packages/src/deb/logstash/logstash.preinst
deleted file mode 100644
index 19c8952a..00000000
--- a/bigtop-packages/src/deb/logstash/logstash.preinst
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# preinst script for logstash
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-LS_USER="logstash"
-LS_GROUP="logstash"
-
-case "$1" in
- install|upgrade)
- getent group "$LS_GROUP" >/dev/null || groupadd -r "$LS_GROUP"
- if ! getent passwd "$LS_USER" >/dev/null; then
- # Adding system user: logstash
- adduser \
- --system \
- --ingroup "$LS_GROUP" \
- --home /usr/lib/logstash \
- --gecos "Logstash" \
- --disabled-password \
- --shell /bin/false \
- "$LS_USER" >/dev/null
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/logstash/logstash.prerm b/bigtop-packages/src/deb/logstash/logstash.prerm
deleted file mode 100644
index 2344f273..00000000
--- a/bigtop-packages/src/deb/logstash/logstash.prerm
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-# prerm script for logstash
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --remove logstash-conf /etc/logstash/conf.dist || :
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/bigtop-packages/src/deb/logstash/rules b/bigtop-packages/src/deb/logstash/rules
deleted file mode 100644
index ca24789a..00000000
--- a/bigtop-packages/src/deb/logstash/rules
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-# -*- makefile -*-
-SHELL=/bin/bash
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- bash debian/do-component-build
-
-
-override_dh_auto_install:
- bash -x debian/install_logstash.sh \
- --build-dir=build \
- --distro-dir=debian \
- --prefix=debian/tmp
diff --git a/bigtop-packages/src/deb/logstash/source/format b/bigtop-packages/src/deb/logstash/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/bigtop-packages/src/deb/logstash/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/bigtop-packages/src/rpm/elasticsearch/SPECS/elasticsearch.spec b/bigtop-packages/src/rpm/elasticsearch/SPECS/elasticsearch.spec
deleted file mode 100644
index 8c2334bb..00000000
--- a/bigtop-packages/src/rpm/elasticsearch/SPECS/elasticsearch.spec
+++ /dev/null
@@ -1,115 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-%define pkg_name elasticsearch
-%define lib_elasticsearch /usr/lib/%{pkg_name}
-%define etc_elasticsearch /etc/%{pkg_name}
-%define config_elasticsearch %{etc_elasticsearch}/conf
-%define log_elasticsearch /var/log/%{pkg_name}
-%define bin_elasticsearch /usr/lib/%{pkg_name}/bin
-%define man_elasticsearch /usr/share/man
-%define run_elasticsearch /var/run/%{pkg_name}
-
-%if %{?suse_version:1}0
-%define doc_elasticsearch %{_docdir}/elasticsearch-doc
-%define alternatives_cmd update-alternatives
-%define chkconfig_dep aaa_base
-%define service_dep aaa_base
-%global initd_dir %{_sysconfdir}/rc.d
-%else
-%define doc_elasticsearch %{_docdir}/elasticsearch
-%define alternatives_cmd alternatives
-%define chkconfig_dep chkconfig
-%define service_dep initscripts
-%global initd_dir %{_sysconfdir}/rc.d/init.d
-%endif
-
-# disable repacking jars
-%define __os_install_post %{nil}
-
-Name: elasticsearch
-Version: %{elasticsearch_version}
-Release: %{elasticsearch_release}
-Summary: Elasticsearch is a distributed RESTful search engine based on the Lucene library.
-URL: https://www.elastic.co/
-Group: Application/Internet
-BuildArch: noarch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: elasticsearch-%{elasticsearch_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_%{name}.sh
-Source3: elasticsearch.default
-Source4: elasticsearch.init
-#BIGTOP_PATCH_FILES
-Requires: bigtop-utils >= 0.7
-
-# CentOS 5 does not have any dist macro
-# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
-%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# Required for init scripts
-Requires: /lib/lsb/init-functions
-Requires: initscripts
-%endif
-
-%description
-Elasticsearch is a search engine based on the Lucene library.
-It provides a distributed, multitenant-capable full-text search engine with
-an HTTP web interface and schema-free JSON documents.
-
-%prep
-%setup -n elasticsearch-%{elasticsearch_base_version}
-
-#BIGTOP_PATCH_COMMANDS
-
-%build
-env FULL_VERSION=%{elasticsearch_base_version} bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_elasticsearch.sh \
- --build-dir=build \
- --prefix=$RPM_BUILD_ROOT \
- --distro-dir=$RPM_SOURCE_DIR \
- --initd-dir=%{initd_dir} \
- --doc-dir=%{doc_elasticsearch}
-
-%pre
-getent group elasticsearch >/dev/null || groupadd -r elasticsearch
-getent passwd elasticsearch > /dev/null || useradd -c "Elasticsearch" -s /sbin/nologin -g elasticsearch -r -d %{run_elasticsearch} elasticsearch 2> /dev/null || :
-
-%post
-%{alternatives_cmd} --install %{config_elasticsearch} %{elasticsearch_name}-conf %{config_elasticsearch}.dist 30
-/usr/bin/chown -R root:elasticsearch /etc/elasticsearch
-
-%preun
-if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{elasticsearch_name}-conf %{config_elasticsearch}.dist || :
-fi
-
-
-#######################
-#### FILES SECTION ####
-#######################
-%files
-%defattr(-,root,root,755)
-%config(noreplace) %{config_elasticsearch}.dist
-%config(noreplace) /etc/default/elasticsearch
-%{initd_dir}/elasticsearch
-%{lib_elasticsearch}
-%defattr(-,elasticsearch,elasticsearch,755)
-/var/lib/elasticsearch
-/var/run/elasticsearch
-/var/log/elasticsearch
diff --git a/bigtop-packages/src/rpm/kibana/SPECS/kibana.spec b/bigtop-packages/src/rpm/kibana/SPECS/kibana.spec
deleted file mode 100644
index 2d2816d1..00000000
--- a/bigtop-packages/src/rpm/kibana/SPECS/kibana.spec
+++ /dev/null
@@ -1,98 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-%define pkg_name kibana
-%define lib_kibana /usr/lib/%{pkg_name}
-%define etc_kibana /etc/%{pkg_name}
-%define config_kibana %{etc_kibana}/conf
-%define log_kibana /var/log/%{pkg_name}
-%define man_kibana /usr/share/man
-%define run_kibana /var/run/%{pkg_name}
-%define _unpackaged_files_terminate_build 0
-%define debug_package %{nil}
-
-# disable repacking jars
-%define __os_install_post %{nil}
-
-Name: kibana
-Version: %{kibana_version}
-Release: %{kibana_release}
-Summary: Kibana is a browser-based analytics and search dashboard.
-URL: https://www.elastic.co/kibana
-Group: Application/Internet
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: kibana-%{kibana_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_%{name}.sh
-#BIGTOP_PATCH_FILES
-Requires: bigtop-utils >= 0.7
-AutoProv: no
-AutoReqProv: no
-
-# CentOS 5 does not have any dist macro
-# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
-%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# Required for init scripts
-Requires: /lib/lsb/init-functions
-Requires: initscripts
-%endif
-
-%description
-Kibana is a free and open user interface that lets you visualize your Elasticsearch data
-and navigate the Elastic Stack. Do anything from tracking query load to
-understanding the way requests flow through your apps.
-
-%prep
-%setup -n kibana-%{kibana_base_version}
-
-#BIGTOP_PATCH_COMMANDS
-%build
-env FULL_VERSION=%{kibana_base_version} bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_kibana.sh \
- --build-dir=build \
- --prefix=$RPM_BUILD_ROOT \
- --distro-dir=$RPM_SOURCE_DIR \
-
-ln -sf %{lib_kibana}/bin/* ${RPM_BUILD_ROOT}%{bin_kibana}
-
-%pre
-getent group kibana >/dev/null || groupadd -r kibana
-getent passwd kibana > /dev/null || useradd -c "Kibana" -s /sbin/nologin -g kibana -r -d %{run_kibana} kibana 2> /dev/null || :
-
-%post
-%{alternatives_cmd} --install %{config_kibana} %{kibana_name}-conf %{config_kibana}.dist 30
-/usr/bin/chown -R root:kibana /etc/kibana
-
-%preun
-if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{kibana_name}-conf %{config_kibana}.dist || :
-fi
-
-#######################
-#### FILES SECTION ####
-#######################
-%files
-%defattr(-,root,root,755)
-%config(noreplace) %{config_kibana}.dist
-%{lib_kibana}
-
-%defattr(-,kibana,kibana,755)
-/var/lib/kibana
-/var/run/kibana
-/var/log/kibana
diff --git a/bigtop-packages/src/rpm/logstash/SPECS/logstash.spec b/bigtop-packages/src/rpm/logstash/SPECS/logstash.spec
deleted file mode 100644
index 0a6ff802..00000000
--- a/bigtop-packages/src/rpm/logstash/SPECS/logstash.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-%define pkg_name logstash
-%define lib_logstash /usr/lib/%{pkg_name}
-%define etc_logstash /etc/%{pkg_name}
-%define config_logstash %{etc_logstash}/conf
-%define log_logstash /var/log/%{pkg_name}
-%define bin_logstash /usr/lib/%{pkg_name}/bin
-%define man_logstash /usr/share/man
-%define run_logstash /var/run/%{pkg_name}
-
-%if %{?suse_version:1}0
-%define alternatives_cmd update-alternatives
-%define chkconfig_dep aaa_base
-%define service_dep aaa_base
-%global initd_dir %{_sysconfdir}/rc.d
-%else
-%define alternatives_cmd alternatives
-%define chkconfig_dep chkconfig
-%define service_dep initscripts
-%global initd_dir %{_sysconfdir}/rc.d/init.d
-%endif
-
-# disable repacking jars
-%define __os_install_post %{nil}
-
-# Disable debuginfo package
-%define debug_package %{nil}
-
-Name: logstash
-Version: %{logstash_version}
-Release: %{logstash_release}
-Summary: Logstash is a server-side data processing pipeline that ingests data from a multitude of sources simultaneously.
-URL: https://www.elastic.co/logstash
-Group: Application/Internet
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: logstash-%{logstash_base_version}.tar.gz
-Source1: do-component-build
-Source2: install_%{name}.sh
-Source3: log4j2.properties
-Source4: logstash.default
-#BIGTOP_PATCH_FILES
-Requires: bigtop-utils >= 0.7
-AutoProv: no
-AutoReqProv: no
-
-
-# CentOS 5 does not have any dist macro
-# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
-%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
-# Required for init scripts
-Requires: /lib/lsb/init-functions
-Requires: initscripts
-%endif
-
-%description
-Logstash is an open source, server-side data processing pipeline
-that ingests data from a multitude of sources simultaneously,
-transforms it, and then sends it to your favorite "stash."
-
-%prep
-%setup -n logstash-%{logstash_base_version}
-
-#BIGTOP_PATCH_COMMANDS
-%build
-env FULL_VERSION=%{logstash_base_version} bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_logstash.sh \
- --build-dir=build \
- --prefix=$RPM_BUILD_ROOT \
- --distro-dir=$RPM_SOURCE_DIR
-
-%pre
-getent group logstash >/dev/null || groupadd -r logstash
-getent passwd logstash > /dev/null || useradd -c "Logstash" -s /sbin/nologin -g logstash -r -d %{run_logstash} logstash 2> /dev/null || :
-
-%post
-%{alternatives_cmd} --install %{config_logstash} %{logstash_name}-conf %{config_logstash}.dist 30
-/usr/bin/chown -R root:logstash /etc/logstash
-
-%preun
-if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{logstash_name}-conf %{config_logstash}.dist || :
-fi
-
-#######################
-#### FILES SECTION ####
-#######################
-%files
-%defattr(-,root,root,755)
-%config(noreplace) %{config_logstash}.dist
-%{lib_logstash}
-%defattr(-,logstash,logstash,755)
-/var/lib/logstash
-/var/run/logstash
-/var/log/logstash
diff --git a/bigtop-tests/smoke-tests/elasticsearch/build.gradle b/bigtop-tests/smoke-tests/elasticsearch/build.gradle
deleted file mode 100644
index d9ba7e39..00000000
--- a/bigtop-tests/smoke-tests/elasticsearch/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-def tests_to_include() {
- return [
- "TestBase.groovy",
- "TestInfo.groovy",
- "TestDocument.groovy",
- ];
-}
-
-dependencies {
- testCompile group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.1'
-}
-
-sourceSets {
- test {
- groovy {
- srcDirs = [
- "${BIGTOP_HOME}/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke"
- ]
- }
- }
-}
-
-test.doFirst {
- checkEnv(["ELASTICSEARCH_URL"])
-}
diff --git a/bigtop-tests/smoke-tests/kibana/TestKibanaSmoke.groovy b/bigtop-tests/smoke-tests/kibana/TestKibanaSmoke.groovy
deleted file mode 100644
index 84ec4ee4..00000000
--- a/bigtop-tests/smoke-tests/kibana/TestKibanaSmoke.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-import org.junit.BeforeClass
-import org.junit.AfterClass
-import org.apache.bigtop.itest.shell.Shell
-import static org.junit.Assert.assertTrue
-import static org.junit.Assert.assertFalse
-import org.junit.Test
-import org.apache.bigtop.itest.TestUtils
-import org.junit.runner.RunWith
-import static org.apache.bigtop.itest.LogErrorsUtils.logError
-import static org.junit.Assert.assertEquals
-
-class TestKibanaSmoke {
- static Shell sh = new Shell("/bin/bash -s");
- private static String KIBANA_HOME = System.getenv("KIBANA_HOME");
-
- static final String KIBANA_START = KIBANA_HOME + "/bin/start-kibana;"
- static final String WAIT_FOR_COMPLETION = "sleep 60;"
- static final String GET_KIBANA_STATUS = "curl -i localhost:5601;"
-
- @Test
- public void KibanaWebTest() {
- /* Check if elasticsearch was deployed firstly */
- def folder = new File("/usr/lib/elasticsearch");
- if (!folder.exists()) {
- println "No ElasticSearch stack, please install ES first.";
- assertTrue(0);
- }
-
- sh.exec(KIBANA_START + WAIT_FOR_COMPLETION + GET_KIBANA_STATUS);
- logError(sh);
- assertTrue("Kibana start failed", sh.getRet() == 0);
- }
-}
diff --git a/bigtop-tests/smoke-tests/kibana/build.gradle b/bigtop-tests/smoke-tests/kibana/build.gradle
deleted file mode 100644
index 7dae5b55..00000000
--- a/bigtop-tests/smoke-tests/kibana/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-def tests_to_include() {
- return [
- "TestKibanaSmoke.groovy"
- ];
-}
-
-sourceSets {
- test {
- groovy {
- srcDirs = ["${BIGTOP_HOME}/bigtop-tests/smoke-tests/kibana/"]
- exclude { FileTreeElement elem -> (doExclude(elem.getName())) }
- }
- }
-}
-
-test.doFirst {
- checkEnv(["KIBANA_HOME"])
-}
diff --git a/bigtop-tests/smoke-tests/logstash/TestLogstashSmoke.groovy b/bigtop-tests/smoke-tests/logstash/TestLogstashSmoke.groovy
deleted file mode 100644
index 03f58aee..00000000
--- a/bigtop-tests/smoke-tests/logstash/TestLogstashSmoke.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
-import org.junit.BeforeClass
-import org.junit.AfterClass
-import org.apache.bigtop.itest.shell.Shell
-import static org.junit.Assert.assertTrue
-import static org.junit.Assert.assertFalse
-import org.junit.Test
-import org.apache.bigtop.itest.TestUtils
-import org.junit.runner.RunWith
-import static org.junit.Assert.assertEquals
-
-class TestLogstashSmoke {
- static Shell sh = new Shell("/bin/bash -s");
- private static String LOGSTASH_HOME = System.getenv("LOGSTASH_HOME");
-
- static final String LOGSTASH_CMD = LOGSTASH_HOME + "/bin/logstash "
- static final String TINYBENCH_CONFIG = "resources/generator.conf "
-
- @Test
- public void LogstashTinyBenchTest() {
- /* Tiny benchmark with logstash Generator-plugin */
- sh.exec("time "
- + LOGSTASH_CMD
- + "-f "
- + TINYBENCH_CONFIG
- );
- assertTrue("Logstash tiny benchmark Failed.", sh.getRet() == 0);
- }
-}
diff --git a/bigtop-tests/smoke-tests/logstash/build.gradle b/bigtop-tests/smoke-tests/logstash/build.gradle
deleted file mode 100644
index 3e79e01d..00000000
--- a/bigtop-tests/smoke-tests/logstash/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-def tests_to_include() {
- return [
- "TestLogstashSmoke.groovy"
- ];
-}
-
-sourceSets {
- test {
- groovy {
- srcDirs = ["${BIGTOP_HOME}/bigtop-tests/smoke-tests/logstash/"]
- exclude { FileTreeElement elem -> (doExclude(elem.getName())) }
- }
- }
-}
-
-test.doFirst {
- checkEnv(["LOGSTASH_HOME"])
-}
diff --git a/bigtop-tests/smoke-tests/logstash/resources/generator.conf b/bigtop-tests/smoke-tests/logstash/resources/generator.conf
deleted file mode 100644
index ace596d1..00000000
--- a/bigtop-tests/smoke-tests/logstash/resources/generator.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-input {
- generator {
- count => 100000
- message => '{"key1":"value1","key2":[1,2],"key3":{"subkey1":"subvalue1"}}'
- codec => json
- }
-}
diff --git a/bigtop-tests/test-artifacts/elasticsearch/pom.xml b/bigtop-tests/test-artifacts/elasticsearch/pom.xml
deleted file mode 100644
index 053ee987..00000000
--- a/bigtop-tests/test-artifacts/elasticsearch/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>bigtop-smokes</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>elasticsearch-smoke</artifactId>
- <version>3.2.0-SNAPSHOT</version>
-
- <name>elasticsearchsmoke</name>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestBase.groovy b/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestBase.groovy
deleted file mode 100644
index 80646f42..00000000
--- a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestBase.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.bigtop.itest.elasticsearch
-
-import static org.junit.Assert.assertNotNull
-import static org.junit.Assert.assertTrue
-import static org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.BeforeClass
-import org.apache.commons.logging.LogFactory
-import org.apache.commons.logging.Log
-import groovyx.net.http.RESTClient
-
-import org.junit.runner.RunWith
-
-class ElasticsearchTestBase {
- static RESTClient elastic
-
- static String prop(String key) {
- def value = System.getenv(key)
- assertNotNull(value)
- return value
- }
-
- @BeforeClass
- static void setUp() {
- elastic = new RESTClient("${prop('ELASTICSEARCH_URL')}:9200/")
- elastic.parser.'text/plain' = elastic.parser.'application/json'
- }
-}
diff --git a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestDocument.groovy b/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestDocument.groovy
deleted file mode 100644
index 7f19455d..00000000
--- a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestDocument.groovy
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-package org.apache.bigtop.itest.elasticsearch
-
-import static org.junit.Assert.assertTrue
-import static org.junit.Assert.assertEquals
-import org.junit.Test
-import groovy.json.JsonSlurper
-import groovy.json.JsonOutput
-
-/**
- * Utterly trivial test to see if the server is running
- */
-class TestDocument extends ElasticsearchTestBase {
- static jsonSlurper = new JsonSlurper()
-
- @Test
- void testCRUD() {
- // create a record
- def data = jsonSlurper.parseText('{"title" : "Winter","artist" : "Giuliano Carmignola","album" : "Vivaldi : Le Quattro Stagioni","year" : 1994}')
- def response = elastic.put(
- path: '/music/classic/1',
- contentType: 'application/json',
- body: data,
- headers: [Accept: 'application/json'])
- assertEquals("created", response.data.result)
- println "Sample record is created"
-
- // now get it back
- elastic.get( path: '/music/classic/1' ) { resp, json ->
- println "Read it back: "+json
- assertEquals(200, resp.status)
- assertEquals("Winter", json._source.title)
- }
-
- // now update it
- data = jsonSlurper.parseText('{"title" : "Winter","artist" : "Giuliano Carmignola","album" : "Vivaldi : Le Quattro Stagioni","year" : 1994, "Country":"Italy"}')
- response = elastic.post(
- path: '/music/classic/1',
- contentType: 'application/json',
- body: data,
- headers: [Accept: 'application/json'])
- assertEquals("updated", response.data.result)
- println "Sample record is updated"
-
- // read it back
- elastic.get( path: '/music/classic/1' ) { resp, json ->
- println "Read it back: "+json
- assertEquals(200, resp.status)
- assertEquals("Italy", json._source.Country)
- }
-
- // delete it
- response = elastic.delete( path: '/music/classic/1' )
- assertEquals("deleted", response.data.result)
- println "Sample record is deleted"
- }
-}
diff --git a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestInfo.groovy b/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestInfo.groovy
deleted file mode 100644
index 97113550..00000000
--- a/bigtop-tests/test-artifacts/elasticsearch/src/main/groovy/org/apache/bigtop/itest/elasticsearch/smoke/TestInfo.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-package org.apache.bigtop.itest.elasticsearch
-
-import static org.junit.Assert.assertTrue
-import static org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Utterly trivial test to see if the server is running
- */
-class TestInfo extends ElasticsearchTestBase {
- @Test
- void testStackInfo() {
- elastic.get( path: '/' ) { resp, json ->
- println json
- assertEquals("bigtop-es", json.cluster_name)
- assertEquals("You Know, for Search", json.tagline)
- }
- }
-
- @Test
- void testClusterInfo() {
- elastic.get( path: '/_cluster/state' ) { resp, json ->
- println json.nodes.size()+" nodes in cluster"
- assertTrue(json.nodes.size()>0)
- }
- }
-}
diff --git a/bigtop-tests/test-execution/smokes/elasticsearch/pom.xml b/bigtop-tests/test-execution/smokes/elasticsearch/pom.xml
deleted file mode 100644
index 70758c79..00000000
--- a/bigtop-tests/test-execution/smokes/elasticsearch/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>smoke-tests</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>elasticsearch-smoke-test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <name>Elasticsearch smoke test execution</name>
-
- <properties>
- <org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId>
- <org.apache.maven-dependency-plugin.artifactId>elasticsearch-smoke</org.apache.maven-dependency-plugin.artifactId>
- <org.apache.maven-dependency-plugin.version>${elasticsearch-smoke.version}</org.apache.maven-dependency-plugin.version>
- <org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>elasticsearch-smoke</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/bigtop.bom b/bigtop.bom
index 2df88c3e..d56659a0 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -110,7 +110,7 @@ bigtop {
*/
dependencies = [
'bigtop-utils':['ambari', 'bigtop-groovy', 'bigtop-jsvc',
- 'elasticsearch', 'flink', 'logstash', 'zookeeper'],
+ 'flink', 'zookeeper'],
'bigtop-groovy':['hadoop'],
'bigtop-jsvc':['hadoop'],
zookeeper:['hadoop', 'hbase', 'kafka'],
@@ -356,33 +356,6 @@ bigtop {
site = "${apache.APACHE_MIRROR}/${download_path}"
archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
}
- 'elasticsearch' {
- name = 'elasticsearch'
- relNotes = 'Search and Analytics engine'
- version { base = '5.6.14'; pkg = base; release = 2 }
- tarball { destination = "$name-${version.base}.tar.gz"
- source = "v${version.base}.zip" }
- url { site = "https://github.com/elastic/elasticsearch/archive"
- archive = site }
- }
- 'logstash' {
- name = 'logstash'
- relNotes = 'Data processing pipeline'
- version { base = '5.4.1'; pkg = base; release = 2 }
- tarball { destination = "$name-${version.base}.tar.gz"
- source = "v${version.base}.zip" }
- url { site = "https://github.com/elastic/logstash/archive"
- archive = site }
- }
- 'kibana' {
- name = 'kibana'
- relNotes = 'A browser-based analytics and search dashboard'
- version { base = '5.4.1'; pkg = base; release = 1 }
- tarball { destination = "$name-${version.base}.tar.gz"
- source = "v${version.base}.zip" }
- url { site = "https://github.com/elastic/kibana/archive"
- archive = site }
- }
'ranger' {
name = 'ranger'
relNotes = 'Apache Ranger'
diff --git a/build.gradle b/build.gradle
index 683a0e12..9993f155 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,6 @@ rat {
"bigtop-tests/smoke-tests/hive/passwd.ql",
"bigtop-tests/smoke-tests/phoenix/*.csv",
"bigtop-tests/smoke-tests/phoenix/*.sql",
- "bigtop-tests/smoke-tests/logstash/resources/**",
"**/target/**",
"**/build/**",
"**/.gradle/**",
@@ -93,7 +92,6 @@ rat {
"bigtop-deploy/puppet/**/*.yaml",
"bigtop-deploy/puppet/modules/hadoop/files/*/id_hdfsuser*",
"bigtop-deploy/puppet/modules/bigtop-util/Gemfile.lock",
- "bigtop-deploy/puppet/modules/kibana/templates/*",
"bigtop-deploy/puppet/modules/zeppelin/templates/interpreter.json",
/* Debian package files that have a rigid structure
(* matches package name) */
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 69b33c08..64d04da6 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -148,15 +148,6 @@ generate-config() {
cat $BIGTOP_PUPPET_DIR/hiera.yaml >> ./config/hiera.yaml
cp -vfr $BIGTOP_PUPPET_DIR/hieradata ./config/
- # A workaround for starting Elasticsearch on ppc64le.
- # See BIGTOP-3574 for details.
- running_arch=$(uname -m)
- if [ "ppc64le" == ${running_arch} ]; then
- elasticsearch_bootstrap_system_call_filter=false
- else
- elasticsearch_bootstrap_system_call_filter=true
- fi
-
cat > ./config/hieradata/site.yaml << EOF
bigtop::hadoop_head_node: $1
hadoop::hadoop_storage_dirs: [/data/1, /data/2]
@@ -165,7 +156,6 @@ bigtop::bigtop_repo_gpg_check: $gpg_check
hadoop_cluster_node::cluster_components: $3
hadoop_cluster_node::cluster_nodes: [$node_list]
hadoop::common_yarn::yarn_resourcemanager_scheduler_class: org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler
-elasticsearch::bootstrap::system_call_filter: $elasticsearch_bootstrap_system_call_filter
EOF
}
diff --git a/provisioner/utils/smoke-tests.sh b/provisioner/utils/smoke-tests.sh
index 8bf54574..e761d0a9 100755
--- a/provisioner/utils/smoke-tests.sh
+++ b/provisioner/utils/smoke-tests.sh
@@ -34,7 +34,6 @@ echo -e "\n===== EXPORTING VARIABLES =====\n"
export ALLUXIO_HOME=${ALLUXIO_HOME:-/usr/lib/alluxio}
export AMBARI_URL=${AMBARI_URL:-http://localhost:8080}
-export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-http://localhost}
export FLINK_HOME=${FLINK_HOME:-/usr/lib/flink}
export GPDB_HOME=${GPDB_HOME:-/usr/lib/gpdb}
export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
@@ -45,9 +44,7 @@ export HBASE_CONF_DIR=${HBASE_CONF_DIR:-/usr/lib/hbase/conf}
export HIVE_HOME=${HIVE_HOME:-/usr/lib/hive}
export HIVE_CONF_DIR=${HIVE_CONF_DIR:-/etc/hive/conf}
export KAFKA_HOME=${KAFKA_HOME:-/usr/lib/kafka}
-export KIBANA_HOME=${KIBANA_HOME:-/usr/lib/kibana}
export LIVY_HOME=${LIVY_HOME:-/usr/lib/livy}
-export LOGSTASH_HOME=${LOGSTASH_HOME:-/usr/lib/logstash}
export OOZIE_TAR_HOME=${OOZIE_TAR_HOME:-/usr/lib/oozie}
export OOZIE_URL=${OOZIE_URL:-http://localhost:11000/oozie}
export SPARK_HOME=${SPARK_HOME:-/usr/lib/spark}