Skip to content
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.

Sign up for GitHub

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

[*] remove unused code from GetAllActiveHostsFromConfigDB(), closes #266 #268

Merged
merged 1 commit into from
Aug 30, 2023
Merged

[*] remove unused code from GetAllActiveHostsFromConfigDB(), closes #266 #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions src/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,32 +161,7 @@ func GetAllActiveHostsFromConfigDB() (MetricData, error) {
where
md_is_enabled
`
sqlPrev := `
select /* pgwatch3_generated */
md_unique_name, md_group, md_dbtype, md_hostname, md_port, md_dbname, md_user, coalesce(md_password, '') as md_password,
coalesce(pc_config, md_config)::text as md_config, md_statement_timeout_seconds, md_sslmode, md_is_superuser,
coalesce(md_include_pattern, '') as md_include_pattern, coalesce(md_exclude_pattern, '') as md_exclude_pattern,
coalesce(md_custom_tags::text, '{}') as md_custom_tags, md_root_ca_path, md_client_cert_path, md_client_key_path,
md_password_type, coalesce(md_host_config, '{}')::text as md_host_config, md_only_if_master
from
pgwatch3.monitored_db
left join
pgwatch3.preset_config on pc_name = md_preset_config_name
where
md_is_enabled
`
data, err := DBExecRead(mainContext, configDb, sqlLatest)
if err != nil {
err1 := err
logger.Debugf("Failed to query the monitored DB-s config with latest SQL: %v ", err1)
data, err = DBExecRead(mainContext, configDb, sqlPrev)
if err == nil {
logger.Warning("Fetching monitored DB-s config succeeded with SQL from previous schema version - gatherer update required!")
} else {
logger.Errorf("Failed to query the monitored DB-s config: %v", err1) // show the original error
}
}
return data, err
return DBExecRead(mainContext, configDb, sqlLatest)
}

func OldPostgresMetricsDeleter(ctx context.Context, metricAgeDaysThreshold int64, schemaType db.MetricSchemaType) {
Expand Down