You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2020/10/15 09:00:25 UTC
[lucene-solr] branch jira/solr14930 updated (28c1437 -> 20a34a2)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a change to branch jira/solr14930
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 28c1437 remove file
add 2a3da99 SOLR-14914: Add option to disable metrics collection.
add 529f1fb Merge branch 'master' into jira/solr14930
add 20a34a2 Merge branch 'master' into jira/solr14930
No new revisions were added by this update.
Summary of changes:
solr/CHANGES.txt | 2 +
.../prometheus/PrometheusExporterTestBase.java | 1 +
.../solr/cloud/api/collections/SplitShardCmd.java | 9 +-
.../java/org/apache/solr/core/CoreContainer.java | 12 +-
.../java/org/apache/solr/core/MetricsConfig.java | 71 +++++-
.../java/org/apache/solr/core/SolrXmlConfig.java | 13 +-
.../apache/solr/handler/admin/MetricsHandler.java | 18 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 15 +-
.../org/apache/solr/metrics/MetricSuppliers.java | 267 ++++++++++++++++++---
.../org/apache/solr/metrics/SolrMetricManager.java | 14 +-
.../src/test-files/solr/solr-metricsconfig.xml | 2 +-
solr/core/src/test-files/solr/solr.xml | 2 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 1 +
.../solr/cloud/MetricsHistoryIntegrationTest.java | 1 +
.../MetricsHistoryWithAuthIntegrationTest.java | 2 +-
.../test/org/apache/solr/cloud/SplitShardTest.java | 1 +
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 1 +
.../org/apache/solr/cloud/TestCloudRecovery.java | 1 +
.../org/apache/solr/cloud/TestTlogReplica.java | 1 +
.../org/apache/solr/cloud/rule/RulesTest.java} | 0
.../solr/handler/admin/AdminHandlersProxyTest.java | 1 +
.../handler/admin/MetricsHistoryHandlerTest.java | 1 +
.../org/apache/solr/metrics/MetricsConfigTest.java | 12 +
.../solr/metrics/MetricsDisabledCloudTest.java | 72 ++++++
.../solr/search/stats/TestDefaultStatsCache.java | 1 +
solr/server/solr/solr.xml | 2 +
solr/solr-ref-guide/src/metrics-history.adoc | 3 +
solr/solr-ref-guide/src/metrics-reporting.adoc | 15 ++
.../solrj/impl/SolrClientNodeStateProvider.java | 50 ++--
.../solrj/impl/CloudHttp2SolrClientRetryTest.java | 1 +
.../solrj/impl/CloudHttp2SolrClientTest.java | 1 +
.../solrj/impl/CloudSolrClientRetryTest.java | 1 +
.../client/solrj/impl/CloudSolrClientTest.java | 1 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 3 +-
.../apache/solr/cloud/SolrCloudAuthTestCase.java | 12 +
35 files changed, 516 insertions(+), 94 deletions(-)
copy solr/{solrj/src/test-files/solrj/solr/multicore/core1/core.properties => core/src/test/org/apache/solr/cloud/rule/RulesTest.java} (100%)
create mode 100644 solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java