diff --git a/.ci/logstash-run.sh b/.ci/logstash-run.sh index 3e7bd084..9f2d46d5 100755 --- a/.ci/logstash-run.sh +++ b/.ci/logstash-run.sh @@ -26,7 +26,7 @@ wait_for_es() { } if [[ "$INTEGRATION" != "true" ]]; then - jruby -rbundler/setup -S rspec -fd spec/unit -t ~integration -t ~secure_integration + bundle exec rspec --format=documentation spec/unit --tag ~integration --tag ~secure_integration else if [[ "$SECURE_INTEGRATION" == "true" ]]; then @@ -38,5 +38,5 @@ else echo "Waiting for elasticsearch to respond..." ES_VERSION=$(wait_for_es) echo "Elasticsearch $ES_VERSION is Up!" - jruby -rbundler/setup -S rspec -fd $extra_tag_args --tag update_tests:painless --tag es_version:$ES_VERSION spec/integration + bundle exec rspec --format=documentation $extra_tag_args --tag update_tests:painless --tag es_version:$ES_VERSION spec/integration fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 17f28ab8..84d18e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 11.12.2 + - [Doc] Fixes the broken apache http client link [#1101](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1101) + ## 11.12.1 - Log bulk request response body on error, not just when debug logging is enabled [#1096](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1096) diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 8162f41f..6f7e72eb 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -1185,7 +1185,7 @@ How long to wait before checking for a stale connection to determine if a keepal Consider setting this value lower than the default, possibly to 0, if you get connection errors regularly. This client is based on Apache Commons. Here's how the -https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html#setValidateAfterInactivity(int)[Apache +https://hc.apache.org/httpcomponents-client-4.5.x/current/httpclient/apidocs/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html#setValidateAfterInactivity(int)[Apache Commons documentation] describes this option: "Defines period of inactivity in milliseconds after which persistent connections must be re-validated prior to being leased to the consumer. Non-positive value passed to this method disables diff --git a/logstash-output-elasticsearch.gemspec b/logstash-output-elasticsearch.gemspec index fa356997..07dfcb22 100644 --- a/logstash-output-elasticsearch.gemspec +++ b/logstash-output-elasticsearch.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'logstash-output-elasticsearch' - s.version = '11.12.1' + s.version = '11.12.2' s.licenses = ['apache-2.0'] s.summary = "Stores logs in Elasticsearch" s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"