Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16639: Fix jq parse error of solr-exporter metrics node_thread_pool_completed_total (#1317)

Naoto MINAMI8decf1d356c5
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 03b0d47abe6..c57b97f60a7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -199,6 +199,8 @@ Bug Fixes
* SOLR-16628: Ensure that InputStreams are closed after Xml parsing (Michael Gibney, David Smiley, Kevin Risden)
+* SOLR-16639: Fix jq parse error of solr-exporter metrics node_thread_pool_completed_total (Naoto Minami)
+
Build
---------------------
* Upgrade forbiddenapis to 3.4 (Uwe Schindler)
diff --git a/solr/prometheus-exporter/conf/solr-exporter-config.xml b/solr/prometheus-exporter/conf/solr-exporter-config.xml
index cd1883d1f0e..cd0b3221d2f 100644
--- a/solr/prometheus-exporter/conf/solr-exporter-config.xml
+++ b/solr/prometheus-exporter/conf/solr-exporter-config.xml
@@ -538,7 +538,7 @@
}
</str>
<str>
- $jq:node-thread-pool(completed_total, select(.key | endswith(".completed")), count)
+ $jq:node-thread-pool(completed_total, select(.key | endswith(".completed")) | select(.value | type=="object"), count)
</str>
<str>
$jq:node-thread-pool(running, select(.key | endswith(".running")), object.value, GAUGE)