Merge pull request #187 from shizunge/dependabot/github_actions/docker/setup-buildx-action-3.12.0

Bump docker/setup-buildx-action from 3.11.1 to 3.12.0
2025-12-24 22:32:46 -08:00 · 2025-12-22 08:01:45 +00:00 · 2025-11-24 10:44:01 -08:00 · 2025-11-24 08:02:13 +00:00 · 2025-11-07 00:34:28 -08:00 · 2025-10-06 10:47:04 -07:00
12 changed files with 222 additions and 105 deletions
--- a/.github/workflows/docker-hub-description.yml
+++ b/.github/workflows/docker-hub-description.yml
@@ -12,9 +12,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
      - name: Update Docker Hub description
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@v5
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_PASSWORD }}
--- a/.github/workflows/on-pull-request.yml
+++ b/.github/workflows/on-pull-request.yml
@@ -0,0 +1,48 @@
+name: On pull request
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+    paths-ignore:
+      - 'dashboard/*'
+      - 'examples/*'
+      - 'README.md'
+      - 'LICENSE'
+  workflow_dispatch:
+
+env:
+  PLATFORMS: "linux/amd64,linux/arm64,linux/arm/v7"
+  
+jobs:
+  build_container_image:
+    name: Build Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.12.0
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}-development
+          tags: |
+            type=raw,value=dev-{{date 'X'}}
+            type=raw,value=latest
+            type=ref,event=branch
+            type=edge,branch=main
+      - name: Build 
+        uses: docker/build-push-action@v6.18.0
+        with:
+          platforms: ${{ env.PLATFORMS }}
+          push: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          provenance: false
+
+
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -3,7 +3,8 @@ name: On push
 on:
  push:
    branches-ignore:
-      - release
+      - 'release'
+      - 'dependabot/**'
    paths-ignore:
      - 'dashboard/*'
      - 'examples/*'
@@ -18,20 +19,21 @@ jobs:
  build_and_push:
    name: Build and push Docker image
    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
-      - name: Login to docker hub
-        uses: docker/login-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.12.0
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3.6.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_PASSWORD }}
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -49,7 +51,7 @@ jobs:
            type=ref,event=branch
            type=edge,branch=main
      - name: Build and push ${{ github.repository }}:${{ steps.git.outputs.image_tag }}
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.18.0
        with:
          platforms: ${{ env.PLATFORMS }}
          push: true
--- a/.github/workflows/on-release.yml
+++ b/.github/workflows/on-release.yml
@@ -13,18 +13,18 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3.12.0
      - name: Login to docker hub
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.6.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_PASSWORD }}
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -40,7 +40,7 @@ jobs:
            type=ref,event=branch
            type=ref,event=tag
      - name: Build and push
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.18.0
        with:
          platforms: ${{ env.PLATFORMS }}
          push: true
--- a/README.md
+++ b/README.md
@@ -1,5 +1,12 @@
 # endlessh-go

