mirror of
https://github.com/prometheus-community/postgres_exporter
synced 2025-04-22 06:55:41 +00:00
parent
37e6dd3bec
commit
8f3088611b
@ -2,25 +2,24 @@ package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"math"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
"regexp"
|
||||
"errors"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"gopkg.in/yaml.v2"
|
||||
|
||||
"github.com/blang/semver"
|
||||
_ "github.com/lib/pq"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/common/log"
|
||||
"github.com/blang/semver"
|
||||
|
||||
)
|
||||
|
||||
var Version string = "0.0.1"
|
||||
@ -358,7 +357,6 @@ var queryOverrides = map[string][]OverrideQuery{
|
||||
},
|
||||
// No query is applicable for 9.1 that gives any sensible data.
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
// Convert the query override file to the version-specific query override file
|
||||
@ -509,7 +507,7 @@ func makeDescMap(pgVersion semver.Version, metricMaps map[string]map[string]Colu
|
||||
// Check column version compatibility for the current map
|
||||
// Force to discard if not compatible.
|
||||
if columnMapping.supportedVersions != nil {
|
||||
if columnMapping.supportedVersions(pgVersion) {
|
||||
if !columnMapping.supportedVersions(pgVersion) {
|
||||
thisMap[columnName] = MetricMap{
|
||||
discard: true,
|
||||
conversion: func(in interface{}) (float64, bool) {
|
||||
@ -948,7 +946,7 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, db *sql.DB) err
|
||||
e.lastMapVersion = semanticVersion
|
||||
|
||||
if e.userQueriesPath != "" {
|
||||
if err := addQueries(e.userQueriesPath, semanticVersion, e.metricMap, e.queryOverrides) ; err != nil {
|
||||
if err := addQueries(e.userQueriesPath, semanticVersion, e.metricMap, e.queryOverrides); err != nil {
|
||||
log.Errorln("Failed to reload user queries:", e.userQueriesPath, err)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user