merge to 0.18.1

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Questions and Answers
+   url: https://github.com/burningalchemist/sql_exporter/discussions
+   about: Please ask your questions on installation and usage here.

.github/workflows/build.yml

@@ -10,16 +10,18 @@ on:
 
 jobs:
   build:
+    if: ${{ !startsWith(github.event.head_commit.message, 'docs:') }}
     name: Build
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.18
+        go-version: ^1.24
+        check-latest: true
       id: go
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Style
       run: make style
     - name: Vet

.github/workflows/codeql-analysis.yml

@@ -11,6 +11,9 @@ on:
 
 jobs:
   analyze:
+    if: | 
+      ${{ !startsWith(github.event.head_commit.message, 'docs:') }} ||
+      ${{ !startsWith(github.event.head_commit.message, 'build:') }}
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -25,27 +28,27 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.18
+        go-version: ^1.20
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -59,4 +62,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/helm-workflow.yaml

@@ -0,0 +1,115 @@
+name: Helm
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+env:
+  HELM_VERSION: 3.12.1
+  PYTHON_VERSION: 3.9
+  TARGET_BRANCH: chart-testing-target-branch
+  TARGET_REMOTE: test
+jobs:
+  helm-jobs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: "v${{ env.HELM_VERSION }}"
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          check-latest: true
+      # ---------------------------------------------------------------
+      # -- Instead of comparing to the master branch, I'm getting
+      # --  the commit hash set in the previous step from a
+      # --  currently released chart. If it doesn't exists, then
+      # --  I assume that chart is not released and compare to the
+      # --  previous commit 
+      # --
+      # -- Also, I'm setting the RepoURL here. Since we plan to support
+      # --  the official chart in this git repository, the helm
+      # --  repository is expected to belong to this repo as well.
+      # ---------------------------------------------------------------
+      - name: Retrieve the latest commit sha from the helm chart
+        run: |
+          HELM_REPO_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${GITHUB_REPOSITORY#*/}"
+          if helm repo add sql-exporter $HELM_REPO_URL
+          then
+            helm repo update
+            echo "TARGET_COMMIT=$(helm show chart sql-exporter/sql-exporter | yq '.annotations.git/commit-sha')" >> "${GITHUB_ENV}"
+          else
+            echo "TARGET_COMMIT=$(git show HEAD^1 --pretty=format:%H --no-patch)" >> "${GITHUB_ENV}"
+          fi
+      # ---------------------------------------------------------------
+      # -- As I could find CT doesn't support testing against commits
+      # --  directly, so I'm creating a new fake remote from a commit
+      # --  and testing the chart against it. This workaround doesn't
+      # --  support maintainers validation, but we have it disabled
+      # --  anyway
+      # ---------------------------------------------------------------
+      - name: Prepare a dummy remote to test the chart
+        run: |
+          DUMMY_REMOTE=$(mktemp -d)
+          git init "${DUMMY_REMOTE}"
+          git remote add "${TARGET_REMOTE}" "${DUMMY_REMOTE}"
+          git checkout -b "${TARGET_BRANCH}" "${TARGET_COMMIT}"
+          git push --set-upstream "${TARGET_REMOTE}" "${TARGET_BRANCH}"
+          git checkout "${GITHUB_SHA}"
+      - name: Set up chart-testing
+        uses: helm/[email protected]
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --chart-dirs . --target-branch "${TARGET_BRANCH}" --remote "${TARGET_REMOTE}")
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Run chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct lint --target-branch "${TARGET_BRANCH}" --remote "${TARGET_REMOTE}" --validate-maintainers=false --chart-dirs .
+      - name: Setup helmfile
+        if: steps.list-changed.outputs.changed == 'true'
+        uses: mamezou-tech/[email protected]
+      - name: Create kind cluster
+        if: steps.list-changed.outputs.changed == 'true'
+        uses: helm/[email protected]
+      - name: Init postgres server
+        if: steps.list-changed.outputs.changed == 'true'
+        run: |
+          helmfile -f helm/ci/helmfile.yaml sync
+      - name: Run chart-testing (install)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --target-branch "${TARGET_BRANCH}" --remote "${TARGET_REMOTE}" --chart-dirs .
+      - name: Run chart-testing (upgrade)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --target-branch "${TARGET_BRANCH}" --remote "${TARGET_REMOTE}" --chart-dirs . --upgrade
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+      # ---------------------------------------------------------------
+      # -- On each run we're setting an annotation with the current
+      # --  commit hash, so in case it's released, we will see it
+      # --  running `$ helm show sql-exporter/sql-exporter`
+      # ---------------------------------------------------------------
+      - name: Set the git sha annotations in the helm chart
+        run: yq -i ".annotations.git/commit-sha = \"${GITHUB_SHA}\"" ./helm/Chart.yaml
+
+      - name: Release charts
+        if: ${{ github.event.repository.default_branch && github.event_name == 'push' }}
+        uses: helm/chart-releaser-action@main
+        with:
+          charts_dir: .
+          mark_as_latest: false
+          packages_with_index: true
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_RELEASE_NAME_TEMPLATE: "chart-{{ .Name }}-{{ .Version }}"