+[![Release](https://img.shields.io/github/release/shizunge/endlessh-go.svg?label=Release)](https://github.com/shizunge/endlessh-go/releases/latest)
+[![License](https://img.shields.io/badge/License-GPLv3-blue)](https://github.com/shizunge/endlessh-go/blob/main/LICENSE)
+[![Image Size](https://img.shields.io/docker/image-size/shizunge/endlessh-go/latest.svg?label=Image%20Size)](https://hub.docker.com/r/shizunge/endlessh-go)
+[![Docker Pulls](https://img.shields.io/docker/pulls/shizunge/endlessh-go.svg?label=Docker%20Pulls&logo=Docker)](https://hub.docker.com/r/shizunge/endlessh-go)
+[![Build](https://img.shields.io/github/actions/workflow/status/shizunge/endlessh-go/on-push.yml?label=Build&branch=main&logo=GitHub)](https://github.com/shizunge/endlessh-go/actions/workflows/on-push.yml)
+[![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/shizunge/endlessh-go?label=CodeFactor&logo=CodeFactor)](https://www.codefactor.io/repository/github/shizunge/endlessh-go)
+
 A golang implementation of [endlessh](https://nullprogram.com/blog/2019/03/22/) exporting Prometheus metrics, visualized by a Grafana dashboard.

 ![screenshot](https://github.com/shizunge/endlessh-go/raw/main/dashboard/screenshot.png)
@@ -81,6 +88,10 @@ Usage of ./endlessh-go
        The address for prometheus (default "0.0.0.0")
  -prometheus_port string
        The port for prometheus (default "2112")
+  -proxy_protocol_enabled
+        Enable PROXY protocol support. This causes the server to expect PROXY protocol headers on incoming connections.
+  -proxy_protocol_read_header_timeout_ms int
+        Timeout for reading the PROXY protocol header in milliseconds. If the connection does not send a valid PROXY protocol header in this time, the header is ignored. (default 200)
  -stderrthreshold value
        logs at or above this threshold go to stderr (default 2)
  -v value
--- a/dashboard/endlessh.json
+++ b/dashboard/endlessh.json
@@ -21,7 +21,7 @@
      "type": "grafana",
      "id": "grafana",
      "name": "Grafana",
-      "version": "10.3.0-64399"
+      "version": "12.3.0-18356121373.patch9"
    },
    {
      "type": "panel",
@@ -76,10 +76,9 @@
      }
    ]
  },
-  "description": "Dashboard for endlessh (Fix current connections)",
+  "description": "Dashboard for endlessh (Add ports selection)",
  "editable": false,
  "fiscalYearStartMonth": 0,
-  "gnetId": 15156,
  "graphTooltip": 0,
  "id": null,
  "links": [
@@ -108,7 +107,6 @@
      "url": "https://grafana.com/grafana/dashboards/15156"
    }
  ],
-  "liveNow": false,
  "panels": [
    {
      "datasource": {
@@ -126,7 +124,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -147,6 +145,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -154,11 +153,12 @@
          "fields": "/^Total number connections that endlessh trapped$/",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -166,7 +166,7 @@
            "uid": "${DS_PROMETHEUS}"
          },
          "editorMode": "code",
-          "expr": "(endlessh_client_open_count{instance=~\"$host\",job=~\"$job\"} - endlessh_client_open_count{instance=~\"$host\",job=~\"$job\"} offset $__interval) > 0 or (endlessh_client_open_count{instance=~\"$host\",job=~\"$job\"}!=0 unless endlessh_client_open_count{instance=~\"$host\",job=~\"$job\"} offset $__interval)",
+          "expr": "(endlessh_client_open_count{instance=~\"$host\", local_port=~\"$port\",job=~\"$job\"} - endlessh_client_open_count{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} offset $__interval) > 0 or (endlessh_client_open_count{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"}!=0 unless endlessh_client_open_count{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} offset $__interval)",
          "format": "table",
          "instant": false,
          "legendFormat": "Seen {{ip}}",
@@ -179,7 +179,7 @@
            "uid": "${DS_PROMETHEUS}"
          },
          "editorMode": "code",
-          "expr": "(endlessh_client_trapped_time_seconds{instance=~\"$host\",job=~\"$job\"} - endlessh_client_trapped_time_seconds{instance=~\"$host\",job=~\"$job\"} offset $__interval) > 0 or (endlessh_client_trapped_time_seconds{instance=~\"$host\",job=~\"$job\"}!=0 unless endlessh_client_trapped_time_seconds{instance=~\"$host\",job=~\"$job\"} offset $__interval)",
+          "expr": "(endlessh_client_trapped_time_seconds{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} - endlessh_client_trapped_time_seconds{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} offset $__interval) > 0 or (endlessh_client_trapped_time_seconds{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"}!=0 unless endlessh_client_trapped_time_seconds{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} offset $__interval)",
          "format": "table",
          "hide": false,
          "instant": false,
@@ -271,7 +271,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          },
@@ -291,6 +291,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -298,11 +299,12 @@
          "fields": "/^Time spent on endlessh$/",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -397,7 +399,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          },
@@ -417,6 +419,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -424,22 +427,25 @@
          "fields": "",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "${DS_PROMETHEUS}"
          },
+          "editorMode": "code",
          "exemplar": true,
-          "expr": "sum(increase(endlessh_sent_bytes_total{instance=~\"$host\",job=~\"$job\"}[$__range]))",
+          "expr": "sum(increase(endlessh_sent_bytes_total{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"}[$__range]))",
          "hide": false,
          "interval": "",
          "legendFormat": "Bytes sent by endlessh",
+          "range": true,
          "refId": "sent_bytes"
        }
      ],
@@ -462,7 +468,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -481,6 +487,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -488,11 +495,12 @@
          "fields": "/^Unique IPs connected$/",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -576,7 +584,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -595,6 +603,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -602,11 +611,12 @@
          "fields": "/^Client IP of the latest connection$/",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "value",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -712,7 +722,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              },
              {
                "color": "#EAB839",
@@ -740,6 +750,7 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "auto",
+        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@@ -747,19 +758,21 @@
          "fields": "",
          "values": false
        },
+        "showPercentChange": false,
        "text": {},
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "${DS_PROMETHEUS}"
          },
+          "editorMode": "code",
          "exemplar": true,
