From 86960e147117ebea2699aa582e4b1730c76db4e8 Mon Sep 17 00:00:00 2001 From: Seth Samuel Date: Thu, 3 Oct 2024 10:13:33 -0400 Subject: [PATCH 1/4] Postgres metrics --- comp/core/agenttelemetry/impl/config.go | 8 ++++++++ pkg/collector/corechecks/oracle/telemetry.go | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/comp/core/agenttelemetry/impl/config.go b/comp/core/agenttelemetry/impl/config.go index 3109a400b573c..46abb36ec6e39 100644 --- a/comp/core/agenttelemetry/impl/config.go +++ b/comp/core/agenttelemetry/impl/config.go @@ -261,6 +261,14 @@ var defaultProfiles = ` - name: oracle.activity_latency - name: oracle.statement_metrics - name: oracle.statement_plan_errors + - name: postgres.schema_tables_elapsed_ms + - name: postgres.schema_tables_count + - name: postgres.collect_relations_autodiscovery_ms + - name: postgres.collect_stat_autodiscovery_ms + - name: postgres.get_new_pg_stat_activity_ms + - name: postgres.get_active_connections_ms + - name: postgres.get_new_pg_stat_activity_count + - name: postgres.get_active_connections_count - name: transactions.input_count - name: transactions.requeued - name: transactions.retries diff --git a/pkg/collector/corechecks/oracle/telemetry.go b/pkg/collector/corechecks/oracle/telemetry.go index 34be6ef378d6b..46a32ac9086a5 100644 --- a/pkg/collector/corechecks/oracle/telemetry.go +++ b/pkg/collector/corechecks/oracle/telemetry.go @@ -17,9 +17,9 @@ var ( // TlmOracleActivityLatency is the time for the activity gathering to complete TlmOracleActivityLatency = telemetry.NewHistogram("oracle", "activity_latency", nil, "Histogram of activity query latency in ms", []float64{10, 25, 50, 75, 100, 250, 500, 1000, 10000}) // TlmOracleActivitySamplesCount is the number of activity samples collected - TlmOracleActivitySamplesCount = telemetry.NewCounter("oracle", "activity_samples_count", nil, "Number of activity samples collected") + TlmOracleActivitySamplesCount = telemetry.NewGauge("oracle", "activity_samples_count", nil, "Number of activity samples collected") // TlmOracleStatementMetricsLatency is the time for the statement metrics gathering to complete TlmOracleStatementMetricsLatency = telemetry.NewHistogram("oracle", "statement_metrics", nil, "Histogram of statement metrics latency in ms", []float64{10, 25, 50, 75, 100, 250, 500, 1000, 10000}) // TlmOracleStatementMetricsErrorCount is the number of statement plan errors - TlmOracleStatementMetricsErrorCount = telemetry.NewCounter("oracle", "statement_plan_errors", nil, "Number of statement plan errors") + TlmOracleStatementMetricsErrorCount = telemetry.NewGauge("oracle", "statement_plan_errors", nil, "Number of statement plan errors") ) From 46a02d9a8229900b523325cd7da7519188dca809 Mon Sep 17 00:00:00 2001 From: Seth Samuel Date: Thu, 3 Oct 2024 12:44:42 -0400 Subject: [PATCH 2/4] Add Postgres metrics --- comp/core/agenttelemetry/impl/config.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/comp/core/agenttelemetry/impl/config.go b/comp/core/agenttelemetry/impl/config.go index 46abb36ec6e39..f3b7e49013b70 100644 --- a/comp/core/agenttelemetry/impl/config.go +++ b/comp/core/agenttelemetry/impl/config.go @@ -266,9 +266,12 @@ var defaultProfiles = ` - name: postgres.collect_relations_autodiscovery_ms - name: postgres.collect_stat_autodiscovery_ms - name: postgres.get_new_pg_stat_activity_ms - - name: postgres.get_active_connections_ms - name: postgres.get_new_pg_stat_activity_count + - name: postgres.get_active_connections_ms - name: postgres.get_active_connections_count + - name: postgres.collect_activity_snapshot_ms + - name: postgres.collect_statement_samples_ms + - name: postgres.collect_statement_samples_count - name: transactions.input_count - name: transactions.requeued - name: transactions.retries From 3e9aeb6e516afd8e525258891411fb6f7873da14 Mon Sep 17 00:00:00 2001 From: Seth Samuel Date: Thu, 3 Oct 2024 12:57:37 -0400 Subject: [PATCH 3/4] Release note --- ...stgres-integration-telemetry-b17470c3de15424f.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 releasenotes/notes/postgres-integration-telemetry-b17470c3de15424f.yaml diff --git a/releasenotes/notes/postgres-integration-telemetry-b17470c3de15424f.yaml b/releasenotes/notes/postgres-integration-telemetry-b17470c3de15424f.yaml new file mode 100644 index 0000000000000..d8e9691890449 --- /dev/null +++ b/releasenotes/notes/postgres-integration-telemetry-b17470c3de15424f.yaml @@ -0,0 +1,11 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +other: + - | + Adds Postgres integration metrics to cross-org telemetry whitelist. From 328d9f1dd7200148331d56e5b5497c4829fa49b4 Mon Sep 17 00:00:00 2001 From: Seth Samuel Date: Thu, 3 Oct 2024 13:22:33 -0400 Subject: [PATCH 4/4] Whitespace --- comp/core/agenttelemetry/impl/config.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/comp/core/agenttelemetry/impl/config.go b/comp/core/agenttelemetry/impl/config.go index f3b7e49013b70..d05e92da2f28a 100644 --- a/comp/core/agenttelemetry/impl/config.go +++ b/comp/core/agenttelemetry/impl/config.go @@ -261,17 +261,17 @@ var defaultProfiles = ` - name: oracle.activity_latency - name: oracle.statement_metrics - name: oracle.statement_plan_errors - - name: postgres.schema_tables_elapsed_ms - - name: postgres.schema_tables_count - - name: postgres.collect_relations_autodiscovery_ms - - name: postgres.collect_stat_autodiscovery_ms - - name: postgres.get_new_pg_stat_activity_ms - - name: postgres.get_new_pg_stat_activity_count - - name: postgres.get_active_connections_ms - - name: postgres.get_active_connections_count - - name: postgres.collect_activity_snapshot_ms - - name: postgres.collect_statement_samples_ms - - name: postgres.collect_statement_samples_count + - name: postgres.schema_tables_elapsed_ms + - name: postgres.schema_tables_count + - name: postgres.collect_relations_autodiscovery_ms + - name: postgres.collect_stat_autodiscovery_ms + - name: postgres.get_new_pg_stat_activity_ms + - name: postgres.get_new_pg_stat_activity_count + - name: postgres.get_active_connections_ms + - name: postgres.get_active_connections_count + - name: postgres.collect_activity_snapshot_ms + - name: postgres.collect_statement_samples_ms + - name: postgres.collect_statement_samples_count - name: transactions.input_count - name: transactions.requeued - name: transactions.retries