diff --git a/.gitignore b/.gitignore index ff3332b..a1d566d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ojdbc8.jar pom.xml.releaseBackup -release.properties \ No newline at end of file +release.properties +target/* diff --git a/Dockerfile b/Dockerfile index a4fc3dc..ce90fdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jre-alpine -ADD target/prometheus-jdbc-exporter-jar-with-dependencies.jar target/ +COPY target/prometheus-jdbc-exporter-jar-with-dependencies.jar /target/ +COPY jar_lib/README.md /jar_lib/README.md EXPOSE 5555 -CMD java -Djava.security.egd=file:///dev/urandom -cp "target/*" no.sysco.middleware.metrics.prometheus.jdbc.WebServer 0.0.0.0:5555 ./config.yml +CMD java -Djava.security.egd=file:///dev/urandom -cp "/target/*:/jar_lib/*" no.sysco.middleware.metrics.prometheus.jdbc.WebServer 0.0.0.0:5555 ./config.yml diff --git a/jar_lib/README.md b/jar_lib/README.md new file mode 100644 index 0000000..3899473 --- /dev/null +++ b/jar_lib/README.md @@ -0,0 +1,3 @@ +Place any addtional jar here. These will be copied into docker image and will be added to CLASSPATH. + +NOTE: It is better to use add dependencies to [pom.xml](../pom.xml). This directory should only be used when the library jars are not available as part in maven repositories. diff --git a/pom.xml b/pom.xml index 7002907..104a74e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ no.sysco.middleware.metrics prometheus-jdbc-exporter - 1.2-SNAPSHOT + 1.3-SNAPSHOT jar prometheus-jdbc-exporter @@ -32,27 +32,32 @@ io.prometheus simpleclient - 0.0.23 + 0.9.0 org.yaml snakeyaml - 1.18 + 1.26 io.prometheus simpleclient_servlet - 0.0.21 + 0.9.0 org.eclipse.jetty jetty-servlet - 8.1.7.v20120910 + 9.4.30.v20200611 junit junit - 4.12 + 4.13 + + + net.snowflake + snowflake-jdbc + 3.12.13 @@ -62,7 +67,7 @@ maven-compiler-plugin - 3.6.1 + 3.8.1 1.8 1.8 @@ -76,7 +81,7 @@ maven-assembly-plugin - 3.0.0 + 3.3.0 ${project.build.finalName} @@ -103,7 +108,7 @@ com.spotify dockerfile-maven-plugin - 1.3.4 + 1.4.13 default diff --git a/src/main/java/no/sysco/middleware/metrics/prometheus/jdbc/JdbcConfig.java b/src/main/java/no/sysco/middleware/metrics/prometheus/jdbc/JdbcConfig.java index da65dcd..a9f7d02 100644 --- a/src/main/java/no/sysco/middleware/metrics/prometheus/jdbc/JdbcConfig.java +++ b/src/main/java/no/sysco/middleware/metrics/prometheus/jdbc/JdbcConfig.java @@ -279,7 +279,7 @@ private List getSamples(JdbcConfig.Query query, throws SQLException { List samples = new ArrayList<>(); - final String queryName = String.format("jdbc_%s", query.name); + final String queryName = String.format("%s", query.name); while (rs.next()) { List labelValues = query.labels diff --git a/test b/test new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/test @@ -0,0 +1 @@ +test