[PR PATCH] rsyslog: enable omelasticsearch.so

[PR PATCH] rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

There is a new pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages rsyslog-elasticsearch
https://github.com/void-linux/void-packages/pull/30883

rsyslog: enable omelasticsearch.so
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30883.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsyslog-elasticsearch-30883.patch --]
[-- Type: text/x-diff, Size: 1865 bytes --]

From cecff8b7fe12e54be6c51fdbdf28aa9ecabe25b7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 14 May 2021 22:10:35 -0500
Subject: [PATCH] rsyslog: enable omelasticsearch.so

---
 srcpkgs/rsyslog-elasticsearch |  1 +
 srcpkgs/rsyslog/template      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/rsyslog-elasticsearch

diff --git a/srcpkgs/rsyslog-elasticsearch b/srcpkgs/rsyslog-elasticsearch
new file mode 120000
index 000000000000..4ade98bc4c2a
--- /dev/null
+++ b/srcpkgs/rsyslog-elasticsearch
@@ -0,0 +1 @@
+rsyslog
\ No newline at end of file
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index b18fd1da3527..33c55076e9be 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,14 +1,14 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
  --enable-gssapi-krb5 --enable-mmsnmptrapd --enable-impstats --enable-omprog
  --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmsnare
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
- --enable-testbench"
+ --enable-elasticsearch --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
  liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel"
@@ -75,3 +75,12 @@ rsyslog-postgresql_package() {
 		vmove usr/lib/rsyslog/ompgsql.so
 	}
 }
+
+rsyslog-elasticsearch_package() {
+	lib32disabled=yes
+	depends="rsyslog"
+	short_desc+=" - Elasticsearch add-on"
+	pkg_install() {
+		vmove usr/lib/rsyslog/omelasticsearch.so
+	}
+}

Re: [PR PATCH] [Updated] rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages rsyslog-elasticsearch
https://github.com/void-linux/void-packages/pull/30883

rsyslog: enable omelasticsearch.so
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30883.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsyslog-elasticsearch-30883.patch --]
[-- Type: text/x-diff, Size: 1865 bytes --]

From 3c9d60d17bcdad716ba259a21800f7b04a5907f2 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 14 May 2021 22:10:35 -0500
Subject: [PATCH] rsyslog: enable omelasticsearch.so

---
 srcpkgs/rsyslog-elasticsearch |  1 +
 srcpkgs/rsyslog/template      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/rsyslog-elasticsearch

diff --git a/srcpkgs/rsyslog-elasticsearch b/srcpkgs/rsyslog-elasticsearch
new file mode 120000
index 000000000000..4ade98bc4c2a
--- /dev/null
+++ b/srcpkgs/rsyslog-elasticsearch
@@ -0,0 +1 @@
+rsyslog
\ No newline at end of file
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index b18fd1da3527..33c55076e9be 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,14 +1,14 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
  --enable-gssapi-krb5 --enable-mmsnmptrapd --enable-impstats --enable-omprog
  --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmsnare
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
- --enable-testbench"
+ --enable-elasticsearch --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
  liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel"
@@ -75,3 +75,12 @@ rsyslog-postgresql_package() {
 		vmove usr/lib/rsyslog/ompgsql.so
 	}
 }
+
+rsyslog-elasticsearch_package() {
+	lib32disabled=yes
+	depends="rsyslog"
+	short_desc+=" - Elasticsearch add-on"
+	pkg_install() {
+		vmove usr/lib/rsyslog/omelasticsearch.so
+	}
+}

Re: [PR PATCH] [Updated] rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]

There is an updated pull request by zdykstra against master on the void-packages repository

https://github.com/zdykstra/void-packages rsyslog-elasticsearch
https://github.com/void-linux/void-packages/pull/30883

rsyslog: enable omelasticsearch.so
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30883.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsyslog-elasticsearch-30883.patch --]
[-- Type: text/x-diff, Size: 1865 bytes --]

From 5e7418b7ba690a039731dfea2bc2821a742bfbd8 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 14 May 2021 22:10:35 -0500
Subject: [PATCH] rsyslog: enable omelasticsearch.so

---
 srcpkgs/rsyslog-elasticsearch |  1 +
 srcpkgs/rsyslog/template      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/rsyslog-elasticsearch

diff --git a/srcpkgs/rsyslog-elasticsearch b/srcpkgs/rsyslog-elasticsearch
new file mode 120000
index 000000000000..4ade98bc4c2a
--- /dev/null
+++ b/srcpkgs/rsyslog-elasticsearch
@@ -0,0 +1 @@
+rsyslog
\ No newline at end of file
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index b18fd1da3527..33c55076e9be 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,14 +1,14 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
  --enable-gssapi-krb5 --enable-mmsnmptrapd --enable-impstats --enable-omprog
  --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmsnare
  --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages
- --enable-testbench"
+ --enable-elasticsearch --enable-testbench"
 hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="gnutls-devel libcurl-devel libestr-devel libfastjson-devel
  liblogging-devel libmariadbclient-devel mit-krb5-devel postgresql-libs-devel"
@@ -75,3 +75,12 @@ rsyslog-postgresql_package() {
 		vmove usr/lib/rsyslog/ompgsql.so
 	}
 }
+
+rsyslog-elasticsearch_package() {
+	lib32disabled=yes
+	depends="rsyslog"
+	short_desc+=" - Elasticsearch add-on"
+	pkg_install() {
+		vmove usr/lib/rsyslog/omelasticsearch.so
+	}
+}

Re: rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/30883#issuecomment-841688554

Comment:
Checks seem to be taking longer than the timeout threshold. Doh.

Re: rsyslog: enable omelasticsearch.so

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30883#issuecomment-841714976

Comment:
If the test works locally you can add `make_check=ci-skip` and mention that it timeouts.

Re: rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 592 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/30883#issuecomment-841718352

Comment:
```
============================================================================
Testsuite summary for rsyslog 8.2010.0
============================================================================
# TOTAL: 473
# PASS:  420
# SKIP:  11
# XFAIL: 0
# FAIL:  42
# XPASS: 0
# ERROR: 0
```

I'll see if any of these can reasonably be fixed - the tests that are failing don't seem to have anything to do with `omelasticsearch.so` being enabled.

Re: rsyslog: enable omelasticsearch.so

[zdykstra]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/30883#issuecomment-841747726

Comment:
Tests run with the current template from `master`:
```
============================================================================
Testsuite summary for rsyslog 8.2010.0
============================================================================
# TOTAL: 473
# PASS:  418
# SKIP:  11
# XFAIL: 0
# FAIL:  44
# XPASS: 0
# ERROR: 0
```

Re: [PR PATCH] [Merged]: rsyslog: enable omelasticsearch.so

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

There's a merged pull request on the void-packages repository

rsyslog: enable omelasticsearch.so
https://github.com/void-linux/void-packages/pull/30883

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->