Pull upstream

.github/workflows/go.yml

@@ -0,0 +1,65 @@
+name: Go
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test
+    strategy:
+      matrix:
+        go-version:
+          - 1.16
+        include:
+          - go-version: tip
+            os: ubuntu-latest
+            may-fail: true
+    runs-on: ubuntu-latest
+    # The environment this job references
+    environment:
+      name: CI
+    steps:
+    - name: Set up Go release
+      if: matrix.go-version != 'tip'
+      uses: percona-platform/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Set up Go tip
+      if: matrix.go-version == 'tip'
+      env:
+        # to avoid error due to `go version` accepting -v flag with an argument since 1.15
+        GOFLAGS: ""
+      run: |
+        git clone --depth=1 https://go.googlesource.com/go $HOME/gotip
+        cd $HOME/gotip/src
+        ./make.bash
+        echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
+        echo "$HOME/gotip/bin" >> $GITHUB_PATH
+    - name: Checkout code
+      uses: percona-platform/checkout@v2
+    - name: Build
+      run: make build
+    - name: Run checks
+      run: |
+        go build -modfile=tools/go.mod -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
+        go build -modfile=tools/go.mod -o bin/reviewdog github.com/reviewdog/reviewdog/cmd/reviewdog
+        bin/golangci-lint run -c=.golangci-required.yml --out-format=line-number | env REVIEWDOG_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} bin/reviewdog -f=golangci-lint -level=error -reporter=github-pr-check
+        bin/golangci-lint run -c=.golangci.yml --out-format=line-number | env REVIEWDOG_GITHUB_API_TOKEN=${{ secrets.GITHUB_TOKEN }} bin/reviewdog -f=golangci-lint -level=error -reporter=github-pr-review
+    - name: Run Tests
+      env:
+        AWS_ACCESS_KEY: AKIAZPBRO3QWCEHJTL35
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
+      run: make test-race
+    - name: Run Codecov
+      run: make codecov
+    - name: Build tarball
+      run: make tarball
+    - name: Build tarball
+      run: make docker
+    - name: Run debug commands on failure
+      if: ${{ failure() }}
+      run: |
+        env
+        go version
+        go env
+        pwd
+        git status

.gitignore

@@ -3,3 +3,6 @@
 /.idea/
 /.vscode/
 rds_exporter
+config.yml
+bin/
+coverage.txt

.golangci-required.yml

@@ -0,0 +1,13 @@
+---
+# The most valuable linters; they are required to pass for PR to be merged.
+linters:
+  disable-all: true
+  enable:
+    - depguard
+    - goimports
+    - ineffassign
+    - govet
+    - staticcheck
+
+issues:
+  exclude-use-default: false

.golangci.yml

@@ -8,7 +8,6 @@ linters-settings:
     check-exported: true
 
   unparam:
-    algo: rta
     check-exported: true
 
 linters:

.promu.yml

@@ -1,5 +1,7 @@
 go:
     cgo: false
+repository:
+    path: github.com/percona/rds_exporter
 build:
     flags: -a -tags netgo
     ldflags: |
@@ -11,7 +13,7 @@ build:
 tarball:
     files:
         - LICENSE
-        - config.yml
+        # - config.yml
 crossbuild:
     platforms:
         - linux/amd64

CHANGELOG.md

@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [Unreleased]
+Nothing yet.
+
+
+## [0.7.0] - 2020-06-02
+### Added
+- `disable_basic_metrics` and `disable_enhanced_metrics` configuration options.
+
+### Changed
+- Major changes in `node_exporter`-like metrics. See [PR #33](https://github.com/percona/rds_exporter/pull/33)
+  and [here](https://github.com/percona/rds_exporter#metrics).
+- `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variables are honored now
+  ([PR #43](https://github.com/percona/rds_exporter/pull/43) by [@ahmgeek](https://github.com/ahmgeek)).
+- Tests and linting improvements.
+
+
+## [0.6.0] - 2019-12-04
+- Initial tagged release.
+
+
+[Unreleased]: https:/github.com/percona/rds_exporter/compare/v0.7.0...main
+[0.7.0]: https://github.com/percona/rds_exporter/compare/v0.6.0...v0.7.0
+[0.6.0]: https://github.com/percona/rds_exporter/releases/tag/v0.6.0

Dockerfile

@@ -1,7 +1,13 @@
+FROM golang:1.16 as build
+
+COPY . /usr/src/rds_exporter
+
+RUN cd /usr/src/rds_exporter && make build
+
 FROM        alpine:latest
 
-COPY rds_exporter  /bin/
-COPY config.yml           /etc/rds_exporter/config.yml
+COPY --from=build /usr/src/rds_exporter/rds_exporter  /bin/
+# COPY config.yml           /etc/rds_exporter/config.yml
 
 RUN apk update && \
     apk add ca-certificates && \