-
Notifications
You must be signed in to change notification settings - Fork 755
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add support for pg_stat_user_indexes, pg_index_properties, pg_index_size_bytes #1071
base: master
Are you sure you want to change the base?
Changes from all commits
96b6bbc
69223b3
9342607
f2fe2d1
f682fed
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
// Copyright 2023 The Prometheus Authors | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
package collector | ||
|
||
import ( | ||
"context" | ||
"database/sql" | ||
"fmt" | ||
"strings" | ||
|
||
"log/slog" | ||
|
||
"github.com/prometheus/client_golang/prometheus" | ||
) | ||
|
||
func init() { | ||
registerCollector(pgIndexSubsystem, defaultDisabled, NewPgIndexCollector) | ||
} | ||
|
||
type PGIndexCollector struct { | ||
log *slog.Logger | ||
} | ||
|
||
const pgIndexSubsystem = "index" | ||
|
||
func NewPgIndexCollector(config collectorConfig) (Collector, error) { | ||
return &PGIndexCollector{log: config.logger}, nil | ||
} | ||
|
||
var ( | ||
pgIndexProperties = prometheus.NewDesc( | ||
prometheus.BuildFQName(namespace, pgIndexSubsystem, "properties"), | ||
"Postgresql index properties", | ||
[]string{"datname", "schemaname", "relname", "indexrelname", "is_unique", "is_primary", "is_valid", "is_ready"}, | ||
prometheus.Labels{}, | ||
) | ||
pgIndexSize = prometheus.NewDesc( | ||
prometheus.BuildFQName(namespace, pgIndexSubsystem, "size_bytes"), | ||
"Postgresql index size in bytes", | ||
[]string{"datname", "schemaname", "relname", "indexrelname"}, | ||
prometheus.Labels{}, | ||
) | ||
) | ||
|
||
func pgIndexQuery(columns []string) string { | ||
return fmt.Sprintf("SELECT %s FROM pg_catalog.pg_stat_user_indexes s JOIN pg_catalog.pg_index i ON s.indexrelid = i.indexrelid WHERE i.indislive='1';", strings.Join(columns, ",")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't typically use a function to build the query unless we need dynamic columns. In this case it should just be a static query const. |
||
} | ||
|
||
func boolToString(b bool) string { | ||
if b { | ||
return "1" | ||
} | ||
return "0" | ||
} | ||
|
||
func (c *PGIndexCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error { | ||
db := instance.getDB() | ||
|
||
columns := []string{ | ||
"current_database() datname", | ||
"s.schemaname", | ||
"s.relname", | ||
"s.indexrelname", | ||
"i.indisunique", | ||
"i.indisprimary", | ||
"i.indisvalid", | ||
"i.indisready", | ||
"pg_relation_size(i.indexrelid) AS indexsize", | ||
} | ||
|
||
rows, err := db.QueryContext(ctx, | ||
pgIndexQuery(columns), | ||
) | ||
|
||
if err != nil { | ||
return err | ||
} | ||
defer rows.Close() | ||
for rows.Next() { | ||
var datname, schemaname, relname, indexrelname sql.NullString | ||
var idxIsUnique, idxIsPrimary, idxIsValid, idxIsReady sql.NullBool | ||
var idxSize sql.NullFloat64 | ||
|
||
r := []any{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think that this slice adds anything. We can scan directly into the vars above. |
||
&datname, | ||
&schemaname, | ||
&relname, | ||
&indexrelname, | ||
&idxIsUnique, | ||
&idxIsPrimary, | ||
&idxIsValid, | ||
&idxIsReady, | ||
&idxSize, | ||
} | ||
|
||
if err := rows.Scan(r...); err != nil { | ||
return err | ||
} | ||
datnameLabel := "unknown" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do these metrics make sense when these values are not known? I feel that if too many are NULL/unknown, the metric is useless and should just be skipped. |
||
if datname.Valid { | ||
datnameLabel = datname.String | ||
} | ||
schemanameLabel := "unknown" | ||
if schemaname.Valid { | ||
schemanameLabel = schemaname.String | ||
} | ||
relnameLabel := "unknown" | ||
if relname.Valid { | ||
relnameLabel = relname.String | ||
} | ||
indexrelnameLabel := "unknown" | ||
if indexrelname.Valid { | ||
indexrelnameLabel = indexrelname.String | ||
} | ||
|
||
indexIsUniqueLabel := "unknown" | ||
if idxIsUnique.Valid { | ||
indexIsUniqueLabel = boolToString(idxIsUnique.Bool) | ||
} | ||
|
||
indexIsPrimaryLabel := "unknown" | ||
if idxIsPrimary.Valid { | ||
indexIsPrimaryLabel = boolToString(idxIsPrimary.Bool) | ||
} | ||
|
||
indexIsValidLabel := "unknown" | ||
if idxIsValid.Valid { | ||
indexIsValidLabel = boolToString(idxIsValid.Bool) | ||
} | ||
|
||
indexIsReadyLabel := "unknown" | ||
if idxIsReady.Valid { | ||
indexIsReadyLabel = boolToString(idxIsReady.Bool) | ||
} | ||
|
||
indexSizeMetric := -1.0 | ||
if idxSize.Valid { | ||
indexSizeMetric = idxSize.Float64 | ||
} | ||
|
||
propertiesLabels := []string{datnameLabel, schemanameLabel, relnameLabel, indexrelnameLabel, indexIsUniqueLabel, indexIsPrimaryLabel, indexIsValidLabel, indexIsReadyLabel} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Again, what does the slice improve vs just using the values below? |
||
ch <- prometheus.MustNewConstMetric( | ||
pgIndexProperties, | ||
prometheus.CounterValue, | ||
1, | ||
propertiesLabels..., | ||
) | ||
|
||
sizeLabels := []string{datnameLabel, schemanameLabel, relnameLabel, indexrelnameLabel} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Again, what does the slice improve vs just using the values below? |
||
ch <- prometheus.MustNewConstMetric( | ||
pgIndexSize, | ||
prometheus.GaugeValue, | ||
indexSizeMetric, | ||
sizeLabels..., | ||
) | ||
} | ||
if err := rows.Err(); err != nil { | ||
return err | ||
} | ||
return nil | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
// Copyright 2023 The Prometheus Authors | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
package collector | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/DATA-DOG/go-sqlmock" | ||
"github.com/prometheus/client_golang/prometheus" | ||
dto "github.com/prometheus/client_model/go" | ||
"github.com/smartystreets/goconvey/convey" | ||
) | ||
|
||
func TestPgIndexesCollector(t *testing.T) { | ||
db, mock, err := sqlmock.New() | ||
if err != nil { | ||
t.Fatalf("Error opening a stub db connection: %s", err) | ||
} | ||
defer db.Close() | ||
inst := &instance{db: db} | ||
|
||
columns := []string{ | ||
"datname", | ||
"schemaname", | ||
"relname", | ||
"indexrelname", | ||
"indisunique", | ||
"indisprimary", | ||
"indisvalid", | ||
"indisready", | ||
"indexsize", | ||
} | ||
rows := sqlmock.NewRows(columns). | ||
AddRow("postgres", "public", "pgtest_accounts", "pgtest_accounts_pkey", "0", "1", "1", "1", "123456789") | ||
|
||
cols := []string{ | ||
"current_database() datname", | ||
"s.schemaname", | ||
"s.relname", | ||
"s.indexrelname", | ||
"i.indisunique", | ||
"i.indisprimary", | ||
"i.indisvalid", | ||
"i.indisready", | ||
"pg_relation_size(i.indexrelid) AS indexsize", | ||
} | ||
|
||
mock.ExpectQuery(sanitizeQuery(pgIndexQuery(cols))).WillReturnRows(rows) | ||
|
||
ch := make(chan prometheus.Metric) | ||
go func() { | ||
defer close(ch) | ||
c := PGIndexCollector{} | ||
|
||
if err := c.Update(context.Background(), inst, ch); err != nil { | ||
t.Errorf("Error calling PGIndexCollector.Update: %s", err) | ||
} | ||
}() | ||
|
||
expected := []MetricResult{ | ||
{labels: labelMap{"datname": "postgres", "indexrelname": "pgtest_accounts_pkey", "schemaname": "public", "relname": "pgtest_accounts", "is_unique": "0", "is_primary": "1", "is_valid": "1", "is_ready": "1"}, value: 1, metricType: dto.MetricType_COUNTER}, | ||
{labels: labelMap{"datname": "postgres", "indexrelname": "pgtest_accounts_pkey", "schemaname": "public", "relname": "pgtest_accounts"}, value: 123456789, metricType: dto.MetricType_GAUGE}, | ||
} | ||
convey.Convey("Metrics comparison", t, func() { | ||
for _, expect := range expected { | ||
m := readMetric(<-ch) | ||
convey.So(expect, convey.ShouldResemble, m) | ||
} | ||
}) | ||
if err := mock.ExpectationsWereMet(); err != nil { | ||
t.Errorf("there were unfulfilled exceptions: %s", err) | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why this import is in it's own section. This should go with the stdlib imports above.