diff --git a/Makefile b/Makefile index 26b56327..02b74946 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=1.15.0-b1 +VERSION=1.15.0 default: versioncheck diff --git a/README.md b/README.md index 2fc9f2a5..aa2d0b50 100644 --- a/README.md +++ b/README.md @@ -112,8 +112,8 @@ scrape_configs: The docker images are available via: ```bash -docker pull pambrose/prometheus-proxy:1.15.0-b1 -docker pull pambrose/prometheus-agent:1.15.0-b1 +docker pull pambrose/prometheus-proxy:1.15.0 +docker pull pambrose/prometheus-agent:1.15.0 ``` Start a proxy container with: @@ -122,7 +122,7 @@ 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.15.0-b1 + pambrose/prometheus-proxy:1.15.0 ``` Start an agent container with: @@ -130,7 +130,7 @@ 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.15.0-b1 + pambrose/prometheus-agent:1.15.0 ``` 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.15.0-b1 + pambrose/prometheus-agent:1.15.0 ``` **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the @@ -296,7 +296,7 @@ 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.15.0-b1 + pambrose/prometheus-proxy:1.15.0 docker run --rm -p 8083:8083 -p 8093:8093 \ --mount type=bind,source="$(pwd)"/testing/certs,target=/app/testing/certs \ @@ -304,7 +304,7 @@ docker run --rm -p 8083:8083 -p 8093:8093 \ --env AGENT_CONFIG=tls-no-mutual-auth.conf \ --env PROXY_HOSTNAME=mymachine.lan:50440 \ --name docker-agent \ - pambrose/prometheus-agent:1.15.0-b1 + pambrose/prometheus-agent:1.15.0 ``` **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the diff --git a/bin/docker-agent.sh b/bin/docker-agent.sh index cbb01de5..8ddf411e 100755 --- a/bin/docker-agent.sh +++ b/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.15.0-b1 + pambrose/prometheus-agent:1.15.0 diff --git a/bin/docker-proxy.sh b/bin/docker-proxy.sh index e245f8ce..adf302de 100755 --- a/bin/docker-proxy.sh +++ b/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.15.0-b1 + pambrose/prometheus-proxy:1.15.0 diff --git a/build.gradle b/build.gradle index 298939ef..d4f49203 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { } group = 'io.prometheus' -version = '1.15.0-b1' +version = '1.15.0' sourceCompatibility = 11 targetCompatibility = 11 @@ -25,7 +25,7 @@ buildConfig { buildConfigField('String', 'APP_NAME', "\"${project.name}\"") buildConfigField('String', 'APP_VERSION', "\"${project.version}\"") - buildConfigField('String', 'APP_RELEASE_DATE', "\"11/29/22\"") + buildConfigField('String', 'APP_RELEASE_DATE', "\"12/14/22\"") } repositories { diff --git a/etc/compose/proxy.yml b/etc/compose/proxy.yml index d5e226d7..c2204069 100644 --- a/etc/compose/proxy.yml +++ b/etc/compose/proxy.yml @@ -1,6 +1,6 @@ prometheus-proxy: autoredeploy: true - image: 'pambrose/prometheus-proxy:1.15.0-b1' + image: 'pambrose/prometheus-proxy:1.15.0' ports: - '8080:8080' - '8082:8082' diff --git a/gradle.properties b/gradle.properties index fe4660ad..0c5efe9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,13 +8,13 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF annotation_version=1.3.2 dropwizard_version=4.2.13 gengrpc_version=1.3.0 -grpc_version=1.51.0 +grpc_version=1.51.1 jcommander_version=1.82 -jetty_version=9.4.49.v20220914 +jetty_version=10.0.13 junit_version=5.9.1 kluent_version=1.72 kotlin_version=1.7.21 -ktor_version=2.1.3 +ktor_version=2.2.1 logback_version=1.4.5 logging_version=3.0.4 # Keep in sync with grpc @@ -23,7 +23,7 @@ prometheus_version=0.16.0 # Keep in sync with grpc protoc_version=3.21.7 serialization_version=1.4.1 -slf4j_version=2.0.5 +slf4j_version=2.0.6 typesafe_version=1.4.2 -utils_version=1.31.0 +utils_version=1.32.0 zipkin_version=5.14.1 \ No newline at end of file