Merge branch 'build' into dependabot/docker/sysdig/sysdig-mini-ubi-1.5.4

Author: sysdigkenneth

.circleci/config.yml

@@ -2,27 +2,28 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.16.0
+  prometheus: prometheus/prometheus@0.17.1
 
 executors:
   # This must match .promu.yml.
   golang:
     docker:
-    - image: cimg/go:1.18
+    - image: cimg/go:1.21
 
 jobs:
   test:
     executor: golang
 
     steps:
     - prometheus/setup_environment
+    - run: GOHOSTARCH=386 GOARCH=386 make test
     - run: make
     - prometheus/store_artifact:
         file: postgres_exporter
 
   integration:
     docker:
-    - image: cimg/go:1.18
+    - image: cimg/go:1.20
     - image: << parameters.postgres_image >>
       environment:
         POSTGRES_DB: circle_test
@@ -56,11 +57,12 @@ workflows:
         matrix:
           parameters:
             postgres_image:
-            - circleci/postgres:10
             - circleci/postgres:11
             - circleci/postgres:12
             - circleci/postgres:13
-            - cimg/postgres:14.1
+            - cimg/postgres:14.9
+            - cimg/postgres:15.4
+            - cimg/postgres:16.0
     - prometheus/build:
         name: build
         parallelism: 3

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# Teams can be specified as code owners as well. Teams should
+# be identified in the format @org/team-name. Teams must have
+# explicit write access to the repository. In this example,
+* @sysdiglabs/promcat

.github/workflows/build.yaml

@@ -5,6 +5,12 @@ name: Build
 on:
   push:
     branches: [ build ]
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch you want to build'
+        required: true
+        default: 'build'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

.github/workflows/golangci-lint.yml

@@ -1,3 +1,5 @@
+---
+# This action is synced from https://github.com/prometheus/prometheus
 name: golangci-lint
 on:
   push:
@@ -16,15 +18,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
-          go-version: 1.18.x
+          go-version: 1.21.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@v3.4.0
+        uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
         with:
-          version: v1.52.2
+          version: v1.54.2

.github/workflows/push-dry-run.yaml

@@ -18,6 +18,7 @@ jobs:
         jenkins_url: "https://jenkins.internal.sysdig.tools/"
         jenkins_user: '[email protected]'
         jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }}
+        job_timeout: "300"
         job_name: "promcat/job/exporters/job/integrations-postgresql-exporter"
         job_params: |
           {

.github/workflows/push.yaml

@@ -20,6 +20,7 @@ jobs:
         jenkins_url: "https://jenkins.internal.sysdig.tools/"
         jenkins_user: '[email protected]'
         jenkins_token: ${{ secrets.JENKINS_BOT_API_TOKEN }}
+        job_timeout: "300"
         job_name: "promcat/job/exporters/job/integrations-postgresql-exporter"
         job_params: |
           {

.github/workflows/release.yaml

@@ -14,12 +14,12 @@ jobs:
       if: "!startswith(github.ref, 'refs/tags/v')"
       run: exit 78
     - name: build
-      uses: sysdiglabs/exporter-builder@v0.6
+      uses: sysdiglabs/exporter-builder@v1.1
       with:
         exporter: postgresql-exporter
-        artifactory_token: ${{ secrets.ARTI_TOKEN }}
-        artifactory_username: [email protected]
+        artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }}
+        artifactory_username: _json_key
         sysdig_secure_token: ${{ secrets.SYSDIG_SECURE_TOKEN }}
         tag_name: ${{ github.event.release.tag_name }}
         target: ${{ matrix.docker }}
-        repository: artifactory.internal.sysdig.com
+        repository: us-docker.pkg.dev

.golangci.yml

@@ -1,4 +1,9 @@
 ---
+linters:
+  enable:
+  - misspell
+  - revive
+
 issues:
   exclude-rules:
   - path: _test.go
@@ -7,4 +12,12 @@ issues:
 
 linters-settings:
   errcheck:
-    exclude: scripts/errcheck_excludes.txt
+    exclude-functions:
+      # Never check for logger errors.
+      - (github.com/go-kit/log.Logger).Log
+  revive:
+    rules:
+      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
+      - name: unused-parameter
+        severity: warning
+        disabled: true

.promu.yml

@@ -1,13 +1,12 @@
 go:
     # This must match .circle/config.yml.
-    version: 1.18
+    version: 1.21
 repository:
     path: github.com/prometheus-community/postgres_exporter
 build:
     binaries:
         - name: postgres_exporter
           path: ./cmd/postgres_exporter
-    flags: -a -tags 'netgo static_build'
     ldflags: |
         -X github.com/prometheus/common/version.Version={{.Version}}
         -X github.com/prometheus/common/version.Revision={{.Revision}}

.yamllint

@@ -20,9 +20,4 @@ rules:
       config/testdata/section_key_dup.bad.yml
   line-length: disable
   truthy:
-    ignore: |
-      .github/workflows/codeql-analysis.yml
-      .github/workflows/funcbench.yml
-      .github/workflows/fuzzing.yml
-      .github/workflows/prombench.yml
-      .github/workflows/golangci-lint.yml
+    check-keys: false