Unified Storage: Adds sql metrics #87651
Merged
Conversation
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
…rom postgres connection string format
owensmallwood
added
no-backport
owensmallwood
commented
May 10, 2024
| @@ -69,7 +71,7 @@ func (db *EntityDB) GetEngine() (*xorm.Engine, error) { | |||
| } | |||
|
|
|||
| connectionString := fmt.Sprintf( | |||
| "user='%s' password='%s' host='%s' port='%s' dbname='%s' sslmode='%s'", // sslcert='%s' sslkey='%s' sslrootcert='%s'", | |||
| "user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", // sslcert='%s' sslkey='%s' sslrootcert='%s'", | |||
There was a problem hiding this comment.
Had to change this so things can run locally. This issue is fixed in this PR
DanCech
reviewed
May 10, 2024
Comment on lines
143
to
147
| // register the go_sql_stats_connections_* metrics | ||
| if err := prometheus.Register(sqlstats.NewStatsCollector("unified_storage", db.engine.DB().DB)); err != nil { | ||
| db.log.Warn("Failed to register unified storage sql stats collector", "error", err) | ||
| } | ||
|
|
There was a problem hiding this comment.
Should this be up in the block where we create the new connection? Or do we need it even when we are piggybacking on the main grafana connection?
There was a problem hiding this comment.
If we're piggybacking on the grafana connection, then this function should return right away bc of this
if db.engine != nil {
return db.engine, nil
}at the beginning.
There was a problem hiding this comment.
nope, check out lines 128-134
There was a problem hiding this comment.
the check for whether we've already set up db.engine is just a shortcut so you can call GetEngine again and it'll return the engine we configured the first time.
DanCech
approved these changes
May 10, 2024
inf0rmer
approved these changes
May 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since we use a separate db engine for US, we weren't getting any db metrics.