diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f952b39a4..75499b733 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: username: ${{ secrets.QUAY_UBI_READONLY_USERNAME }} password: ${{ secrets.QUAY_UBI_READONLY_PASSWORD }} - name: build - uses: sysdiglabs/exporter-builder@v1.1 + uses: sysdiglabs/exporter-builder@v1.2 with: exporter: postgresql-exporter artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }} diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 91fd99ba6..3a9f75c12 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -1,5 +1,6 @@ --- # This action is synced from https://github.com/prometheus/prometheus +version: 1 name: golangci-lint on: push: @@ -25,11 +26,11 @@ jobs: - name: install Go uses: actions/setup-go@v5 with: - go-version: 1.23.7 + go-version: 1.25.x - name: Install snmp_exporter/generator dependencies run: sudo apt-get update && sudo apt-get -y install libsnmp-dev if: github.repository == 'prometheus/snmp_exporter' - name: Lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v8 with: - version: v1.64 \ No newline at end of file + version: v2.4.0 diff --git a/.github/workflows/push-dry-run.yaml b/.github/workflows/push-dry-run.yaml index b272c1413..dace70c66 100644 --- a/.github/workflows/push-dry-run.yaml +++ b/.github/workflows/push-dry-run.yaml @@ -13,8 +13,9 @@ jobs: runs-on: tools-runner steps: - name: Trigger jenkins job to upload master to Quay.io - uses: draios/jenkins-job-trigger-action@1.1.0 + uses: sysdiglabs/jenkins-job-trigger-action@1.1.0 with: + jenkins_external_base_url: ${{ secrets.JENKINS_EXTERNAL_BASE_URL }} jenkins_url: ${{ secrets.JENKINS_INTERNAL_URL }} jenkins_user: ${{ secrets.JENKINS_BOT_API_USER }} jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }} diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 52d3e9342..b793af40d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -15,8 +15,9 @@ jobs: runs-on: tools-runner steps: - name: Trigger jenkins job to upload master to Quay.io - uses: draios/jenkins-job-trigger-action@1.1.0 + uses: sysdiglabs/jenkins-job-trigger-action@1.1.0 with: + jenkins_external_base_url: ${{ secrets.JENKINS_EXTERNAL_BASE_URL }} jenkins_url: ${{ secrets.JENKINS_INTERNAL_URL }} jenkins_user: ${{ secrets.JENKINS_BOT_API_USER }} jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c1bce1288..0fa20f4dd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: username: ${{ secrets.QUAY_UBI_READONLY_USERNAME }} password: ${{ secrets.QUAY_UBI_READONLY_PASSWORD }} - name: build - uses: sysdiglabs/exporter-builder@v1.1 + uses: sysdiglabs/exporter-builder@v1.2 with: exporter: postgresql-exporter artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }} @@ -28,4 +28,4 @@ jobs: sysdig_secure_token: ${{ secrets.SYSDIG_SECURE_TOKEN }} tag_name: ${{ github.event.release.tag_name }} target: ${{ matrix.docker }} - repository: us-docker.pkg.dev \ No newline at end of file + repository: us-docker.pkg.dev diff --git a/Dockerfile b/Dockerfile index bb7f1f483..7ac1d343b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6 AS base +FROM golang:1.25.5 AS base ARG VERSION ARG GIT_COMMIT ARG DATE @@ -22,7 +22,7 @@ EXPOSE 9187 USER 59000:59000 ENTRYPOINT [ "/bin/postgres_exporter" ] -FROM quay.io/sysdig/sysdig-stig-mini-ubi9:1.3.13 AS ubi +FROM quay.io/sysdig/sysdig-stig-mini-ubi9:1.4.5 AS ubi COPY --from=builder /bin/postgres_exporter /bin/postgres_exporter EXPOSE 9187 USER 59000:59000 diff --git a/go.mod b/go.mod index cb2c2e086..fc51bddfe 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/prometheus-community/postgres_exporter -go 1.23.0 - -toolchain go1.23.7 +go 1.25.0 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 @@ -37,11 +35,11 @@ require ( github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/smarty/assertions v1.15.0 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect - golang.org/x/crypto v0.36.0 // indirect - golang.org/x/net v0.38.0 // indirect + golang.org/x/crypto v0.45.0 // indirect + golang.org/x/net v0.47.0 // indirect golang.org/x/oauth2 v0.27.0 // indirect - golang.org/x/sync v0.12.0 // indirect - golang.org/x/sys v0.31.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/sync v0.18.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/text v0.31.0 // indirect google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index 567060844..af3af301e 100644 --- a/go.sum +++ b/go.sum @@ -68,18 +68,18 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=