Skip to content

Commit

Permalink
1.20.0 (#98)
Browse files Browse the repository at this point in the history
* Update dependencies, Gradle wrapper, and minor formatting changes.

The changes include updating various dependencies such as Kotlinter, ben-manes.versions, gmazzo.buildconfig, kotlinx.kover, ktor-client, ktor-server, and others to their newer versions. 

* Update Kotlin and gRPC versions in build.gradle and gradle.properties
* Refactor configuration handling in 'Agent' and 'Proxy' classes
  • Loading branch information
pambrose authored Dec 12, 2023
1 parent e17f4b1 commit 9b502f7
Show file tree
Hide file tree
Showing 25 changed files with 955 additions and 750 deletions.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ insert_final_newline = true
max_line_length = 120
trim_trailing_whitespace = true

[build.gradle]
indent_size = 4

# Override for Makefile
[{Makefile, makefile, GNUmakefile}]
[{Makefile, makefile}]
indent_style = tab
indent_size = 4

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=1.19.0
VERSION=1.20.0

default: versioncheck

Expand Down Expand Up @@ -71,4 +71,4 @@ refresh:
./gradlew --refresh-dependencies

upgrade-wrapper:
./gradlew wrapper --gradle-version=8.4 --distribution-type=bin
./gradlew wrapper --gradle-version=8.5 --distribution-type=bin
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ scrape_configs:
The docker images are available via:
```bash
docker pull pambrose/prometheus-proxy:1.19.0
docker pull pambrose/prometheus-agent:1.19.0
docker pull pambrose/prometheus-proxy:1.20.0
docker pull pambrose/prometheus-agent:1.20.0
```

Start a proxy container with:
Expand All @@ -123,15 +123,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.19.0
pambrose/prometheus-proxy:1.20.0
```

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.19.0
pambrose/prometheus-agent:1.20.0
```

Using the config
Expand All @@ -149,7 +149,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.19.0
pambrose/prometheus-agent:1.20.0
```

**Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
Expand Down Expand Up @@ -297,15 +297,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.19.0
pambrose/prometheus-proxy:1.20.0

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.19.0
pambrose/prometheus-agent:1.20.0
```

**Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
Expand Down
2 changes: 1 addition & 1 deletion bin/docker-agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0
pambrose/prometheus-agent:1.20.0
2 changes: 1 addition & 1 deletion bin/docker-proxy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.0
pambrose/prometheus-proxy:1.20.0
Loading

0 comments on commit 9b502f7

Please sign in to comment.