diff --git a/contrib/distro/redhat/graylog2.conf b/contrib/distro/redhat/graylog2.conf index b1b8ded736..07c4b6dadf 100644 --- a/contrib/distro/redhat/graylog2.conf +++ b/contrib/distro/redhat/graylog2.conf @@ -104,7 +104,7 @@ gelf_listen_address = 0.0.0.0 gelf_listen_port = 12201 # Drools Rule File (Use to rewrite incoming log messages) -# See: http://support.torch.sh/help/kb/graylog2-server/custom-message-rewritingprocessing +# See: http://graylog2.org/resources/documentation/general/rewriting # rules_file = /etc/graylog2.d/rules/graylog2.drl # AMQP @@ -116,7 +116,7 @@ amqp_password = guest amqp_virtualhost = / # HTTP input -# http://support.torch.sh/help/kb/graylog2-server/using-the-gelf-http-input +# http://graylog2.org/resources/documentation/sending/gelfhttp http_enabled = false http_listen_address = 0.0.0.0 http_listen_port = 12202 @@ -156,7 +156,7 @@ enable_tokenizer_filter = true #graphite_carbon_tcp_port = 2003 #graphite_prefix = logs -# Librato Metrics (http://support.torch.sh/help/kb/graylog2-server/using-librato-metrics-with-graylog2) +# Librato Metrics #enable_libratometrics_output = false #enable_libratometrics_system_metrics = false #libratometrics_api_user = you@example.com diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/http/GELFHttpInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/http/GELFHttpInput.java index 9b954f5e26..cc6882f97d 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/http/GELFHttpInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/gelf/http/GELFHttpInput.java @@ -100,7 +100,7 @@ public class GELFHttpInput extends GELFInputBase { @Override public String linkToDocs() { - return "http://support.torch.sh/help/kb/graylog2-server/using-the-gelf-http-input"; + return "http://graylog2.org/resources/documentation/sending/gelfhttp"; } @Override diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/kafka/KafkaInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/kafka/KafkaInput.java index 42cc675143..be0d405785 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/kafka/KafkaInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/kafka/KafkaInput.java @@ -356,7 +356,7 @@ public class KafkaInput extends MessageInput { @Override public String linkToDocs() { - return "http://support.torch.sh/help/kb/getting-your-logs-into-graylog2/using-the-kafka-message-input"; + return "http://graylog2.org/resources/documentation/sending/heroku"; } @Override diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/misc/jsonpath/JsonPathInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/misc/jsonpath/JsonPathInput.java index 7b7a818762..511c45885c 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/misc/jsonpath/JsonPathInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/misc/jsonpath/JsonPathInput.java @@ -197,7 +197,7 @@ public class JsonPathInput extends MessageInput { @Override public String linkToDocs() { - return "http://support.torch.sh/help/kb/graylog2-server/the-json-path-from-http-api-input"; + return "http://graylog2.org/resources/documentation/sending/jsonpath"; } @Override diff --git a/graylog2-inputs/src/main/java/org/graylog2/inputs/radio/RadioKafkaInput.java b/graylog2-inputs/src/main/java/org/graylog2/inputs/radio/RadioKafkaInput.java index 3bff50f561..6491716805 100644 --- a/graylog2-inputs/src/main/java/org/graylog2/inputs/radio/RadioKafkaInput.java +++ b/graylog2-inputs/src/main/java/org/graylog2/inputs/radio/RadioKafkaInput.java @@ -63,7 +63,7 @@ public class RadioKafkaInput extends KafkaInput { @Override public String linkToDocs() { - return "http://support.torch.sh/help/kb/graylog2-server/using-graylog2-radio-v020x"; + return "http://graylog2.org/resources/documentation/setup/radio"; } @Override diff --git a/graylog2-server/src/main/java/org/graylog2/UI.java b/graylog2-server/src/main/java/org/graylog2/UI.java index 735db94778..cc442541cf 100644 --- a/graylog2-server/src/main/java/org/graylog2/UI.java +++ b/graylog2-server/src/main/java/org/graylog2/UI.java @@ -24,10 +24,9 @@ import org.slf4j.LoggerFactory; */ public class UI { - private static final String HELP_DOCS = "http://support.torch.sh/help/kb"; - private static final String HELP_MAILING_LIST = "http://support.torch.sh/help/kb/general/forums-mailing-list"; - private static final String HELP_ISSUE_TRACKER = "http://support.torch.sh/help/kb/general/issue-trackers"; - private static final String HELP_TORCH = "http://www.torch.sh/"; + private static final String HELP_DOCS = "http://graylog2.org/resources/documentation"; + private static final String HELP_COMMUNITY = "http://graylog2.org/resources/community-support"; + private static final String HELP_COMMERCIAL = "http://graylog2.org/products"; private static final Logger LOG = LoggerFactory.getLogger(Main.class); @@ -49,16 +48,15 @@ public class UI { sb.append("Need help?").append("\n\n"); sb.append("* Official documentation: ").append(HELP_DOCS).append("\n"); - sb.append("* Mailing list: ").append(HELP_MAILING_LIST).append("\n"); - sb.append("* Issue tracker: ").append(HELP_ISSUE_TRACKER).append("\n"); - sb.append("* Commercial support: ").append(HELP_TORCH).append("\n"); + sb.append("* Community support: ").append(HELP_COMMUNITY).append("\n"); + sb.append("* Commercial support: ").append(HELP_COMMERCIAL).append("\n"); if (docLinks != null && docLinks.length > 0) { sb.append("\n").append("But we also got some specific help " + "pages that might help you in this case:").append("\n\n"); for (final String docLink : docLinks) { - sb.append("* ").append(docLink(docLink)).append("\n"); + sb.append("* ").append(docLink).append("\n"); } } @@ -77,13 +75,4 @@ public class UI { return sb.append("\n").toString(); } - - private static String docLink(String part) { - if (!part.startsWith("/")) { - part = "/" + part; - } - - return "http://support.torch.sh/help/kb" + part; - } - } diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/Indexer.java b/graylog2-server/src/main/java/org/graylog2/indexer/Indexer.java index b7d49a7939..3ea6f74c09 100644 --- a/graylog2-server/src/main/java/org/graylog2/indexer/Indexer.java +++ b/graylog2-server/src/main/java/org/graylog2/indexer/Indexer.java @@ -204,7 +204,7 @@ public class Indexer { UI.exitHardWithWall("Could not successfully connect to ElasticSearch. Check that your cluster state is not RED " + "and that ElasticSearch is running properly.", - new String[]{"graylog2-server/configuring-and-tuning-elasticsearch-for-graylog2-v0200"}); + new String[]{"http://graylog2.org/resources/documentation/setup/elasticsearch"}); } searches = searchesFactory.create(client); diff --git a/misc/graylog2.conf b/misc/graylog2.conf index d520698a29..964fb7f5ce 100644 --- a/misc/graylog2.conf +++ b/misc/graylog2.conf @@ -71,7 +71,7 @@ elasticsearch_replicas = 0 elasticsearch_index_prefix = graylog2 # Do you want to allow searches with leading wildcards? This can be extremely resource hungry and should only -# be enabled with care. See also: http://support.torch.sh/help/kb/graylog2-web-interface/the-search-bar-explained +# be enabled with care. See also: http://graylog2.org/resources/documentation/general/queries allow_leading_wildcard_searches = false # Do you want to allow searches to be highlighted? Depending on the size of your messages this can be memory hungry and @@ -216,7 +216,7 @@ mongodb_max_connections = 100 mongodb_threads_allowed_to_block_multiplier = 5 # Drools Rule File (Use to rewrite incoming log messages) -# See: http://support.torch.sh/help/kb/graylog2-server/custom-message-rewritingprocessing +# See: http://graylog2.org/resources/documentation/general/rewriting #rules_file = /etc/graylog2.drl # Email transport