Merge remote-tracking branch 'origin/master' into pgstattuple-collector

Author: dbulashev

.github/workflows/beta.yml

@@ -20,7 +20,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-22.04
-    container: cherts/pgscv-test-runner:1.0.10
+    container: cherts/pgscv-test-runner:2.0.12
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -35,6 +35,11 @@ jobs:
     permissions:
       contents: read
       packages: write
+      id-token: write
+      attestations: write
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -50,17 +55,41 @@ jobs:
       - name: Login to registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=v${{ steps.version.outputs.VERSION }}-${{ steps.version.outputs.GIT_BRANCH }}-${{ steps.version.outputs.GIT_COMMIT }}-${{ steps.version.outputs.GIT_DATE }}-beta
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push
+        id: push
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./Dockerfile.beta
           platforms: linux/amd64
           push: true
-          tags: ghcr.io/${{ github.repository_owner }}:v${{ steps.version.outputs.VERSION }}-${{ steps.version.outputs.GIT_BRANCH }}-${{ steps.version.outputs.GIT_COMMIT }}-${{ steps.version.outputs.GIT_DATE }}-beta
+          tags: ${{ steps.meta.outputs.tags }}
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        id: attest
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
+      - name: Cleanup registry
+        uses: actions/delete-package-versions@v5
+        with:
+          owner: ${{ github.repository_owner }}
+          package-name: 'pgscv'
+          package-type: container
+          min-versions-to-keep: 50
+#          delete-only-untagged-versions: 'true'

.github/workflows/default.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-22.04
-    container: cherts/pgscv-test-runner:1.0.10
+    container: cherts/pgscv-test-runner:2.0.12
 
     steps:
       - name: Checkout code

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-22.04
-    container: cherts/pgscv-test-runner:1.0.10
+    container: cherts/pgscv-test-runner:2.0.12
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -27,11 +27,15 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
+      - name: Lint Dockerfile
+        run: make docker-lint
       - name: Build image
         run: make docker-build
       - name: Log in to Docker Hub
+        if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
         run: docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Push image to Docker Hub
+        if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
         run: make docker-push
 
   goreleaser:
@@ -45,7 +49,7 @@ jobs:
       - name: Run setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: 1.24
+          go-version: 1.25
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

Dockerfile

@@ -1,6 +1,6 @@
 # stage 1
-# __release_tag__ golang 1.24 was released 2025-02-11
-FROM golang:1.24 AS build
+# __release_tag__ golang 1.25 was released 2025-08-12
+FROM golang:1.25 AS build
 LABEL stage=intermediate
 WORKDIR /app
 COPY . .

Dockerfile.beta

@@ -0,0 +1,20 @@
+# stage 1
+# __release_tag__ golang 1.25 was released 2025-08-12
+FROM golang:1.25 AS build
+LABEL stage=intermediate
+WORKDIR /app
+COPY . .
+RUN make build-beta
+
+# stage 2: scratch
+# __release_tag__ alpine 3.22.0 was released 2025-05-30
+LABEL org.opencontainers.image.title="pgSCV"
+LABEL org.opencontainers.image.description="pgSCV is a PostgreSQL ecosystem metrics collector"
+LABEL org.opencontainers.image.vendor="pgSCV Team"
+FROM alpine:3.22.0 AS dist
+COPY --from=build /app/bin/pgscv /bin/pgscv
+#COPY docker_entrypoint.sh /bin/
+EXPOSE 9890
+#EXPOSE 6060
+ENTRYPOINT ["/bin/pgscv"]
+#ENTRYPOINT ["/bin/docker_entrypoint.sh"]

Makefile

@@ -27,11 +27,13 @@ BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
 VERSION_BETA=1.0-$(BRANCH)-$(COMMIT)-$(DATE)-beta
 
 LDFLAGS = -a -installsuffix cgo -ldflags "-X main.appName=${APPNAME} -X main.gitTag=${VERSION} -X main.gitCommit=${COMMIT} -X main.gitBranch=${BRANCH}"
+LDFLAGS_BETA = -a -installsuffix cgo -ldflags "-X main.appName=${APPNAME} -X main.gitTag=${VERSION_BETA} -X main.gitCommit=${COMMIT} -X main.gitBranch=${BRANCH}"
+
 MODERNIZE_CMD = go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.18.1
 
 .PHONY: help \
 		clean lint test race \
-		build docker-build docker-push go-update \
+		build docker-lint docker-build docker-push go-update \
 		modernize modernize-fix modernize-check
 
 .DEFAULT_GOAL := help
@@ -71,6 +73,15 @@ build: dep ## Build
 	mkdir -p ./bin
 	CGO_ENABLED=0 GOOS=${APPOS} GOARCH=${GOARCH} go build ${LDFLAGS} -o bin/${APPNAME} ./cmd
 
