mirror of
https://github.com/prometheus-community/postgres_exporter
synced 2025-04-04 23:29:30 +00:00
Fix issues identified by the gometalinters.
This commit is contained in:
Will Rouesnel
parent
4477dfa9b3
commit
34ffcb449d
@ -26,7 +26,7 @@ func querySettings(ch chan<- prometheus.Metric, db *sql.DB) error {
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintln("Error running query on database: ", namespace, err))
|
||||
}
|
||||
defer rows.Close()
|
||||
defer rows.Close() // nolint: errcheck
|
||||
|
||||
for rows.Next() {
|
||||
s := &pgSetting{}
|
||||
@ -51,7 +51,7 @@ func (s *pgSetting) metric() prometheus.Metric {
|
||||
var (
|
||||
err error
|
||||
name = strings.Replace(s.name, ".", "_", -1)
|
||||
unit = s.unit
|
||||
unit = s.unit // nolint: ineffassign
|
||||
shortDesc = s.shortDesc
|
||||
subsystem = "settings"
|
||||
val float64
|
||||
@ -85,7 +85,7 @@ func (s *pgSetting) metric() prometheus.Metric {
|
||||
func (s *pgSetting) normaliseUnit() (val float64, unit string, err error) {
|
||||
val, err = strconv.ParseFloat(s.setting, 64)
|
||||
if err != nil {
|
||||
return val, unit, errors.New(fmt.Sprintf("Error converting setting %q value %q to float: %s", s.name, s.setting, err))
|
||||
return val, unit, fmt.Errorf("Error converting setting %q value %q to float: %s", s.name, s.setting, err)
|
||||
}
|
||||
|
||||
// Units defined in: https://www.postgresql.org/docs/current/static/config-setting.html
|
||||
@ -97,7 +97,7 @@ func (s *pgSetting) normaliseUnit() (val float64, unit string, err error) {
|
||||
case "kB", "MB", "GB", "TB", "8kB", "16MB":
|
||||
unit = "bytes"
|
||||
default:
|
||||
err = errors.New(fmt.Sprintf("Unknown unit for runtime variable: %q", s.unit))
|
||||
err = fmt.Errorf("Unknown unit for runtime variable: %q", s.unit)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -186,7 +186,7 @@ func (s *PgSettingSuite) TestMetric(c *C) {
|
||||
for _, f := range fixtures {
|
||||
d := &dto.Metric{}
|
||||
m := f.p.metric()
|
||||
m.Write(d)
|
||||
m.Write(d) // nolint: errcheck
|
||||
|
||||
c.Check(m.Desc().String(), Equals, f.d)
|
||||
c.Check(d.GetGauge().GetValue(), Equals, f.v)
|
||||
|
||||
@ -24,10 +24,11 @@ import (
|
||||
"github.com/prometheus/common/log"
|
||||
)
|
||||
|
||||
// executable version (set at build time by make)
|
||||
var Version string = "0.0.1"
|
||||
// Version is set during build to the git describe version
|
||||
// (semantic version)-(commitish) form.
|
||||
var Version = "0.0.1"
|
||||
|
||||
var db *sql.DB = nil
|
||||
var sharedDBConn *sql.DB
|
||||
|
||||
var (
|
||||
listenAddress = flag.String(
|
||||
@ -46,7 +47,7 @@ var (
|
||||
"dumpmaps", false,
|
||||
"Do not run, simply dump the maps.",
|
||||
)
|
||||
showVersion = flag.Bool("version", false, "print version")
|
||||
showVersion = flag.Bool("version", false, "print version and exit")
|
||||
)
|
||||
|
||||
// Metric name parts.
|
||||
@ -61,7 +62,7 @@ const (
|
||||
)
|
||||
|
||||
// landingPage contains the HTML served at '/'.
|
||||
// TODO: Make this nicer and more informative.
|
||||
// TODO: Make cu nicer and more informative.
|
||||
var landingPage = []byte(`<html>
|
||||
<head><title>Postgres exporter</title></head>
|
||||
<body>
|
||||
@ -71,10 +72,22 @@ var landingPage = []byte(`<html>
|
||||
</html>
|
||||
`)
|
||||
|
||||
// ColumnUsage should be one of several enum values which describe how a
|
||||
// queried row is to be converted to a Prometheus metric.
|
||||
type ColumnUsage int
|
||||
|
||||
// Implements the yaml.Unmarshaller interface
|
||||
func (this *ColumnUsage) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
||||
// nolint: golint
|
||||
const (
|
||||
DISCARD ColumnUsage = iota // Ignore cu column
|
||||
LABEL ColumnUsage = iota // Use cu column as a label
|
||||
COUNTER ColumnUsage = iota // Use cu column as a counter
|
||||
GAUGE ColumnUsage = iota // Use cu column as a gauge
|
||||
MAPPEDMETRIC ColumnUsage = iota // Use cu column with the supplied mapping of text values
|
||||
DURATION ColumnUsage = iota // This column should be interpreted as a text duration (and converted to milliseconds)
|
||||
)
|
||||
|
||||
// UnmarshalYAML implements the yaml.Unmarshaller interface.
|
||||
func (cu *ColumnUsage) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
||||
var value string
|
||||
if err := unmarshal(&value); err != nil {
|
||||
return err
|
||||
@ -85,19 +98,10 @@ func (this *ColumnUsage) UnmarshalYAML(unmarshal func(interface{}) error) error
|
||||
return err
|
||||
}
|
||||
|
||||
*this = columnUsage
|
||||
*cu = columnUsage
|
||||
return nil
|
||||
}
|
||||
|
||||
const (
|
||||
DISCARD ColumnUsage = iota // Ignore this column
|
||||
LABEL ColumnUsage = iota // Use this column as a label
|
||||
COUNTER ColumnUsage = iota // Use this column as a counter
|
||||
GAUGE ColumnUsage = iota // Use this column as a gauge
|
||||
MAPPEDMETRIC ColumnUsage = iota // Use this column with the supplied mapping of text values
|
||||
DURATION ColumnUsage = iota // This column should be interpreted as a text duration (and converted to milliseconds)
|
||||
)
|
||||
|
||||
// Regex used to get the "short-version" from the postgres version field.
|
||||
var versionRegex = regexp.MustCompile(`^\w+ (\d+\.\d+\.\d+)`)
|
||||
var lowestSupportedVersion = semver.MustParse("9.1.0")
|
||||
@ -113,7 +117,7 @@ func parseVersion(versionString string) (semver.Version, error) {
|
||||
errors.New(fmt.Sprintln("Could not find a postgres version in string:", versionString))
|
||||
}
|
||||
|
||||
// User-friendly representation of a prometheus descriptor map
|
||||
// ColumnMapping is the user-friendly representation of a prometheus descriptor map
|
||||
type ColumnMapping struct {
|
||||
usage ColumnUsage `yaml:"usage"`
|
||||
description string `yaml:"description"`
|
||||
@ -121,22 +125,20 @@ type ColumnMapping struct {
|
||||
supportedVersions semver.Range `yaml:"pg_version"` // Semantic version ranges which are supported. Unsupported columns are not queried (internally converted to DISCARD).
|
||||
}
|
||||
|
||||
func (this *ColumnMapping) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
||||
// UnmarshalYAML implements yaml.Unmarshaller
|
||||
func (cm *ColumnMapping) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
||||
type plain ColumnMapping
|
||||
if err := unmarshal((*plain)(this)); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return unmarshal((*plain)(cm))
|
||||
}
|
||||
|
||||
// Groups metric maps under a shared set of labels
|
||||
// MetricMapNamespace groups metric maps under a shared set of labels.
|
||||
type MetricMapNamespace struct {
|
||||
labels []string // Label names for this namespace
|
||||
columnMappings map[string]MetricMap // Column mappings in this namespace
|
||||
labels []string // Label names for cu namespace
|
||||
columnMappings map[string]MetricMap // Column mappings in cu namespace
|
||||
}
|
||||
|
||||
// Stores the prometheus metric description which a given column will be mapped
|
||||
// to by the collector
|
||||
// MetricMap stores the prometheus metric description which a given column will
|
||||
// be mapped to by the collector
|
||||
type MetricMap struct {
|
||||
discard bool // Should metric be discarded during mapping?
|
||||
vtype prometheus.ValueType // Prometheus valuetype
|
||||
@ -144,9 +146,9 @@ type MetricMap struct {
|
||||
conversion func(interface{}) (float64, bool) // Conversion function to turn PG result into float64
|
||||
}
|
||||
|
||||
// TODO: revisit this with the semver system
|
||||
// TODO: revisit cu with the semver system
|
||||
func dumpMaps() {
|
||||
for name, cmap := range metricMaps {
|
||||
for name, cmap := range builtinMetricMaps {
|
||||
query, ok := queryOverrides[name]
|
||||
if !ok {
|
||||
fmt.Println(name)
|
||||
@ -163,7 +165,7 @@ func dumpMaps() {
|
||||
}
|
||||
}
|
||||
|
||||
var metricMaps = map[string]map[string]ColumnMapping{
|
||||
var builtinMetricMaps = map[string]map[string]ColumnMapping{
|
||||
"pg_stat_bgwriter": {
|
||||
"checkpoints_timed": {COUNTER, "Number of scheduled checkpoints that have been performed", nil, nil},
|
||||
"checkpoints_req": {COUNTER, "Number of requested checkpoints that have been performed", nil, nil},
|
||||
@ -179,80 +181,80 @@ var metricMaps = map[string]map[string]ColumnMapping{
|
||||
},
|
||||
"pg_stat_database": {
|
||||
"datid": {LABEL, "OID of a database", nil, nil},
|
||||
"datname": {LABEL, "Name of this database", nil, nil},
|
||||
"numbackends": {GAUGE, "Number of backends currently connected to this database. This is the only column in this view that returns a value reflecting current state; all other columns return the accumulated values since the last reset.", nil, nil},
|
||||
"xact_commit": {COUNTER, "Number of transactions in this database that have been committed", nil, nil},
|
||||
"xact_rollback": {COUNTER, "Number of transactions in this database that have been rolled back", nil, nil},
|
||||
"blks_read": {COUNTER, "Number of disk blocks read in this database", nil, nil},
|
||||
"blks_hit": {COUNTER, "Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (this only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)", nil, nil},
|
||||
"tup_returned": {COUNTER, "Number of rows returned by queries in this database", nil, nil},
|
||||
"tup_fetched": {COUNTER, "Number of rows fetched by queries in this database", nil, nil},
|
||||
"tup_inserted": {COUNTER, "Number of rows inserted by queries in this database", nil, nil},
|
||||
"tup_updated": {COUNTER, "Number of rows updated by queries in this database", nil, nil},
|
||||
"tup_deleted": {COUNTER, "Number of rows deleted by queries in this database", nil, nil},
|
||||
"conflicts": {COUNTER, "Number of queries canceled due to conflicts with recovery in this database. (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)", nil, nil},
|
||||
"temp_files": {COUNTER, "Number of temporary files created by queries in this database. All temporary files are counted, regardless of why the temporary file was created (e.g., sorting or hashing), and regardless of the log_temp_files setting.", nil, nil},
|
||||
"temp_bytes": {COUNTER, "Total amount of data written to temporary files by queries in this database. All temporary files are counted, regardless of why the temporary file was created, and regardless of the log_temp_files setting.", nil, nil},
|
||||
"deadlocks": {COUNTER, "Number of deadlocks detected in this database", nil, nil},
|
||||
"blk_read_time": {COUNTER, "Time spent reading data file blocks by backends in this database, in milliseconds", nil, nil},
|
||||
"blk_write_time": {COUNTER, "Time spent writing data file blocks by backends in this database, in milliseconds", nil, nil},
|
||||
"datname": {LABEL, "Name of cu database", nil, nil},
|
||||
"numbackends": {GAUGE, "Number of backends currently connected to cu database. This is the only column in cu view that returns a value reflecting current state; all other columns return the accumulated values since the last reset.", nil, nil},
|
||||
"xact_commit": {COUNTER, "Number of transactions in cu database that have been committed", nil, nil},
|
||||
"xact_rollback": {COUNTER, "Number of transactions in cu database that have been rolled back", nil, nil},
|
||||
"blks_read": {COUNTER, "Number of disk blocks read in cu database", nil, nil},
|
||||
"blks_hit": {COUNTER, "Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (cu only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)", nil, nil},
|
||||
"tup_returned": {COUNTER, "Number of rows returned by queries in cu database", nil, nil},
|
||||
"tup_fetched": {COUNTER, "Number of rows fetched by queries in cu database", nil, nil},
|
||||
"tup_inserted": {COUNTER, "Number of rows inserted by queries in cu database", nil, nil},
|
||||
"tup_updated": {COUNTER, "Number of rows updated by queries in cu database", nil, nil},
|
||||
"tup_deleted": {COUNTER, "Number of rows deleted by queries in cu database", nil, nil},
|
||||
"conflicts": {COUNTER, "Number of queries canceled due to conflicts with recovery in cu database. (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)", nil, nil},
|
||||
"temp_files": {COUNTER, "Number of temporary files created by queries in cu database. All temporary files are counted, regardless of why the temporary file was created (e.g., sorting or hashing), and regardless of the log_temp_files setting.", nil, nil},
|
||||
"temp_bytes": {COUNTER, "Total amount of data written to temporary files by queries in cu database. All temporary files are counted, regardless of why the temporary file was created, and regardless of the log_temp_files setting.", nil, nil},
|
||||
"deadlocks": {COUNTER, "Number of deadlocks detected in cu database", nil, nil},
|
||||
"blk_read_time": {COUNTER, "Time spent reading data file blocks by backends in cu database, in milliseconds", nil, nil},
|
||||
"blk_write_time": {COUNTER, "Time spent writing data file blocks by backends in cu database, in milliseconds", nil, nil},
|
||||
"stats_reset": {COUNTER, "Time at which these statistics were last reset", nil, nil},
|
||||
},
|
||||
"pg_stat_database_conflicts": {
|
||||
"datid": {LABEL, "OID of a database", nil, nil},
|
||||
"datname": {LABEL, "Name of this database", nil, nil},
|
||||
"confl_tablespace": {COUNTER, "Number of queries in this database that have been canceled due to dropped tablespaces", nil, nil},
|
||||
"confl_lock": {COUNTER, "Number of queries in this database that have been canceled due to lock timeouts", nil, nil},
|
||||
"confl_snapshot": {COUNTER, "Number of queries in this database that have been canceled due to old snapshots", nil, nil},
|
||||
"confl_bufferpin": {COUNTER, "Number of queries in this database that have been canceled due to pinned buffers", nil, nil},
|
||||
"confl_deadlock": {COUNTER, "Number of queries in this database that have been canceled due to deadlocks", nil, nil},
|
||||
"datname": {LABEL, "Name of cu database", nil, nil},
|
||||
"confl_tablespace": {COUNTER, "Number of queries in cu database that have been canceled due to dropped tablespaces", nil, nil},
|
||||
"confl_lock": {COUNTER, "Number of queries in cu database that have been canceled due to lock timeouts", nil, nil},
|
||||
"confl_snapshot": {COUNTER, "Number of queries in cu database that have been canceled due to old snapshots", nil, nil},
|
||||
"confl_bufferpin": {COUNTER, "Number of queries in cu database that have been canceled due to pinned buffers", nil, nil},
|
||||
"confl_deadlock": {COUNTER, "Number of queries in cu database that have been canceled due to deadlocks", nil, nil},
|
||||
},
|
||||
"pg_locks": {
|
||||
"datname": {LABEL, "Name of this database", nil, nil},
|
||||
"datname": {LABEL, "Name of cu database", nil, nil},
|
||||
"mode": {LABEL, "Type of Lock", nil, nil},
|
||||
"count": {GAUGE, "Number of locks", nil, nil},
|
||||
},
|
||||
"pg_stat_replication": {
|
||||
"procpid": {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange("<9.2.0")},
|
||||
"pid": {DISCARD, "Process ID of a WAL sender process", nil, semver.MustParseRange(">=9.2.0")},
|
||||
"usesysid": {DISCARD, "OID of the user logged into this WAL sender process", nil, nil},
|
||||
"usename": {DISCARD, "Name of the user logged into this WAL sender process", nil, nil},
|
||||
"application_name": {DISCARD, "Name of the application that is connected to this WAL sender", nil, nil},
|
||||
"client_addr": {LABEL, "IP address of the client connected to this WAL sender. If this field is null, it indicates that the client is connected via a Unix socket on the server machine.", nil, nil},
|
||||
"usesysid": {DISCARD, "OID of the user logged into cu WAL sender process", nil, nil},
|
||||
"usename": {DISCARD, "Name of the user logged into cu WAL sender process", nil, nil},
|
||||
"application_name": {DISCARD, "Name of the application that is connected to cu WAL sender", nil, nil},
|
||||
"client_addr": {LABEL, "IP address of the client connected to cu WAL sender. If cu field is null, it indicates that the client is connected via a Unix socket on the server machine.", nil, nil},
|
||||
"client_hostname": {DISCARD, "Host name of the connected client, as reported by a reverse DNS lookup of client_addr. This field will only be non-null for IP connections, and only when log_hostname is enabled.", nil, nil},
|
||||
"client_port": {DISCARD, "TCP port number that the client is using for communication with this WAL sender, or -1 if a Unix socket is used", nil, nil},
|
||||
"backend_start": {DISCARD, "with time zone Time when this process was started, i.e., when the client connected to this WAL sender", nil, nil},
|
||||
"client_port": {DISCARD, "TCP port number that the client is using for communication with cu WAL sender, or -1 if a Unix socket is used", nil, nil},
|
||||
"backend_start": {DISCARD, "with time zone Time when cu process was started, i.e., when the client connected to cu WAL sender", nil, nil},
|
||||
"backend_xmin": {DISCARD, "The current backend's xmin horizon.", nil, nil},
|
||||
"state": {LABEL, "Current WAL sender state", nil, nil},
|
||||
"sent_location": {DISCARD, "Last transaction log position sent on this connection", nil, nil},
|
||||
"write_location": {DISCARD, "Last transaction log position written to disk by this standby server", nil, nil},
|
||||
"flush_location": {DISCARD, "Last transaction log position flushed to disk by this standby server", nil, nil},
|
||||
"replay_location": {DISCARD, "Last transaction log position replayed into the database on this standby server", nil, nil},
|
||||
"sync_priority": {DISCARD, "Priority of this standby server for being chosen as the synchronous standby", nil, nil},
|
||||
"sync_state": {DISCARD, "Synchronous state of this standby server", nil, nil},
|
||||
"sent_location": {DISCARD, "Last transaction log position sent on cu connection", nil, nil},
|
||||
"write_location": {DISCARD, "Last transaction log position written to disk by cu standby server", nil, nil},
|
||||
"flush_location": {DISCARD, "Last transaction log position flushed to disk by cu standby server", nil, nil},
|
||||
"replay_location": {DISCARD, "Last transaction log position replayed into the database on cu standby server", nil, nil},
|
||||
"sync_priority": {DISCARD, "Priority of cu standby server for being chosen as the synchronous standby", nil, nil},
|
||||
"sync_state": {DISCARD, "Synchronous state of cu standby server", nil, nil},
|
||||
"slot_name": {LABEL, "A unique, cluster-wide identifier for the replication slot", nil, semver.MustParseRange(">=9.2.0")},
|
||||
"plugin": {DISCARD, "The base name of the shared object containing the output plugin this logical slot is using, or null for physical slots", nil, nil},
|
||||
"plugin": {DISCARD, "The base name of the shared object containing the output plugin cu logical slot is using, or null for physical slots", nil, nil},
|
||||
"slot_type": {DISCARD, "The slot type - physical or logical", nil, nil},
|
||||
"datoid": {DISCARD, "The OID of the database this slot is associated with, or null. Only logical slots have an associated database", nil, nil},
|
||||
"database": {DISCARD, "The name of the database this slot is associated with, or null. Only logical slots have an associated database", nil, nil},
|
||||
"active": {DISCARD, "True if this slot is currently actively being used", nil, nil},
|
||||
"datoid": {DISCARD, "The OID of the database cu slot is associated with, or null. Only logical slots have an associated database", nil, nil},
|
||||
"database": {DISCARD, "The name of the database cu slot is associated with, or null. Only logical slots have an associated database", nil, nil},
|
||||
"active": {DISCARD, "True if cu slot is currently actively being used", nil, nil},
|
||||
"active_pid": {DISCARD, "Process ID of a WAL sender process", nil, nil},
|
||||
"xmin": {DISCARD, "The oldest transaction that this slot needs the database to retain. VACUUM cannot remove tuples deleted by any later transaction", nil, nil},
|
||||
"catalog_xmin": {DISCARD, "The oldest transaction affecting the system catalogs that this slot needs the database to retain. VACUUM cannot remove catalog tuples deleted by any later transaction", nil, nil},
|
||||
"restart_lsn": {DISCARD, "The address (LSN) of oldest WAL which still might be required by the consumer of this slot and thus won't be automatically removed during checkpoints", nil, nil},
|
||||
"xmin": {DISCARD, "The oldest transaction that cu slot needs the database to retain. VACUUM cannot remove tuples deleted by any later transaction", nil, nil},
|
||||
"catalog_xmin": {DISCARD, "The oldest transaction affecting the system catalogs that cu slot needs the database to retain. VACUUM cannot remove catalog tuples deleted by any later transaction", nil, nil},
|
||||
"restart_lsn": {DISCARD, "The address (LSN) of oldest WAL which still might be required by the consumer of cu slot and thus won't be automatically removed during checkpoints", nil, nil},
|
||||
"pg_current_xlog_location": {DISCARD, "pg_current_xlog_location", nil, nil},
|
||||
"pg_xlog_location_diff": {GAUGE, "Lag in bytes between master and slave", nil, semver.MustParseRange(">=9.2.0")},
|
||||
"confirmed_flush_lsn": {DISCARD, "LSN position a consumer of a slot has confirmed flushing the data received", nil, nil},
|
||||
},
|
||||
"pg_stat_activity": {
|
||||
"datname": {LABEL, "Name of this database", nil, nil},
|
||||
"datname": {LABEL, "Name of cu database", nil, nil},
|
||||
"state": {LABEL, "connection state", nil, semver.MustParseRange(">=9.2.0")},
|
||||
"count": {GAUGE, "number of connections in this state", nil, nil},
|
||||
"count": {GAUGE, "number of connections in cu state", nil, nil},
|
||||
"max_tx_duration": {GAUGE, "max duration in seconds any active transaction has been running", nil, nil},
|
||||
},
|
||||
}
|
||||
|
||||
// Override querys are run in-place of simple namespace look ups, and provide
|
||||
// OverrideQuery 's are run in-place of simple namespace look ups, and provide
|
||||
// advanced functionality. But they have a tendency to postgres version specific.
|
||||
// There aren't too many versions, so we simply store customized versions using
|
||||
// the semver matching we do for columns.
|
||||
@ -262,7 +264,7 @@ type OverrideQuery struct {
|
||||
}
|
||||
|
||||
// Overriding queries for namespaces above.
|
||||
// TODO: validate this is a closed set in tests, and there are no overlaps
|
||||
// TODO: validate cu is a closed set in tests, and there are no overlaps
|
||||
var queryOverrides = map[string][]OverrideQuery{
|
||||
"pg_locks": {
|
||||
{
|
||||
@ -366,15 +368,15 @@ func makeQueryOverrideMap(pgVersion semver.Version, queryOverrides map[string][]
|
||||
return resultMap
|
||||
}
|
||||
|
||||
// Add queries to the metricMaps and queryOverrides maps. Added queries do not
|
||||
// Add queries to the builtinMetricMaps and queryOverrides maps. Added queries do not
|
||||
// respect version requirements, because it is assumed that the user knows
|
||||
// what they are doing with their version of postgres.
|
||||
//
|
||||
// This function modifies metricMap and queryOverrideMap to contain the new
|
||||
// queries.
|
||||
// TODO: test code for all this.
|
||||
// TODO: test code for all cu.
|
||||
// TODO: use proper struct type system
|
||||
// TODO: the YAML this supports is "non-standard" - we should move away from it.
|
||||
// TODO: the YAML cu supports is "non-standard" - we should move away from it.
|
||||
func addQueries(queriesPath string, pgVersion semver.Version, exporterMap map[string]MetricMapNamespace, queryOverrideMap map[string]string) error {
|
||||
var extra map[string]interface{}
|
||||
|
||||
@ -431,9 +433,9 @@ func addQueries(queriesPath string, pgVersion semver.Version, exporterMap map[st
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: we should support this
|
||||
// TODO: we should support cu
|
||||
columnMapping.mapping = nil
|
||||
// Should we support this for users?
|
||||
// Should we support cu for users?
|
||||
columnMapping.supportedVersions = nil
|
||||
|
||||
metricMap[name] = columnMapping
|
||||
@ -715,10 +717,10 @@ func (e *Exporter) Describe(ch chan<- *prometheus.Desc) {
|
||||
// from Postgres. So we use the poor man's describe method: Run a collect
|
||||
// and send the descriptors of all the collected metrics. The problem
|
||||
// here is that we need to connect to the Postgres DB. If it is currently
|
||||
// unavailable, the descriptors will be incomplete. Since this is a
|
||||
// unavailable, the descriptors will be incomplete. Since cu is a
|
||||
// stand-alone exporter and not used as a library within other code
|
||||
// implementing additional metrics, the worst that can happen is that we
|
||||
// don't detect inconsistent metrics created by this exporter
|
||||
// don't detect inconsistent metrics created by cu exporter
|
||||
// itself. Also, a change in the monitored Postgres instance may change the
|
||||
// exported metrics during the runtime of the exporter.
|
||||
|
||||
@ -756,26 +758,32 @@ func newDesc(subsystem, name, help string) *prometheus.Desc {
|
||||
// Query within a namespace mapping and emit metrics. Returns fatal errors if
|
||||
// the scrape fails, and a slice of errors if they were non-fatal.
|
||||
func queryNamespaceMapping(ch chan<- prometheus.Metric, db *sql.DB, namespace string, mapping MetricMapNamespace, queryOverrides map[string]string) ([]error, error) {
|
||||
// Check for a query override for this namespace
|
||||
// Check for a query override for cu namespace
|
||||
query, found := queryOverrides[namespace]
|
||||
if !found {
|
||||
// No query override - do a simple * search.
|
||||
query = fmt.Sprintf("SELECT * FROM %s;", namespace)
|
||||
}
|
||||
|
||||
// Was this query disabled (i.e. nothing sensible can be queried on this
|
||||
// Was cu query disabled (i.e. nothing sensible can be queried on cu
|
||||
// version of PostgreSQL?
|
||||
if query == "" {
|
||||
if query == "" && found {
|
||||
// Return success (no pertinent data)
|
||||
return []error{}, nil
|
||||
}
|
||||
|
||||
// Don't fail on a bad scrape of one metric
|
||||
rows, err := db.Query(query)
|
||||
var rows *sql.Rows
|
||||
var err error
|
||||
|
||||
if !found {
|
||||
// I've no idea how to avoid this properly at the moment, but this is
|
||||
// an admin tool so you're not injecting SQL right?
|
||||
// nolint: gas
|
||||
rows, err = db.Query(fmt.Sprintf("SELECT * FROM %s;", namespace))
|
||||
} else {
|
||||
rows, err = db.Query(query)
|
||||
}
|
||||
if err != nil {
|
||||
return []error{}, errors.New(fmt.Sprintln("Error running query on database: ", namespace, err))
|
||||
}
|
||||
defer rows.Close()
|
||||
defer rows.Close() // nolint: errcheck
|
||||
|
||||
var columnNames []string
|
||||
columnNames, err = rows.Columns()
|
||||
@ -803,7 +811,7 @@ func queryNamespaceMapping(ch chan<- prometheus.Metric, db *sql.DB, namespace st
|
||||
return []error{}, errors.New(fmt.Sprintln("Error retrieving rows:", namespace, err))
|
||||
}
|
||||
|
||||
// Get the label values for this row
|
||||
// Get the label values for cu row
|
||||
var labels = make([]string, len(mapping.labels))
|
||||
for idx, columnName := range mapping.labels {
|
||||
labels[idx], _ = dbToString(columnData[columnIdx[columnName]])
|
||||
@ -814,7 +822,7 @@ func queryNamespaceMapping(ch chan<- prometheus.Metric, db *sql.DB, namespace st
|
||||
// converted to float64s. NULLs are allowed and treated as NaN.
|
||||
for idx, columnName := range columnNames {
|
||||
if metricMapping, ok := mapping.columnMappings[columnName]; ok {
|
||||
// Is this a metricy metric?
|
||||
// Is cu a metricy metric?
|
||||
if metricMapping.discard {
|
||||
continue
|
||||
}
|
||||
@ -878,9 +886,12 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, db *sql.DB) err
|
||||
var versionString string
|
||||
err := versionRow.Scan(&versionString)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintln("Error scanning version string:", err))
|
||||
return fmt.Errorf("Error scanning version string: %v", err)
|
||||
}
|
||||
semanticVersion, err := parseVersion(versionString)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error parsing version string: %v", err)
|
||||
}
|
||||
if semanticVersion.LT(lowestSupportedVersion) {
|
||||
log.Warnln("PostgreSQL version is lower then our lowest supported version! Got", semanticVersion.String(), "minimum supported is", lowestSupportedVersion.String())
|
||||
}
|
||||
@ -890,7 +901,7 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, db *sql.DB) err
|
||||
log.Infoln("Semantic Version Changed:", e.lastMapVersion.String(), "->", semanticVersion.String())
|
||||
e.mappingMtx.Lock()
|
||||
|
||||
e.metricMap = makeDescMap(semanticVersion, metricMaps)
|
||||
e.metricMap = makeDescMap(semanticVersion, builtinMetricMaps)
|
||||
e.queryOverrides = makeQueryOverrideMap(semanticVersion, queryOverrides)
|
||||
e.lastMapVersion = semanticVersion
|
||||
|
||||
@ -913,7 +924,7 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, db *sql.DB) err
|
||||
}
|
||||
|
||||
func getDB(conn string) (*sql.DB, error) {
|
||||
if db == nil {
|
||||
if sharedDBConn == nil {
|
||||
d, err := sql.Open("postgres", conn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -924,10 +935,10 @@ func getDB(conn string) (*sql.DB, error) {
|
||||
}
|
||||
d.SetMaxOpenConns(1)
|
||||
d.SetMaxIdleConns(1)
|
||||
db = d
|
||||
sharedDBConn = d
|
||||
}
|
||||
|
||||
return db, nil
|
||||
return sharedDBConn, nil
|
||||
}
|
||||
|
||||
func (e *Exporter) scrape(ch chan<- prometheus.Metric) {
|
||||
@ -996,12 +1007,12 @@ func main() {
|
||||
|
||||
http.Handle(*metricPath, prometheus.Handler())
|
||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write(landingPage)
|
||||
w.Write(landingPage) // nolint: errcheck
|
||||
})
|
||||
|
||||
log.Infof("Starting Server: %s", *listenAddress)
|
||||
log.Fatal(http.ListenAndServe(*listenAddress, nil))
|
||||
if db != nil {
|
||||
defer db.Close()
|
||||
if sharedDBConn != nil {
|
||||
defer sharedDBConn.Close() // nolint: errcheck
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ func (s *IntegrationSuite) SetUpSuite(c *C) {
|
||||
prometheus.MustRegister(exporter)
|
||||
}
|
||||
|
||||
// TODO: it would be nice if this didn't mostly just recreate the scrape function
|
||||
// TODO: it would be nice if cu didn't mostly just recreate the scrape function
|
||||
func (s *IntegrationSuite) TestAllNamespacesReturnResults(c *C) {
|
||||
// Setup a dummy channel to consume metrics
|
||||
ch := make(chan prometheus.Metric, 100)
|
||||
|
||||
@ -47,9 +47,9 @@ func (s *FunctionalSuite) TestSemanticVersionColumnDiscard(c *C) {
|
||||
|
||||
{
|
||||
// Update the map so the discard metric should be eliminated
|
||||
discardable_metric := testMetricMap["test_namespace"]["metric_which_discards"]
|
||||
discardable_metric.supportedVersions = semver.MustParseRange(">0.0.1")
|
||||
testMetricMap["test_namespace"]["metric_which_discards"] = discardable_metric
|
||||
discardableMetric := testMetricMap["test_namespace"]["metric_which_discards"]
|
||||
discardableMetric.supportedVersions = semver.MustParseRange(">0.0.1")
|
||||
testMetricMap["test_namespace"]["metric_which_discards"] = discardableMetric
|
||||
|
||||
// Discard metric should be discarded
|
||||
resultMap := makeDescMap(semver.MustParse("0.0.1"), testMetricMap)
|
||||
@ -67,9 +67,9 @@ func (s *FunctionalSuite) TestSemanticVersionColumnDiscard(c *C) {
|
||||
|
||||
{
|
||||
// Update the map so the discard metric should be kept but has a version
|
||||
discardable_metric := testMetricMap["test_namespace"]["metric_which_discards"]
|
||||
discardable_metric.supportedVersions = semver.MustParseRange(">0.0.1")
|
||||
testMetricMap["test_namespace"]["metric_which_discards"] = discardable_metric
|
||||
discardableMetric := testMetricMap["test_namespace"]["metric_which_discards"]
|
||||
discardableMetric.supportedVersions = semver.MustParseRange(">0.0.1")
|
||||
testMetricMap["test_namespace"]["metric_which_discards"] = discardableMetric
|
||||
|
||||
// Discard metric should be discarded
|
||||
resultMap := makeDescMap(semver.MustParse("0.0.2"), testMetricMap)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user