-          "expr": "sum((endlessh_client_open_count_total{instance=~\"$host\",job=~\"$job\"}) - (endlessh_client_closed_count_total{instance=~\"$host\",job=~\"$job\"} or endlessh_client_open_count_total{instance=~\"$host\",job=~\"$job\"} * 0))",
+          "expr": "sum((endlessh_client_open_count_total{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"}) - (endlessh_client_closed_count_total{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} or endlessh_client_open_count_total{instance=~\"$host\",local_port=~\"$port\",job=~\"$job\"} * 0))",
          "instant": false,
          "interval": "",
          "legendFormat": "Open Connections",
@@ -786,6 +799,7 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
+            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 0,
            "gradientMode": "none",
@@ -802,6 +816,7 @@
              "type": "linear"
            },
            "showPoints": "auto",
+            "showValues": false,
            "spanNulls": false,
            "stacking": {
              "group": "A",
@@ -812,13 +827,13 @@
            }
          },
          "mappings": [],
-          "min": -0.01,
+          "min": 0,
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -840,10 +855,12 @@
          "showLegend": false
        },
        "tooltip": {
+          "hideZeros": false,
          "mode": "single",
          "sort": "none"
        }
      },
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -904,11 +921,14 @@
          "fields": "",
          "values": false
        },
+        "sort": "desc",
        "tooltip": {
+          "hideZeros": false,
          "mode": "single",
          "sort": "none"
        }
      },
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -919,7 +939,7 @@
          "refId": "A"
        }
      ],
-      "title": "Connections by country",
+      "title": "Connections by Country",
      "transformations": [
        {
          "id": "filterByRefId",
@@ -1015,7 +1035,7 @@
            "steps": [
              {
                "color": "#96D98D",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -1029,7 +1049,6 @@
        "y": 7
      },
      "id": 48,
-      "links": [],
      "options": {
        "basemap": {
          "config": {},
@@ -1094,10 +1113,11 @@
          "id": "zero",
          "lat": 0,
          "lon": 0,
+          "noRepeat": false,
          "zoom": 1
        }
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -1194,6 +1214,9 @@
              "type": "auto"
            },
            "filterable": true,
+            "footer": {
+              "reducers": []
+            },
            "inspect": false,
            "minWidth": 50
          },
@@ -1204,7 +1227,7 @@
            "steps": [
              {
                "color": "green",
-                "value": null
+                "value": 0
              }
            ]
          }
@@ -1271,14 +1294,6 @@
      "id": 49,
      "options": {
        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "frameIndex": 0,
        "showHeader": true,
        "sortBy": [
@@ -1288,7 +1303,7 @@
          }
        ]
      },
-      "pluginVersion": "10.3.0-64399",
+      "pluginVersion": "12.3.0-18356121373.patch9",
      "targets": [
        {
          "datasource": {
@@ -1461,7 +1476,7 @@
    }
  ],
  "refresh": "",
-  "schemaVersion": 39,
+  "schemaVersion": 42,
  "tags": [
    "prometheus"
  ],
@@ -1475,7 +1490,6 @@
          "uid": "${DS_PROMETHEUS}"
        },
        "definition": "label_values(endlessh_client_open_count_total, job)",
-        "hide": 0,
        "includeAll": true,
        "label": "Job",
        "multi": true,
@@ -1487,7 +1501,6 @@
        },
        "refresh": 2,
        "regex": "",
-        "skipUrlSync": false,
        "sort": 1,
        "type": "query"
      },
@@ -1499,7 +1512,6 @@
          "uid": "${DS_PROMETHEUS}"
        },
        "definition": "label_values(endlessh_client_open_count_total{job=~\"$job\"}, instance)",
-        "hide": 0,
        "includeAll": true,
        "label": "Host",
        "multi": true,
@@ -1511,7 +1523,26 @@
        },
        "refresh": 2,
        "regex": "",
-        "skipUrlSync": false,
+        "sort": 1,
+        "type": "query"
+      },
+      {
+        "allValue": ".*",
+        "current": {},
+        "definition": "label_values(endlessh_client_open_count_total{job=~\"$job\", instance=~\"$host\"},local_port)",
+        "description": "",
+        "includeAll": true,
+        "label": "Port",
+        "multi": true,
+        "name": "port",
+        "options": [],
+        "query": {
+          "qryType": 1,
+          "query": "label_values(endlessh_client_open_count_total{job=~\"$job\", instance=~\"$host\"},local_port)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 2,
+        "regex": "",
        "sort": 1,
        "type": "query"
      }
@@ -1525,6 +1556,6 @@
  "timezone": "",
  "title": "Endlessh",
  "uid": "ATIxYkO7k",
-  "version": 12,
+  "version": 13,
  "weekStart": ""
 }
--- a/examples/docker-maxmind/docker-compose.yml
+++ b/examples/docker-maxmind/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:

  endlessh:
