diff --git a/managed/services/telemetry/config.default.yml b/managed/services/telemetry/config.default.yml index 9e93a971c21..4d63fc7da40 100644 --- a/managed/services/telemetry/config.default.yml +++ b/managed/services/telemetry/config.default.yml @@ -284,6 +284,40 @@ telemetry: - metric_name: "postgresql_version" label: "short_version" + - id: PostgresDBInstalledExtensions + source: VM + query: pg_extensions{service_name!="pmm-server-postgresql"} + transform: + type: JSON + metric: postgresql_installed_extensions + summary: "Installed extensions on the PostgresSQL instance" + data: + - metric_name: "1" + label: "name" + - metric_name: "2" + label: "version" + - metric_name: "3" + label: "relocatable" + - metric_name: "4" + label: "service_id" + + - id: PostgresDBAvailableExtensions + source: VM + query: pg_available_extensions{service_name!="pmm-server-postgresql"} + transform: + type: JSON + metric: postgresql_available_extensions + summary: "Available extensions on the PostgresSQL instance" + data: + - metric_name: "1" + label: "name" + - metric_name: "2" + label: "default_version" + - metric_name: "3" + label: "installed_version" + - metric_name: "4" + label: "service_id" + - id: HAProxyVersion source: VM query: haproxy_process_build_info diff --git a/managed/services/victoriametrics/scrape_configs.go b/managed/services/victoriametrics/scrape_configs.go index 083a3f8cc19..977a7b5dbd7 100644 --- a/managed/services/victoriametrics/scrape_configs.go +++ b/managed/services/victoriametrics/scrape_configs.go @@ -420,6 +420,7 @@ func scrapeConfigsForPostgresExporter(s *models.MetricsResolutions, params *scra "custom_query.hr", "standard.go", "standard.process", + "postgres", } hrOptions = collectors.FilterOutCollectors("", hrOptions, params.agent.DisabledCollectors) hr, err := scrapeConfigForStandardExporter("hr", s.HR, params, hrOptions) diff --git a/managed/services/victoriametrics/scrape_configs_test.go b/managed/services/victoriametrics/scrape_configs_test.go index 3d720dbcde4..79694314006 100644 --- a/managed/services/victoriametrics/scrape_configs_test.go +++ b/managed/services/victoriametrics/scrape_configs_test.go @@ -864,6 +864,7 @@ func TestScrapeConfig(t *testing.T) { Params: url.Values{"collect[]": []string{ "custom_query.hr", "exporter", + "postgres", "standard.go", }}, }, { diff --git a/managed/services/victoriametrics/victoriametrics_test.go b/managed/services/victoriametrics/victoriametrics_test.go index 811f1b6d836..6eb19fcd9cf 100644 --- a/managed/services/victoriametrics/victoriametrics_test.go +++ b/managed/services/victoriametrics/victoriametrics_test.go @@ -637,6 +637,7 @@ scrape_configs: collect[]: - custom_query.hr - exporter + - postgres - standard.go - standard.process scrape_interval: 5s