This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from 9903d0342fa SOLR-17333: Various rate limiting fixes (#2522)
add fd7d44771e0 SOLR-10654: Metrics: New wt=prometheus option (#2405)
No new revisions were added by this update.
Summary of changes:
solr/CHANGES.txt | 2 +
solr/core/build.gradle | 7 +
.../src/java/org/apache/solr/core/SolrCore.java | 3 +
.../apache/solr/handler/admin/MetricsHandler.java | 53 +-
.../apache/solr/metrics/prometheus/SolrMetric.java | 57 +++
.../solr/metrics/prometheus/SolrNoOpMetric.java | 29 ++
.../metrics/prometheus/SolrPrometheusExporter.java | 226 +++++++++
.../core/PrometheusCoreExporterInfo.java | 37 ++
.../prometheus/core/SolrCoreCacheMetric.java | 52 ++
.../prometheus/core/SolrCoreHandlerMetric.java | 78 +++
.../prometheus/core/SolrCoreHighlighterMetric.java | 50 ++
.../prometheus/core/SolrCoreIndexMetric.java | 48 ++
.../metrics/prometheus/core/SolrCoreMetric.java | 52 ++
.../prometheus/core/SolrCoreSearcherMetric.java | 64 +++
.../prometheus/core/SolrCoreTlogMetric.java | 52 ++
.../core/SolrPrometheusCoreExporter.java | 74 +++
.../solr/metrics/prometheus/core/package-info.java | 22 +
.../jetty/SolrJettyDispatchesMetric.java | 46 ++
.../metrics/prometheus/jetty/SolrJettyMetric.java | 27 ++
.../prometheus/jetty/SolrJettyReqRespMetric.java | 65 +++
.../jetty/SolrPrometheusJettyExporter.java | 49 ++
.../metrics/prometheus/jetty/package-info.java | 22 +
.../prometheus/jvm/PrometheusJvmExporterInfo.java | 30 ++
.../prometheus/jvm/SolrJvmBuffersMetric.java | 56 +++
.../metrics/prometheus/jvm/SolrJvmGcMetrics.java | 54 +++
.../prometheus/jvm/SolrJvmMemoryMetric.java | 65 +++
.../solr/metrics/prometheus/jvm/SolrJvmMetric.java | 27 ++
.../metrics/prometheus/jvm/SolrJvmOsMetric.java | 58 +++
.../prometheus/jvm/SolrPrometheusJvmExporter.java | 61 +++
.../solr/metrics/prometheus/jvm/package-info.java | 22 +
.../node/PrometheusNodeExporterInfo.java | 27 ++
.../prometheus/node/SolrNodeContainerMetric.java | 57 +++
.../prometheus/node/SolrNodeHandlerMetric.java | 64 +++
.../metrics/prometheus/node/SolrNodeMetric.java | 29 ++
.../node/SolrPrometheusNodeExporter.java | 104 ++++
.../solr/metrics/prometheus/node/package-info.java | 22 +
.../solr/metrics/prometheus/package-info.java | 25 +
.../solr/response/PrometheusResponseWriter.java | 146 ++++++
.../prometheus/solr-prometheus-output.txt | 535 +++++++++++++++++++++
.../solr/handler/admin/MetricsHandlerTest.java | 397 +++++++++++++++
.../apache/solr/metrics/SolrCoreMetricTest.java | 81 ++++
.../solr/metrics/SolrPrometheusExporterTest.java | 161 +++++++
.../response/TestPrometheusResponseWriter.java | 105 ++++
...theus-metrics-exposition-formats-1.1.0.jar.sha1 | 1 +
...eus-metrics-exposition-formats-LICENSE-ASL.txt} | 0
...ometheus-metrics-exposition-formats-NOTICE.txt} | 0
.../prometheus-metrics-model-1.1.0.jar.sha1 | 1 +
...xt => prometheus-metrics-model-LICENSE-ASL.txt} | 0
...ICE.txt => prometheus-metrics-model-NOTICE.txt} | 0
.../deployment-guide/pages/metrics-reporting.adoc | 4 +
.../monitoring-with-prometheus-and-grafana.adoc | 44 +-
versions.lock | 2 +
52 files changed, 3284 insertions(+), 9 deletions(-)
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrNoOpMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrPrometheusExporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreExporterInfo.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreExporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyDispatchesMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyReqRespMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrPrometheusJettyExporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/PrometheusJvmExporterInfo.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmBuffersMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmGcMetrics.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmMemoryMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmOsMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrPrometheusJvmExporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/PrometheusNodeExporterInfo.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeContainerMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeHandlerMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeMetric.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrPrometheusNodeExporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
create mode 100644
solr/core/src/test-files/prometheus/solr-prometheus-output.txt
create mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java
create mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrPrometheusExporterTest.java
create mode 100644
solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
create mode 100644
solr/licenses/prometheus-metrics-exposition-formats-1.1.0.jar.sha1
copy solr/licenses/{freemarker-LICENSE-ASL.txt =>
prometheus-metrics-exposition-formats-LICENSE-ASL.txt} (100%)
copy solr/licenses/{simpleclient-NOTICE.txt =>
prometheus-metrics-exposition-formats-NOTICE.txt} (100%)
create mode 100644 solr/licenses/prometheus-metrics-model-1.1.0.jar.sha1
copy solr/licenses/{freemarker-LICENSE-ASL.txt =>
prometheus-metrics-model-LICENSE-ASL.txt} (100%)
copy solr/licenses/{simpleclient-NOTICE.txt =>
prometheus-metrics-model-NOTICE.txt} (100%)