--- a/examples/docker-simple/docker-compose.yml
+++ b/examples/docker-simple/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.5'
 services:

  endlessh:
--- a/go.mod
+++ b/go.mod
@@ -1,24 +1,25 @@
 module endlessh-go

-go 1.21.0
-toolchain go1.23.1
+go 1.24.2

 require (
-	github.com/golang/glog v1.2.2
-	github.com/oschwald/geoip2-golang v1.11.0
-	github.com/pierrre/geohash v1.1.2
-	github.com/prometheus/client_golang v1.20.5
+	github.com/golang/glog v1.2.5
+	github.com/oschwald/geoip2-golang v1.13.0
+	github.com/pierrre/geohash v1.1.3
+	github.com/prometheus/client_golang v1.23.2
 )

 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oschwald/maxminddb-golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	github.com/pires/go-proxyproto v0.8.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -8,53 +8,69 @@ github.com/broady/gogeohash v0.0.0-20120525094510-7b2c40d64042 h1:iEdmkrNMLXbM7e
 github.com/broady/gogeohash v0.0.0-20120525094510-7b2c40d64042/go.mod h1:f1L9YvXvlt9JTa+A17trQjSMM6bV40f+tHjB+Pi+Fqk=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fanixk/geohash v0.0.0-20150324002647-c1f9b5fa157a h1:Fyfh/dsHFrC6nkX7H7+nFdTd1wROlX/FxEIWVpKYf1U=
 github.com/fanixk/geohash v0.0.0-20150324002647-c1f9b5fa157a/go.mod h1:UgNw+PTmmGN8rV7RvjvnBMsoTU8ZXXnaT3hYsDTBlgQ=
-github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
-github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=
+github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mmcloughlin/geohash v0.10.0 h1:9w1HchfDfdeLc+jFEf/04D27KP7E2QmpDu52wPbJWRE=
 github.com/mmcloughlin/geohash v0.10.0/go.mod h1:oNZxQo5yWJh0eMQEP/8hwQuVx9Z9tjwFUqcTB1SmG0c=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/oschwald/geoip2-golang v1.11.0 h1:hNENhCn1Uyzhf9PTmquXENiWS6AlxAEnBII6r8krA3w=
-github.com/oschwald/geoip2-golang v1.11.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
+github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=
+github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
 github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU=
 github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o=
-github.com/pierrre/assert v0.5.0 h1:l5XuybndelAlp+FfH5Uy6wVJybcCpbU3GnwYcur+4Mo=
-github.com/pierrre/assert v0.5.0/go.mod h1:a2kNx38ErwdJHGEi8a9aFDTImkoO5W/mfix2Es/Zcp0=
-github.com/pierrre/compare v1.4.7 h1:wa8vWJXUj39Uzw4C+VFXseZ9u3ZD5k1jgt3iJLmvWsI=
-github.com/pierrre/compare v1.4.7/go.mod h1:EfhQgoxtZiKi4e2NiCjasv6am7xqVDrVgiyUFcoorLI=
-github.com/pierrre/geohash v1.1.2 h1:UvIJTJHOhtBxn0QZhqeKRln6lirxxznAff1S06BZx3w=
-github.com/pierrre/geohash v1.1.2/go.mod h1:ACW6wOs9Ha9laaU33CGel2y46hJkRjZY7uFGXeVnwDo=
-github.com/pierrre/go-libs v0.7.0 h1:uaHiD66VBLb0jF1PaWGVLKBHdRhkw0KsM5pmlUK+CO8=
-github.com/pierrre/go-libs v0.7.0/go.mod h1:0g8JPnx0MUreex2DGohGhUGrmLu8u87bD5drSMfEOP0=
-github.com/pierrre/pretty v0.3.4 h1:Pxu9M/+Tfx9l03ceehyd+3LUfmIIjdr4YbYGLtAVOwc=
-github.com/pierrre/pretty v0.3.4/go.mod h1:FbroWIpyd5L8P5sehyQ9sxX4YYY51oZbUN+ggNdMIuY=
+github.com/pierrre/assert v0.9.0 h1:eIKXsqcLSeLAOXYGHreen2D5CTZ2/N0/cJBNdxuVLdM=
+github.com/pierrre/assert v0.9.0/go.mod h1:3tthe4L3xYU4biRPVTFo9t2YRO4Dg3+zrLyMS4YanCE=
+github.com/pierrre/compare v1.4.13 h1:b6gi3OgN1emmD1Ly37m+B/Pbq6tac+w3lNGT5xu4I10=
+github.com/pierrre/compare v1.4.13/go.mod h1:+ie0ecM2nS32oLck0FWDstwIUSZ0YF4KBIaACOvKhJM=
+github.com/pierrre/geohash v1.1.3 h1:3u+EbHm2FZQnZCu3E2SaeryIQYtA/eH1YYzDpFm/42c=
+github.com/pierrre/geohash v1.1.3/go.mod h1:K5UlVmtRxicTXgp6eShrlAOk2Neu9zOe76C/ug7RIZ8=
+github.com/pierrre/go-libs v0.17.0 h1:bjxd9unioV/YDkUW7obETp2IFct0kO9HePURn81UL8s=
+github.com/pierrre/go-libs v0.17.0/go.mod h1:920odOqc5mZREW9GFWg056mjQ2prNVRGUZO7HRS2Jlc=
+github.com/pierrre/pretty v0.14.3 h1:I100hHs1C/MCd3M0D/hIV7J2OXl7amLD0uP2jnB7mRw=
+github.com/pierrre/pretty v0.14.3/go.mod h1:HTaFDNtT9ELVK5pODLfXRLiEiyIx3MmQUL5UadrR3/0=
+github.com/pires/go-proxyproto v0.8.1 h1:9KEixbdJfhrbtjpz/ZwCdWDD2Xem0NZ38qMYaASJgp0=
+github.com/pires/go-proxyproto v0.8.1/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
-github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
+github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
+github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
+github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/the42/cartconvert v1.0.0 h1:g8kt6ic2GEhdcZ61ZP9GsWwhosVo5nCnH1n2/oAQXUU=
 github.com/the42/cartconvert v1.0.0/go.mod h1:fWO/msnJVhHqN1yX6OBoxSyfj7TEj1hHiL8bJSQsK30=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/main.go