.github/workflows/release.yml

@@ -14,11 +14,12 @@ jobs:
       VERSION: ${{ github.ref_name }}
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: ^1.18
+        go-version: ^1.24
+        check-latest: true
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Promu - Crossbuild
       run: make crossbuild
@@ -43,7 +44,52 @@ jobs:
       run: make crossbuild-checksum
 
     - name: Upload artifacts
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2.2.2
       with:
         files: |
           .tarballs/*
+  docker:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Get Go version from the '.promu.yml' config
+        id: promu-go-version
+        run: printf "version=%s" "$(yq '.go.version' .promu.yml)" >> $GITHUB_OUTPUT
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: burningalchemist/sql_exporter
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.multi-arch
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          provenance: false
+          build-args: |
+            GOVERSION=${{ steps.promu-go-version.outputs.version }}

.gitignore

@@ -1,4 +1,8 @@
 /.project
 /.settings
+.idea/
+/.vscode
 /sql_exporter
 /sql_exporter.yml
+test_configs/
+.idea/*

.promu.yml

@@ -1,6 +1,6 @@
 go:
     cgo: false
-    version: 1.19
+    version: 1.24
 repository:
     path: github.com/burningalchemist/sql_exporter
 build:
@@ -14,6 +14,8 @@ build:
       -X github.com/prometheus/common/version.Branch={{.Branch}}
       -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
       -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+      -s
+      -w
 tarball:
     files:
       - LICENSE
@@ -27,3 +29,4 @@ crossbuild:
         - windows/amd64
         - linux/armv7
         - linux/arm64
+        - darwin/arm64

Dockerfile.multi-arch

@@ -0,0 +1,22 @@
+ARG GOVERSION=latest
+
+FROM --platform=$BUILDPLATFORM quay.io/prometheus/golang-builder:${GOVERSION}-main AS builder
+
+# Get sql_exporter
+ADD .   /go/src/github.com/burningalchemist/sql_exporter
+WORKDIR /go/src/github.com/burningalchemist/sql_exporter
+
+# Do makefile
+ARG TARGETOS
+ARG TARGETARCH
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make
+
+# Make image and copy build sql_exporter
+FROM  --platform=$TARGETPLATFORM quay.io/prometheus/busybox:latest
+LABEL maintainer="The Prometheus Authors <[email protected]>"
+COPY  --from=builder /go/src/github.com/burningalchemist/sql_exporter/sql_exporter  /bin/sql_exporter
+
+EXPOSE      9399
+USER        nobody
+ENTRYPOINT  [ "/bin/sql_exporter" ]

LICENSE

@@ -1,5 +1,6 @@
 MIT License
 
+Copyright (c) 2020 Sergei Zyubin
 Copyright (c) 2017 Alin Sinpalean
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

Makefile

@@ -11,9 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# To distinguish between native Windows and Windows Subsystem for Linux (WSL),
+# we have to check how PATH is separated. For WSL and Unix-based systems it's
+# a colon; for native Windows it's a semicolon.
+ifeq '$(findstring ;,$(PATH))' ';'
+	GOPATH = $(firstword $(subst ;, ,$(shell $(GO) env GOPATH)))
+	PREFIX = $(shell cd)
+endif
+
 GO     := go
-GOPATH := $(firstword $(subst :, ,$(shell $(GO) env GOPATH)))
+GOPATH ?= $(firstword $(subst :, ,$(shell $(GO) env GOPATH)))
 PROMU  := $(GOPATH)/bin/promu
+PROMU_VERSION := v0.17.0
 pkgs    = $(shell $(GO) list ./... | grep -v /vendor/)
 
 PREFIX              ?= $(shell pwd)
@@ -30,7 +39,7 @@ style:
 
 test:
 	@echo ">> running tests"
-	@$(GO) test -short -race $(pkgs)
+	@$(GO) test -short $(pkgs)
 
 format:
 	@echo ">> formatting code"
@@ -73,10 +82,17 @@ docker:
 	@echo ">> building docker image"
 	@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
 
+# Override for native Windows, where the path separator is a semicolon.
+ifeq '$(findstring ;,$(PATH))' ';'
+promu:
+	@set GOOS=windows
+	@set GOARCH=$(subst AMD64,amd64,$(patsubst i%86,386,$(shell echo %PROCESSOR_ARCHITECTURE%)))
+	@$(GO) install github.com/prometheus/promu@$(PROMU_VERSION)
+else
 promu:
 	@GOOS=$(shell uname -s | tr A-Z a-z) \
 		GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
-		$(GO) install github.com/prometheus/promu@v0.13.0
-
+		$(GO) install github.com/prometheus/promu@$(PROMU_VERSION)
+endif
 
 .PHONY: all style format build test vet tarball docker promu