-
Notifications
You must be signed in to change notification settings - Fork 759
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
Gitlab Collector: Autovacuum collector and test #840
Merged
sysadmind
merged 9 commits into
prometheus-community:master
from
Sticksman:cleanup/gitlab-exporter-autovac
Jul 21, 2023
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c988ac9
Autovacuum collector and test
Sticksman eb57d1d
Update collector/pg_stat_activity_autovacuum.go
Sticksman 10d5fcf
Update collector/pg_stat_activity_autovacuum.go
Sticksman 3aa5b16
Use timestamp seconds
Sticksman 655cc41
query formating
Sticksman 29f4f4a
SQL format
Sticksman 581eb0e
Merge branch 'master' into cleanup/gitlab-exporter-autovac
Sticksman 50e235b
Loosen autovacuum query
Sticksman ae1c588
Merge branch 'master' into cleanup/gitlab-exporter-autovac
Sticksman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
|
||
"github.com/go-kit/log" | ||
"github.com/prometheus/client_golang/prometheus" | ||
) | ||
|
||
const statActivityAutovacuumSubsystem = "stat_activity_autovacuum" | ||
|
||
func init() { | ||
registerCollector(statActivityAutovacuumSubsystem, defaultDisabled, NewPGStatActivityAutovacuumCollector) | ||
} | ||
|
||
type PGStatActivityAutovacuumCollector struct { | ||
log log.Logger | ||
} | ||
|
||
func NewPGStatActivityAutovacuumCollector(config collectorConfig) (Collector, error) { | ||
return &PGStatActivityAutovacuumCollector{log: config.logger}, nil | ||
} | ||
|
||
var ( | ||
statActivityAutovacuumAgeInSeconds = prometheus.NewDesc( | ||
prometheus.BuildFQName(namespace, statActivityAutovacuumSubsystem, "timestamp_seconds"), | ||
"Start timestamp of the vacuum process in seconds", | ||
[]string{"relname"}, | ||
prometheus.Labels{}, | ||
) | ||
|
||
statActivityAutovacuumQuery = ` | ||
SELECT | ||
SPLIT_PART(query, '.', 2) AS relname, | ||
EXTRACT(xact_start) AS timestamp_seconds | ||
FROM | ||
pg_catalog.pg_stat_activity | ||
WHERE | ||
query LIKE 'autovacuum:%' | ||
` | ||
) | ||
|
||
func (PGStatActivityAutovacuumCollector) Update(ctx context.Context, instance *instance, ch chan<- prometheus.Metric) error { | ||
db := instance.getDB() | ||
rows, err := db.QueryContext(ctx, | ||
statActivityAutovacuumQuery) | ||
|
||
if err != nil { | ||
return err | ||
} | ||
defer rows.Close() | ||
|
||
for rows.Next() { | ||
var relname string | ||
var ageInSeconds float64 | ||
|
||
if err := rows.Scan(&relname, &ageInSeconds); err != nil { | ||
return err | ||
} | ||
|
||
ch <- prometheus.MustNewConstMetric( | ||
statActivityAutovacuumAgeInSeconds, | ||
prometheus.GaugeValue, | ||
ageInSeconds, relname, | ||
) | ||
} | ||
if err := rows.Err(); err != nil { | ||
return err | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// 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 TestPGStatActivityAutovacuumCollector(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{ | ||
"relname", | ||
"timestamp_seconds", | ||
} | ||
rows := sqlmock.NewRows(columns). | ||
AddRow("test", 3600) | ||
|
||
mock.ExpectQuery(sanitizeQuery(statActivityAutovacuumQuery)).WillReturnRows(rows) | ||
|
||
ch := make(chan prometheus.Metric) | ||
go func() { | ||
defer close(ch) | ||
c := PGStatActivityAutovacuumCollector{} | ||
|
||
if err := c.Update(context.Background(), inst, ch); err != nil { | ||
t.Errorf("Error calling PGStatActivityAutovacuumCollector.Update: %s", err) | ||
} | ||
}() | ||
expected := []MetricResult{ | ||
{labels: labelMap{"relname": "test"}, value: 3600, 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) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
This seems like it could be fragile. How do we guarantee that this will be the relname?
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 guess because since the query is autogenerated it'll always look something like
autovacuum: COMMAND schema.relname