+build-beta: dep ## Build beta
+	mkdir -p ./bin
+	CGO_ENABLED=0 GOOS=${APPOS} GOARCH=${GOARCH} go build ${LDFLAGS_BETA} -o bin/${APPNAME} ./cmd
+
+docker-lint: ## Lint Dockerfile
+	@echo "Lint container Dockerfile"
+	docker run --rm -i -v $(PWD)/Dockerfile:/Dockerfile \
+	hadolint/hadolint hadolint --ignore DL3002 --ignore DL3008 --ignore DL3059 /Dockerfile
+
 docker-build: ## Build docker image
 	docker build -t ${DOCKER_ACCOUNT}/${APPNAME}:${TAG} .
 	docker image prune --force --filter label=stage=intermediate

README.md

@@ -39,7 +39,7 @@ This project is a continuation of the development of the original pgSCV by [Alex
 Download the archive from [releases](https://github.com/cherts/pgscv/releases). Unpack the archive. Create minimum config file. Start pgSCV systemd service under `postgres` user.
 
 ```bash
-curl -s -L https://github.com/cherts/pgscv/releases/download/v0.15.0/pgscv_0.15.0_linux_$(uname -m).tar.gz -o - | tar xzf - -C /tmp && \
+curl -s -L https://github.com/cherts/pgscv/releases/download/v1.0.0/pgscv_1.0.0_linux_$(uname -m).tar.gz -o - | tar xzf - -C /tmp && \
 mv /tmp/pgscv.yaml /etc && \
 mv /tmp/pgscv.service /etc/systemd/system &&  \
 mv /tmp/pgscv.default /etc/default/pgscv && \
@@ -118,6 +118,10 @@ To help development you are encouraged to:
 - pull requests for new features
 - star the project
 
+### Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=cherts/pgscv&type=Date)](https://www.star-history.com/#cherts/pgscv&Date)
+
 ### Current developer and maintaner
 - [Mikhail Grigorev](https://github.com/cherts)
 

README.ru.md

@@ -32,7 +32,7 @@
 Загрузите архив со страницы [releases](https://github.com/cherts/pgscv/releases). Распакуйте архив. Создайте минимальный файл конфигураации. Запустите pgSCV под пользователем postgres.
 
 ```bash
-curl -s -L https://github.com/cherts/pgscv/releases/download/v0.15.0/pgscv_0.15.0_linux_$(uname -m).tar.gz -o - | tar xzf - -C /tmp && \
+curl -s -L https://github.com/cherts/pgscv/releases/download/v1.0.0/pgscv_1.0.0_linux_$(uname -m).tar.gz -o - | tar xzf - -C /tmp && \
 mv /tmp/pgscv.yaml /etc && \
 mv /tmp/pgscv.service /etc/systemd/system &&  \
 mv /tmp/pgscv.default /etc/default/pgscv && \
@@ -111,6 +111,10 @@ helm install -n pgscv-ns pgscv deploy/helm-chart/
 - запросить новую функциональность;
 - поставить звезду проекту на Github;
 
+### История звезд
+
+[![Star History Chart](https://api.star-history.com/svg?repos=cherts/pgscv&type=Date)](https://www.star-history.com/#cherts/pgscv&Date)
+
 ### Текущий разработчик и сопровождающий
 - [Mikhail Grigorev](https://github.com/cherts)
 

deploy/pgscv.yaml

@@ -30,15 +30,58 @@
 #    postgres/stattuple:
 #      ttl: 24h
 #discovery:
+# Monitoring local PostgreSQL on macOS (https://postgresapp.com)
+#  local_macos_postgresapp:
+#    type: script
+#    config:
+#      script: discovery-scripts/example-postgresapp-macos-discovery.sh
+#      execution_timeout: 10s
+#      refresh_interval: 5m
+#      args:
+#        - "ALL"
+#      env:
+#        - name: PG_PASSWORD
+#          value: "pgscv"
+#      debug: false
+#      target_labels:
+#        - name: environment
+#          value: "local"
+#        - name: __scrape_interval__
+#          value: 1m
+#
+# Monitoring AWS RDS PostgreSQL 
+#  aws:
+#    type: script
+#    config:
+#      script: discovery-scripts/example-aws-discovery.sh
+#      execution_timeout: 30s
+#      refresh_interval: 5m
+#      args:
+#        - "--profile=default --region=us-west-1"
+#      env:
+#        - name: PG_PASSWORD
+#          value: "pgscv"
+#        - name: AWS_ACCESS_KEY_ID
+#          value: "EXAMPLE"
+#        - name: AWS_SECRET_ACCESS_KEY
+#          value: "XXX/YYY/ZZZ"
+#      debug: false
+#      target_labels:
+#        - name: environment
+#          value: "production"
+#        - name: region
+#          value: "us-west-1"
+#        - name: __scrape_interval__
+#          value: 1m
 # Monitoring Yandex.Cloud Managed Service for PostgreSQL 
 #  yandex_mdb:
 #    type: yandex-mdb
 #    config:
 #      - authorized_key: /path/to/secret/authorized_key.json
 #        folder_id: "b1000000000000"
+#        user: "pgscv"
 #        password: "password"
-#        password_from_env: DB_PASSWORD
-#        user: "postgres_exporter"
+#        #password_from_env: DB_PASSWORD
 #        refresh_interval: 5
 #        clusters:
 #          - name: ".*"