From ab44dd9586ae271c40d71387b9d8af75bc12af7e Mon Sep 17 00:00:00 2001 From: Philipp Eberle Date: Mon, 11 Dec 2023 09:18:40 +0100 Subject: [PATCH 1/3] Revert "Remove query as it produces too many results by default (even causing timeouts when scraping)" This reverts commit 7c03b08ae70460037466fc8988fa43cda82c15d6. --- charts/postgreslet/values.yaml | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/charts/postgreslet/values.yaml b/charts/postgreslet/values.yaml index 18ce042..682a7d4 100644 --- a/charts/postgreslet/values.yaml +++ b/charts/postgreslet/values.yaml @@ -438,3 +438,65 @@ sidecars: - size: usage: "GAUGE" description: "Disk space used by the database" + pg_stat_statements: + query: "SELECT + pg_get_userbyid(userid) as user, + pg_database.datname, + pg_stat_statements.queryid, + pg_stat_statements.query, + pg_stat_statements.calls, + pg_stat_statements.total_time as time_milliseconds, + pg_stat_statements.rows, + pg_stat_statements.shared_blks_hit, + pg_stat_statements.shared_blks_read, + pg_stat_statements.shared_blks_dirtied, + pg_stat_statements.shared_blks_written, + pg_stat_statements.local_blks_hit, + pg_stat_statements.local_blks_read, + pg_stat_statements.local_blks_dirtied, + pg_stat_statements.local_blks_written, + pg_stat_statements.temp_blks_read, + pg_stat_statements.temp_blks_written, + pg_stat_statements.blk_read_time, + pg_stat_statements.blk_write_time + FROM pg_stat_statements + JOIN pg_database + ON pg_database.oid = pg_stat_statements.dbid" + metrics: + - user: + usage: "LABEL" + description: "The user who executed the statement" + - datname: + usage: "LABEL" + description: "The database in which the statement was executed" + - queryid: + usage: "LABEL" + description: "Internal hash code, computed from the statement's parse tree" + - query: + usage: "LABEL" + description: "Processed query" + - calls: + usage: "COUNTER" + description: "Number of times executed" + - time_milliseconds: + usage: "COUNTER" + description: "Total time spent in the statement, in milliseconds" + - rows: + usage: "COUNTER" + description: "Total number of rows retrieved or affected by the statement" + - shared_blks_hit: + usage: "COUNTER" + description: "Total number of shared block cache hits by the statement" + - shared_blks_read: + usage: "COUNTER" + description: "Total number of shared blocks read by the statement" + - shared_blks_dirtied: + usage: "COUNTER" + description: "Total number of shared blocks dirtied by the statement" + - shared_blks_written: + usage: "COUNTER" + description: "Total number of shared blocks written by the statement" + - local_blks_hit: + usage: "COUNTER" + description: "Total number of local block cache hits by the statement" + From a6f0911b521ae47a6cef006ad839ecf8e2be9cf1 Mon Sep 17 00:00:00 2001 From: Philipp Eberle Date: Mon, 11 Dec 2023 10:02:27 +0100 Subject: [PATCH 2/3] Bump version --- charts/postgreslet/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/postgreslet/Chart.yaml b/charts/postgreslet/Chart.yaml index 280ee26..0f9ed15 100644 --- a/charts/postgreslet/Chart.yaml +++ b/charts/postgreslet/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.0 +version: 0.10.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 7521b601e94dd79d4bf0af74819b3f5f538f4a5b Mon Sep 17 00:00:00 2001 From: Philipp Eberle Date: Mon, 11 Dec 2023 10:03:29 +0100 Subject: [PATCH 3/3] Make pg_stat_statements configurable --- charts/postgreslet/templates/configmap-sidecars.yaml | 4 ++++ charts/postgreslet/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/charts/postgreslet/templates/configmap-sidecars.yaml b/charts/postgreslet/templates/configmap-sidecars.yaml index f62dfbb..d34b230 100644 --- a/charts/postgreslet/templates/configmap-sidecars.yaml +++ b/charts/postgreslet/templates/configmap-sidecars.yaml @@ -2,7 +2,11 @@ apiVersion: v1 data: postgres-exporter-service-port: {{ .Values.sidecars.exporter.servicePort | quote }} postgres-exporter-service-target-port: {{ .Values.sidecars.exporter.containerPort | quote }} +{{- if .Values.sidecars.exporter.enableStatementsQuery }} + queries.yaml: {{ printf "%s\n%s" .Values.sidecars.exporter.queries .Values.sidecars.exporter.queriesStatements | b64enc }} +{{- else }} queries.yaml: {{ b64enc .Values.sidecars.exporter.queries }} +{{- end }} fluent-bit.conf: {{ b64enc .Values.sidecars.fluentbit.conf }} sidecars: | - name: postgres-exporter diff --git a/charts/postgreslet/values.yaml b/charts/postgreslet/values.yaml index 682a7d4..49adc20 100644 --- a/charts/postgreslet/values.yaml +++ b/charts/postgreslet/values.yaml @@ -438,6 +438,7 @@ sidecars: - size: usage: "GAUGE" description: "Disk space used by the database" + queriesStatements: |+ pg_stat_statements: query: "SELECT pg_get_userbyid(userid) as user, @@ -499,4 +500,5 @@ sidecars: - local_blks_hit: usage: "COUNTER" description: "Total number of local block cache hits by the statement" + enableStatementsQuery: false