Merge branch 'prometheus-community:master' into fix/pg_stat_archiver-version

cmd/postgres_exporter/datasource.go

@@ -21,7 +21,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

cmd/postgres_exporter/main.go

@@ -17,8 +17,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/promlog"

cmd/postgres_exporter/namespace.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
 )

cmd/postgres_exporter/pg_setting.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

cmd/postgres_exporter/pg_setting_test.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !integration
 // +build !integration
 
 package main

cmd/postgres_exporter/postgres_exporter.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -576,14 +576,14 @@ func (e *Exporter) setupInternalMetrics() {
 		Namespace:   namespace,
 		Subsystem:   exporter,
 		Name:        "last_scrape_duration_seconds",
-		Help:        "Duration of the last scrape of metrics from PostgresSQL.",
+		Help:        "Duration of the last scrape of metrics from PostgreSQL.",
 		ConstLabels: e.constantLabels,
 	})
 	e.totalScrapes = prometheus.NewCounter(prometheus.CounterOpts{
 		Namespace:   namespace,
 		Subsystem:   exporter,
 		Name:        "scrapes_total",
-		Help:        "Total number of times PostgresSQL was scraped for metrics.",
+		Help:        "Total number of times PostgreSQL was scraped for metrics.",
 		ConstLabels: e.constantLabels,
 	})
 	e.error = prometheus.NewGauge(prometheus.GaugeOpts{

cmd/postgres_exporter/postgres_exporter_integration_test.go

@@ -14,6 +14,7 @@
 // These are specialized integration tests. We only build them when we're doing
 // a lot of additional work to keep the external docker environment they require
 // working.
+//go:build integration
 // +build integration
 
 package main

cmd/postgres_exporter/postgres_exporter_test.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !integration
 // +build !integration
 
 package main

cmd/postgres_exporter/queries.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"gopkg.in/yaml.v2"
 )
 

cmd/postgres_exporter/server.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

cmd/postgres_exporter/util.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/lib/pq"
 )