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 2021/09/01 05:00:34 UTC
[bigtop] branch branch-1.5 updated (3eaa312 -> 0d1380c)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a change to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git.
from 3eaa312 BIGTOP-3546. Could not find org.pentaho:pentaho-aggdesigner-algorithm:5.1.5-jhyde.
new 58a378f BIGTOP-3499. Fix Logstash build failure due to gem version incompatibility. (#734)
new 2c1fc4e BIGTOP-3562. Building Logstash is failing due to the unavailability of keyserver. (#791)
new 0d1380c BIGTOP-3582. Logstash RPM Build Fails. (#815)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bigtop-packages/src/common/logstash/do-component-build | 2 +-
.../common/logstash/patch1-gem-version-compatibility.diff | 10 ++++++++++
.../logstash/patch2-pin-logstash-output-elasticsearch.diff | 13 +++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff
create mode 100644 bigtop-packages/src/common/logstash/patch2-pin-logstash-output-elasticsearch.diff
[bigtop] 02/03: BIGTOP-3562. Building Logstash is failing due to
the unavailability of keyserver. (#791)
Posted by iw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git
commit 2c1fc4e097b84bb60bab3e961655c52a77aebee7
Author: Kengo Seki <se...@apache.org>
AuthorDate: Mon Jun 28 11:05:07 2021 +0900
BIGTOP-3562. Building Logstash is failing due to the unavailability of keyserver. (#791)
(cherry picked from commit 3cb84ddcff0f2a0e80b916ec71895b58b53c623e)
---
bigtop-packages/src/common/logstash/do-component-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bigtop-packages/src/common/logstash/do-component-build b/bigtop-packages/src/common/logstash/do-component-build
index 4f63607..143c778 100644
--- a/bigtop-packages/src/common/logstash/do-component-build
+++ b/bigtop-packages/src/common/logstash/do-component-build
@@ -35,7 +35,7 @@ case ${ID}-${VERSION_ID} in
esac
# Install ruby-2.4.0 to build Logstash
-gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import -
curl -sSL https://get.rvm.io | bash -s stable
if ((UID == 0))
then
[bigtop] 03/03: BIGTOP-3582. Logstash RPM Build Fails. (#815)
Posted by iw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git
commit 0d1380c3019748a429521755064b17ad860e75b3
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Sep 1 11:28:41 2021 +0900
BIGTOP-3582. Logstash RPM Build Fails. (#815)
(cherry picked from commit d9f163507e69fc46acdbcf4bb12f5ca22d10e8d3)
---
.../logstash/patch2-pin-logstash-output-elasticsearch.diff | 13 +++++++++++++
1 file changed, 13 insertions(+)
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
new file mode 100644
index 0000000..205b17c
--- /dev/null
+++ b/bigtop-packages/src/common/logstash/patch2-pin-logstash-output-elasticsearch.diff
@@ -0,0 +1,13 @@
+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"
[bigtop] 01/03: BIGTOP-3499. Fix Logstash build failure due to gem
version incompatibility. (#734)
Posted by iw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git
commit 58a378f9d0b5da6a9325f2f07bc745e5643831b9
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Feb 16 11:05:57 2021 +0900
BIGTOP-3499. Fix Logstash build failure due to gem version incompatibility. (#734)
(cherry picked from commit 4a9f6598321a61e2c4fb60da56ef54904b8dd4f2)
---
.../src/common/logstash/patch1-gem-version-compatibility.diff | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff b/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff
new file mode 100644
index 0000000..bf7f2ee
--- /dev/null
+++ b/bigtop-packages/src/common/logstash/patch1-gem-version-compatibility.diff
@@ -0,0 +1,10 @@
+diff --git a/Gemfile b/Gemfile
+index e6b55ded0..ee2f4ef0a 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -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"