Apache Solr open-source search software
SOLR-15862 Fix lucene.apache.org links (#466)
Jan Høydahl92e2328b4d99
diff --git a/dev-docs/pmc-chair.adoc b/dev-docs/pmc-chair.adocindex f0b0393325c..821a4c424e5 100644--- a/dev-docs/pmc-chair.adoc+++ b/dev-docs/pmc-chair.adoc@@ -81,9 +81,9 @@ The standard process for handling vulnerability reports is defined at https://ww*All vulnerability reports must be handled with discretion and should not be discussed outside the Apache Security team and the PMC.* The reason for this is to prevent the vulnerability from being exploited before we have a chance to come up with proper mitigation steps and/or bug fixes.=== How Vulnerabilities are Reported-The mailing list [email protected] has been set up to handle vulnerability reports. This list includes the Apache Security team, so they do not need to be cc'd on mails to that list. PMC members are unfortunately not automatically subscribed to this list, they must subscribe themselves.+The mailing list [email protected] has been set up to handle vulnerability reports. This list includes the Apache Security team, so they do not need to be cc'd on mails to that list. PMC members are unfortunately not automatically subscribed to this list, they must subscribe themselves.-The Apache Security team should be kept in the loop regarding how we decide to handle any vulnerability report. They are not cc'd on mails to [email protected], so if discussion happens there, [email protected] should be copied where appropriate.+The Apache Security team should be kept in the loop regarding how we decide to handle any vulnerability report. They are not cc'd on mails to [email protected], so if discussion happens there, [email protected] should be copied where appropriate.Vulnerabilities may also be reported via Jira. When this happens, the Security Level field in the issue must be set to "Private", which means it can only be viewed by members of the PMC.@@ -138,7 +138,7 @@ Private PMC files: https://svn.apache.org/repos/private/pmc/lucene/The Lucene PMC traditionally rotates the Chair once a year.When it's time to change Chairs, think of a member of the PMC to replace you and ask if they will be willing to serve a term as Chair.-If they agree, you can start a VOTE thread in [email protected] nominating your successor.+If they agree, you can start a VOTE thread in [email protected] nominating your successor.Assuming the vote passes, you can send a resolution to the Board for their approval to change the Chair. Include the vote thread in the resolution.You do not need to wait until the usual quarterly report is due to change the Chair.diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdfindex 20efbd241ce..968fe56b378 100644--- a/dev-tools/doap/solr.rdf+++ b/dev-tools/doap/solr.rdf@@ -23,7 +23,7 @@xmlns:asfext="http://projects.apache.org/ns/asfext#"xmlns:foaf="http://xmlns.com/foaf/0.1/"><!--- This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf+ This file's canonical URL is: https://solr.apache.org/doap.rdfNote that the canonical URL may redirect to other non-canonical locations.-->diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex 91436c2b3ca..cde62939532 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -64,7 +64,7 @@ templates:(( template=vote_logic )).Mail template {% if passed %}successful{% else %}failed{% endif %} vote----- To: [email protected]+ To: [email protected]Subject: [{% if passed %}RESULT{% else %}FAILED{% endif %}] [VOTE] Release Lucene/Solr {{ release_version }} RC{{ rc_number }}It's been >72h since the vote was initiated and the result is:@@ -113,7 +113,7 @@ templates:Solr {{ release_version }} is available for immediate download at:- <https://lucene.apache.org/solr/downloads.html>+ <https://solr.apache.org/downloads.html>### Solr {{ release_version }} Release Highlights:@@ -122,11 +122,11 @@ templates:Please refer to the Upgrade Notes in the Solr Ref Guide for information on upgrading from previous Solr versions:- <https://lucene.apache.org/solr/guide/{{ release_version_refguide }}/solr-upgrade-notes.html>+ <https://solr.apache.org/guide/{{ release_version_refguide }}/solr-upgrade-notes.html>Please read CHANGES.txt for a full list of {% if is_feature_release %}new features, changes and {% endif %}bugfixes:- <https://lucene.apache.org/solr/{{ release_version_underscore }}/changes/Changes.html>+ <https://solr.apache.org/{{ release_version_underscore }}/changes/Changes.html>Solr {{ release_version }} also includes {% if is_feature_release %}features, optimizations and {% endif %}bugfixes in the corresponding Apache Lucene release:@@ -137,7 +137,7 @@ templates:.Mail template----Subject: [ANNOUNCE] Apache Lucene {{ release_version }} released(( template=announce_lucene_mail_body ))@@ -171,7 +171,7 @@ templates:.Mail template----Subject: [ANNOUNCE] Apache Solr {{ release_version }} released(( template=announce_solr_mail_body ))@@ -548,7 +548,7 @@ groups:.Mail template----- To: [email protected]+ To: [email protected]Subject: New branch and feature freeze for Lucene/Solr {{ release_version }}NOTICE:@@ -588,7 +588,7 @@ groups:.Mail template----- To: [email protected]+ To: [email protected]Subject: Bugfix release Lucene/Solr {{ release_version }}NOTICE:@@ -799,7 +799,7 @@ groups:.Mail template----- To: [email protected]+ To: [email protected]Subject: [VOTE] Release Lucene/Solr {{ release_version }} RC{{ rc_number }}Please vote for release candidate {{ rc_number }} for Lucene/Solr {{ release_version }}@@ -1232,7 +1232,7 @@ groups:- stage_websitedescription: |Push the website changes to 'production' branch. This will build and publish the live site on- https://lucene.apache.org+ https://solr.apache.orgcommands: !Commandsroot_folder: '{{ git_website_folder }}'commands:diff --git a/gradle/documentation/documentation.gradle b/gradle/documentation/documentation.gradleindex 2d5de0d0267..f8f3d35a523 100644--- a/gradle/documentation/documentation.gradle+++ b/gradle/documentation/documentation.gradle@@ -38,7 +38,7 @@ configure(rootProject) {}}())- solrRefguideUrl = project.propertyOrDefault('solr.refguide.url', "https://lucene.apache.org/solr/guide/${refguideUrlVersion}")+ solrRefguideUrl = project.propertyOrDefault('solr.refguide.url', "https://solr.apache.org/guide/${refguideUrlVersion}")}task documentation() {diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex d8f8453e8d3..67e20c248e8 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -16286,7 +16286,7 @@ Other Changesin the migration of existing clients. (yonik)* SOLR-3691: SimplePostTool: Mode for crawling/posting web pages- See https://lucene.apache.org/solr/guide/post-tool.html for examples (janhoy)+ See https://solr.apache.org/guide/post-tool.html for examples (janhoy)* SOLR-3707: Upgrade Solr to Tika 1.2 (janhoy)@@ -18380,7 +18380,7 @@ New FeaturesGreat Circle (haversine), Manhattan, Euclidean and String (using theStringDistance methods in the Lucene spellchecker).Also added geohash(), deg() and rad() convenience functions.- See https://lucene.apache.org/solr/guide/function-queries.html (gsingers)+ See https://solr.apache.org/guide/function-queries.html (gsingers)* SOLR-1553: New dismax parser implementation (accessible as "edismax")that supports full lucene syntax, improved reserved char escaping,diff --git a/solr/README.md b/solr/README.mdindex 4c3710dc395..e675ada8172 100644--- a/solr/README.md+++ b/solr/README.md@@ -23,7 +23,7 @@ from the Apache Lucene project.For a complete description of the Solr project, team composition, sourcecode repositories, and other details, please see the Solr web site at-https://lucene.apache.org/solr+https://solr.apache.org/solrGetting Started@@ -117,11 +117,11 @@ For more information about Solr examples please read...For more information about the "Solr Home" and Solr specific configuration- * https://lucene.apache.org/solr/guide/solr-tutorial.html+ * https://solr.apache.org/guide/solr-tutorial.htmlFor a Solr tutorial- * https://lucene.apache.org/solr/resources.html+ * https://solr.apache.org/resources.htmlFor a list of other tutorials and introductory articles.@@ -168,7 +168,7 @@ Instructions for Building Apache Solr from SourceAlternately, you can obtain a copy of the latest Apache Solr source codedirectly from the GIT repository:- https://lucene.apache.org/solr/community.html#version-control+ https://solr.apache.org/community.html#version-control3. Navigate to the root of your source tree folder and issue the `./gradlew tasks`command to see the available options for building, testing, and packaging Solr.diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.javaindex 351edc3f513..911b9e6c306 100644--- a/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java+++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java@@ -78,7 +78,7 @@ import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;* for information on downloading pre-trained models.</p>** Note that in order to use model files larger than 1MB on SolrCloud,- * <a href="https://lucene.apache.org/solr/guide/setting-up-an-external-zookeeper-ensemble.html#increasing-the-file-size-limit"+ * <a href="https://solr.apache.org/guide/setting-up-an-external-zookeeper-ensemble.html#increasing-the-file-size-limit"* >ZooKeeper server and client configuration is required</a>.** <p>diff --git a/solr/contrib/ltr/example/README.md b/solr/contrib/ltr/example/README.mdindex 06a47890f5d..482da31b078 100644--- a/solr/contrib/ltr/example/README.md+++ b/solr/contrib/ltr/example/README.md@@ -1,6 +1,6 @@This README file is only about this example directory's content.-Please refer to the Solr Reference Guide's section on [Learning To Rank](https://lucene.apache.org/solr/guide/learning-to-rank.html) section for broader information on Learning to Rank (LTR) with Apache Solr.+Please refer to the Solr Reference Guide's section on [Learning To Rank](https://solr.apache.org/guide/learning-to-rank.html) section for broader information on Learning to Rank (LTR) with Apache Solr.# Start Solr with the LTR plugin enableddiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.javaindex c46a84ca0c3..2c1141ed8df 100644--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java@@ -43,7 +43,7 @@ import org.apache.solr.search.SyntaxError;/*** This feature allows you to reuse any Solr query as a feature. The value* of the feature will be the score of the given query for the current document.- * See <a href="https://lucene.apache.org/solr/guide/other-parsers.html">Solr documentation of other parsers</a> you can use as a feature.+ * See <a href="https://solr.apache.org/guide/other-parsers.html">Solr documentation of other parsers</a> you can use as a feature.* Example configurations:* <pre>[{ "name": "isBook","class": "org.apache.solr.ltr.feature.SolrFeature",diff --git a/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml b/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xmlindex f7638dd0a38..bf8e491603c 100644--- a/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml+++ b/solr/contrib/prometheus-exporter/conf/solr-exporter-config.xml@@ -70,7 +70,7 @@{name: "solr_metrics_core_query_{UNIQUE}",type: "{TYPE}",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core"],label_values: [$category, $handler, $core],value: $value@@ -79,7 +79,7 @@{name: "solr_metrics_core_query_{UNIQUE}",type: "{TYPE}",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -104,7 +104,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -113,7 +113,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -137,7 +137,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -146,7 +146,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -161,7 +161,7 @@{name : "solr_metrics_node_{UNIQUE}",type : "{TYPE}",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -186,7 +186,7 @@{name: "solr_metrics_core_searcher_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -195,7 +195,7 @@{name: "solr_metrics_core_searcher_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -213,7 +213,7 @@{name : "solr_metrics_node_thread_pool_{UNIQUE}",type : "{TYPE}",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "executor"],label_values : [$category, $handler, $executor],value : $value@@ -226,7 +226,7 @@{name : "solr_metrics_jvm_{UNIQUE}",type : "{TYPE}",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -248,7 +248,7 @@{name : "solr_ping",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/ping.html",+ help : "See following URL: https://solr.apache.org/guide/ping.html",label_names : [],label_values : [],value : $value@@ -293,7 +293,7 @@{name : "solr_metrics_jetty_response_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["status"],label_values : [$status],value : $value@@ -306,7 +306,7 @@{name : "solr_metrics_jetty_requests_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["method"],label_values : [$method],value : $value@@ -318,7 +318,7 @@{name : "solr_metrics_jetty_dispatches_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : [],label_values : [],value : $value@@ -334,7 +334,7 @@{name : "solr_metrics_jvm_buffers",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["pool"],label_values : [$pool],value : $value@@ -348,7 +348,7 @@{name : "solr_metrics_jvm_buffers_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["pool", "item"],label_values : [$pool, $item],value : $value@@ -361,7 +361,7 @@{name : "solr_metrics_jvm_gc_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -374,7 +374,7 @@{name : "solr_metrics_jvm_gc_seconds_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -398,7 +398,7 @@{name : "solr_metrics_jvm_memory_pools_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["space", "item"],label_values : [$space, $item],value : $value@@ -424,7 +424,7 @@{name : "solr_metrics_jvm_os_cpu_time_seconds",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : ["processCpuTime"],value : $value@@ -436,7 +436,7 @@{name : "solr_metrics_jvm_os_load_average",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : ["systemLoadAverage"],value : $value@@ -449,7 +449,7 @@{name : "solr_metrics_jvm_threads",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -466,7 +466,7 @@{name : "solr_metrics_overseer_collectionWorkQueueSize",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : [],label_values : [],value : $value@@ -480,7 +480,7 @@{name : "solr_metrics_overseer_stateUpdateQueueSize",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : [],label_values : [],value : $value@@ -515,7 +515,7 @@{name : "solr_metrics_node_cores",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "item"],label_values : [$category, $item],value : $value@@ -531,7 +531,7 @@{name : "solr_metrics_node_core_root_fs_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "item"],label_values : [$category, $item],value : $value@@ -557,7 +557,7 @@{name : "solr_metrics_node_connections",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "item"],label_values : [$category, $handler, $item],value : $value@@ -656,7 +656,7 @@{name: "solr_metrics_core_field_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core"],label_values: [$category, $core],value: $value@@ -665,7 +665,7 @@{name: "solr_metrics_core_field_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica"],label_values: [$category, $core, $collection, $shard, $replica],value: $value@@ -759,7 +759,7 @@{name: "solr_metrics_core_fs_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "item"],label_values: [$category, $core, $item],value: $value@@ -768,7 +768,7 @@{name: "solr_metrics_core_fs_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "item"],label_values: [$category, $core, $collection, $shard, $replica, $item],value: $value@@ -793,7 +793,7 @@{name: "solr_metrics_core_highlighter_request_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "name", "item"],label_values: [$category, $core, $name, $item],value: $value@@ -802,7 +802,7 @@{name: "solr_metrics_core_highlighter_request_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "name", "item"],label_values: [$category, $core, $collection, $shard, $replica, $name, $item],value: $value@@ -825,7 +825,7 @@{name: "solr_metrics_core_index_size_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core"],label_values: [$category, $core],value: $value@@ -834,7 +834,7 @@{name: "solr_metrics_core_index_size_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica"],label_values: [$category, $core, $collection, $shard, $replica],value: $value@@ -858,7 +858,7 @@{name: "solr_metrics_core_replication_master",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -867,7 +867,7 @@{name: "solr_metrics_core_replication_master",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -891,7 +891,7 @@{name: "solr_metrics_core_replication_follower",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -900,7 +900,7 @@{name: "solr_metrics_core_replication_follower",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -924,7 +924,7 @@{name: "solr_metrics_core_searcher_documents",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "item"],label_values: [$category, $core, $item],value: $value@@ -933,7 +933,7 @@{name: "solr_metrics_core_searcher_documents",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "item"],label_values: [$category, $core, $collection, $shard, $replica, $item],value: $value@@ -958,7 +958,7 @@{name : "solr_collections_live_nodes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : [],label_values : [],value : $value@@ -971,7 +971,7 @@{name : "solr_collections_pull_replicas",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection"],label_values : [$collection],value : $value@@ -984,7 +984,7 @@{name : "solr_collections_nrt_replicas",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection"],label_values : [$collection],value : $value@@ -997,7 +997,7 @@{name : "solr_collections_tlog_replicas",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection"],label_values : [$collection],value : $value@@ -1012,7 +1012,7 @@{name : "solr_collections_shard_state",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection","shard"],label_values : [$collection,$shard],value : $value@@ -1035,7 +1035,7 @@{name : "solr_collections_replica_state",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection", "shard", "replica", "replica_name", "core", "base_url", "node_name", "type", "state"],label_values : [$collection, $shard, $replica, $replica_name, $core, $base_url, $node_name, $type, $state],value : $value@@ -1058,7 +1058,7 @@{name : "solr_collections_shard_leader",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection", "shard", "replica", "replica_name", "core", "base_url", "node_name", "type"],label_values : [$collection, $shard, $replica, $replica_name, $core, $base_url, $node_name, $type],value : $valuediff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xmlindex fdd3e3ddd9e..74126451d7c 100644--- a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml@@ -77,7 +77,7 @@{name : "solr_ping",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/ping.html",+ help : "See following URL: https://solr.apache.org/guide/ping.html",label_names : [],label_values : [],value : $value@@ -118,7 +118,7 @@{name : "solr_metrics_jvm_buffers",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["pool"],label_values : [$pool],value : $value@@ -132,7 +132,7 @@{name : "solr_metrics_jvm_buffers_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["pool", "item"],label_values : [$pool, $item],value : $value@@ -145,7 +145,7 @@{name : "solr_metrics_jvm_gc_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -158,7 +158,7 @@{name : "solr_metrics_jvm_gc_seconds_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -171,7 +171,7 @@{name : "solr_metrics_jvm_memory_heap_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -184,7 +184,7 @@{name : "solr_metrics_jvm_memory_non_heap_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -198,7 +198,7 @@{name : "solr_metrics_jvm_memory_pools_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["space", "item"],label_values : [$space, $item],value : $value@@ -211,7 +211,7 @@{name : "solr_metrics_jvm_memory_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -224,7 +224,7 @@{name : "solr_metrics_jvm_os_memory_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -237,7 +237,7 @@{name : "solr_metrics_jvm_os_file_descriptors",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -250,7 +250,7 @@{name : "solr_metrics_jvm_os_cpu_load",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -262,7 +262,7 @@{name : "solr_metrics_jvm_os_cpu_time_seconds",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : ["processCpuTime"],value : $value@@ -274,7 +274,7 @@{name : "solr_metrics_jvm_os_load_average",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : ["systemLoadAverage"],value : $value@@ -287,7 +287,7 @@{name : "solr_metrics_jvm_threads",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["item"],label_values : [$item],value : $value@@ -301,7 +301,7 @@{name : "solr_metrics_node_client_errors_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -315,7 +315,7 @@{name : "solr_metrics_node_errors_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -329,7 +329,7 @@{name : "solr_metrics_node_requests_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -343,7 +343,7 @@{name : "solr_metrics_node_server_errors_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -357,7 +357,7 @@{name : "solr_metrics_node_timeouts_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -371,7 +371,7 @@{name : "solr_metrics_node_time_seconds_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -385,7 +385,7 @@{name : "solr_metrics_node_cores",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "item"],label_values : [$category, $item],value : $value@@ -401,7 +401,7 @@{name : "solr_metrics_node_core_root_fs_bytes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "item"],label_values : [$category, $item],value : $value@@ -418,7 +418,7 @@{name : "solr_metrics_node_thread_pool_completed_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "executor"],label_values : [$category, $handler, $executor],value : $value@@ -435,7 +435,7 @@{name : "solr_metrics_node_thread_pool_running",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "executor"],label_values : [$category, $handler, $executor],value : $value@@ -452,7 +452,7 @@{name : "solr_metrics_node_thread_pool_submitted_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "executor"],label_values : [$category, $handler, $executor],value : $value@@ -469,7 +469,7 @@{name : "solr_metrics_node_connections",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler", "item"],label_values : [$category, $handler, $item],value : $value@@ -497,7 +497,7 @@{name: "solr_metrics_core_client_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -506,7 +506,7 @@{name: "solr_metrics_core_client_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -531,7 +531,7 @@{name: "solr_metrics_core_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -540,7 +540,7 @@{name: "solr_metrics_core_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -565,7 +565,7 @@{name: "solr_metrics_core_requests_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -574,7 +574,7 @@{name: "solr_metrics_core_requests_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -599,7 +599,7 @@{name: "solr_metrics_core_server_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -608,7 +608,7 @@{name: "solr_metrics_core_server_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -633,7 +633,7 @@{name: "solr_metrics_core_timeouts_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -642,7 +642,7 @@{name: "solr_metrics_core_timeouts_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -667,7 +667,7 @@{name: "solr_metrics_core_time_seconds_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -676,7 +676,7 @@{name: "solr_metrics_core_time_seconds_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -699,7 +699,7 @@{name: "solr_metrics_core_field_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core"],label_values: [$category, $core],value: $value@@ -708,7 +708,7 @@{name: "solr_metrics_core_field_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica"],label_values: [$category, $core, $collection, $shard, $replica],value: $value@@ -734,7 +734,7 @@{name: "solr_metrics_core_searcher_cache",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -743,7 +743,7 @@{name: "solr_metrics_core_searcher_cache",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -769,7 +769,7 @@{name: "solr_metrics_core_searcher_cache_ratio",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -778,7 +778,7 @@{name: "solr_metrics_core_searcher_cache_ratio",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -804,7 +804,7 @@{name: "solr_metrics_core_searcher_warmup_time_seconds",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -813,7 +813,7 @@{name: "solr_metrics_core_searcher_warmup_time_seconds",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -839,7 +839,7 @@{name: "solr_metrics_core_searcher_cumulative_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -848,7 +848,7 @@{name: "solr_metrics_core_searcher_cumulative_cache_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -874,7 +874,7 @@{name: "solr_metrics_core_searcher_cumulative_cache_ratio",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "type", "item"],label_values: [$category, $core, $type, $item],value: $value@@ -883,7 +883,7 @@{name: "solr_metrics_core_searcher_cumulative_cache_ratio",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "type", "item"],label_values: [$category, $core, $collection, $shard, $replica, $type, $item],value: $value@@ -907,7 +907,7 @@{name: "solr_metrics_core_fs_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "item"],label_values: [$category, $core, $item],value: $value@@ -916,7 +916,7 @@{name: "solr_metrics_core_fs_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "item"],label_values: [$category, $core, $collection, $shard, $replica, $item],value: $value@@ -941,7 +941,7 @@{name: "solr_metrics_core_highlighter_request_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "name", "item"],label_values: [$category, $core, $name, $item],value: $value@@ -950,7 +950,7 @@{name: "solr_metrics_core_highlighter_request_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "name", "item"],label_values: [$category, $core, $collection, $shard, $replica, $name, $item],value: $value@@ -973,7 +973,7 @@{name: "solr_metrics_core_index_size_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core"],label_values: [$category, $core],value: $value@@ -982,7 +982,7 @@{name: "solr_metrics_core_index_size_bytes",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica"],label_values: [$category, $core, $collection, $shard, $replica],value: $value@@ -1006,7 +1006,7 @@{name: "solr_metrics_core_replication_master",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1015,7 +1015,7 @@{name: "solr_metrics_core_replication_master",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1039,7 +1039,7 @@{name: "solr_metrics_core_replication_follower",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1048,7 +1048,7 @@{name: "solr_metrics_core_replication_follower",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1072,7 +1072,7 @@{name: "solr_metrics_core_searcher_documents",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "item"],label_values: [$category, $core, $item],value: $value@@ -1081,7 +1081,7 @@{name: "solr_metrics_core_searcher_documents",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "core", "collection", "shard", "replica", "item"],label_values: [$category, $core, $collection, $shard, $replica, $item],value: $value@@ -1105,7 +1105,7 @@{name: "solr_metrics_core_update_handler_adds",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1114,7 +1114,7 @@{name: "solr_metrics_core_update_handler_adds",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1138,7 +1138,7 @@{name: "solr_metrics_core_update_handler_auto_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1147,7 +1147,7 @@{name: "solr_metrics_core_update_handler_auto_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1171,7 +1171,7 @@{name: "solr_metrics_core_update_handler_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1180,7 +1180,7 @@{name: "solr_metrics_core_update_handler_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1204,7 +1204,7 @@{name: "solr_metrics_core_update_handler_adds_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1213,7 +1213,7 @@{name: "solr_metrics_core_update_handler_adds_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1237,7 +1237,7 @@{name: "solr_metrics_core_update_handler_deletes_by_id_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1246,7 +1246,7 @@{name: "solr_metrics_core_update_handler_deletes_by_id_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1270,7 +1270,7 @@{name: "solr_metrics_core_update_handler_deletes_by_query_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1279,7 +1279,7 @@{name: "solr_metrics_core_update_handler_deletes_by_query_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1303,7 +1303,7 @@{name: "solr_metrics_core_update_handler_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1312,7 +1312,7 @@{name: "solr_metrics_core_update_handler_errors_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1336,7 +1336,7 @@{name: "solr_metrics_core_update_handler_deletes_by_id",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1345,7 +1345,7 @@{name: "solr_metrics_core_update_handler_deletes_by_id",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1369,7 +1369,7 @@{name: "solr_metrics_core_update_handler_deletes_by_query",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1378,7 +1378,7 @@{name: "solr_metrics_core_update_handler_deletes_by_query",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1402,7 +1402,7 @@{name: "solr_metrics_core_update_handler_pending_docs",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1411,7 +1411,7 @@{name: "solr_metrics_core_update_handler_pending_docs",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1435,7 +1435,7 @@{name: "solr_metrics_core_update_handler_errors",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1444,7 +1444,7 @@{name: "solr_metrics_core_update_handler_errors",type: "GAUGE",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1468,7 +1468,7 @@{name: "solr_metrics_core_update_handler_expunge_deletes_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1477,7 +1477,7 @@{name: "solr_metrics_core_update_handler_expunge_deletes_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1501,7 +1501,7 @@{name: "solr_metrics_core_update_handler_merges_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1510,7 +1510,7 @@{name: "solr_metrics_core_update_handler_merges_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1534,7 +1534,7 @@{name: "solr_metrics_core_update_handler_optimizes_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1543,7 +1543,7 @@{name: "solr_metrics_core_update_handler_optimizes_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1567,7 +1567,7 @@{name: "solr_metrics_core_update_handler_rollbacks_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1576,7 +1576,7 @@{name: "solr_metrics_core_update_handler_rollbacks_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1600,7 +1600,7 @@{name: "solr_metrics_core_update_handler_soft_auto_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1609,7 +1609,7 @@{name: "solr_metrics_core_update_handler_soft_auto_commits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1633,7 +1633,7 @@{name: "solr_metrics_core_update_handler_splits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -1642,7 +1642,7 @@{name: "solr_metrics_core_update_handler_splits_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -1667,7 +1667,7 @@{name : "solr_collections_live_nodes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : [],label_values : [],value : $value@@ -1682,7 +1682,7 @@{name : "solr_collections_shard_state",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection","shard"],label_values : [$collection,$shard],value : $value@@ -1704,7 +1704,7 @@{name : "solr_collections_replica_state",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection", "shard", "replica", "replica_name", "core", "base_url", "node_name", "type"],label_values : [$collection, $shard, $replica, $replica_name, $core, $base_url, $node_name, $type],value : $value@@ -1726,7 +1726,7 @@{name : "solr_collections_shard_leader",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection", "shard", "replica", "replica_name", "core", "base_url", "node_name", "type"],label_values : [$collection, $shard, $replica, $replica_name, $core, $base_url, $node_name, $type],value : $valuediff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xmlindex de10dfe6130..e6e5870fd56 100644--- a/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml@@ -33,7 +33,7 @@{name : "solr_ping",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/ping.html",+ help : "See following URL: https://solr.apache.org/guide/ping.html",label_names : [],label_values : [],value : $value@@ -57,7 +57,7 @@{name : "solr_collections_live_nodes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : [],label_values : [],value : $value@@ -79,7 +79,7 @@{name : "solr_collections_shard_leader",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : ["collection", "shard", "replica", "core", "type"],label_values : [$collection, $shard, $replica, $core, $type],value : $value@@ -121,7 +121,7 @@{name : "solr_metrics_jvm_buffers",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["pool"],label_values : [$pool],value : $valuediff --git a/solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xml b/solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xmlindex 90f316fe337..ade07535be4 100644--- a/solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/conf/test-config-with-templates.xml@@ -41,7 +41,7 @@{name: "solr_metrics_core_query_{UNIQUE}",type: "{TYPE}",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core"],label_values: [$category, $handler, $core],value: $value@@ -50,7 +50,7 @@{name: "solr_metrics_core_query_{UNIQUE}",type: "{TYPE}",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -75,7 +75,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -84,7 +84,7 @@{name: "solr_metrics_core_{UNIQUE}",type: "{TYPE}",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -99,7 +99,7 @@{name : "solr_metrics_node_{UNIQUE}",type : "{TYPE}",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $value@@ -143,7 +143,7 @@{name: "solr_metrics_core_query_errors_1minRate",type: "GAUGE",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core"],label_values: [$category, $handler, $core],value: $value@@ -152,7 +152,7 @@{name: "solr_metrics_core_query_errors_1minRate",type: "GAUGE",- help: "See: https://lucene.apache.org/solr/guide/performance-statistics-reference.html",+ help: "See: https://solr.apache.org/guide/performance-statistics-reference.html",label_names: ["category", "searchHandler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -180,7 +180,7 @@{name: "solr_metrics_core_timeouts_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core"],label_values: [$category, $handler, $core],value: $value@@ -189,7 +189,7 @@{name: "solr_metrics_core_timeouts_total",type: "COUNTER",- help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help: "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names: ["category", "handler", "core", "collection", "shard", "replica"],label_values: [$category, $handler, $core, $collection, $shard, $replica],value: $value@@ -207,7 +207,7 @@{name : "solr_metrics_node_time_seconds_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["category", "handler"],label_values : [$category, $handler],value : $valuediff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schemaindex 346d6b16bbe..f419f6596dd 100644--- a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema+++ b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema@@ -23,7 +23,7 @@For more information, on how to customize this file, please see- http://lucene.apache.org/solr/guide/fields-and-schema-design.html+ https://solr.apache.org/guide/fields-and-schema-design.htmlPERFORMANCE NOTE: this schema includes many optional features and should notbe used for benchmarking. To improve performance one could@@ -246,7 +246,7 @@matching across fields.For more info on customizing your analyzer chain, please see- http://lucene.apache.org/solr/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters+ https://solr.apache.org/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters--><!-- One can also specify an existing Analyzer class that has a@@ -373,7 +373,7 @@<!-- A geospatial field type that supports multiValued and polygon shapes.For more information about this and other spatial fields see:- http://lucene.apache.org/solr/guide/spatial-search.html+ https://solr.apache.org/guide/spatial-search.html--><fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />@@ -401,7 +401,7 @@<!-- Similarity is the scoring routine for each document vs. a query.A custom Similarity or SimilarityFactory may be specified here, butthe default is fine for most applications.- For more info: http://lucene.apache.org/solr/guide/schema-elements.html#similarity+ For more info: https://solr.apache.org/guide/schema-elements.html#similarity--><!--<similarity class="com.example.solr.CustomSimilarityFactory">diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.javaindex 2719e0bcd0a..68618eb58a7 100644--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java@@ -152,7 +152,7 @@ public class SolrCloudScraperTest extends PrometheusExporterTestBase {assertEquals(2, collection1Metrics.size());Collector.MetricFamilySamples liveNodeSamples = collection1Metrics.get(0);assertEquals("solr_collections_live_nodes", liveNodeSamples.name);- assertEquals("See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus", liveNodeSamples.help);+ assertEquals("See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus", liveNodeSamples.help);assertEquals(1, liveNodeSamples.samples.size());assertEquals(diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.javaindex 13b34cedb54..6493df362b9 100644--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java@@ -77,7 +77,7 @@ public class V2HttpCall extends HttpSolrCall {api = new Api(null) {@Overridepublic void call(SolrQueryRequest req, SolrQueryResponse rsp) {- rsp.add("documentation", "https://lucene.apache.org/solr/guide/v2-api.html");+ rsp.add("documentation", "https://solr.apache.org/guide/v2-api.html");rsp.add("description", "V2 API root path");}};diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 4705d5fee7d..5d8281ad86d 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -1584,7 +1584,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {int count = refCount.decrementAndGet();if (count > 0) return; // close is called often, and only actually closes if nothing is using it.if (count < 0) {- log.error("Too many close [count:{}] on {}. Please report this exception to [email protected]", count, this);+ log.error("Too many close [count:{}] on {}. Please report this exception to [email protected]", count, this);assert false : "Too many closes on SolrCore";return;}diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.javaindex 320c658a82a..f3e5581d734 100644--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java@@ -235,7 +235,7 @@ public class SolrXmlConfig {if (config.getVal(xPath, false) != null) {throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Should not have found " + xPath +- "\n. Please upgrade your solr.xml: https://lucene.apache.org/solr/guide/format-of-solr-xml.html");+ "\n. Please upgrade your solr.xml: https://solr.apache.org/guide/format-of-solr-xml.html");}}diff --git a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.htmlindex 64cc3acd351..6bd19d4db6c 100644--- a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html+++ b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html@@ -39,7 +39,7 @@|start Project Logo+--><div class="projectlogo">-<a href="http://lucene.apache.org/solr/"><img class="logoImage" alt="Solr" src="images/solr_small.png" title="Solr Description"></a>+<a href="https://solr.apache.org/"><img class="logoImage" alt="Solr" src="images/solr_small.png" title="Solr Description"></a></div><!--+|end Project Logodiff --git a/solr/example/README.md b/solr/example/README.mdindex fa668ffaa1b..6a03dbf3c4b 100644--- a/solr/example/README.md+++ b/solr/example/README.md@@ -62,7 +62,7 @@ For more information about this example please read...For more information about the "Solr Home" and Solr specific configuration-* https://lucene.apache.org/solr/guide/solr-tutorial.html+* https://solr.apache.org/guide/solr-tutorial.htmlFor a Solr tutorialdiff --git a/solr/server/solr/README.md b/solr/server/solr/README.mdindex cf6a3f1d63c..04cd872b707 100644--- a/solr/server/solr/README.md+++ b/solr/server/solr/README.md@@ -43,7 +43,7 @@ a single SolrCore named "collection1" and that the "Instance Directory"for collection1 should be the same as the Solr Home Directory.For more information about solr.xml, please see:-https://lucene.apache.org/solr/guide/solr-cores-and-solr-xml.html+https://solr.apache.org/guide/solr-cores-and-solr-xml.html### Individual SolrCore Instance Directories@@ -62,7 +62,7 @@ example/solr/collection1/core.propertiesFor more information about core discovery, please see:-https://lucene.apache.org/solr/guide/core-discovery.html+https://solr.apache.org/guide/core-discovery.html### A Shared 'lib' Directory@@ -76,4 +76,4 @@ When using SolrCloud using the embedded ZooKeeper option for Solr, it iscommon to have a "zoo.cfg" file and "zoo_data" directories in the Solr HomeDirectory. Please see the SolrCloud documentation for more details.-https://lucene.apache.org/solr/guide/solrcloud.html+https://solr.apache.org/guide/solrcloud.htmldiff --git a/solr/server/solr/configsets/_default/conf/managed-schema.xml b/solr/server/solr/configsets/_default/conf/managed-schema.xmlindex 6b5796c589c..8bd61ed7b7f 100644--- a/solr/server/solr/configsets/_default/conf/managed-schema.xml+++ b/solr/server/solr/configsets/_default/conf/managed-schema.xml@@ -23,7 +23,7 @@For more information, on how to customize this file, please see- http://lucene.apache.org/solr/guide/fields-and-schema-design.html+ https://solr.apache.org/guide/fields-and-schema-design.htmlPERFORMANCE NOTE: this schema includes many optional features and should notbe used for benchmarking. To improve performance one could@@ -267,7 +267,7 @@matching across fields.For more info on customizing your analyzer chain, please see- http://lucene.apache.org/solr/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters+ https://solr.apache.org/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters--><!-- One can also specify an existing Analyzer class that has a@@ -534,7 +534,7 @@<!-- A geospatial field type that supports multiValued and polygon shapes.For more information about this and other spatial fields see:- http://lucene.apache.org/solr/guide/spatial-search.html+ https://solr.apache.org/guide/spatial-search.html--><fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />@@ -1020,7 +1020,7 @@<!-- Similarity is the scoring routine for each document vs. a query.A custom Similarity or SimilarityFactory may be specified here, butthe default is fine for most applications.- For more info: http://lucene.apache.org/solr/guide/schema-elements.html#similarity+ For more info: https://solr.apache.org/guide/schema-elements.html#similarity--><!--<similarity class="com.example.solr.CustomSimilarityFactory">diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex 59a85ae10dd..f99231bc084 100644--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml@@ -735,7 +735,7 @@<!-- Request Handlers- https://lucene.apache.org/solr/guide/requesthandlers-and-searchcomponents-in-solrconfig.html+ https://solr.apache.org/guide/requesthandlers-and-searchcomponents-in-solrconfig.htmlIncoming queries will be dispatched to a specific handler by name based on the path specified in the request.@@ -778,7 +778,7 @@The spell check component can return a list of alternative spellingsuggestions.- https://lucene.apache.org/solr/guide/spell-checking.html+ https://solr.apache.org/guide/spell-checking.html--><searchComponent name="spellcheck" class="solr.SpellCheckComponent">@@ -835,7 +835,7 @@IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW ISNOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!- See https://lucene.apache.org/solr/guide/spell-checking.html for details+ See https://solr.apache.org/guide/spell-checking.html for detailson the request parameters.--><requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">@@ -862,7 +862,7 @@<!-- Highlighting Component- https://lucene.apache.org/solr/guide/highlighting.html+ https://solr.apache.org/guide/highlighting.html--><searchComponent class="solr.HighlightComponent" name="highlight"><highlighting>@@ -967,7 +967,7 @@</searchComponent><!-- Update Request Processors- https://lucene.apache.org/solr/guide/update-request-processors.html+ https://solr.apache.org/guide/update-request-processors.htmlChains or individual Update Request Processor Factories can be declared and referencedto preprocess documents sent to Update Request Handlers.@@ -986,7 +986,7 @@declaring schemaFactory as ManagedIndexSchemaFactory, withmutable specified as true.- See https://lucene.apache.org/solr/guide/schemaless-mode.html for further explanation.+ See https://solr.apache.org/guide/schemaless-mode.html for further explanation.--><updateProcessor class="solr.UUIDUpdateProcessorFactory" name="uuid"/>@@ -1108,7 +1108,7 @@<!-- Query Parsers- https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html+ https://solr.apache.org/guide/query-syntax-and-parsing.htmlMultiple QParserPlugins can be registered by name, and thenused in either the "defType" param for the QueryComponent (useddiff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schemaindex 3c4abfccc77..aad0c822f34 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema@@ -373,7 +373,7 @@matching across fields.For more info on customizing your analyzer chain, please see- http://lucene.apache.org/solr/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters+ https://solr.apache.org/guide/understanding-analyzers-tokenizers-and-filters.html#understanding-analyzers-tokenizers-and-filters--><!-- One can also specify an existing Analyzer class that has adiff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex 59d05691826..6ba59aaadd9 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml@@ -481,7 +481,7 @@when running solr to run with ltr enabled:-Dsolr.ltr.enabled=true- https://lucene.apache.org/solr/guide/learning-to-rank.html+ https://solr.apache.org/guide/learning-to-rank.html--><cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"class="solr.CaffeineCache"@@ -743,7 +743,7 @@<!-- Request Handlers- https://lucene.apache.org/solr/guide/requesthandlers-and-searchcomponents-in-solrconfig.html+ https://solr.apache.org/guide/requesthandlers-and-searchcomponents-in-solrconfig.htmlIncoming queries will be dispatched to a specific handler by name based on the path specified in the request.@@ -811,7 +811,7 @@<!-- Solr Cell Update Request Handler- https://lucene.apache.org/solr/guide/indexing-with-tika.html+ https://solr.apache.org/guide/indexing-with-tika.html--><requestHandler name="/update/extract"@@ -830,7 +830,7 @@<!-- XSLT Update Request Handler- https://lucene.apache.org/solr/guide/indexing-with-update-handlers.html#using-xslt-to-transform-xml-index-updates+ https://solr.apache.org/guide/indexing-with-update-handlers.html#using-xslt-to-transform-xml-index-updates--><requestHandler name="/update/xslt"@@ -844,7 +844,7 @@The spell check component can return a list of alternative spellingsuggestions.- https://lucene.apache.org/solr/guide/spell-checking.html+ https://solr.apache.org/guide/spell-checking.html--><searchComponent name="spellcheck" class="solr.SpellCheckComponent">@@ -938,7 +938,7 @@IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW ISNOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!- See https://lucene.apache.org/solr/guide/spell-checking.html for details+ See https://solr.apache.org/guide/spell-checking.html for detailson the request parameters.--><requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">@@ -969,7 +969,7 @@As with the rest of this solrconfig.xml file, the configuration of this component is purelyan example that applies specifically to this configset and example documents.- See: https://lucene.apache.org/solr/guide/suggester.html+ See: https://solr.apache.org/guide/suggester.html--><searchComponent name="suggest" class="solr.SuggestComponent"><lst name="suggester">@@ -997,7 +997,7 @@<!-- Term Vector Component- https://lucene.apache.org/solr/guide/the-term-vector-component.html+ https://solr.apache.org/guide/the-term-vector-component.html--><searchComponent name="tvComponent" class="solr.TermVectorComponent"/>@@ -1023,7 +1023,7 @@when running solr to run with clustering enabled:-Dsolr.clustering.enabled=true- https://lucene.apache.org/solr/guide/result-clustering.html+ https://solr.apache.org/guide/result-clustering.html--><searchComponent name="clustering"enable="${solr.clustering.enabled:false}"@@ -1105,7 +1105,7 @@<!-- Query Elevation Component- https://lucene.apache.org/solr/guide/query-elevation-component.html+ https://solr.apache.org/guide/query-elevation-component.htmla search component that enables you to configure the topresults for a given query regardless of the normal lucene@@ -1129,7 +1129,7 @@<!-- Highlighting Component- https://lucene.apache.org/solr/guide/highlighting.html+ https://solr.apache.org/guide/highlighting.html--><searchComponent class="solr.HighlightComponent" name="highlight"><highlighting>@@ -1234,7 +1234,7 @@</searchComponent><!-- Update Request Processors- https://lucene.apache.org/solr/guide/update-request-processors.html+ https://solr.apache.org/guide/update-request-processors.htmlChains or individual Update Request Processor Factories can be declared and referencedto preprocess documents sent to Update Request Handlers.@@ -1270,7 +1270,7 @@making this example suitable for detecting languages form full-textrich documents injected via ExtractingRequestHandler.- See more about langId at https://lucene.apache.org/solr/guide/language-detection.html+ See more about langId at https://solr.apache.org/guide/language-detection.html--><!--<updateRequestProcessorChain name="langid">@@ -1289,7 +1289,7 @@This example hooks in an update processor implemented using JavaScript and demonstrateshow to pass in custom parameters.- See more about script update processor at https://lucene.apache.org/solr/guide/script-update-processor.html+ See more about script update processor at https://solr.apache.org/guide/script-update-processor.html--><!--<updateRequestProcessorChain name="script">@@ -1334,7 +1334,7 @@in Solr's conf/xslt directory. Changes to xslt files are checkedevery xsltCacheLifetimeSeconds. This is part of the Scripting contrib module.- See more about this response writer at https://lucene.apache.org/solr/guide/response-writers.html#xslt-response-writer+ See more about this response writer at https://solr.apache.org/guide/response-writers.html#xslt-response-writer--><queryResponseWriter name="xslt"startup="lazy"@@ -1344,7 +1344,7 @@<!-- Query Parsers- https://lucene.apache.org/solr/guide/query-syntax-and-parsing.html+ https://solr.apache.org/guide/query-syntax-and-parsing.htmlMultiple QParserPlugins can be registered by name, and thenused in either the "defType" param for the QueryComponent (used@@ -1374,7 +1374,7 @@when running solr to run with ltr enabled:-Dsolr.ltr.enabled=true- https://lucene.apache.org/solr/guide/learning-to-rank.html+ https://solr.apache.org/guide/learning-to-rank.htmlQuery parser is used to rerank top docs with a provided model-->@@ -1415,7 +1415,7 @@when running solr to run with ltr enabled:-Dsolr.ltr.enabled=true- https://lucene.apache.org/solr/guide/learning-to-rank.html+ https://solr.apache.org/guide/learning-to-rank.html--><transformer enable="${solr.ltr.enabled:false}" name="features" class="org.apache.solr.ltr.response.transform.LTRFeatureLoggerTransformerFactory"><str name="fvCacheName">QUERY_DOC_FV</str>diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.jsindex bd361182d2c..9eaf7b8db1e 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js@@ -4,7 +4,7 @@In order for this to be executed, it must be properly wired into solrconfig.xml; by default it is commented out inthe example solrconfig.xml and must be uncommented to be enabled.- See https://lucene.apache.org/solr/guide/script-update-processor.html for more details.+ See https://solr.apache.org/guide/script-update-processor.html for more details.*/function processAdd(cmd) {diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/example_atom.xsl b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/example_atom.xslindex b6c23151dc4..8c36bac1297 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/example_atom.xsl+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/example_atom.xsl@@ -40,7 +40,7 @@</subtitle><author><name>Apache Solr</name>- <email>[email protected]</email>+ <email>[email protected]</email></author><link rel="self" type="application/atom+xml"href="http://localhost:8983/solr/q={$query}&wt=xslt&tr=atom.xsl"/>diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xslindex a4a0512dd0a..7fc6d773ba1 100644--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl@@ -23,7 +23,7 @@This is part of the Scripting contrib module.- See more about this response writer at https://lucene.apache.org/solr/guide/response-writers.html#xslt-response-writer+ See more about this response writer at https://solr.apache.org/guide/response-writers.html#xslt-response-writer--><xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>diff --git a/solr/server/solr/solr.xml b/solr/server/solr/solr.xmlindex 8d002782e8f..fb188cf4192 100644--- a/solr/server/solr/solr.xml+++ b/solr/server/solr/solr.xml@@ -23,7 +23,7 @@More information about options available in this configuration file,and Solr Core administration can be found online:- https://lucene.apache.org/solr/guide/format-of-solr-xml.html+ https://solr.apache.org/guide/format-of-solr-xml.html--><solr>diff --git a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc b/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adocindex f427cb20fb0..bf6dbb3c1a9 100644--- a/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc+++ b/solr/solr-ref-guide/src/monitoring-with-prometheus-and-grafana.adoc@@ -280,7 +280,7 @@ Below is a slightly shortened version of it:{name : "solr_ping",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/ping.html",+ help : "See following URL: https://solr.apache.org/guide/ping.html",label_names : [],label_values : [],value : $value@@ -312,7 +312,7 @@ Below is a slightly shortened version of it:{name : "solr_metrics_jetty_response_total",type : "COUNTER",- help : "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",+ help : "See following URL: https://solr.apache.org/guide/metrics-reporting.html",label_names : ["status"],label_values : [$status],value : $value@@ -337,7 +337,7 @@ Below is a slightly shortened version of it:{name : "solr_collections_live_nodes",type : "GAUGE",- help : "See following URL: https://lucene.apache.org/solr/guide/collections-api.html#clusterstatus",+ help : "See following URL: https://solr.apache.org/guide/collections-api.html#clusterstatus",label_names : [],label_values : [],value : $value@@ -474,7 +474,7 @@ A jq query has to output JSON in the following format:{"name": "solr_ping","type": "GAUGE",- "help": "See following URL: https://lucene.apache.org/solr/guide/ping.html",+ "help": "See following URL: https://solr.apache.org/guide/ping.html","label_names": ["base_url","core"],"label_values": ["http://localhost:8983/solr","collection1"],"value": 1.0@@ -524,7 +524,7 @@ For example, `solr-exporter` converts the JSON in the previous section to the fo[source,plain]----# TYPE solr_ping gauge-# HELP solr_ping See following URL: https://lucene.apache.org/solr/guide/ping.html+# HELP solr_ping See following URL: https://solr.apache.org/guide/ping.htmlsolr_ping{base_url="http://localhost:8983/solr",core="collection1"} 1.0----diff --git a/solr/solr-ref-guide/src/v2-api.adoc b/solr/solr-ref-guide/src/v2-api.adocindex f89d81b4771..cafddbc9e7c 100644--- a/solr/solr-ref-guide/src/v2-api.adoc+++ b/solr/solr-ref-guide/src/v2-api.adoc@@ -75,7 +75,7 @@ Example: `\http://localhost:8983/api/c/gettingstarted/get/_introspect`----{"spec":[{- "documentation":"https://lucene.apache.org/solr/guide/real-time-get.html",+ "documentation":"https://solr.apache.org/guide/real-time-get.html","description":"RealTime Get allows retrieving documents by ID before the documents have been committed to the index. It is useful when you need access to documents as soon as they are indexed but your commit times are high for other reasons.","methods":["GET"],"url":{@@ -110,13 +110,13 @@ Example of introspect for a POST API: `\http://localhost:8983/api/c/gettingstart----{"spec":[{- "documentation":"https://lucene.apache.org/solr/guide/collections-api.html",+ "documentation":"https://solr.apache.org/guide/collections-api.html","description":"Several collection-level operations are supported with this endpoint: modify collection attributes; reload a collection; migrate documents to a different collection; rebalance collection leaders; balance properties across shards; and add or delete a replica property.","methods":["POST"],"url":{"paths":["/collections/{collection}","/c/{collection}"]},"commands":{"modify":{- "documentation":"https://lucene.apache.org/solr/guide/collections-api.html#modifycollection",+ "documentation":"https://solr.apache.org/guide/collections-api.html#modifycollection","description":"Modifies specific attributes of a collection. Multiple attributes can be changed at one time.","type":"object","properties":{diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.javaindex 4c677601312..53bded73bad 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java@@ -3163,7 +3163,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>* Sets the collection attribute to the given value** @param key a string attribute key, must be one of the entries documented- * in the <a href="https://lucene.apache.org/solr/guide/collections-api.html#modifycollection">Modify Collection API documentation</a>+ * in the <a href="https://solr.apache.org/guide/collections-api.html#modifycollection">Modify Collection API documentation</a>* @param value the attribute value for the given key*/public Modify setAttribute(String key, Object value) {@@ -3188,7 +3188,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>* Removes the given key from the collection** @param key the string attribute key, must be one of the entries documented- * in the <a href="https://lucene.apache.org/solr/guide/collections-api.html#modifycollection">Modify Collection API documentation</a>+ * in the <a href="https://solr.apache.org/guide/collections-api.html#modifycollection">Modify Collection API documentation</a>*/public Modify unsetAttribute(String key) {if (key == null) {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequest.javaindex 43e56dc6a68..5b2086271a5 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/DirectJsonQueryRequest.java@@ -24,10 +24,10 @@ import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.params.SolrParams;/**- * Represents a query using the <a href="https://lucene.apache.org/solr/guide/json-request-api.html">JSON Query DSL</a>+ * Represents a query using the <a href="https://solr.apache.org/guide/json-request-api.html">JSON Query DSL</a>** This class doesn't construct the request body itself. It uses a provided String without any modification. Often- * used in combination with the JSON DSL's <a href="https://lucene.apache.org/solr/guide/json-request-api.html#parameter-substitution-macro-expansion">macro expansion capabilities</a>.+ * used in combination with the JSON DSL's <a href="https://solr.apache.org/guide/json-request-api.html#parameter-substitution-macro-expansion">macro expansion capabilities</a>.* The JSON body can contain template parameters which are replaced with values fetched from the {@link SolrParams}* used by this request. For a more flexible, guided approach to constructing JSON DSL requests, see* {@link JsonQueryRequest}.diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JsonQueryRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JsonQueryRequest.javaindex 9febda06380..76a1e28346f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JsonQueryRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JsonQueryRequest.java@@ -33,7 +33,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.Utils;/**- * Represents a query using the <a href="https://lucene.apache.org/solr/guide/json-request-api.html">JSON Query DSL</a>+ * Represents a query using the <a href="https://solr.apache.org/guide/json-request-api.html">JSON Query DSL</a>** This class constructs the request using setters for individual properties. For a more monolithic approach to* constructing the JSON request, see {@link DirectJsonQueryRequest}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.javaindex d3572ba419f..08136e1a85a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java@@ -42,8 +42,8 @@ import org.apache.solr.common.util.Utils;* based on this class within the client applications.</p>* <p>This class is experimental and it is subject to change.</p>*- * @see <a href="https://lucene.apache.org/solr/guide/schema-api.html">Solr Schema API</a>- * @see <a href="https://lucene.apache.org/solr/guide/managed-resources.html">Solr managed resources</a>+ * @see <a href="https://solr.apache.org/guide/schema-api.html">Solr Schema API</a>+ * @see <a href="https://solr.apache.org/guide/managed-resources.html">Solr managed resources</a>* @since solr 5.3*/public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {@@ -363,7 +363,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* Creates a new instance of the request.** @param fieldAttributes field type attributes that can be used to enrich the field definition.- * @see <a href="https://lucene.apache.org/solr/guide/defining-fields.html">Defining Solr fields</a>+ * @see <a href="https://solr.apache.org/guide/defining-fields.html">Defining Solr fields</a>*/public AddField(Map<String, Object> fieldAttributes) {this(fieldAttributes, null);@@ -386,7 +386,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* will not partially modify a field's definition. If the field does not exist in the schema the method call* {@link #process(SolrClient, String)} will fail.*- * @see <a href="https://lucene.apache.org/solr/guide/defining-fields.html">Defining Solr fields</a>+ * @see <a href="https://solr.apache.org/guide/defining-fields.html">Defining Solr fields</a>*/public static class ReplaceField extends SingleUpdate {/**@@ -442,8 +442,8 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {/*** Adds a new dynamic field rule to the schema of the specified collection.*- * @see <a href="https://lucene.apache.org/solr/guide/defining-fields.html">Defining Solr fields</a>- * @see <a href="https://lucene.apache.org/solr/guide/dynamic-fields.html">Solr dynamic fields</a>+ * @see <a href="https://solr.apache.org/guide/defining-fields.html">Defining Solr fields</a>+ * @see <a href="https://solr.apache.org/guide/dynamic-fields.html">Solr dynamic fields</a>*/public static class AddDynamicField extends SingleUpdate {/**@@ -479,8 +479,8 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* Creates a new instance of the request.** @param dynamicFieldAttributes field type attributes that can be used to enrich the field definition.- * @see <a href="https://lucene.apache.org/solr/guide/defining-fields.html">Defining Solr fields</a>- * @see <a href="https://lucene.apache.org/solr/guide/dynamic-fields.html">Solr dynamic fields</a>+ * @see <a href="https://solr.apache.org/guide/defining-fields.html">Defining Solr fields</a>+ * @see <a href="https://solr.apache.org/guide/dynamic-fields.html">Solr dynamic fields</a>*/public ReplaceDynamicField(Map<String, Object> dynamicFieldAttributes) {this(dynamicFieldAttributes, null);@@ -535,7 +535,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* Creates a new instance of the request.** @param fieldTypeDefinition the field type definition- * @see <a href="https://lucene.apache.org/solr/guide/solr-field-types.html">Solr field types</a>+ * @see <a href="https://solr.apache.org/guide/solr-field-types.html">Solr field types</a>*/public AddFieldType(FieldTypeDefinition fieldTypeDefinition) {this(fieldTypeDefinition, null);@@ -564,7 +564,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* Creates a new instance of the request.** @param fieldTypeDefinition the field type definition- * @see <a href="https://lucene.apache.org/solr/guide/solr-field-types.html">Solr field types</a>+ * @see <a href="https://solr.apache.org/guide/solr-field-types.html">Solr field types</a>*/public ReplaceFieldType(FieldTypeDefinition fieldTypeDefinition) {this(fieldTypeDefinition, null);@@ -620,7 +620,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {** @param source the source field name* @param dest the collection of the destination field names- * @see <a href="https://lucene.apache.org/solr/guide/copying-fields.html">Copying fields</a>+ * @see <a href="https://solr.apache.org/guide/copying-fields.html">Copying fields</a>*/public AddCopyField(String source, List<String> dest) {this(source, dest, (SolrParams) null);@@ -633,7 +633,7 @@ public class SchemaRequest extends AbstractSchemaRequest<SchemaResponse> {* @param dest the collection of the destination field names* @param maxChars the number of characters to be copied from the source to the dest. Specifying* 0 as value, means that all the source characters will be copied to the dest.- * @see <a href="https://lucene.apache.org/solr/guide/copying-fields.html">Copying fields</a>+ * @see <a href="https://solr.apache.org/guide/copying-fields.html">Copying fields</a>*/public AddCopyField(String source, List<String> dest, Integer maxChars) {this(source, dest, maxChars, null);diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.javaindex 29a0882f686..aea6a0f5e57 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java@@ -18,6 +18,6 @@/*** Convenience classes for making Schema API requests.* <p>- * See <a href="https://lucene.apache.org/solr/guide/schema-api.html">Schema API</a>+ * See <a href="https://solr.apache.org/guide/schema-api.html">Schema API</a>*/package org.apache.solr.client.solrj.request.schema;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.javaindex b93b4f0aa58..96ed3088d1c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java@@ -29,7 +29,7 @@ import org.apache.solr.common.util.NamedList;/*** This class is used to wrap the response messages retrieved from Solr Schema API.*- * @see <a href="https://lucene.apache.org/solr/guide/schema-api.html">Solr Schema API</a>+ * @see <a href="https://solr.apache.org/guide/schema-api.html">Solr Schema API</a>* @since solr 5.3*/public class SchemaResponse extends SolrResponseBase {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.javaindex 46093642a5c..80077634ddf 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java@@ -18,6 +18,6 @@/*** Convenience classes for dealing with Schema API responses.* <p>- * See <a href="https://lucene.apache.org/solr/guide/schema-api.html">Schema API</a>+ * See <a href="https://solr.apache.org/guide/schema-api.html">Schema API</a>*/package org.apache.solr.client.solrj.response.schema;diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.javaindex 23796fbf332..ae8053969ef 100644--- a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java@@ -85,7 +85,7 @@ public class Slice extends ZkNodeProps implements Iterable<Replica> {/*** A shard is put in that state after it has been successfully split. See- * <a href="https://lucene.apache.org/solr/guide/collections-api.html#splitshard">+ * <a href="https://solr.apache.org/guide/collections-api.html#splitshard">* the reference guide</a> for more details.*/INACTIVE,diff --git a/solr/solrj/src/resources/apispec/cluster.security.BasicAuth.Commands.json b/solr/solrj/src/resources/apispec/cluster.security.BasicAuth.Commands.jsonindex ee0b7f53e0b..ba03e03324b 100644--- a/solr/solrj/src/resources/apispec/cluster.security.BasicAuth.Commands.json+++ b/solr/solrj/src/resources/apispec/cluster.security.BasicAuth.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/basic-authentication-plugin.html",+ "documentation": "https://solr.apache.org/guide/basic-authentication-plugin.html","description": "Modifies the configuration of Basic authentication, allowing you to add or remove users and their passwords.","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.JwtAuth.Commands.json b/solr/solrj/src/resources/apispec/cluster.security.JwtAuth.Commands.jsonindex e940d2f34f7..d4f43dfd11f 100644--- a/solr/solrj/src/resources/apispec/cluster.security.JwtAuth.Commands.json+++ b/solr/solrj/src/resources/apispec/cluster.security.JwtAuth.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/jwt-authentication-plugin.html",+ "documentation": "https://solr.apache.org/guide/jwt-authentication-plugin.html","description": "Modifies the configuration of JWT token authentication.","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.json b/solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.jsonindex c656f491182..e77f693c8a8 100644--- a/solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.json+++ b/solr/solrj/src/resources/apispec/cluster.security.MultiPluginAuth.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/basic-authentication-plugin.html",+ "documentation": "https://solr.apache.org/guide/basic-authentication-plugin.html","description": "Modifies the configuration of the multi-auth plugin. Each command should be wrapped in a single key object that identifies the scheme. The embedded command is then passed to the scheme specific plugin.","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.RuleBasedAuthorization.json b/solr/solrj/src/resources/apispec/cluster.security.RuleBasedAuthorization.jsonindex 4a7fdbebabd..ad4aac1d9e3 100644--- a/solr/solrj/src/resources/apispec/cluster.security.RuleBasedAuthorization.json+++ b/solr/solrj/src/resources/apispec/cluster.security.RuleBasedAuthorization.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/rule-based-authorization-plugin.html",+ "documentation": "https://solr.apache.org/guide/rule-based-authorization-plugin.html","description": "Defines roles for accessing Solr, and assigns users to those roles. Use this API to change user authorizations to each of Solr's components.","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.authentication.Commands.json b/solr/solrj/src/resources/apispec/cluster.security.authentication.Commands.jsonindex fa18660e8b6..b71911cf9e4 100644--- a/solr/solrj/src/resources/apispec/cluster.security.authentication.Commands.json+++ b/solr/solrj/src/resources/apispec/cluster.security.authentication.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/securing-solr.html",+ "documentation": "https://solr.apache.org/guide/securing-solr.html","description":"This is a placeholder output when no authentication is configured","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.authentication.json b/solr/solrj/src/resources/apispec/cluster.security.authentication.jsonindex a1e755e4d90..d912f147961 100644--- a/solr/solrj/src/resources/apispec/cluster.security.authentication.json+++ b/solr/solrj/src/resources/apispec/cluster.security.authentication.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/authentication-and-authorization-plugins.html",+ "documentation": "https://solr.apache.org/guide/authentication-and-authorization-plugins.html","description": "Shows the configuration for authentication, including users, classes (type of authentication) and other parameters.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/cluster.security.authorization.Commands.json b/solr/solrj/src/resources/apispec/cluster.security.authorization.Commands.jsonindex 16fa73352fa..dfa47b552a0 100644--- a/solr/solrj/src/resources/apispec/cluster.security.authorization.Commands.json+++ b/solr/solrj/src/resources/apispec/cluster.security.authorization.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/securing-solr.html",+ "documentation": "https://solr.apache.org/guide/securing-solr.html","description":"This is a placeholder output when no authorization is configured","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/cluster.security.authorization.json b/solr/solrj/src/resources/apispec/cluster.security.authorization.jsonindex 298621c898c..798f80453ad 100644--- a/solr/solrj/src/resources/apispec/cluster.security.authorization.json+++ b/solr/solrj/src/resources/apispec/cluster.security.authorization.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/authentication-and-authorization-plugins.html",+ "documentation": "https://solr.apache.org/guide/authentication-and-authorization-plugins.html","description":"Shows the configuration for authorization, including the classes (type of authorization), permissions, user-roles, and other parameters.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.RealtimeGet.json b/solr/solrj/src/resources/apispec/core.RealtimeGet.jsonindex 7cdb6e2f8e6..b670398f41e 100644--- a/solr/solrj/src/resources/apispec/core.RealtimeGet.json+++ b/solr/solrj/src/resources/apispec/core.RealtimeGet.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/realtime-get.html",+ "documentation": "https://solr.apache.org/guide/realtime-get.html","description": "RealTime Get allows retrieving documents by ID before the documents have been committed to the index. It is useful when you need access to documents as soon as they are indexed but your commit times are high for other reasons.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.addCopyField.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.addCopyField.jsonindex e366a3e5dcd..d3dc92d82ac 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.addCopyField.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.addCopyField.json@@ -1,5 +1,5 @@{- "documentation" : "https://lucene.apache.org/solr/guide/schema-api.html#add-a-new-copy-field-rule",+ "documentation" : "https://solr.apache.org/guide/schema-api.html#add-a-new-copy-field-rule","description": "Adds a new copy field rule, to allow one field to be populated with the contents of one or more other fields.","type": "object","properties": {diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.addField.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.addField.jsonindex aa32a908656..8ee1583a48c 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.addField.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.addField.json@@ -1,5 +1,5 @@{- "documentation" :"https://lucene.apache.org/solr/guide/schema-api.html",+ "documentation" :"https://solr.apache.org/guide/schema-api.html","type":"object","properties":{"name": {@@ -78,7 +78,7 @@},"docValues": {"type": "boolean",- "description": "If true, field values will be stored in a column-oriented docValues structure. This can be more efficient for some fields, particularly those used for faceting. More information is available from https://lucene.apache.org/solr/guide/docvalues.html. If this is not defined, it will inherit the value from the fieldType. If the fieldType does not define a value, it will default to true for all non-text fields (such as dates, integers, longs, etc.)."+ "description": "If true, field values will be stored in a column-oriented docValues structure. This can be more efficient for some fields, particularly those used for faceting. More information is available from https://solr.apache.org/guide/docvalues.html. If this is not defined, it will inherit the value from the fieldType. If the fieldType does not define a value, it will default to true for all non-text fields (such as dates, integers, longs, etc.)."},"termPayloads": {"type": "boolean",diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.addFieldType.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.addFieldType.jsonindex 56bd6b72099..99bca980620 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.addFieldType.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.addFieldType.json@@ -37,7 +37,7 @@},"multiTermAnalyzer": {"description": "A multiterm analyzer section defines how incoming queries that results in Multi-Term expansion will be analyzed for a field of this type.",- "documentation": "https://lucene.apache.org/solr/guide/analyzers.html#analysis-for-multi-term-expansion",+ "documentation": "https://solr.apache.org/guide/analyzers.html#analysis-for-multi-term-expansion","#include": "core.SchemaEdit.addFieldType.analyzers"},"analyzer": {diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteCopyField.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteCopyField.jsonindex 682c9f6e2e4..c0853ace529 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteCopyField.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteCopyField.json@@ -1,6 +1,6 @@{"type":"object",- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html#delete-a-copy-field-rule",+ "documentation": "https://solr.apache.org/guide/schema-api.html#delete-a-copy-field-rule","description": "Deletes a copy field rule. Both sides of the copy rule (source and destination) are required in order to delete the rule.","properties":{"source": {diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteDynamicField.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteDynamicField.jsonindex 3822da74155..a8fc8a49599 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteDynamicField.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteDynamicField.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html#delete-a-dynamic-field-rule",+ "documentation": "https://solr.apache.org/guide/schema-api.html#delete-a-dynamic-field-rule","description": "Deletes a dynamic field.","type":"object","properties": {diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteField.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteField.jsonindex ffd6a4a6e80..eedf41a7e58 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteField.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteField.json@@ -1,5 +1,5 @@{- "documentation" : "https://lucene.apache.org/solr/guide/schema-api.html#delete-a-field",+ "documentation" : "https://solr.apache.org/guide/schema-api.html#delete-a-field","description": "Deletes a field from the schema.","type":"object","properties":{diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteFieldType.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteFieldType.jsonindex c2b629fd91c..920260d40be 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteFieldType.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.deleteFieldType.json@@ -1,5 +1,5 @@{- "documentation":"https://lucene.apache.org/solr/guide/schema-api.html#delete-a-field-type",+ "documentation":"https://solr.apache.org/guide/schema-api.html#delete-a-field-type","description": "Deletes a field type from the schema.","type":"object","properties": {diff --git a/solr/solrj/src/resources/apispec/core.SchemaEdit.json b/solr/solrj/src/resources/apispec/core.SchemaEdit.jsonindex d824671f3fb..05ca06ceb79 100644--- a/solr/solrj/src/resources/apispec/core.SchemaEdit.json+++ b/solr/solrj/src/resources/apispec/core.SchemaEdit.json@@ -1,6 +1,6 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html",- "description": "The Schema API provides viewing, editing, adding, and deleting elements of Solr's schema. This API can only be used if Managed Schema is enabled and the schema is defined as mutable. See https://lucene.apache.org/solr/guide/schema-factory-definition-in-solrconfig.html for more information about enabling Managed Schema.",+ "documentation": "https://solr.apache.org/guide/schema-api.html",+ "description": "The Schema API provides viewing, editing, adding, and deleting elements of Solr's schema. This API can only be used if Managed Schema is enabled and the schema is defined as mutable. See https://solr.apache.org/guide/schema-factory-definition-in-solrconfig.html for more information about enabling Managed Schema.","methods": ["POST"],diff --git a/solr/solrj/src/resources/apispec/core.SchemaRead.copyFields.json b/solr/solrj/src/resources/apispec/core.SchemaRead.copyFields.jsonindex 0ba3deff2d3..4fbb0a3e8b6 100644--- a/solr/solrj/src/resources/apispec/core.SchemaRead.copyFields.json+++ b/solr/solrj/src/resources/apispec/core.SchemaRead.copyFields.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html#list-copy-fields",+ "documentation": "https://solr.apache.org/guide/schema-api.html#list-copy-fields","description": "Lists all copy fields.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.SchemaRead.dynamicFields_fieldTypes.json b/solr/solrj/src/resources/apispec/core.SchemaRead.dynamicFields_fieldTypes.jsonindex 4acb5aff3a6..fc901a9f408 100644--- a/solr/solrj/src/resources/apispec/core.SchemaRead.dynamicFields_fieldTypes.json+++ b/solr/solrj/src/resources/apispec/core.SchemaRead.dynamicFields_fieldTypes.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html",+ "documentation": "https://solr.apache.org/guide/schema-api.html","methods": ["GET"],diff --git a/solr/solrj/src/resources/apispec/core.SchemaRead.fields.json b/solr/solrj/src/resources/apispec/core.SchemaRead.fields.jsonindex 6d3b993cb85..d2ad02b6872 100644--- a/solr/solrj/src/resources/apispec/core.SchemaRead.fields.json+++ b/solr/solrj/src/resources/apispec/core.SchemaRead.fields.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html#list-fields",+ "documentation": "https://solr.apache.org/guide/schema-api.html#list-fields","description": "Get only the fields defined in the schema.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.SchemaRead.json b/solr/solrj/src/resources/apispec/core.SchemaRead.jsonindex c2a5457bd74..756342b439c 100644--- a/solr/solrj/src/resources/apispec/core.SchemaRead.json+++ b/solr/solrj/src/resources/apispec/core.SchemaRead.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/schema-api.html",+ "documentation": "https://solr.apache.org/guide/schema-api.html","methods": ["GET"],diff --git a/solr/solrj/src/resources/apispec/core.Update.json b/solr/solrj/src/resources/apispec/core.Update.jsonindex e04859e2e9f..e58164fa54b 100644--- a/solr/solrj/src/resources/apispec/core.Update.json+++ b/solr/solrj/src/resources/apispec/core.Update.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/indexing-with-update-handlers.html",+ "documentation": "https://solr.apache.org/guide/indexing-with-update-handlers.html","methods": ["POST"],diff --git a/solr/solrj/src/resources/apispec/core.config.Commands.json b/solr/solrj/src/resources/apispec/core.config.Commands.jsonindex e3a18acb320..7fd6dc4c485 100644--- a/solr/solrj/src/resources/apispec/core.config.Commands.json+++ b/solr/solrj/src/resources/apispec/core.config.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/config-api.html",+ "documentation": "https://solr.apache.org/guide/config-api.html","description": "The Config API enables manipulating various aspects of your solrconfig.xml using REST-like API calls. All properties set with this API update a file called configoverlay.json, but not the solrconfig.xml file itself.","methods": ["POST"@@ -12,13 +12,13 @@"commands": {"set-property:": {"type": "object",- "documentation": "https://lucene.apache.org/solr/guide/config-api.html#commands-to-modify-the-config",+ "documentation": "https://solr.apache.org/guide/config-api.html#commands-to-modify-the-config","description": "Sets one or more of several pre-defined properties. These properties set cache sizes and classes, commit rules, JMX settings, and request dispatcher settings. See the documentation for the list of properties that are supported. If a property is set that already exists, it will be overwritten.","additionalProperties": true},"unset-property": {"type":"array",- "documentation": "https://lucene.apache.org/solr/guide/config-api.html#commands-to-modify-the-config",+ "documentation": "https://solr.apache.org/guide/config-api.html#commands-to-modify-the-config","description": "Removes one or more of several pre-defined properties. These properties set cache sizes and classes, commit rules, JMX settings, and request dispatcher settings. See the documentation for the list of properties that are supported. The value of the property does not need to be defined with the list of properties, only the name of the property.","items": {"type": "string"diff --git a/solr/solrj/src/resources/apispec/core.config.Commands.runtimeLib.json b/solr/solrj/src/resources/apispec/core.config.Commands.runtimeLib.jsonindex 50a850328a4..89ec43aa92c 100644--- a/solr/solrj/src/resources/apispec/core.config.Commands.runtimeLib.json+++ b/solr/solrj/src/resources/apispec/core.config.Commands.runtimeLib.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/adding-custom-plugins-in-solrcloud-mode.html",+ "documentation": "https://solr.apache.org/guide/adding-custom-plugins-in-solrcloud-mode.html","description": "Allows you to register .jars that have been uploaded to the .system collection in Solr. Note that uploading the .jar must occur before using this API.","type": "object","properties": {diff --git a/solr/solrj/src/resources/apispec/core.config.Params.Commands.json b/solr/solrj/src/resources/apispec/core.config.Params.Commands.jsonindex 2691c1c50fb..2e6d45d666f 100644--- a/solr/solrj/src/resources/apispec/core.config.Params.Commands.json+++ b/solr/solrj/src/resources/apispec/core.config.Params.Commands.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/request-parameters-api.html",+ "documentation": "https://solr.apache.org/guide/request-parameters-api.html","description": "Create, update and delete request parameter sets (paramsets) to override or replace parameters defined in solrconfig.xml. Parameter sets are used with request handlers by setting the useParams attribute to the paramset name in the definition of the request handler or with individual requests to Solr. Parameter sets defined with this API are stored in a file params.json in ZooKeeper or on the filesystem when not using SolrCloud. Note this API does not directly update solrconfig.xml. ","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/core.config.Params.json b/solr/solrj/src/resources/apispec/core.config.Params.jsonindex ec4f1768a2c..bce9af4e8f5 100644--- a/solr/solrj/src/resources/apispec/core.config.Params.json+++ b/solr/solrj/src/resources/apispec/core.config.Params.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/request-parameters-api.html",+ "documentation": "https://solr.apache.org/guide/request-parameters-api.html","description": "List all parameter sets (paramsets). Individual paramsets can be requested by paramset name.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.config.json b/solr/solrj/src/resources/apispec/core.config.jsonindex 81e7d54d651..b46b96b2d4e 100644--- a/solr/solrj/src/resources/apispec/core.config.json+++ b/solr/solrj/src/resources/apispec/core.config.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/config-api.html",+ "documentation": "https://solr.apache.org/guide/config-api.html","description": "Gets the Solr configuration for a collection.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.system.blob.json b/solr/solrj/src/resources/apispec/core.system.blob.jsonindex dc32cfbb133..acd2b9c2419 100644--- a/solr/solrj/src/resources/apispec/core.system.blob.json+++ b/solr/solrj/src/resources/apispec/core.system.blob.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/blob-store-api.html",+ "documentation": "https://solr.apache.org/guide/blob-store-api.html","description": "Lists blobs in the blob store (the .system collection). The list can be limited by name or name and version.","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.system.blob.upload.json b/solr/solrj/src/resources/apispec/core.system.blob.upload.jsonindex 3382b975408..21df30651a1 100644--- a/solr/solrj/src/resources/apispec/core.system.blob.upload.json+++ b/solr/solrj/src/resources/apispec/core.system.blob.upload.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/blob-store-api.html",+ "documentation": "https://solr.apache.org/guide/blob-store-api.html","description": "Uploads a blob to the blob store. Note that the blob store is a specially named collection (which must be '.system') which must be created before uploading a blob to it.","methods": ["POST"diff --git a/solr/solrj/src/resources/apispec/core.tasks.cancel.json b/solr/solrj/src/resources/apispec/core.tasks.cancel.jsonindex ffe9fc0d51e..2034d1f6ba9 100644--- a/solr/solrj/src/resources/apispec/core.tasks.cancel.json+++ b/solr/solrj/src/resources/apispec/core.tasks.cancel.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/task-management.html",+ "documentation": "https://solr.apache.org/guide/task-management.html","description": "Cancel a currently running task","methods": ["GET"diff --git a/solr/solrj/src/resources/apispec/core.tasks.list.json b/solr/solrj/src/resources/apispec/core.tasks.list.jsonindex a898f9fab88..9a4caf3c021 100644--- a/solr/solrj/src/resources/apispec/core.tasks.list.json+++ b/solr/solrj/src/resources/apispec/core.tasks.list.json@@ -1,5 +1,5 @@{- "documentation": "https://lucene.apache.org/solr/guide/task-management.html",+ "documentation": "https://solr.apache.org/guide/task-management.html","description": "List currently running tasks","methods": ["GET"diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 9530b95ca68..5a1bb262549 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -2913,7 +2913,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {assertFalse("SecureRandom algorithm '" + algorithm + "' is in use by your JVM, " +"which is a potentially blocking algorithm on some environments. " +- "Please report the details of this failure (and your JVM vendor/version) to [email protected]. " ++ "Please report the details of this failure (and your JVM vendor/version) to [email protected]. " +"You can try to run your tests with -D"+EGD+"="+URANDOM+" or bypass this check using " +"-Dtest.solr.allowed.securerandom="+ algorithm +" as a JVM option when running tests.",// be permissive in our checks and deny only algorithmsdiff --git a/solr/test-framework/src/resources/create-keystores.sh b/solr/test-framework/src/resources/create-keystores.shindex 0b43f288ba6..0dc3d86760c 100755--- a/solr/test-framework/src/resources/create-keystores.sh+++ b/solr/test-framework/src/resources/create-keystores.sh@@ -28,10 +28,10 @@ echo "### remove old keystores"rm -f SSLTestConfig.testing.keystore SSLTestConfig.hostname-and-ip-missmatch.keystoreecho "### create 'localhost' keystore and keys"-keytool -keystore SSLTestConfig.testing.keystore -storepass "secret" -alias solrtest -keypass "secret" -genkey -keyalg RSA -dname "cn=localhost, ou=SolrTest, o=lucene.apache.org, c=US" -ext "san=dns:localhost,ip:127.0.0.1" -validity 999999+keytool -keystore SSLTestConfig.testing.keystore -storepass "secret" -alias solrtest -keypass "secret" -genkey -keyalg RSA -dname "cn=localhost, ou=SolrTest, o=solr.apache.org, c=US" -ext "san=dns:localhost,ip:127.0.0.1" -validity 999999# See https://tools.ietf.org/html/rfc5737echo "### create 'Bogus Host' keystore and keys"-keytool -keystore SSLTestConfig.hostname-and-ip-missmatch.keystore -storepass "secret" -alias solrtest -keypass "secret" -genkey -keyalg RSA -dname "cn=bogus.hostname.tld, ou=SolrTest, o=lucene.apache.org, c=US" -ext "san=dns:bogus.hostname.tld,ip:192.0.2.0" -validity 999999+keytool -keystore SSLTestConfig.hostname-and-ip-missmatch.keystore -storepass "secret" -alias solrtest -keypass "secret" -genkey -keyalg RSA -dname "cn=bogus.hostname.tld, ou=SolrTest, o=solr.apache.org, c=US" -ext "san=dns:bogus.hostname.tld,ip:192.0.2.0" -validity 999999