+++ b/main.go
@@ -28,6 +28,7 @@ import (
 	"time"

 	"github.com/golang/glog"
+	proxyproto "github.com/pires/go-proxyproto"
 )

 func startSending(maxClients int64, bannerMaxLength int64, records chan<- metrics.RecordEntry) chan *client.Client {
@@ -67,15 +68,22 @@ func startSending(maxClients int64, bannerMaxLength int64, records chan<- metric
 	return clients
 }

-func startAccepting(maxClients int64, connType, connHost, connPort string, interval time.Duration, clients chan<- *client.Client, records chan<- metrics.RecordEntry) {
+func startAccepting(maxClients int64, connType, connHost, connPort string, interval time.Duration, clients chan<- *client.Client, records chan<- metrics.RecordEntry, proxyProtocolEnabled bool, proxyProtocolReadHeaderTimeout int) {
 	go func() {
 		l, err := net.Listen(connType, connHost+":"+connPort)
 		if err != nil {
 			glog.Errorf("Error listening: %v", err)
 			os.Exit(1)
 		}
+
+		// Wrap the listener in a proxy protocol listener
+		if proxyProtocolEnabled {
+			l = &proxyproto.Listener{Listener: l, ReadHeaderTimeout: time.Duration(proxyProtocolReadHeaderTimeout) * time.Millisecond}
+		}
+
 		// Close the listener when the application closes.
 		defer l.Close()
+
 		glog.Infof("Listening on %v:%v", connHost, connPort)
 		for {
 			// Listen for an incoming connection.
@@ -125,6 +133,8 @@ func main() {
 	prometheusCleanUnseenSeconds := flag.Int("prometheus_clean_unseen_seconds", 0, "Remove series if the IP is not seen for the given time. Set to 0 to disable. (default 0)")
 	geoipSupplier := flag.String("geoip_supplier", "off", "Supplier to obtain Geohash of IPs. Possible values are \"off\", \"ip-api\", \"max-mind-db\"")
 	maxMindDbFileName := flag.String("max_mind_db", "", "Path to the MaxMind DB file.")
+	proxyProtocolEnabled := flag.Bool("proxy_protocol_enabled", false, "Enable PROXY protocol support. This causes the server to expect PROXY protocol headers on incoming connections.")
+	proxyProtocolReadHeaderTimeout := flag.Int("proxy_protocol_read_header_timeout_ms", 200, "Timeout for reading the PROXY protocol header in milliseconds. If the connection does not send a valid PROXY protocol header in this time, the header is ignored.")

 	flag.Usage = func() {
 		fmt.Fprintf(flag.CommandLine.Output(), "Usage of %v \n", os.Args[0])
@@ -155,7 +165,7 @@ func main() {
 		connPorts = append(connPorts, defaultPort)
 	}
 	for _, connPort := range connPorts {
-		startAccepting(*maxClients, *connType, *connHost, connPort, interval, clients, records)
+		startAccepting(*maxClients, *connType, *connHost, connPort, interval, clients, records, *proxyProtocolEnabled, *proxyProtocolReadHeaderTimeout)
 	}
 	for {
 		if *prometheusCleanUnseenSeconds <= 0 {
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -153,7 +153,7 @@ func StartRecording(maxClients int64, prometheusEnabled bool, prometheusCleanUns
 			case RecordEntryTypeStart:
 				geohash, country, location, err := geoip.GeohashAndLocation(r.IpAddr, geoOption)
 				if err != nil {
-					glog.Warningf("Failed to obatin the geohash of %v: %v.", r.IpAddr, err)
+					glog.Warningf("Failed to obtain the geohash of %v: %v.", r.IpAddr, err)
 				}
 				clientIP.With(prometheus.Labels{
 					"ip":         r.IpAddr,
Author	SHA1	Message	Date
Shizun Ge	1585df7876	Merge pull request #187 from shizunge/dependabot/github_actions/docker/setup-buildx-action-3.12.0 Bump docker/setup-buildx-action from 3.11.1 to 3.12.0	2025-12-24 22:32:46 -08:00
dependabot[bot]	07df006502	Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.11.1 to 3.12.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.11.1...v3.12.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: 3.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-22 08:01:45 +00:00
Shizun Ge	829fe080a8	Merge pull request #186 from shizunge/dependabot/github_actions/actions/checkout-6 Bump actions/checkout from 5 to 6	2025-11-24 10:44:01 -08:00
dependabot[bot]	63b07abf45	Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-24 08:02:13 +00:00
Shizun Ge	b4077f7002	[dashboard] Add ports selection.	2025-11-07 00:34:28 -08:00
Shizun Ge	f64550176c	Merge pull request #184 from shizunge/dependabot/github_actions/docker/login-action-3.6.0 Bump docker/login-action from 3.5.0 to 3.6.0	2025-10-06 10:47:04 -07:00
Shizun Ge	3c60cdf2ed	Merge pull request #185 from shizunge/dependabot/github_actions/peter-evans/dockerhub-description-5 Bump peter-evans/dockerhub-description from 4 to 5	2025-10-06 10:46:56 -07:00
dependabot[bot]	5e3b96cc65	Bump peter-evans/dockerhub-description from 4 to 5 Bumps [peter-evans/dockerhub-description](https://github.com/peter-evans/dockerhub-description) from 4 to 5. - [Release notes](https://github.com/peter-evans/dockerhub-description/releases) - [Commits](https://github.com/peter-evans/dockerhub-description/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/dockerhub-description dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-06 08:02:22 +00:00
dependabot[bot]	f6e2189c79	Bump docker/login-action from 3.5.0 to 3.6.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-06 08:02:19 +00:00
Shizun Ge	5fadfc1cc3	Merge pull request #181 from firstred/proxy-protocol Add PROXY protocol support	2025-09-11 17:33:32 -07:00
Michael Dekker	e1a2425ced	Add PROXY protocol support	2025-09-12 00:00:26 +02:00
Shizun Ge	2470ee67d7	Merge pull request #180 from dataprolet/main Remove obsolete "version" from compose files	2025-09-09 08:16:04 -07:00
dataprolet	5cf0b1fa3f	Remove obsolete version	2025-09-09 16:33:56 +02:00
dataprolet	61483cde46	Remove obsolete version	2025-09-09 16:33:37 +02:00
Shizun Ge	37a5392166	Merge pull request #179 from shizunge/dependabot/go_modules/github.com/prometheus/client_golang-1.23.2 Bump github.com/prometheus/client_golang from 1.23.0 to 1.23.2	2025-09-08 11:37:58 -07:00
dependabot[bot]	02c896ba89	Bump github.com/prometheus/client_golang from 1.23.0 to 1.23.2 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.23.0 to 1.23.2. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.23.0...v1.23.2) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-version: 1.23.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-08 08:14:01 +00:00
Shizun Ge	e6070444c8	Merge pull request #178 from shizunge/dependabot/github_actions/actions/checkout-5 Bump actions/checkout from 4 to 5	2025-08-25 09:58:11 -07:00
dependabot[bot]	0aa99ef83b	Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-25 15:04:03 +00:00
Shizun Ge	1518c37fe7	Merge pull request #177 from shizunge/dependabot/github_actions/docker/login-action-3.5.0 Bump docker/login-action from 3.4.0 to 3.5.0	2025-08-12 00:40:08 -07:00
dependabot[bot]	7b30a30a37	Bump docker/login-action from 3.4.0 to 3.5.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-11 12:13:20 +00:00
Shizun Ge	c0db3758a8	Merge pull request #176 from shizunge/dependabot/go_modules/github.com/prometheus/client_golang-1.23.0 Bump github.com/prometheus/client_golang from 1.22.0 to 1.23.0	2025-08-04 08:54:34 -07:00
dependabot[bot]	0ef5dd1d16	Bump github.com/prometheus/client_golang from 1.22.0 to 1.23.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.22.0 to 1.23.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.22.0...v1.23.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-version: 1.23.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-04 11:21:18 +00:00
Shizun Ge	644d2808f0	Add badges	2025-07-26 02:27:54 -07:00
Shizun Ge	35477d6c2b	Merge pull request #175 from shizunge/dependabot/go_modules/github.com/oschwald/geoip2-golang-1.13.0 Bump github.com/oschwald/geoip2-golang from 1.11.0 to 1.13.0	2025-07-14 06:33:40 -07:00
dependabot[bot]	953a76b638	Bump github.com/oschwald/geoip2-golang from 1.11.0 to 1.13.0 Bumps [github.com/oschwald/geoip2-golang](https://github.com/oschwald/geoip2-golang) from 1.11.0 to 1.13.0. - [Release notes](https://github.com/oschwald/geoip2-golang/releases) - [Changelog](https://github.com/oschwald/geoip2-golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/oschwald/geoip2-golang/compare/v1.11.0...v1.13.0) --- updated-dependencies: - dependency-name: github.com/oschwald/geoip2-golang dependency-version: 1.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-14 10:37:24 +00:00
Shizun Ge	97dd54bbb4	Merge pull request #174 from vst-name/main Fixed type in error logs in metrics.go	2025-07-07 10:36:52 -07:00
Vladislav Stishenko	d5d671b74d	Fixed type in error logs in metrics.go Signed-off-by: Vladislav Stishenko <github@vst.name>	2025-06-29 20:19:15 +05:00
Shizun Ge	dbec0d7b36	Merge pull request #171 from agneum14/country-panel-title-case Make the country connections panel title case	2025-06-25 10:15:38 -07:00
Shizun Ge	2ae998243b	Merge pull request #173 from shizunge/dependabot/github_actions/docker/setup-buildx-action-3.11.1 Bump docker/setup-buildx-action from 3.10.0 to 3.11.1	2025-06-25 10:13:00 -07:00
Shizun Ge	22e7d84792	Merge pull request #172 from shizunge/dependabot/go_modules/github.com/pierrre/geohash-1.1.3 Bump github.com/pierrre/geohash from 1.1.2 to 1.1.3	2025-06-25 10:12:49 -07:00
Shizun Ge	3691c01bcf	Merge pull request #167 from shizunge/dependabot/go_modules/github.com/golang/glog-1.2.5 Bump github.com/golang/glog from 1.2.4 to 1.2.5	2025-06-25 10:12:33 -07:00
Shizun Ge	cedc9b0598	Merge pull request #170 from shizunge/dependabot/github_actions/docker/build-push-action-6.18.0 Bump docker/build-push-action from 6.15.0 to 6.18.0	2025-06-25 10:12:16 -07:00
dependabot[bot]	4c98088fc6	Bump docker/setup-buildx-action from 3.10.0 to 3.11.1 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.10.0 to 3.11.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.10.0...v3.11.1) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: 3.11.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-23 09:37:44 +00:00
dependabot[bot]	602e22b631	Bump github.com/pierrre/geohash from 1.1.2 to 1.1.3 Bumps [github.com/pierrre/geohash](https://github.com/pierrre/geohash) from 1.1.2 to 1.1.3. - [Commits](https://github.com/pierrre/geohash/compare/v1.1.2...v1.1.3) --- updated-dependencies: - dependency-name: github.com/pierrre/geohash dependency-version: 1.1.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-16 09:10:27 +00:00
Andrew G. Neumann	b81117a9de	Make the country connections panel title case	2025-06-04 21:16:49 -04:00
dependabot[bot]	502efbfcc2	Bump docker/build-push-action from 6.15.0 to 6.18.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.15.0 to 6.18.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.15.0...v6.18.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.18.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-02 09:27:37 +00:00
dependabot[bot]	2e39a6194f	Bump github.com/golang/glog from 1.2.4 to 1.2.5 Bumps [github.com/golang/glog](https://github.com/golang/glog) from 1.2.4 to 1.2.5. - [Release notes](https://github.com/golang/glog/releases) - [Commits](https://github.com/golang/glog/compare/v1.2.4...v1.2.5) --- updated-dependencies: - dependency-name: github.com/golang/glog dependency-version: 1.2.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-05 08:42:00 +00:00
Shizun Ge	93181ac5b3	[workflow] Ignore dependabot on push	2025-04-23 10:10:46 -07:00
Shizun Ge	cfa86895ea	Merge pull request #158 from shizunge/dependabot/github_actions/docker/setup-buildx-action-3.10.0 Bump docker/setup-buildx-action from 3.8.0 to 3.10.0	2025-04-17 23:13:59 -07:00
Shizun Ge	c86d19a55f	Merge pull request #159 from shizunge/dependabot/github_actions/docker/build-push-action-6.15.0 Bump docker/build-push-action from 6.11.0 to 6.15.0	2025-04-17 23:13:48 -07:00
Shizun Ge	4a02af0905	Merge pull request #161 from shizunge/dependabot/github_actions/docker/login-action-3.4.0 Bump docker/login-action from 3.3.0 to 3.4.0	2025-04-17 23:13:37 -07:00
Shizun Ge	9aa45d5151	Merge pull request #152 from shizunge/dependabot/go_modules/github.com/golang/glog-1.2.4 Bump github.com/golang/glog from 1.2.3 to 1.2.4	2025-04-17 23:09:04 -07:00
dependabot[bot]	c2a3afedbc	Bump github.com/golang/glog from 1.2.3 to 1.2.4 Bumps [github.com/golang/glog](https://github.com/golang/glog) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/golang/glog/releases) - [Commits](https://github.com/golang/glog/compare/v1.2.3...v1.2.4) --- updated-dependencies: - dependency-name: github.com/golang/glog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-18 06:07:35 +00:00
Shizun Ge	529a185781	Merge pull request #165 from shizunge/dependabot/go_modules/github.com/prometheus/client_golang-1.22.0 Bump github.com/prometheus/client_golang from 1.20.5 to 1.22.0	2025-04-17 23:06:20 -07:00
Shizun Ge	789c569d22	fix workflow names	2025-04-17 23:05:17 -07:00
dependabot[bot]	8c5f4b46d1	Bump docker/setup-buildx-action from 3.8.0 to 3.10.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.8.0...v3.10.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-18 06:04:34 +00:00
dependabot[bot]	5c145553ff	Bump docker/build-push-action from 6.11.0 to 6.15.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.11.0 to 6.15.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.11.0...v6.15.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-18 06:04:23 +00:00
dependabot[bot]	b960bb9f52	Bump docker/login-action from 3.3.0 to 3.4.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-18 06:04:08 +00:00
dependabot[bot]	f196e91efd	Bump github.com/prometheus/client_golang from 1.20.5 to 1.22.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.5 to 1.22.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.5...v1.22.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-version: 1.22.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-18 05:57:18 +00:00
Shizun Ge	3893a6bd09	add on pull request workflow	2025-04-17 22:52:07 -07:00
Shizun Ge	2cb5d7ba9c	update to go 1.24.2	2025-04-17 22:49:40 -07:00
Shizun Ge	79e128509d	Merge pull request #150 from shizunge/dependabot/github_actions/docker/build-push-action-6.11.0 Bump docker/build-push-action from 6.10.0 to 6.11.0	2025-01-15 09:28:13 -08:00
dependabot[bot]	2384728729	Bump docker/build-push-action from 6.10.0 to 6.11.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.10.0 to 6.11.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.10.0...v6.11.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-13 08:50:04 +00:00
Shizun Ge	ea5a8c07c2	Merge pull request #149 from shizunge/dependabot/github_actions/docker/setup-buildx-action-3.8.0 Bump docker/setup-buildx-action from 3.7.1 to 3.8.0	2024-12-23 08:02:39 -06:00
dependabot[bot]	8f6b0989fe	Bump docker/setup-buildx-action from 3.7.1 to 3.8.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-23 08:54:35 +00:00
Shizun Ge	a1de063f4e	Merge pull request #146 from shizunge/dependabot/github_actions/docker/build-push-action-6.10.0 Bump docker/build-push-action from 6.9.0 to 6.10.0	2024-12-03 16:59:33 -08:00
dependabot[bot]	cd7d7f3958	Bump docker/build-push-action from 6.9.0 to 6.10.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.9.0 to 6.10.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.9.0...v6.10.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 08:15:51 +00:00
Shizun Ge	749be56be1	Merge pull request #144 from shizunge/dependabot/go_modules/github.com/golang/glog-1.2.3 Bump github.com/golang/glog from 1.2.2 to 1.2.3	2024-11-11 10:47:05 -08:00
dependabot[bot]	80c5a21de9	Bump github.com/golang/glog from 1.2.2 to 1.2.3 Bumps [github.com/golang/glog](https://github.com/golang/glog) from 1.2.2 to 1.2.3. - [Release notes](https://github.com/golang/glog/releases) - [Commits](https://github.com/golang/glog/compare/v1.2.2...v1.2.3) --- updated-dependencies: - dependency-name: github.com/golang/glog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-11 08:08:40 +00:00