Apache Solr open-source search software
SOLR-14972: Change default port of prometheus exporter to 8989 (#2046)
Jan Høydahl0c3f2f4ac817
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 18c309708a0..8861d97a1ae 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -40,6 +40,8 @@ Improvements* SOLR-14880: Support coreRootDirectory setting when create new cores from command line, in standalone mode (Alexandre Rafalovitch)+* SOLR-14972: Change default port of prometheus exporter to 8989 because it clashed with default embedded zookeeper port (janhoy)+Other Changes----------------------* SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.javaindex 1a0bff8612e..d3da263fb77 100644--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java@@ -50,7 +50,7 @@ public class SolrExporter {private static final String[] ARG_PORT_FLAGS = {"-p", "--port"};private static final String ARG_PORT_METAVAR = "PORT";private static final String ARG_PORT_DEST = "port";- private static final int ARG_PORT_DEFAULT = 9983;+ private static final int ARG_PORT_DEFAULT = 8989;private static final String ARG_PORT_HELP = "Specify the solr-exporter HTTP listen port; default is " + ARG_PORT_DEFAULT + ".";private static final String[] ARG_BASE_URL_FLAGS = {"-b", "--baseurl"};diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adocindex 503a30bf13c..e05cd75f20a 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc@@ -139,6 +139,8 @@ _(raw; not yet edited)_* SOLR-14654: plugins cannot be loaded using "runtimeLib=true" option. Use the package manager to use and load plugins+* SOLR-14972: The default port of prometheus exporter has changed from 9983 to 8989, so you may need to adjust your configuration after upgrade.+=== Upgrade Prerequisites in Solr 9* Upgrade all collections in stateFormat=1 to stateFormat=2 *before* upgrading to Solr 9, as Solr 9 does not support thediff --git a/solr/solr-ref-guide/src/monitoring-solr-with-prometheus-and-grafana.adoc b/solr/solr-ref-guide/src/monitoring-solr-with-prometheus-and-grafana.adocindex 8661fea5df8..e260f81f167 100644--- a/solr/solr-ref-guide/src/monitoring-solr-with-prometheus-and-grafana.adoc+++ b/solr/solr-ref-guide/src/monitoring-solr-with-prometheus-and-grafana.adoc@@ -89,7 +89,7 @@ Displays command line help and usage.`-p`, `--port`, `$PORT`::The port where Prometheus will listen for new data. This port will be used to configure Prometheus.-It can be any port not already in use on your server. The default is `9983`.+It can be any port not already in use on your server. The default is `8989`.`-b`, `--baseurl`, `$SOLR_URL`::The Solr base URL (such as `\http://localhost:8983/solr`) when Solr is running in Standalone mode.