Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14957: Add Prometheus Exporter to docker PATH. Fix classpath issues. (#2017)

This commit is contained in:
Houston Putman 2020-10-26 14:15:30 -04:00 committed by GitHub
parent b649f3f40d
commit 4fe4f37131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -134,6 +134,8 @@ Other Changes
* SOLR-14944: Remove the "spins" metrics - support for detection of spinning disks has been * SOLR-14944: Remove the "spins" metrics - support for detection of spinning disks has been
removed in LUCENE-9576. (ab) removed in LUCENE-9576. (ab)
* SOLR-14957: Add Prometheus Exporter to docker PATH. Fix classpath issues. (Houston Putman)
Bug Fixes Bug Fixes
--------------------- ---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution * SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution

6
solr/contrib/prometheus-exporter/bin/solr-exporter
View File

@ -74,7 +74,7 @@ then
REPO="$BASEDIR"/lib REPO="$BASEDIR"/lib
fi fi
CLASSPATH=$CLASSPATH_PREFIX CLASSPATH=$CLASSPATH_PREFIX:$BASEDIR/conf
for JAR in $(find "$REPO" -name '*.jar') for JAR in $(find "$REPO" -name '*.jar')
do do
CLASSPATH="$CLASSPATH":"$JAR" CLASSPATH="$CLASSPATH":"$JAR"
@ -103,6 +103,10 @@ for JAR in $(find "$BASEDIR"/../../server/solr-webapp/webapp/WEB-INF/lib -name '
do do
CLASSPATH="$CLASSPATH":"$JAR" CLASSPATH="$CLASSPATH":"$JAR"
done done
for JAR in $(find "$BASEDIR"/../../server/lib/ext -name '*.jar')
do
CLASSPATH="$CLASSPATH":"$JAR"
done
# Memory settings # Memory settings
JAVA_MEM_OPTS= JAVA_MEM_OPTS=

2
solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
View File

@ -71,7 +71,7 @@ if "%JAVACMD%"=="" set JAVACMD=java
if "%REPO%"=="" set REPO=%BASEDIR%\lib if "%REPO%"=="" set REPO=%BASEDIR%\lib
set CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*;%BASEDIR%\..\..\server\solr-webapp\webapp\WEB-INF\lib\* set CLASSPATH=%REPO%\*;%BASEDIR%\conf;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*;%BASEDIR%\..\..\server\solr-webapp\webapp\WEB-INF\lib\*;%BASEDIR%\..\..\server\lib\ext\*
set EXTRA_JVM_ARGUMENTS=-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml set EXTRA_JVM_ARGUMENTS=-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
goto endInit goto endInit

2
solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
View File

@ -68,7 +68,7 @@ public class SolrExporter {
private static final String[] ARG_CONFIG_FLAGS = {"-f", "--config-file"}; private static final String[] ARG_CONFIG_FLAGS = {"-f", "--config-file"};
private static final String ARG_CONFIG_METAVAR = "CONFIG"; private static final String ARG_CONFIG_METAVAR = "CONFIG";
private static final String ARG_CONFIG_DEST = "configFile"; private static final String ARG_CONFIG_DEST = "configFile";
private static final String ARG_CONFIG_DEFAULT = "./conf/solr-exporter-config.xml"; private static final String ARG_CONFIG_DEFAULT = "solr-exporter-config.xml";
private static final String ARG_CONFIG_HELP = "Specify the configuration file; the default is " + ARG_CONFIG_DEFAULT + "."; private static final String ARG_CONFIG_HELP = "Specify the configuration file; the default is " + ARG_CONFIG_DEFAULT + ".";
private static final String[] ARG_SCRAPE_INTERVAL_FLAGS = {"-s", "--scrape-interval"}; private static final String[] ARG_SCRAPE_INTERVAL_FLAGS = {"-s", "--scrape-interval"};

2
solr/docker/Dockerfile
View File

@ -23,7 +23,7 @@ ENV SOLR_USER="solr" \
SOLR_UID="8983" \ SOLR_UID="8983" \
SOLR_GROUP="solr" \ SOLR_GROUP="solr" \
SOLR_GID="8983" \ SOLR_GID="8983" \
PATH="/opt/solr/bin:/opt/docker-solr/scripts:$PATH" \ PATH="/opt/solr/bin:/opt/docker-solr/scripts:/opt/solr/contrib/prometheus-exporter/bin:$PATH" \
SOLR_INCLUDE=/etc/default/solr.in.sh \ SOLR_INCLUDE=/etc/default/solr.in.sh \
SOLR_HOME=/var/solr/data \ SOLR_HOME=/var/solr/data \
SOLR_PID_DIR=/var/solr \ SOLR_PID_DIR=/var/solr \