You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/10/10 15:22:48 UTC
[skywalking] branch master updated: Unify the service label in postgresql MAL (#9752)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 091b7810c1 Unify the service label in postgresql MAL (#9752)
091b7810c1 is described below
commit 091b7810c1d48e4432a319bc955479fd09e23307
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Oct 10 23:22:29 2022 +0800
Unify the service label in postgresql MAL (#9752)
---
.../src/main/resources/otel-rules/postgresql.yaml | 36 +++++++++++-----------
.../postgres-exporter/docker-compose.yml | 6 ++--
.../postgres-exporter/otel-collector-config.yaml | 4 ++-
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/oap-server/server-starter/src/main/resources/otel-rules/postgresql.yaml b/oap-server/server-starter/src/main/resources/otel-rules/postgresql.yaml
index e3ba4a345c..d65707d5ae 100644
--- a/oap-server/server-starter/src/main/resources/otel-rules/postgresql.yaml
+++ b/oap-server/server-starter/src/main/resources/otel-rules/postgresql.yaml
@@ -29,7 +29,7 @@
# "-P-6H+3M" -- parses as "+6 hours and -3 minutes"
# </pre>
filter: "{ tags -> tags.job_name == 'postgresql-monitoring' }" # The OpenTelemetry job name
-expSuffix: tag({tags -> tags.server = 'postgresql::' + tags.server}).service(['server'] , Layer.POSTGRESQL)
+expSuffix: tag({tags -> tags.host_name = 'postgresql::' + tags.host_name}).service(['host_name'] , Layer.POSTGRESQL)
metricPrefix: meter_pg
metricsRules:
# postgresql configurations
@@ -55,36 +55,36 @@ metricsRules:
# dashboards
## rows
- name: fetched_rows_rate
- exp: pg_stat_database_tup_fetched.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_tup_fetched.sum(['datname','host_name']).rate('PT1M')
- name: deleted_rows_rate
- exp: pg_stat_database_tup_deleted.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_tup_deleted.sum(['datname','host_name']).rate('PT1M')
- name: inserted_rows_rate
- exp: pg_stat_database_tup_inserted.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_tup_inserted.sum(['datname','host_name']).rate('PT1M')
- name: updated_rows_rate
- exp: pg_stat_database_tup_updated.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_tup_updated.sum(['datname','host_name']).rate('PT1M')
- name: returned_rows_rate
- exp: pg_stat_database_tup_returned.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_tup_returned.sum(['datname','host_name']).rate('PT1M')
## locks
- name: locks_count
- exp: pg_locks_count.tag({tags -> tags.mode = tags.datname + ":" + tags.mode}).sum(['mode','server'])
+ exp: pg_locks_count.tag({tags -> tags.mode = tags.datname + ":" + tags.mode}).sum(['mode','host_name'])
- ## sessions
+ ## sessions
- name: active_sessions
- exp: pg_stat_activity_count.tagEqual('state','active').sum(['datname' , 'server'])
+ exp: pg_stat_activity_count.tagEqual('state','active').sum(['datname' , 'host_name'])
- name: idle_sessions
- exp: pg_stat_activity_count.tagMatch('state','idle|idle in transaction|idle in transaction (aborted)').sum(['datname' , 'server'])
+ exp: pg_stat_activity_count.tagMatch('state','idle|idle in transaction|idle in transaction (aborted)').sum(['datname' , 'host_name'])
## transactions
- name: committed_transactions_rate
- exp: pg_stat_database_xact_commit.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_xact_commit.sum(['datname','host_name']).rate('PT1M')
- name: rolled_back_transactions_rate
- exp: pg_stat_database_xact_rollback.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_xact_rollback.sum(['datname','host_name']).rate('PT1M')
## cache and temporary file
- name: cache_hit_rate
- exp: (pg_stat_database_blks_hit*100 / (pg_stat_database_blks_read + pg_stat_database_blks_hit)).sum(['datname','server'])
+ exp: (pg_stat_database_blks_hit*100 / (pg_stat_database_blks_read + pg_stat_database_blks_hit)).sum(['datname','host_name'])
- name: temporary_files_rate
- exp: pg_stat_database_temp_bytes.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_temp_bytes.sum(['datname','host_name']).rate('PT1M')
## checkpoint
- name: checkpoint_write_time_rate
@@ -95,14 +95,14 @@ metricsRules:
exp: pg_stat_bgwriter_checkpoints_req_total.rate('PT1M')
- name: checkpoints_timed_rate
exp: pg_stat_bgwriter_checkpoints_timed_total.rate('PT1M')
-
+
## conflicts and deadlocks
- name: conflicts_rate
- exp: pg_stat_database_conflicts.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_conflicts.sum(['datname','host_name']).rate('PT1M')
- name: deadlocks_rate
- exp: pg_stat_database_deadlocks.sum(['datname','server']).rate('PT1M')
+ exp: pg_stat_database_deadlocks.sum(['datname','host_name']).rate('PT1M')
- ## buffers
+ ## buffers
- name: buffers_checkpoint
exp: pg_stat_bgwriter_buffers_checkpoint.rate('PT1M')
- name: buffers_clean
diff --git a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml
index 1c844eb31a..e8853ab3ed 100644
--- a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml
+++ b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml
@@ -67,7 +67,7 @@ services:
- "psql -f /docker/mock.sql -h postgres -p 5432 -U postgres"
postgres-exporter:
image: quay.io/prometheuscommunity/postgres-exporter:v0.11.0
- depends_on:
+ depends_on:
- postgres
ports:
- 9187
@@ -89,7 +89,7 @@ services:
depends_on:
postgres:
condition: service_healthy
-
+
otel-collector:
image: otel/opentelemetry-collector:0.50.0
networks:
@@ -104,4 +104,4 @@ services:
condition: service_healthy
networks:
- e2e:
\ No newline at end of file
+ e2e:
diff --git a/test/e2e-v2/cases/postgresql/postgres-exporter/otel-collector-config.yaml b/test/e2e-v2/cases/postgresql/postgres-exporter/otel-collector-config.yaml
index f2193f6e1f..10ee8dc009 100644
--- a/test/e2e-v2/cases/postgresql/postgres-exporter/otel-collector-config.yaml
+++ b/test/e2e-v2/cases/postgresql/postgres-exporter/otel-collector-config.yaml
@@ -21,6 +21,8 @@ receivers:
scrape_interval: 5s
static_configs:
- targets: ["postgres-exporter:9187"]
+ labels:
+ host_name: postgres:5432
processors:
batch:
@@ -52,4 +54,4 @@ service:
# - opencensus #
#########################################
- logging
- - otlp
\ No newline at end of file
+ - otlp