1.14.2 (#84)

* Update jars

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.14.1
+VERSION=1.14.2
 
 default: versioncheck
 
@@ -67,4 +67,4 @@ refresh:
 	./gradlew --refresh-dependencies
 
 upgrade-wrapper:
-	./gradlew wrapper --gradle-version=7.5.1 --distribution-type=bin
+	./gradlew wrapper --gradle-version=7.6 --distribution-type=bin

README.md

@@ -112,8 +112,8 @@ scrape_configs:
 The docker images are available via:
 
 ```bash
-docker pull pambrose/prometheus-proxy:1.14.1
-docker pull pambrose/prometheus-agent:1.14.1
+docker pull pambrose/prometheus-proxy:1.14.2
+docker pull pambrose/prometheus-agent:1.14.2
 ```
 
 Start a proxy container with:
@@ -122,15 +122,15 @@ Start a proxy container with:
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         --env ADMIN_ENABLED=true \
         --env METRICS_ENABLED=true \
-        pambrose/prometheus-proxy:1.14.1
+        pambrose/prometheus-proxy:1.14.2
 ```
 
 Start an agent container with:
 
 ```bash
 docker run --rm -p 8083:8083 -p 8093:8093 \
         --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.14.1
+        pambrose/prometheus-agent:1.14.2
 ```
 
 Using the config
@@ -148,7 +148,7 @@ is in your current directory, run an agent container with:
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/prom-agent.conf,target=/app/prom-agent.conf \
     --env AGENT_CONFIG=prom-agent.conf \
-    pambrose/prometheus-agent:1.14.1
+    pambrose/prometheus-agent:1.14.2
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
@@ -294,15 +294,15 @@ docker run --rm -p 8082:8082 -p 8092:8092 -p 50440:50440 -p 8080:8080 \
     --env PROXY_CONFIG=tls-no-mutual-auth.conf \
     --env ADMIN_ENABLED=true \
     --env METRICS_ENABLED=true \
-    pambrose/prometheus-proxy:1.14.1
+    pambrose/prometheus-proxy:1.14.2
 
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/testing/certs,target=/app/testing/certs \
     --mount type=bind,source="$(pwd)"/examples/tls-no-mutual-auth.conf,target=/app/tls-no-mutual-auth.conf \
     --env AGENT_CONFIG=tls-no-mutual-auth.conf \
     --env PROXY_HOSTNAME=mymachine.lan:50440 \
     --name docker-agent \
-    pambrose/prometheus-agent:1.14.1
+    pambrose/prometheus-agent:1.14.2
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
@@ -326,7 +326,11 @@ An example config can be found in
 [Grafana](https://grafana.com) dashboards for the proxy and agent
 are [here](https://github.com/pambrose/prometheus-proxy/tree/master/grafana).
 
-## Related LinksK
+## Nginx Support
+
+Nginx does not work as a reverse proxy for prometheus-proxy.
+
+## Related Links
 
 * [Prometheus.io](http://prometheus.io)
 * [gRPC](http://grpc.io)

bin/docker-agent.sh

@@ -3,4 +3,4 @@
 docker run --rm -p 8083:8083 -p 8093:8093 \
   --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
   --env PROXY_HOSTNAME=mymachine.lan \
-  pambrose/prometheus-agent:1.14.1
+  pambrose/prometheus-agent:1.14.2

bin/docker-proxy.sh

@@ -2,4 +2,4 @@
 
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
   --env PROXY_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-  pambrose/prometheus-proxy:1.14.1
+  pambrose/prometheus-proxy:1.14.2

build.gradle

@@ -2,10 +2,10 @@ plugins {
     id 'idea'
     id 'java'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.7.21'
     id 'com.google.protobuf' version '0.8.18'   // Keep in sync with grpc
     id 'org.jmailen.kotlinter' version "3.12.0"
-    id "com.github.ben-manes.versions" version '0.42.0'
+    id "com.github.ben-manes.versions" version '0.44.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'com.github.gmazzo.buildconfig' version '3.1.0'
     id 'org.jetbrains.kotlinx.kover' version '0.6.1'
@@ -15,7 +15,7 @@ plugins {
 }
 
 group = 'io.prometheus'
-version = '1.14.1'
+version = '1.14.2'
 
 sourceCompatibility = 11
 targetCompatibility = 11
@@ -90,7 +90,7 @@ buildConfig {
 
     buildConfigField('String', 'APP_NAME', "\"${project.name}\"")
     buildConfigField('String', 'APP_VERSION', "\"${project.version}\"")
-    buildConfigField('String', 'APP_RELEASE_DATE', "\"10/14/22\"")
+    buildConfigField('String', 'APP_RELEASE_DATE', "\"11/26/22\"")
 }
 
 publishing {

etc/compose/proxy.yml

@@ -1,6 +1,6 @@
 prometheus-proxy:
   autoredeploy: true
-  image: 'pambrose/prometheus-proxy:1.14.1'
+  image: 'pambrose/prometheus-proxy:1.14.2'
   ports:
     - '8080:8080'
     - '8082:8082'

gradle.properties

@@ -6,24 +6,24 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 annotation_version=1.3.2
-dropwizard_version=4.2.12
+dropwizard_version=4.2.13
 gengrpc_version=1.3.0
-grpc_version=1.50.0
+grpc_version=1.51.0
 jcommander_version=1.82
 jetty_version=9.4.49.v20220914
 junit_version=5.9.1
-kluent_version=1.68
-kotlin_version=1.7.20
-ktor_version=2.1.2
-logback_version=1.4.4
-logging_version=3.0.2
+kluent_version=1.72
+kotlin_version=1.7.21
+ktor_version=2.1.3
+logback_version=1.4.5
+logging_version=3.0.4
 # Keep in sync with grpc
 tcnative_version=2.0.54.Final
 prometheus_version=0.16.0
 # Keep in sync with grpc
 protoc_version=3.21.7
-serialization_version=1.4.0
-slf4j_version=2.0.3
+serialization_version=1.4.1
+slf4j_version=2.0.5
 typesafe_version=1.4.2
-utils_version=1.30.0
+utils_version=1.31.0
 zipkin_version=5.14.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists