Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15887: Remove <jmx/> from shipped solrconfig.xml (#485)

Eric Pughd38a9545ccaf
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2f969ab8006..ec77fcc7588 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -194,6 +194,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15890: Add a limit to the Admin SQL panel if one is not included in the stmt (Joel Bernstein)
+* SOLR-15887: Remove <jmx/> from shipped solrconfig.xm. (Eric Pugh)
+
Build
---------------------
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index f99231bc084..0ae25bd3ec8 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -247,25 +247,6 @@
<!-- <infoStream file="INFOSTREAM.txt">false</infoStream> -->
</indexConfig>
-
- <!-- JMX
-
- This example enables JMX if and only if an existing MBeanServer
- is found, use this if you want to configure JMX through JVM
- parameters. Remove this to disable exposing Solr configuration
- and statistics to JMX.
-
- For more details see https://solr.apache.org/guide/jmx-with-solr.html
- -->
- <jmx />
- <!-- If you want to connect to a particular server, specify the
- agentId
- -->
- <!-- <jmx agentId="myAgent" /> -->
- <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
- <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
- -->
-
<!-- The default high-performance update handler -->
<updateHandler class="solr.DirectUpdateHandler2">
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 6ba59aaadd9..0985150568c 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -260,25 +260,6 @@
<infoStream>true</infoStream>
</indexConfig>
-
- <!-- JMX
-
- This example enables JMX if and only if an existing MBeanServer
- is found, use this if you want to configure JMX through JVM
- parameters. Remove this to disable exposing Solr configuration
- and statistics to JMX.
-
- For more details see https://solr.apache.org/guide/jmx-with-solr.html
- -->
- <jmx />
- <!-- If you want to connect to a particular server, specify the
- agentId
- -->
- <!-- <jmx agentId="myAgent" /> -->
- <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
- <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
- -->
-
<!-- The default high-performance update handler -->
<updateHandler class="solr.DirectUpdateHandler2">
diff --git a/solr/server/solr/solr.xml b/solr/server/solr/solr.xml
index fb188cf4192..8e919c616f3 100644
--- a/solr/server/solr/solr.xml
+++ b/solr/server/solr/solr.xml
@@ -17,11 +17,11 @@
-->
<!--
- This is an example of a simple "solr.xml" file for configuring one or
- more Solr Cores, as well as allowing Cores to be added, removed, and
+ This is an example of a simple "solr.xml" file for configuring one or
+ more Solr Cores, as well as allowing Cores to be added, removed, and
reloaded via HTTP requests.
- More information about options available in this configuration file,
+ More information about options available in this configuration file,
and Solr Core administration can be found online:
https://solr.apache.org/guide/format-of-solr-xml.html
-->
@@ -57,6 +57,8 @@
<int name="connTimeout">${connTimeout:60000}</int>
</shardHandlerFactory>
- <metrics enabled="${metricsEnabled:true}"/>
+ <metrics enabled="${metricsEnabled:true}">
+ <!--reporter name="jmx_metrics" group="core" class="org.apache.solr.metrics.reporters.SolrJmxReporter"/-->
+ </metrics>
</solr>