From 356ecb370506c727941317f4fd8a0f29bd4cc8a0 Mon Sep 17 00:00:00 2001 From: Cas Donoghue Date: Fri, 10 Jan 2025 14:28:35 -0800 Subject: [PATCH] Replace/remove references to defunct freenode instance (#16873) The preferred channel for communication about LS is the elastic discussion forum, this commit updates the source code and readme files to reflect that. --- README.md | 1 - .../templates/codec-plugin/README.md | 2 +- .../templates/filter-plugin/README.md | 2 +- .../templates/input-plugin/README.md | 2 +- .../templates/output-plugin/README.md | 2 +- logstash-core/lib/logstash/config/mixin.rb | 16 ++++++++-------- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index edb4a68d7..9daea3a65 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ supported platforms, from [downloads page](https://www.elastic.co/downloads/logs - [Logstash Forum](https://discuss.elastic.co/c/logstash) - [Logstash Documentation](https://www.elastic.co/guide/en/logstash/current/index.html) -- [#logstash on freenode IRC](https://webchat.freenode.net/?channels=logstash) - [Logstash Product Information](https://www.elastic.co/products/logstash) - [Elastic Support](https://www.elastic.co/subscriptions) diff --git a/lib/pluginmanager/templates/codec-plugin/README.md b/lib/pluginmanager/templates/codec-plugin/README.md index 7a89c8aa3..31ac2be8f 100644 --- a/lib/pluginmanager/templates/codec-plugin/README.md +++ b/lib/pluginmanager/templates/codec-plugin/README.md @@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi ## Need Help? -Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum. +Need help? Try the https://discuss.elastic.co/c/logstash discussion forum. ## Developing diff --git a/lib/pluginmanager/templates/filter-plugin/README.md b/lib/pluginmanager/templates/filter-plugin/README.md index fc39afc1d..9fd9be34d 100644 --- a/lib/pluginmanager/templates/filter-plugin/README.md +++ b/lib/pluginmanager/templates/filter-plugin/README.md @@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi ## Need Help? -Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum. +Need help? Try the https://discuss.elastic.co/c/logstash discussion forum. ## Developing diff --git a/lib/pluginmanager/templates/input-plugin/README.md b/lib/pluginmanager/templates/input-plugin/README.md index fc39afc1d..9fd9be34d 100644 --- a/lib/pluginmanager/templates/input-plugin/README.md +++ b/lib/pluginmanager/templates/input-plugin/README.md @@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi ## Need Help? -Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum. +Need help? Try the https://discuss.elastic.co/c/logstash discussion forum. ## Developing diff --git a/lib/pluginmanager/templates/output-plugin/README.md b/lib/pluginmanager/templates/output-plugin/README.md index fc39afc1d..9fd9be34d 100644 --- a/lib/pluginmanager/templates/output-plugin/README.md +++ b/lib/pluginmanager/templates/output-plugin/README.md @@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi ## Need Help? -Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum. +Need help? Try the https://discuss.elastic.co/c/logstash discussion forum. ## Developing diff --git a/logstash-core/lib/logstash/config/mixin.rb b/logstash-core/lib/logstash/config/mixin.rb index eb32625c1..5e04ec730 100644 --- a/logstash-core/lib/logstash/config/mixin.rb +++ b/logstash-core/lib/logstash/config/mixin.rb @@ -123,14 +123,14 @@ module LogStash::Config::Mixin if opts && opts[:deprecated] extra = opts[:deprecated].is_a?(String) ? opts[:deprecated] : "" extra.gsub!("%PLUGIN%", self.class.config_name) - self.deprecation_logger.deprecated("You are using a deprecated config setting " + - "#{name.inspect} set in #{self.class.config_name}. " + - "Deprecated settings will continue to work, " + - "but are scheduled for removal from logstash " + - "in the future. #{extra} If you have any questions " + - "about this, please visit the #logstash channel " + - "on freenode irc.", {}) - + self.deprecation_logger.deprecated( + "You are using a deprecated config setting #{name.inspect} set in " \ + "#{self.class.config_name}. Deprecated settings will continue to work, " \ + "but are scheduled for removal from logstash in the future. #{extra} " \ + "If you have any questions about this, please ask it on the " \ + "https://discuss.elastic.co/c/logstash discussion forum", + {} + ) end if opts && opts[:obsolete]