1.8.5

* Make cioTimeoutSecs an agent property

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.8.4
+VERSION=1.8.5
 
 default: compile
 

README.md

@@ -97,8 +97,8 @@ scrape_configs:
 
 The docker images are available via:
 ```bash
-docker pull pambrose/prometheus-proxy:1.8.4
-docker pull pambrose/prometheus-agent:1.8.4
+docker pull pambrose/prometheus-proxy:1.8.5
+docker pull pambrose/prometheus-agent:1.8.5
 ```
 
 Start a proxy container with:
@@ -107,15 +107,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.8.4
+        pambrose/prometheus-proxy:1.8.5
 ```
 
 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.8.4
+        pambrose/prometheus-agent:1.8.5
 ```
 
 Using the config file [simple.conf](https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf),
@@ -131,7 +131,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.8.4
+    pambrose/prometheus-agent:1.8.5
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure 
@@ -252,15 +252,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.8.4
+    pambrose/prometheus-proxy:1.8.5
 
 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.8.4
+    pambrose/prometheus-agent:1.8.5
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure 

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.8.4
+  pambrose/prometheus-agent:1.8.5

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.8.4
+  pambrose/prometheus-proxy:1.8.5

build.gradle

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = 'io.prometheus'
-version = '1.8.4'
+version = '1.8.5'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

etc/compose/proxy.yml

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

etc/config/config.conf

@@ -51,7 +51,7 @@ proxy {
     maxAgentInactivitySecs = 15             // Seconds of inactivity before agent is evicted in seconds
     staleAgentCheckPauseSecs = 10           // Pause interval for agent cleanup in seconds
 
-    scrapeRequestTimeoutSecs = 60           // Timeout for scrape requests in seconds
+    scrapeRequestTimeoutSecs = 90           // Timeout for scrape requests in seconds
     scrapeRequestCheckMillis = 500          // Pause time between checks for scrape request timeout in millis
     scrapeRequestBacklogUnhealthySize = 25  // Threshold for returning an unhealthy healthcheck
     scrapeRequestMapUnhealthySize = 25      // Threshold for returning an unhealthy healthcheck
@@ -125,7 +125,7 @@ agent {
     }
   }
 
-  pathConfigs: [                             // List of path configs registered with a Proxy
+  pathConfigs: [                            // List of path configs registered with a Proxy
     {
       name: String                          // Endpint name
       path: String                          // Path used by the proxy
@@ -134,11 +134,13 @@ agent {
   ]
 
   internal {
-    reconnectPauseSecs = 3                  // Pause interval between connect attempts
+    cioTimeoutSecs = 90                     // CIO engine request timeout in seconds
+
+    reconnectPauseSecs = 3                  // Pause interval between connect attempts in seconds
 
     heartbeatEnabled = true
     heartbeatCheckPauseMillis = 500         // Pause interval when checking for inactivity
-    heartbeatMaxInactivitySecs = 5          // Max inactivity before hearbeat sent
+    heartbeatMaxInactivitySecs = 5          // Max inactivity before hearbeat sent in seconds
 
     scrapeRequestBacklogUnhealthySize = 25  // Threshold for returning an unhealthy healthcheck
 

examples/simple.conf

@@ -18,13 +18,13 @@ agent {
       name: "Proxy metrics"
       path: proxy_metrics
       url: "http://localhost:8082/metrics"
-      url: "http://"${?HOSTNAME}":8082/metrics"
+      //url: "http://"${?HOSTNAME}":8082/metrics"
     }
     {
       name: "Agent metrics"
       path: agent_metrics
       url: "http://localhost:8083/metrics"
-      url: "http://"${?HOSTNAME}":8083/metrics"
+      //url: "http://"${?HOSTNAME}":8083/metrics"
     }
   ]
 }