From 0a3894bdcfbda537d2aab89438a0a1acbe2bfdfb Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Fri, 11 Oct 2024 03:10:04 +0300 Subject: [PATCH 01/17] PMM-13207 Update go version. --- .github/workflows/clean.yml | 2 +- build/docker/rpmbuild/Dockerfile | 2 +- build/docker/rpmbuild/Dockerfile.el9 | 2 +- devcontainer.Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 4 ++++ tools/go.mod | 2 +- update/.devcontainer/install-dev-tools.sh | 2 +- update/docker-compose.yml | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index c3e0ad8709..0f7cf8fb07 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: go: - - version: 1.22.x + - version: 1.23.x may-fail: false - version: tip may-fail: true diff --git a/build/docker/rpmbuild/Dockerfile b/build/docker/rpmbuild/Dockerfile index f6ddc34db3..98561c7831 100644 --- a/build/docker/rpmbuild/Dockerfile +++ b/build/docker/rpmbuild/Dockerfile @@ -23,7 +23,7 @@ RUN yum update -y && \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.22.2 +ENV GO_VERSION 1.23.2 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9 index aaee21b90a..be5f1458f7 100644 --- a/build/docker/rpmbuild/Dockerfile.el9 +++ b/build/docker/rpmbuild/Dockerfile.el9 @@ -28,7 +28,7 @@ RUN yum install -y gcc gcc-c++ \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.22.3 +ENV GO_VERSION 1.23.2 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile index 10a3a94498..64e5ecb040 100644 --- a/devcontainer.Dockerfile +++ b/devcontainer.Dockerfile @@ -2,7 +2,7 @@ ARG PMM_SERVER_IMAGE="perconalab/pmm-server:dev-latest" FROM $PMM_SERVER_IMAGE ARG PMM_SERVER_IMAGE -ARG GO_VERSION="1.22.x" +ARG GO_VERSION="1.23.x" RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE" ENV GOPATH=/root/go diff --git a/go.mod b/go.mod index 14c67d0dc2..34f7bc98db 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm -go 1.22.7 +go 1.23.2 // Update saas with // go get -v github.com/percona-platform/saas@latest @@ -23,7 +23,7 @@ require ( github.com/alecthomas/kong v0.9.0 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go v1.55.3 + github.com/aws/aws-sdk-go v1.55.5 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.28.0 github.com/charmbracelet/bubbles v0.18.0 diff --git a/go.sum b/go.sum index 79d5ab4d66..d321cb7bba 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,8 @@ github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E= github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -432,6 +434,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= +github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= github.com/hashicorp/go-msgpack/v2 v2.1.1 h1:xQEY9yB2wnHitoSzk/B9UjXWRQ67QKu5AOm8aFp8N3I= diff --git a/tools/go.mod b/tools/go.mod index d6ff51b44c..c0c01ff7d9 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm/tools -go 1.22.7 +go 1.23.2 replace github.com/go-openapi/spec => github.com/Percona-Lab/spec v0.20.5-percona diff --git a/update/.devcontainer/install-dev-tools.sh b/update/.devcontainer/install-dev-tools.sh index c5e9b3faa5..a2618ac3db 100755 --- a/update/.devcontainer/install-dev-tools.sh +++ b/update/.devcontainer/install-dev-tools.sh @@ -8,7 +8,7 @@ set -o errexit set -o xtrace # download (in the background) the same verison as used by PMM build process -curl -sSL https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz -o /tmp/golang.tar.gz & +curl -sSL https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz -o /tmp/golang.tar.gz & # to install man pages sed -i '/nodocs/d' /etc/yum.conf diff --git a/update/docker-compose.yml b/update/docker-compose.yml index dab0b29593..ed9e2adf71 100644 --- a/update/docker-compose.yml +++ b/update/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: # for tests - PMM_SERVER_IMAGE=${PMM_SERVER_IMAGE:-percona/pmm-server:2} - - GO_VERSION=${GO_VERSION:-1.22.x} + - GO_VERSION=${GO_VERSION:-1.23.x} - PATH=/root/go/bin:$PATH - REVIEWDOG_GITHUB_API_TOKEN=${REVIEWDOG_GITHUB_API_TOKEN} volumes: From 2df2bdca350dfdf246dec730b493b0ade84e24d2 Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Fri, 11 Oct 2024 11:00:20 +0300 Subject: [PATCH 02/17] Revert "PMM-13207 Update go version." This reverts commit 0a3894bdcfbda537d2aab89438a0a1acbe2bfdfb. --- .github/workflows/clean.yml | 2 +- build/docker/rpmbuild/Dockerfile | 2 +- build/docker/rpmbuild/Dockerfile.el9 | 2 +- devcontainer.Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 4 ---- tools/go.mod | 2 +- update/.devcontainer/install-dev-tools.sh | 2 +- update/docker-compose.yml | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 0f7cf8fb07..c3e0ad8709 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: go: - - version: 1.23.x + - version: 1.22.x may-fail: false - version: tip may-fail: true diff --git a/build/docker/rpmbuild/Dockerfile b/build/docker/rpmbuild/Dockerfile index 98561c7831..f6ddc34db3 100644 --- a/build/docker/rpmbuild/Dockerfile +++ b/build/docker/rpmbuild/Dockerfile @@ -23,7 +23,7 @@ RUN yum update -y && \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.23.2 +ENV GO_VERSION 1.22.2 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9 index be5f1458f7..aaee21b90a 100644 --- a/build/docker/rpmbuild/Dockerfile.el9 +++ b/build/docker/rpmbuild/Dockerfile.el9 @@ -28,7 +28,7 @@ RUN yum install -y gcc gcc-c++ \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.23.2 +ENV GO_VERSION 1.22.3 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile index 64e5ecb040..10a3a94498 100644 --- a/devcontainer.Dockerfile +++ b/devcontainer.Dockerfile @@ -2,7 +2,7 @@ ARG PMM_SERVER_IMAGE="perconalab/pmm-server:dev-latest" FROM $PMM_SERVER_IMAGE ARG PMM_SERVER_IMAGE -ARG GO_VERSION="1.23.x" +ARG GO_VERSION="1.22.x" RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE" ENV GOPATH=/root/go diff --git a/go.mod b/go.mod index 34f7bc98db..14c67d0dc2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm -go 1.23.2 +go 1.22.7 // Update saas with // go get -v github.com/percona-platform/saas@latest @@ -23,7 +23,7 @@ require ( github.com/alecthomas/kong v0.9.0 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go v1.55.5 + github.com/aws/aws-sdk-go v1.55.3 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.28.0 github.com/charmbracelet/bubbles v0.18.0 diff --git a/go.sum b/go.sum index d321cb7bba..79d5ab4d66 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,6 @@ github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E= github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= -github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -434,8 +432,6 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= github.com/hashicorp/go-msgpack/v2 v2.1.1 h1:xQEY9yB2wnHitoSzk/B9UjXWRQ67QKu5AOm8aFp8N3I= diff --git a/tools/go.mod b/tools/go.mod index c0c01ff7d9..d6ff51b44c 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm/tools -go 1.23.2 +go 1.22.7 replace github.com/go-openapi/spec => github.com/Percona-Lab/spec v0.20.5-percona diff --git a/update/.devcontainer/install-dev-tools.sh b/update/.devcontainer/install-dev-tools.sh index a2618ac3db..c5e9b3faa5 100755 --- a/update/.devcontainer/install-dev-tools.sh +++ b/update/.devcontainer/install-dev-tools.sh @@ -8,7 +8,7 @@ set -o errexit set -o xtrace # download (in the background) the same verison as used by PMM build process -curl -sSL https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz -o /tmp/golang.tar.gz & +curl -sSL https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz -o /tmp/golang.tar.gz & # to install man pages sed -i '/nodocs/d' /etc/yum.conf diff --git a/update/docker-compose.yml b/update/docker-compose.yml index ed9e2adf71..dab0b29593 100644 --- a/update/docker-compose.yml +++ b/update/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: # for tests - PMM_SERVER_IMAGE=${PMM_SERVER_IMAGE:-percona/pmm-server:2} - - GO_VERSION=${GO_VERSION:-1.23.x} + - GO_VERSION=${GO_VERSION:-1.22.x} - PATH=/root/go/bin:$PATH - REVIEWDOG_GITHUB_API_TOKEN=${REVIEWDOG_GITHUB_API_TOKEN} volumes: From 500f6404c6a56a472092f5d112c75aaba59ef0b9 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Fri, 11 Oct 2024 11:27:38 +0200 Subject: [PATCH 03/17] PMM-13154 PG17 support in QAN (#3159) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * PMM-13154 Intermediate progress * PMM-12154 Some progress * PMM-12154 Some progress * PMM-12154 Fix linter warn * PMM-12154 Cleanup * PMM-12154 Fix * PMM-12154 Update PG version in agent CI * PMM-12154 Update PG tests * PMM-12154 Update PG tests * PMM-12154 Fix PG17 tag * PMM-12154 Update PG tests * PMM-12154 Try fix * PMM-12154 Try fix * PMM-12154 Try fix * PMM-12154 Try fix * PMM-13154 Update PG tests * PMM-12154 Update PG tests * PMM-12154 Update PG tests * PMM-12154 Update PG tests * PMM-13154 Update PG version matrix in CI * PMM-13154 Use dev image of percona distribution for pg17 * PMM-13154 Update PG tests * PMM-13154 Update PG tests * PMM-12154 Cleanup * PMM-13154 Add local block read/write timers to QAN, update QAN API * PMM-13154 Fixed * PMM-13154 Update test data * PMM-13154 Fixes * PMM-13154 Fixes * PMM-13154 Fixes * Rewrite pg_stat_statments view reading * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Fix * PMM-13154 Add licence header * PMM-13154 Fix tests * PMM-13154 Update tests * PMM-13154 Fix style * PMM-13154 Fix CH migration * PMM-13154 Remove redundant fields backfill * Use PG in CI 17rc1 * PMM-13154 Format sources * PMM-13154 Update test --------- Co-authored-by: Jiří Čtvrtka <62988319+JiriCtvrtka@users.noreply.github.com> Co-authored-by: Nurlan Moldomurov --- .github/workflows/agent.yml | 20 +- .../postgres/pgstatmonitor/pgstatmonitor.go | 79 ++- .../pgstatmonitor/pgstatmonitor_models.go | 185 ++++--- .../pgstatmonitor/pgstatmonitor_test.go | 180 ++++--- .../postgres/pgstatstatements/models.go | 48 -- .../pgstatstatements/models_reform.go | 166 ------ .../pg_stat_statements_models.go | 222 ++++++++ .../pgstatstatements/pgstatstatements.go | 42 +- .../pgstatstatements/pgstatstatements_test.go | 168 +++--- .../postgresql_query_show_action_test.go | 4 +- api/agentpb/collector.pb.go | 273 ++++++---- api/agentpb/collector.pb.validate.go | 16 +- api/agentpb/collector.proto | 18 +- api/qanpb/collector.pb.go | 141 ++++- api/qanpb/collector.pb.validate.go | 16 + api/qanpb/collector.proto | 21 +- .../object_details/get_metrics_responses.go | 12 + .../client/profile/get_report_responses.go | 12 + api/qanpb/json/qanpb.json | 76 ++- api/qanpb/qan.pb.go | 179 ++++--- api/qanpb/qan.pb.validate.go | 8 + api/qanpb/qan.proto | 12 +- api/swagger/swagger-dev.json | 76 ++- descriptor.bin | Bin 811632 -> 815154 bytes managed/services/qan/client.go | 12 +- managed/services/qan/client_test.go | 130 ++--- .../sql/17_shared_blk_columns.down.sql | 11 + .../sql/17_shared_blk_columns.up.sql | 11 + qan-api2/models/base.go | 24 +- qan-api2/models/data_ingestion.go | 24 +- qan-api2/models/metrics.go | 17 +- qan-api2/services/analytics/base.go | 28 +- qan-api2/services/analytics/metrics_names.go | 130 ++--- .../GetMetrics_group_by_queryid.json | 244 +++++++++ .../GetMetrics_sparklines_90_points.json | 76 +++ qan-api2/test_data/GetMetrics_total.json | 499 ++++++++++++++++++ 36 files changed, 2270 insertions(+), 910 deletions(-) create mode 100644 agent/agents/postgres/pgstatstatements/pg_stat_statements_models.go create mode 100644 qan-api2/migrations/sql/17_shared_blk_columns.down.sql create mode 100644 qan-api2/migrations/sql/17_shared_blk_columns.up.sql diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index 3d51b98349..a1b6ec790f 100644 --- a/.github/workflows/agent.yml +++ b/.github/workflows/agent.yml @@ -26,15 +26,15 @@ jobs: strategy: matrix: images: - - { mysql: 'mysql:5.6', mongo: 'mongo:4.2', postgres: 'postgres:10', pmm_server: 'percona/pmm-server:2.0.0' } - - { mysql: 'mysql:5.7', mongo: 'mongo:4.4', postgres: 'postgres:11', pmm_server: 'percona/pmm-server:2.0.1' } - - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:12', pmm_server: 'percona/pmm-server:2.1.0' } - - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:13', pmm_server: 'percona/pmm-server:2.2.0' } + - { mysql: 'mysql:5.6', mongo: 'mongo:4.2', postgres: 'postgres:14', pmm_server: 'percona/pmm-server:2.0.0' } + - { mysql: 'mysql:5.7', mongo: 'mongo:4.4', postgres: 'postgres:15', pmm_server: 'percona/pmm-server:2.0.1' } + - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:16', pmm_server: 'percona/pmm-server:2.1.0' } + - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:17rc1', pmm_server: 'percona/pmm-server:2.2.0' } # Percona + latest PMM Server release - - { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.2', postgres: 'perconalab/percona-distribution-postgresql:11', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } - - { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:12.8-pg_stat', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } - - { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:13.5-pg_stat', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } + - { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.2', postgres: 'perconalab/percona-distribution-postgresql:15', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } + - { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:16', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } + - { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:17-dev', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' } # MariaDB (only 3 latest GA versions) # + older supported MongoDB versions @@ -44,9 +44,9 @@ jobs: # - MYSQL_IMAGE=mariadb:10.0 # - MYSQL_IMAGE=mariadb:10.1 - - { mysql: 'mariadb:10.2', mongo: 'mongo:4.4', postgres: 'postgres:9.4', pmm_server: 'perconalab/pmm-server:dev-latest' } - - { mysql: 'mariadb:10.3', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'postgres:9.5', pmm_server: 'perconalab/pmm-server:dev-latest' } - - { mysql: 'mariadb:10.4', postgres: 'postgres:9.6', pmm_server: 'perconalab/pmm-server:dev-latest' } + - { mysql: 'mariadb:10.2', mongo: 'mongo:4.4', postgres: 'postgres:12', pmm_server: 'perconalab/pmm-server:dev-latest' } + - { mysql: 'mariadb:10.3', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:dev-latest' } + - { mysql: 'mariadb:10.4', postgres: 'postgres:14', pmm_server: 'perconalab/pmm-server:dev-latest' } continue-on-error: true diff --git a/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go b/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go index 5b26b531d8..597b24d91a 100644 --- a/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go +++ b/agent/agents/postgres/pgstatmonitor/pgstatmonitor.go @@ -85,6 +85,13 @@ const ( pgStatMonitorVersion20PG13 pgStatMonitorVersion20PG14 pgStatMonitorVersion20PG15 + pgStatMonitorVersion20PG16 + pgStatMonitorVersion21PG12 + pgStatMonitorVersion21PG13 + pgStatMonitorVersion21PG14 + pgStatMonitorVersion21PG15 + pgStatMonitorVersion21PG16 + pgStatMonitorVersion21PG17 ) const ( @@ -184,40 +191,54 @@ func getPGMonitorVersion(q *reform.Querier) (pgStatMonitorVersion, pgStatMonitor var version pgStatMonitorVersion switch { + case vPGSM.Core().GreaterThanOrEqual(v21): + switch { + case vPG >= 17: + version = pgStatMonitorVersion21PG17 + case vPG >= 16: + version = pgStatMonitorVersion21PG16 + case vPG >= 15: + version = pgStatMonitorVersion21PG15 + case vPG >= 14: + version = pgStatMonitorVersion21PG14 + case vPG >= 13: + version = pgStatMonitorVersion21PG13 + default: + version = pgStatMonitorVersion21PG12 + } case vPGSM.Core().GreaterThanOrEqual(v20): - if vPG >= 15 { + switch { + case vPG >= 16: + version = pgStatMonitorVersion20PG16 + case vPG >= 15: version = pgStatMonitorVersion20PG15 - break - } - if vPG >= 14 { + case vPG >= 14: version = pgStatMonitorVersion20PG14 - break - } - if vPG >= 13 { + case vPG >= 13: version = pgStatMonitorVersion20PG13 - break + default: + version = pgStatMonitorVersion20PG12 } - version = pgStatMonitorVersion20PG12 case vPGSM.Core().GreaterThanOrEqual(v11): - if vPG >= 14 { + switch { + case vPG >= 14: version = pgStatMonitorVersion11PG14 - break - } - if vPG >= 13 { + case vPG >= 13: version = pgStatMonitorVersion11PG13 - break + default: + version = pgStatMonitorVersion11PG12 } - version = pgStatMonitorVersion11PG12 + case vPGSM.Core().GreaterThanOrEqual(v10): - if vPG >= 14 { + switch { + case vPG >= 14: version = pgStatMonitorVersion10PG14 - break - } - if vPG >= 13 { + case vPG >= 13: version = pgStatMonitorVersion10PG13 - break + default: + version = pgStatMonitorVersion10PG12 } - version = pgStatMonitorVersion10PG12 + case vPGSM.GreaterThanOrEqual(v09): version = pgStatMonitorVersion09 case vPGSM.GreaterThanOrEqual(v08): @@ -563,10 +584,10 @@ func (m *PGStatMonitorQAN) makeBuckets(current, cache map[time.Time]map[string]* mb.Postgresql.HistogramItems = histogram } - if (currentPSM.PlanTotalTime - prevPSM.PlanTotalTime) != 0 { - mb.Postgresql.MPlanTimeSum = float32(currentPSM.PlanTotalTime-prevPSM.PlanTotalTime) / 1000 - mb.Postgresql.MPlanTimeMin = float32(currentPSM.PlanMinTime) / 1000 - mb.Postgresql.MPlanTimeMax = float32(currentPSM.PlanMaxTime) / 1000 + if (currentPSM.TotalPlanTime - prevPSM.TotalPlanTime) != 0 { + mb.Postgresql.MPlanTimeSum = float32(currentPSM.TotalPlanTime-prevPSM.TotalPlanTime) / 1000 + mb.Postgresql.MPlanTimeMin = float32(currentPSM.MinPlanTime) / 1000 + mb.Postgresql.MPlanTimeMax = float32(currentPSM.MaxPlanTime) / 1000 mb.Postgresql.MPlanTimeCnt = count } @@ -618,9 +639,11 @@ func (m *PGStatMonitorQAN) makeBuckets(current, cache map[time.Time]map[string]* {float32(currentPSM.WalBytes - prevPSM.WalBytes), &mb.Postgresql.MWalBytesSum, &mb.Postgresql.MWalBytesCnt}, // convert milliseconds to seconds - {float32(currentPSM.TotalTime-prevPSM.TotalTime) / 1000, &mb.Common.MQueryTimeSum, &mb.Common.MQueryTimeCnt}, - {float32(currentPSM.BlkReadTime-prevPSM.BlkReadTime) / 1000, &mb.Postgresql.MBlkReadTimeSum, &mb.Postgresql.MBlkReadTimeCnt}, - {float32(currentPSM.BlkWriteTime-prevPSM.BlkWriteTime) / 1000, &mb.Postgresql.MBlkWriteTimeSum, &mb.Postgresql.MBlkWriteTimeCnt}, + {float32(currentPSM.TotalExecTime-prevPSM.TotalExecTime) / 1000, &mb.Common.MQueryTimeSum, &mb.Common.MQueryTimeCnt}, + {float32(currentPSM.SharedBlkReadTime-prevPSM.SharedBlkReadTime) / 1000, &mb.Postgresql.MSharedBlkReadTimeSum, &mb.Postgresql.MSharedBlkReadTimeCnt}, + {float32(currentPSM.SharedBlkWriteTime-prevPSM.SharedBlkWriteTime) / 1000, &mb.Postgresql.MSharedBlkWriteTimeSum, &mb.Postgresql.MSharedBlkWriteTimeCnt}, + {float32(currentPSM.LocalBlkReadTime-prevPSM.LocalBlkReadTime) / 1000, &mb.Postgresql.MLocalBlkReadTimeSum, &mb.Postgresql.MLocalBlkReadTimeCnt}, + {float32(currentPSM.LocalBlkWriteTime-prevPSM.LocalBlkWriteTime) / 1000, &mb.Postgresql.MLocalBlkWriteTimeSum, &mb.Postgresql.MLocalBlkWriteTimeCnt}, // convert microseconds to seconds {float32(cpuSysTime) / 1000000, &mb.Postgresql.MCpuSysTimeSum, &mb.Postgresql.MCpuSysTimeCnt}, diff --git a/agent/agents/postgres/pgstatmonitor/pgstatmonitor_models.go b/agent/agents/postgres/pgstatmonitor/pgstatmonitor_models.go index 275b3e15f3..3b91ca41f9 100644 --- a/agent/agents/postgres/pgstatmonitor/pgstatmonitor_models.go +++ b/agent/agents/postgres/pgstatmonitor/pgstatmonitor_models.go @@ -27,6 +27,7 @@ import ( ) var ( + v21 = version.Must(version.NewVersion("2.1.0")) v20 = version.Must(version.NewVersion("2.0.0")) v11 = version.Must(version.NewVersion("1.1.0")) v10 = version.Must(version.NewVersion("1.0.0")) @@ -46,30 +47,32 @@ type pgStatMonitor struct { BucketStartTimeString string // rest - Bucket int64 - BucketStartTime time.Time - ClientIP string - QueryID string // we select only non-NULL rows - Query string // we select only non-NULL rows - Comments *string - Relations pq.StringArray - Calls int64 - SharedBlksHit int64 - SharedBlksRead int64 - SharedBlksDirtied int64 - SharedBlksWritten int64 - LocalBlksHit int64 - LocalBlksRead int64 - LocalBlksDirtied int64 - LocalBlksWritten int64 - TempBlksRead int64 - TempBlksWritten int64 - BlkReadTime float64 - BlkWriteTime float64 - RespCalls pq.StringArray - CPUUserTime float64 - CPUSysTime float64 - Rows int64 + Bucket int64 + BucketStartTime time.Time + ClientIP string + QueryID string // we select only non-NULL rows + Query string // we select only non-NULL rows + Comments *string + Relations pq.StringArray + Calls int64 + SharedBlksHit int64 + SharedBlksRead int64 + SharedBlksDirtied int64 + SharedBlksWritten int64 + LocalBlksHit int64 + LocalBlksRead int64 + LocalBlksDirtied int64 + LocalBlksWritten int64 + TempBlksRead int64 + TempBlksWritten int64 + SharedBlkReadTime float64 + SharedBlkWriteTime float64 + LocalBlkReadTime float64 + LocalBlkWriteTime float64 + RespCalls pq.StringArray + CPUUserTime float64 + CPUSysTime float64 + Rows int64 TopQueryID *string PlanID *string @@ -81,16 +84,16 @@ type pgStatMonitor struct { Elevel int32 Sqlcode *string Message *string - TotalTime float64 - MinTime float64 - MaxTime float64 - MeanTime float64 - StddevTime float64 + TotalExecTime float64 + MinExecTime float64 + MaxExecTime float64 + MeanExecTime float64 + StddevExecTime float64 PlansCalls int64 - PlanTotalTime float64 - PlanMinTime float64 - PlanMaxTime float64 - PlanMeanTime float64 + TotalPlanTime float64 + MinPlanTime float64 + MaxPlanTime float64 + MeanPlanTime float64 WalRecords int64 WalFpi int64 WalBytes int64 @@ -122,8 +125,6 @@ func newPgStatMonitorStructs(vPGSM pgStatMonitorVersion, vPG pgVersion) (*pgStat {info: parse.FieldInfo{Name: "LocalBlksWritten", Type: "int64", Column: "local_blks_written"}, pointer: &s.LocalBlksWritten}, {info: parse.FieldInfo{Name: "TempBlksRead", Type: "int64", Column: "temp_blks_read"}, pointer: &s.TempBlksRead}, {info: parse.FieldInfo{Name: "TempBlksWritten", Type: "int64", Column: "temp_blks_written"}, pointer: &s.TempBlksWritten}, - {info: parse.FieldInfo{Name: "BlkReadTime", Type: "float64", Column: "blk_read_time"}, pointer: &s.BlkReadTime}, - {info: parse.FieldInfo{Name: "BlkWriteTime", Type: "float64", Column: "blk_write_time"}, pointer: &s.BlkWriteTime}, {info: parse.FieldInfo{Name: "RespCalls", Type: "pq.StringArray", Column: "resp_calls"}, pointer: &s.RespCalls}, {info: parse.FieldInfo{Name: "CPUUserTime", Type: "float64", Column: "cpu_user_time"}, pointer: &s.CPUUserTime}, {info: parse.FieldInfo{Name: "CPUSysTime", Type: "float64", Column: "cpu_sys_time"}, pointer: &s.CPUSysTime}, @@ -150,10 +151,10 @@ func newPgStatMonitorStructs(vPGSM pgStatMonitorVersion, vPG pgVersion) (*pgStat } if vPGSM == pgStatMonitorVersion09 { fields = append(fields, - field{info: parse.FieldInfo{Name: "PlanTotalTime", Type: "float64", Column: "plan_total_time"}, pointer: &s.PlanTotalTime}, - field{info: parse.FieldInfo{Name: "PlanMinTime", Type: "float64", Column: "plan_min_time"}, pointer: &s.PlanMinTime}, - field{info: parse.FieldInfo{Name: "PlanMaxTime", Type: "float64", Column: "plan_max_time"}, pointer: &s.PlanMaxTime}, - field{info: parse.FieldInfo{Name: "PlanMeanTime", Type: "float64", Column: "plan_mean_time"}, pointer: &s.PlanMeanTime}, + field{info: parse.FieldInfo{Name: "TotalPlanTime", Type: "float64", Column: "plan_total_time"}, pointer: &s.TotalPlanTime}, + field{info: parse.FieldInfo{Name: "MinPlanTime", Type: "float64", Column: "plan_min_time"}, pointer: &s.MinPlanTime}, + field{info: parse.FieldInfo{Name: "MaxPlanTime", Type: "float64", Column: "plan_max_time"}, pointer: &s.MaxPlanTime}, + field{info: parse.FieldInfo{Name: "MeanPlanTime", Type: "float64", Column: "plan_mean_time"}, pointer: &s.MeanPlanTime}, field{info: parse.FieldInfo{Name: "PlansCalls", Type: "int64", Column: "plans_calls"}, pointer: &s.PlansCalls}) } if vPGSM >= pgStatMonitorVersion09 { @@ -176,25 +177,37 @@ func newPgStatMonitorStructs(vPGSM pgStatMonitorVersion, vPG pgVersion) (*pgStat fields = append(fields, field{info: parse.FieldInfo{Name: "QueryID", Type: "string", Column: "queryid"}, pointer: &s.QueryID}) } + if vPGSM >= pgStatMonitorVersion21PG17 { + fields = append(fields, + field{info: parse.FieldInfo{Name: "SharedBlkReadTime", Type: "float64", Column: "shared_blk_read_time"}, pointer: &s.SharedBlkReadTime}, + field{info: parse.FieldInfo{Name: "SharedBlkWriteTime", Type: "float64", Column: "shared_blk_write_time"}, pointer: &s.SharedBlkWriteTime}, + field{info: parse.FieldInfo{Name: "LocalBlkReadTime", Type: "float64", Column: "local_blk_read_time"}, pointer: &s.LocalBlkReadTime}, + field{info: parse.FieldInfo{Name: "LocalBlkWriteTime", Type: "float64", Column: "local_blk_write_time"}, pointer: &s.LocalBlkWriteTime}) + } else { + fields = append(fields, + field{info: parse.FieldInfo{Name: "SharedBlkReadTime", Type: "float64", Column: "blk_read_time"}, pointer: &s.SharedBlkReadTime}, + field{info: parse.FieldInfo{Name: "SharedBlkWriteTime", Type: "float64", Column: "blk_write_time"}, pointer: &s.SharedBlkWriteTime}) + } + if vPG <= 12 { fields = append(fields, - field{info: parse.FieldInfo{Name: "TotalTime", Type: "float64", Column: "total_time"}, pointer: &s.TotalTime}, - field{info: parse.FieldInfo{Name: "MinTime", Type: "float64", Column: "min_time"}, pointer: &s.MinTime}, - field{info: parse.FieldInfo{Name: "MaxTime", Type: "float64", Column: "max_time"}, pointer: &s.MaxTime}, - field{info: parse.FieldInfo{Name: "MeanTime", Type: "float64", Column: "mean_time"}, pointer: &s.MeanTime}, - field{info: parse.FieldInfo{Name: "StddevTime", Type: "float64", Column: "stddev_time"}, pointer: &s.StddevTime}) + field{info: parse.FieldInfo{Name: "TotalExecTime", Type: "float64", Column: "total_time"}, pointer: &s.TotalExecTime}, + field{info: parse.FieldInfo{Name: "MinExecTime", Type: "float64", Column: "min_time"}, pointer: &s.MinExecTime}, + field{info: parse.FieldInfo{Name: "MaxExecTime", Type: "float64", Column: "max_time"}, pointer: &s.MaxExecTime}, + field{info: parse.FieldInfo{Name: "MeanExecTime", Type: "float64", Column: "mean_time"}, pointer: &s.MeanExecTime}, + field{info: parse.FieldInfo{Name: "StddevExecTime", Type: "float64", Column: "stddev_time"}, pointer: &s.StddevExecTime}) } if vPG >= 13 { fields = append(fields, - field{info: parse.FieldInfo{Name: "TotalTime", Type: "float64", Column: "total_exec_time"}, pointer: &s.TotalTime}, - field{info: parse.FieldInfo{Name: "MinTime", Type: "float64", Column: "min_exec_time"}, pointer: &s.MinTime}, - field{info: parse.FieldInfo{Name: "MaxTime", Type: "float64", Column: "max_exec_time"}, pointer: &s.MaxTime}, - field{info: parse.FieldInfo{Name: "MeanTime", Type: "float64", Column: "mean_exec_time"}, pointer: &s.MeanTime}, - field{info: parse.FieldInfo{Name: "StddevTime", Type: "float64", Column: "stddev_exec_time"}, pointer: &s.StddevTime}, - field{info: parse.FieldInfo{Name: "PlanTotalTime", Type: "float64", Column: "total_plan_time"}, pointer: &s.PlanTotalTime}, - field{info: parse.FieldInfo{Name: "PlanMinTime", Type: "float64", Column: "min_plan_time"}, pointer: &s.PlanMinTime}, - field{info: parse.FieldInfo{Name: "PlanMaxTime", Type: "float64", Column: "max_plan_time"}, pointer: &s.PlanMaxTime}, - field{info: parse.FieldInfo{Name: "PlanMeanTime", Type: "float64", Column: "mean_plan_time"}, pointer: &s.PlanMeanTime}) + field{info: parse.FieldInfo{Name: "TotalExecTime", Type: "float64", Column: "total_exec_time"}, pointer: &s.TotalExecTime}, + field{info: parse.FieldInfo{Name: "MinExecTime", Type: "float64", Column: "min_exec_time"}, pointer: &s.MinExecTime}, + field{info: parse.FieldInfo{Name: "MaxExecTime", Type: "float64", Column: "max_exec_time"}, pointer: &s.MaxExecTime}, + field{info: parse.FieldInfo{Name: "MeanExecTime", Type: "float64", Column: "mean_exec_time"}, pointer: &s.MeanExecTime}, + field{info: parse.FieldInfo{Name: "StddevExecTime", Type: "float64", Column: "stddev_exec_time"}, pointer: &s.StddevExecTime}, + field{info: parse.FieldInfo{Name: "TotalPlanTime", Type: "float64", Column: "total_plan_time"}, pointer: &s.TotalPlanTime}, + field{info: parse.FieldInfo{Name: "MinPlanTime", Type: "float64", Column: "min_plan_time"}, pointer: &s.MinPlanTime}, + field{info: parse.FieldInfo{Name: "MaxPlanTime", Type: "float64", Column: "max_plan_time"}, pointer: &s.MaxPlanTime}, + field{info: parse.FieldInfo{Name: "MeanPlanTime", Type: "float64", Column: "mean_plan_time"}, pointer: &s.MeanPlanTime}) if vPGSM >= pgStatMonitorVersion09 { fields = append(fields, @@ -274,7 +287,7 @@ func (v *pgStatMonitorAllViewType) NewStruct() reform.Struct { //nolint:ireturn // String returns a string representation of this struct or record. func (s pgStatMonitor) String() string { - res := make([]string, 49) + res := make([]string, 51) res[0] = "Bucket: " + reform.Inspect(s.Bucket, true) res[1] = "BucketStartTime: " + reform.Inspect(s.BucketStartTime, true) res[2] = "UserID: " + reform.Inspect(s.UserID, true) @@ -283,7 +296,7 @@ func (s pgStatMonitor) String() string { res[5] = "Query: " + reform.Inspect(s.Query, true) res[6] = "Relations: " + reform.Inspect(s.Relations, true) res[7] = "Calls: " + reform.Inspect(s.Calls, true) - res[8] = "TotalTime: " + reform.Inspect(s.TotalTime, true) + res[8] = "TotalExecTime: " + reform.Inspect(s.TotalExecTime, true) res[9] = "SharedBlksHit: " + reform.Inspect(s.SharedBlksHit, true) res[10] = "SharedBlksRead: " + reform.Inspect(s.SharedBlksRead, true) res[11] = "SharedBlksDirtied: " + reform.Inspect(s.SharedBlksDirtied, true) @@ -294,36 +307,38 @@ func (s pgStatMonitor) String() string { res[16] = "LocalBlksWritten: " + reform.Inspect(s.LocalBlksWritten, true) res[17] = "TempBlksRead: " + reform.Inspect(s.TempBlksRead, true) res[18] = "TempBlksWritten: " + reform.Inspect(s.TempBlksWritten, true) - res[19] = "BlkReadTime: " + reform.Inspect(s.BlkReadTime, true) - res[20] = "BlkWriteTime: " + reform.Inspect(s.BlkWriteTime, true) - res[21] = "RespCalls: " + reform.Inspect(s.RespCalls, true) - res[22] = "CPUUserTime: " + reform.Inspect(s.CPUUserTime, true) - res[23] = "CPUSysTime: " + reform.Inspect(s.CPUSysTime, true) - res[24] = "DBID: " + reform.Inspect(s.DBID, true) - res[25] = "DatName: " + reform.Inspect(s.DatName, true) - res[26] = "Rows: " + reform.Inspect(s.Rows, true) - res[27] = "TopQueryID: " + reform.Inspect(s.TopQueryID, true) - res[28] = "PlanID: " + reform.Inspect(s.PlanID, true) - res[29] = "QueryPlan: " + reform.Inspect(s.QueryPlan, true) - res[30] = "TopQuery: " + reform.Inspect(s.TopQuery, true) - res[31] = "ApplicationName: " + reform.Inspect(s.ApplicationName, true) - res[32] = "CmdType: " + reform.Inspect(s.CmdType, true) - res[33] = "CmdTypeText: " + reform.Inspect(s.CmdTypeText, true) - res[34] = "Elevel: " + reform.Inspect(s.Elevel, true) - res[35] = "Sqlcode: " + reform.Inspect(s.Sqlcode, true) - res[36] = "Message: " + reform.Inspect(s.Message, true) - res[37] = "MinTime: " + reform.Inspect(s.MinTime, true) - res[38] = "MaxTime: " + reform.Inspect(s.MaxTime, true) - res[39] = "MeanTime: " + reform.Inspect(s.MeanTime, true) - res[40] = "StddevTime: " + reform.Inspect(s.StddevTime, true) - res[41] = "PlansCalls: " + reform.Inspect(s.PlansCalls, true) - res[42] = "PlanTotalTime: " + reform.Inspect(s.PlanTotalTime, true) - res[43] = "PlanMinTime: " + reform.Inspect(s.PlanMinTime, true) - res[44] = "PlanMaxTime: " + reform.Inspect(s.PlanMaxTime, true) - res[45] = "PlanMeanTime: " + reform.Inspect(s.PlanMeanTime, true) - res[46] = "WalRecords: " + reform.Inspect(s.WalRecords, true) - res[47] = "WalFpi: " + reform.Inspect(s.WalFpi, true) - res[48] = "WalBytes: " + reform.Inspect(s.WalBytes, true) + res[19] = "SharedBlkReadTime: " + reform.Inspect(s.SharedBlkReadTime, true) + res[20] = "SharedBlkWriteTime: " + reform.Inspect(s.SharedBlkWriteTime, true) + res[21] = "LocalBlkReadTime: " + reform.Inspect(s.LocalBlkReadTime, true) + res[22] = "LocalBlkWriteTime: " + reform.Inspect(s.LocalBlkWriteTime, true) + res[23] = "RespCalls: " + reform.Inspect(s.RespCalls, true) + res[24] = "CPUUserTime: " + reform.Inspect(s.CPUUserTime, true) + res[25] = "CPUSysTime: " + reform.Inspect(s.CPUSysTime, true) + res[26] = "DBID: " + reform.Inspect(s.DBID, true) + res[27] = "DatName: " + reform.Inspect(s.DatName, true) + res[28] = "Rows: " + reform.Inspect(s.Rows, true) + res[29] = "TopQueryID: " + reform.Inspect(s.TopQueryID, true) + res[30] = "PlanID: " + reform.Inspect(s.PlanID, true) + res[31] = "QueryPlan: " + reform.Inspect(s.QueryPlan, true) + res[32] = "TopQuery: " + reform.Inspect(s.TopQuery, true) + res[33] = "ApplicationName: " + reform.Inspect(s.ApplicationName, true) + res[34] = "CmdType: " + reform.Inspect(s.CmdType, true) + res[35] = "CmdTypeText: " + reform.Inspect(s.CmdTypeText, true) + res[36] = "Elevel: " + reform.Inspect(s.Elevel, true) + res[37] = "Sqlcode: " + reform.Inspect(s.Sqlcode, true) + res[38] = "Message: " + reform.Inspect(s.Message, true) + res[39] = "MinExecTime: " + reform.Inspect(s.MinExecTime, true) + res[40] = "MaxExecTime: " + reform.Inspect(s.MaxExecTime, true) + res[41] = "MeanExecTime: " + reform.Inspect(s.MeanExecTime, true) + res[42] = "StddevExecTime: " + reform.Inspect(s.StddevExecTime, true) + res[43] = "PlansCalls: " + reform.Inspect(s.PlansCalls, true) + res[44] = "TotalPlanTime: " + reform.Inspect(s.TotalPlanTime, true) + res[45] = "MinPlanTime: " + reform.Inspect(s.MinPlanTime, true) + res[46] = "MaxPlanTime: " + reform.Inspect(s.MaxPlanTime, true) + res[47] = "MeanPlanTime: " + reform.Inspect(s.MeanPlanTime, true) + res[48] = "WalRecords: " + reform.Inspect(s.WalRecords, true) + res[49] = "WalFpi: " + reform.Inspect(s.WalFpi, true) + res[50] = "WalBytes: " + reform.Inspect(s.WalBytes, true) return strings.Join(res, ", ") } diff --git a/agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go b/agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go index 2226e04e8b..335579b4f1 100644 --- a/agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go +++ b/agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go @@ -249,31 +249,33 @@ func TestPGStatMonitorSchema(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, - MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, - MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 239, - MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, - MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, - MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, - MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, - CmdType: selectCMDType, - HistogramItems: actual.Postgresql.HistogramItems, - MPlansCallsSum: actual.Postgresql.MPlansCallsSum, - MPlansCallsCnt: mPlansCallsCnt, - MPlanTimeCnt: mPlansTimeCnt, - MPlanTimeSum: actual.Postgresql.MPlanTimeSum, - MPlanTimeMin: actual.Postgresql.MPlanTimeMin, - MPlanTimeMax: actual.Postgresql.MPlanTimeMax, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, + MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, + MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 239, + MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, + MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, + MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, + MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, + CmdType: selectCMDType, + HistogramItems: actual.Postgresql.HistogramItems, + MPlansCallsSum: actual.Postgresql.MPlansCallsSum, + MPlansCallsCnt: mPlansCallsCnt, + MPlanTimeCnt: mPlansTimeCnt, + MPlanTimeSum: actual.Postgresql.MPlanTimeSum, + MPlanTimeMin: actual.Postgresql.MPlanTimeMin, + MPlanTimeMax: actual.Postgresql.MPlanTimeMax, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) assert.Regexp(t, `\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}`, actual.Common.ClientHost) _, err = db.Exec(selectAllCountries) @@ -307,29 +309,31 @@ func TestPGStatMonitorSchema(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: 5, - MRowsCnt: 1, - MRowsSum: 239, - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, - MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, - MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, - MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, - CmdType: selectCMDType, - HistogramItems: actual.Postgresql.HistogramItems, - MPlansCallsSum: actual.Postgresql.MPlansCallsSum, - MPlansCallsCnt: mPlansCallsCnt, - MPlanTimeCnt: mPlansTimeCnt, - MPlanTimeSum: actual.Postgresql.MPlanTimeSum, - MPlanTimeMin: actual.Postgresql.MPlanTimeMin, - MPlanTimeMax: actual.Postgresql.MPlanTimeMax, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: 5, + MRowsCnt: 1, + MRowsSum: 239, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, + MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, + MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, + MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, + CmdType: selectCMDType, + HistogramItems: actual.Postgresql.HistogramItems, + MPlansCallsSum: actual.Postgresql.MPlansCallsSum, + MPlansCallsCnt: mPlansCallsCnt, + MPlanTimeCnt: mPlansTimeCnt, + MPlanTimeSum: actual.Postgresql.MPlanTimeSum, + MPlanTimeMin: actual.Postgresql.MPlanTimeMin, + MPlanTimeMax: actual.Postgresql.MPlanTimeMax, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) }) t.Run("AllCountriesTruncated", func(t *testing.T) { @@ -381,31 +385,33 @@ func TestPGStatMonitorSchema(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, - MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, - MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 30, - MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, - MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, - MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, - MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, - CmdType: selectCMDType, - HistogramItems: actual.Postgresql.HistogramItems, - MPlansCallsSum: actual.Postgresql.MPlansCallsSum, - MPlansCallsCnt: mPlansCallsCnt, - MPlanTimeCnt: mPlansTimeCnt, - MPlanTimeSum: actual.Postgresql.MPlanTimeSum, - MPlanTimeMin: actual.Postgresql.MPlanTimeMin, - MPlanTimeMax: actual.Postgresql.MPlanTimeMax, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, + MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, + MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 30, + MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, + MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, + MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, + MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, + CmdType: selectCMDType, + HistogramItems: actual.Postgresql.HistogramItems, + MPlansCallsSum: actual.Postgresql.MPlansCallsSum, + MPlansCallsCnt: mPlansCallsCnt, + MPlanTimeCnt: mPlansTimeCnt, + MPlanTimeSum: actual.Postgresql.MPlanTimeSum, + MPlanTimeMin: actual.Postgresql.MPlanTimeMin, + MPlanTimeMax: actual.Postgresql.MPlanTimeMax, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) assert.Regexp(t, `\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}`, actual.Common.ClientHost) _, err = db.Exec(q, args...) @@ -420,7 +426,7 @@ func TestPGStatMonitorSchema(t *testing.T) { actual = buckets[0] actual.Common.Username = strings.ReplaceAll(actual.Common.Username, `"`, "") assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09) - assert.InDelta(t, 0, actual.Postgresql.MBlkReadTimeCnt, 1) + assert.InDelta(t, 0, actual.Postgresql.MSharedBlkReadTimeCnt, 1) assert.InDelta(t, 5, actual.Postgresql.MSharedBlksHitSum, 2) expected = &agentpb.MetricsBucket{ Common: &agentpb.MetricsBucket_Common{ @@ -442,29 +448,31 @@ func TestPGStatMonitorSchema(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 30, - MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, - MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, - MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, - MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, - CmdType: selectCMDType, - HistogramItems: actual.Postgresql.HistogramItems, - MPlansCallsSum: actual.Postgresql.MPlansCallsSum, - MPlansCallsCnt: mPlansCallsCnt, - MPlanTimeCnt: mPlansTimeCnt, - MPlanTimeSum: actual.Postgresql.MPlanTimeSum, - MPlanTimeMin: actual.Postgresql.MPlanTimeMin, - MPlanTimeMax: actual.Postgresql.MPlanTimeMax, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 30, + MCpuUserTimeCnt: actual.Postgresql.MCpuUserTimeCnt, + MCpuUserTimeSum: actual.Postgresql.MCpuUserTimeSum, + MCpuSysTimeCnt: actual.Postgresql.MCpuSysTimeCnt, + MCpuSysTimeSum: actual.Postgresql.MCpuSysTimeSum, + CmdType: selectCMDType, + HistogramItems: actual.Postgresql.HistogramItems, + MPlansCallsSum: actual.Postgresql.MPlansCallsSum, + MPlansCallsCnt: mPlansCallsCnt, + MPlanTimeCnt: mPlansTimeCnt, + MPlanTimeSum: actual.Postgresql.MPlanTimeSum, + MPlanTimeMin: actual.Postgresql.MPlanTimeMin, + MPlanTimeMax: actual.Postgresql.MPlanTimeMax, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) }) t.Run("CheckMBlkReadTime", func(t *testing.T) { @@ -518,7 +526,7 @@ func TestPGStatMonitorSchema(t *testing.T) { actual := buckets[0] actual.Common.Username = strings.ReplaceAll(actual.Common.Username, `"`, "") - assert.NotZero(t, actual.Postgresql.MBlkReadTimeSum) + assert.NotZero(t, actual.Postgresql.MSharedBlkReadTimeSum) expectedFingerprint := fmt.Sprintf("INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES ($1, $2, $3, $4)", tableName) expected := &agentpb.MetricsBucket{ Common: &agentpb.MetricsBucket_Common{ @@ -541,8 +549,10 @@ func TestPGStatMonitorSchema(t *testing.T) { Tables: []string{fmt.Sprintf("public.%s", tableName)}, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: float32(n), - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, + MSharedBlkReadTimeCnt: float32(n), + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, MSharedBlksWrittenCnt: actual.Postgresql.MSharedBlksWrittenCnt, @@ -572,7 +582,7 @@ func TestPGStatMonitorSchema(t *testing.T) { }, } tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) assert.Regexp(t, `\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}`, actual.Common.ClientHost) }) } diff --git a/agent/agents/postgres/pgstatstatements/models.go b/agent/agents/postgres/pgstatstatements/models.go index 00746732fe..b68efad06c 100644 --- a/agent/agents/postgres/pgstatstatements/models.go +++ b/agent/agents/postgres/pgstatstatements/models.go @@ -14,8 +14,6 @@ package pgstatstatements -import "fmt" - //go:generate ../../../../bin/reform // pgStatDatabase represents a row in pg_stat_database view. @@ -33,49 +31,3 @@ type pgUser struct { UserID int64 `reform:"usesysid"` UserName *string `reform:"usename"` } - -// pgStatStatements represents a row in pg_stat_statements view. -// -//reform:pg_stat_statements -type pgStatStatements struct { - UserID int64 `reform:"userid"` - DBID int64 `reform:"dbid"` - QueryID int64 `reform:"queryid"` // we select only non-NULL rows - Query string `reform:"query"` // we select only non-NULL rows - Calls int64 `reform:"calls"` - TotalTime float64 `reform:"total_time"` - // MinTime *float64 `reform:"min_time"` - // MaxTime *float64 `reform:"max_time"` - // MeanTime *float64 `reform:"mean_time"` - // StddevTime *float64 `reform:"stddev_time"` - Rows int64 `reform:"rows"` - SharedBlksHit int64 `reform:"shared_blks_hit"` - SharedBlksRead int64 `reform:"shared_blks_read"` - SharedBlksDirtied int64 `reform:"shared_blks_dirtied"` - SharedBlksWritten int64 `reform:"shared_blks_written"` - LocalBlksHit int64 `reform:"local_blks_hit"` - LocalBlksRead int64 `reform:"local_blks_read"` - LocalBlksDirtied int64 `reform:"local_blks_dirtied"` - LocalBlksWritten int64 `reform:"local_blks_written"` - TempBlksRead int64 `reform:"temp_blks_read"` - TempBlksWritten int64 `reform:"temp_blks_written"` - BlkReadTime float64 `reform:"blk_read_time"` - BlkWriteTime float64 `reform:"blk_write_time"` -} - -// pgStatStatementsExtended contains pgStatStatements data and extends it with database, username and tables data. -// It's made for performance reason. -type pgStatStatementsExtended struct { - pgStatStatements - - Database string - Username string - Tables []string - IsQueryTruncated bool - Comments map[string]string -} - -func (e *pgStatStatementsExtended) String() string { - return fmt.Sprintf("%q %q %v: %d: %s (truncated = %t) %v", - e.Database, e.Username, e.Tables, e.QueryID, e.Query, e.IsQueryTruncated, e.Comments) -} diff --git a/agent/agents/postgres/pgstatstatements/models_reform.go b/agent/agents/postgres/pgstatstatements/models_reform.go index ea7cfe7836..473f13e8bb 100644 --- a/agent/agents/postgres/pgstatstatements/models_reform.go +++ b/agent/agents/postgres/pgstatstatements/models_reform.go @@ -172,173 +172,7 @@ var ( _ fmt.Stringer = (*pgUser)(nil) ) -type pgStatStatementsViewType struct { - s parse.StructInfo - z []interface{} -} - -// Schema returns a schema name in SQL database (""). -func (v *pgStatStatementsViewType) Schema() string { - return v.s.SQLSchema -} - -// Name returns a view or table name in SQL database ("pg_stat_statements"). -func (v *pgStatStatementsViewType) Name() string { - return v.s.SQLName -} - -// Columns returns a new slice of column names for that view or table in SQL database. -func (v *pgStatStatementsViewType) Columns() []string { - return []string{ - "userid", - "dbid", - "queryid", - "query", - "calls", - "total_time", - "rows", - "shared_blks_hit", - "shared_blks_read", - "shared_blks_dirtied", - "shared_blks_written", - "local_blks_hit", - "local_blks_read", - "local_blks_dirtied", - "local_blks_written", - "temp_blks_read", - "temp_blks_written", - "blk_read_time", - "blk_write_time", - } -} - -// NewStruct makes a new struct for that view or table. -func (v *pgStatStatementsViewType) NewStruct() reform.Struct { - return new(pgStatStatements) -} - -// pgStatStatementsView represents pg_stat_statements view or table in SQL database. -var pgStatStatementsView = &pgStatStatementsViewType{ - s: parse.StructInfo{ - Type: "pgStatStatements", - SQLName: "pg_stat_statements", - Fields: []parse.FieldInfo{ - {Name: "UserID", Type: "int64", Column: "userid"}, - {Name: "DBID", Type: "int64", Column: "dbid"}, - {Name: "QueryID", Type: "int64", Column: "queryid"}, - {Name: "Query", Type: "string", Column: "query"}, - {Name: "Calls", Type: "int64", Column: "calls"}, - {Name: "TotalTime", Type: "float64", Column: "total_time"}, - {Name: "Rows", Type: "int64", Column: "rows"}, - {Name: "SharedBlksHit", Type: "int64", Column: "shared_blks_hit"}, - {Name: "SharedBlksRead", Type: "int64", Column: "shared_blks_read"}, - {Name: "SharedBlksDirtied", Type: "int64", Column: "shared_blks_dirtied"}, - {Name: "SharedBlksWritten", Type: "int64", Column: "shared_blks_written"}, - {Name: "LocalBlksHit", Type: "int64", Column: "local_blks_hit"}, - {Name: "LocalBlksRead", Type: "int64", Column: "local_blks_read"}, - {Name: "LocalBlksDirtied", Type: "int64", Column: "local_blks_dirtied"}, - {Name: "LocalBlksWritten", Type: "int64", Column: "local_blks_written"}, - {Name: "TempBlksRead", Type: "int64", Column: "temp_blks_read"}, - {Name: "TempBlksWritten", Type: "int64", Column: "temp_blks_written"}, - {Name: "BlkReadTime", Type: "float64", Column: "blk_read_time"}, - {Name: "BlkWriteTime", Type: "float64", Column: "blk_write_time"}, - }, - PKFieldIndex: -1, - }, - z: new(pgStatStatements).Values(), -} - -// String returns a string representation of this struct or record. -func (s pgStatStatements) String() string { - res := make([]string, 19) - res[0] = "UserID: " + reform.Inspect(s.UserID, true) - res[1] = "DBID: " + reform.Inspect(s.DBID, true) - res[2] = "QueryID: " + reform.Inspect(s.QueryID, true) - res[3] = "Query: " + reform.Inspect(s.Query, true) - res[4] = "Calls: " + reform.Inspect(s.Calls, true) - res[5] = "TotalTime: " + reform.Inspect(s.TotalTime, true) - res[6] = "Rows: " + reform.Inspect(s.Rows, true) - res[7] = "SharedBlksHit: " + reform.Inspect(s.SharedBlksHit, true) - res[8] = "SharedBlksRead: " + reform.Inspect(s.SharedBlksRead, true) - res[9] = "SharedBlksDirtied: " + reform.Inspect(s.SharedBlksDirtied, true) - res[10] = "SharedBlksWritten: " + reform.Inspect(s.SharedBlksWritten, true) - res[11] = "LocalBlksHit: " + reform.Inspect(s.LocalBlksHit, true) - res[12] = "LocalBlksRead: " + reform.Inspect(s.LocalBlksRead, true) - res[13] = "LocalBlksDirtied: " + reform.Inspect(s.LocalBlksDirtied, true) - res[14] = "LocalBlksWritten: " + reform.Inspect(s.LocalBlksWritten, true) - res[15] = "TempBlksRead: " + reform.Inspect(s.TempBlksRead, true) - res[16] = "TempBlksWritten: " + reform.Inspect(s.TempBlksWritten, true) - res[17] = "BlkReadTime: " + reform.Inspect(s.BlkReadTime, true) - res[18] = "BlkWriteTime: " + reform.Inspect(s.BlkWriteTime, true) - return strings.Join(res, ", ") -} - -// Values returns a slice of struct or record field values. -// Returned interface{} values are never untyped nils. -func (s *pgStatStatements) Values() []interface{} { - return []interface{}{ - s.UserID, - s.DBID, - s.QueryID, - s.Query, - s.Calls, - s.TotalTime, - s.Rows, - s.SharedBlksHit, - s.SharedBlksRead, - s.SharedBlksDirtied, - s.SharedBlksWritten, - s.LocalBlksHit, - s.LocalBlksRead, - s.LocalBlksDirtied, - s.LocalBlksWritten, - s.TempBlksRead, - s.TempBlksWritten, - s.BlkReadTime, - s.BlkWriteTime, - } -} - -// Pointers returns a slice of pointers to struct or record fields. -// Returned interface{} values are never untyped nils. -func (s *pgStatStatements) Pointers() []interface{} { - return []interface{}{ - &s.UserID, - &s.DBID, - &s.QueryID, - &s.Query, - &s.Calls, - &s.TotalTime, - &s.Rows, - &s.SharedBlksHit, - &s.SharedBlksRead, - &s.SharedBlksDirtied, - &s.SharedBlksWritten, - &s.LocalBlksHit, - &s.LocalBlksRead, - &s.LocalBlksDirtied, - &s.LocalBlksWritten, - &s.TempBlksRead, - &s.TempBlksWritten, - &s.BlkReadTime, - &s.BlkWriteTime, - } -} - -// View returns View object for that struct. -func (s *pgStatStatements) View() reform.View { - return pgStatStatementsView -} - -// check interfaces -var ( - _ reform.View = pgStatStatementsView - _ reform.Struct = (*pgStatStatements)(nil) - _ fmt.Stringer = (*pgStatStatements)(nil) -) - func init() { parse.AssertUpToDate(&pgStatDatabaseView.s, new(pgStatDatabase)) parse.AssertUpToDate(&pgUserView.s, new(pgUser)) - parse.AssertUpToDate(&pgStatStatementsView.s, new(pgStatStatements)) } diff --git a/agent/agents/postgres/pgstatstatements/pg_stat_statements_models.go b/agent/agents/postgres/pgstatstatements/pg_stat_statements_models.go new file mode 100644 index 0000000000..6295b90092 --- /dev/null +++ b/agent/agents/postgres/pgstatstatements/pg_stat_statements_models.go @@ -0,0 +1,222 @@ +// Copyright (C) 2023 Percona LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package pgstatstatements + +import ( + "fmt" + "reflect" + "strings" + + "github.com/blang/semver" + "gopkg.in/reform.v1" + "gopkg.in/reform.v1/parse" +) + +// pgStatStatements represents a row in pg_stat_statements view. +type pgStatStatements struct { + UserID int64 + DBID int64 + QueryID int64 // we select only non-NULL rows + Query string // we select only non-NULL rows + Calls int64 + TotalExecTime float64 + // MinTime + // MaxTime + // MeanTime + // StddevTime + Rows int64 + SharedBlksHit int64 + SharedBlksRead int64 + SharedBlksDirtied int64 + SharedBlksWritten int64 + LocalBlksHit int64 + LocalBlksRead int64 + LocalBlksDirtied int64 + LocalBlksWritten int64 + TempBlksRead int64 + TempBlksWritten int64 + SharedBlkReadTime float64 + SharedBlkWriteTime float64 + LocalBlkReadTime float64 + LocalBlkWriteTime float64 + + // reform related fields + pointers []interface{} + view reform.View +} + +type field struct { + info parse.FieldInfo + pointer interface{} +} + +func newPgStatMonitorStructs(vPGSS semver.Version) (*pgStatStatements, reform.View) { //nolint:ireturn + s := &pgStatStatements{} + fields := []field{ + {info: parse.FieldInfo{Name: "UserID", Type: "int64", Column: "userid"}, pointer: &s.UserID}, + {info: parse.FieldInfo{Name: "DBID", Type: "int64", Column: "dbid"}, pointer: &s.DBID}, + {info: parse.FieldInfo{Name: "QueryID", Type: "int64", Column: "queryid"}, pointer: &s.QueryID}, + {info: parse.FieldInfo{Name: "Query", Type: "string", Column: "query"}, pointer: &s.Query}, + {info: parse.FieldInfo{Name: "Calls", Type: "int64", Column: "calls"}, pointer: &s.Calls}, + {info: parse.FieldInfo{Name: "Rows", Type: "int64", Column: "rows"}, pointer: &s.Rows}, + {info: parse.FieldInfo{Name: "SharedBlksHit", Type: "int64", Column: "shared_blks_hit"}, pointer: &s.SharedBlksHit}, + {info: parse.FieldInfo{Name: "SharedBlksRead", Type: "int64", Column: "shared_blks_read"}, pointer: &s.SharedBlksRead}, + {info: parse.FieldInfo{Name: "SharedBlksDirtied", Type: "int64", Column: "shared_blks_dirtied"}, pointer: &s.SharedBlksDirtied}, + {info: parse.FieldInfo{Name: "SharedBlksWritten", Type: "int64", Column: "shared_blks_written"}, pointer: &s.SharedBlksWritten}, + {info: parse.FieldInfo{Name: "LocalBlksHit", Type: "int64", Column: "local_blks_hit"}, pointer: &s.LocalBlksHit}, + {info: parse.FieldInfo{Name: "LocalBlksRead", Type: "int64", Column: "local_blks_read"}, pointer: &s.LocalBlksRead}, + {info: parse.FieldInfo{Name: "LocalBlksDirtied", Type: "int64", Column: "local_blks_dirtied"}, pointer: &s.LocalBlksDirtied}, + {info: parse.FieldInfo{Name: "LocalBlksWritten", Type: "int64", Column: "local_blks_written"}, pointer: &s.LocalBlksWritten}, + {info: parse.FieldInfo{Name: "TempBlksRead", Type: "int64", Column: "temp_blks_read"}, pointer: &s.TempBlksRead}, + {info: parse.FieldInfo{Name: "TempBlksWritten", Type: "int64", Column: "temp_blks_written"}, pointer: &s.TempBlksWritten}, + } + + if vPGSS.LT(pgStatVer1_8) { + fields = append(fields, + field{info: parse.FieldInfo{Name: "TotalExecTime", Type: "float64", Column: "total_time"}, pointer: &s.TotalExecTime}) + } else { + fields = append(fields, + field{info: parse.FieldInfo{Name: "TotalExecTime", Type: "float64", Column: "total_exec_time"}, pointer: &s.TotalExecTime}) + } + + if vPGSS.LT(pgStatVer1_11) { + fields = append(fields, + field{info: parse.FieldInfo{Name: "SharedBlkReadTime", Type: "float64", Column: "blk_read_time"}, pointer: &s.SharedBlkReadTime}, + field{info: parse.FieldInfo{Name: "SharedBlkWriteTime", Type: "float64", Column: "blk_write_time"}, pointer: &s.SharedBlkWriteTime}) + } else { + fields = append(fields, + field{info: parse.FieldInfo{Name: "SharedBlkReadTime", Type: "float64", Column: "shared_blk_read_time"}, pointer: &s.SharedBlkReadTime}, + field{info: parse.FieldInfo{Name: "SharedBlkWriteTime", Type: "float64", Column: "shared_blk_write_time"}, pointer: &s.SharedBlkWriteTime}, + field{info: parse.FieldInfo{Name: "LocalBlkReadTime", Type: "float64", Column: "local_blk_read_time"}, pointer: &s.LocalBlkReadTime}, + field{info: parse.FieldInfo{Name: "LocalBlkWriteTime", Type: "float64", Column: "local_blk_write_time"}, pointer: &s.LocalBlkWriteTime}) + } + + s.pointers = make([]interface{}, len(fields)) + pgStatStatementsDefaultView := &pgStatStatementsAllViewType{ + s: parse.StructInfo{ + Type: "pgStatStatements", + SQLName: "pg_stat_statements", + Fields: make([]parse.FieldInfo, len(fields)), + PKFieldIndex: -1, + }, + c: make([]string, len(fields)), + vPGSS: vPGSS, + } + for i, field := range fields { + pgStatStatementsDefaultView.s.Fields[i] = field.info + pgStatStatementsDefaultView.c[i] = field.info.Column + s.pointers[i] = field.pointer + } + s.view = pgStatStatementsDefaultView + pgStatStatementsDefaultView.z = s.Values() + + return s, pgStatStatementsDefaultView +} + +type pgStatStatementsAllViewType struct { + s parse.StructInfo + z []interface{} + c []string + vPGSS semver.Version +} + +// Schema returns a schema name in SQL database (""). +func (v *pgStatStatementsAllViewType) Schema() string { + return v.s.SQLSchema +} + +// Name returns a view or table name in SQL database ("pg_stat_monitor"). +func (v *pgStatStatementsAllViewType) Name() string { + return v.s.SQLName +} + +// Columns returns a new slice of column names for that view or table in SQL database. +func (v *pgStatStatementsAllViewType) Columns() []string { + return v.c +} + +// NewStruct makes a new struct for that view or table. +func (v *pgStatStatementsAllViewType) NewStruct() reform.Struct { //nolint:ireturn + str, _ := newPgStatMonitorStructs(v.vPGSS) + return str +} + +// Values returns a slice of struct or record field values. +// Returned interface{} values are never untyped nils. +func (s *pgStatStatements) Values() []interface{} { + values := make([]interface{}, len(s.pointers)) + for i, pointer := range s.pointers { + values[i] = reflect.ValueOf(pointer).Interface() + } + return values +} + +// Pointers returns a slice of pointers to struct or record fields. +// Returned interface{} values are never untyped nils. +func (s *pgStatStatements) Pointers() []interface{} { + return s.pointers +} + +// View returns View object for that struct. +func (s *pgStatStatements) View() reform.View { //nolint:ireturn + return s.view +} + +func (s *pgStatStatements) String() string { + res := make([]string, 19) + res[0] = "UserID: " + reform.Inspect(s.UserID, true) + res[1] = "DBID: " + reform.Inspect(s.DBID, true) + res[2] = "QueryID: " + reform.Inspect(s.QueryID, true) + res[3] = "Query: " + reform.Inspect(s.Query, true) + res[4] = "Calls: " + reform.Inspect(s.Calls, true) + res[5] = "TotalExecTime: " + reform.Inspect(s.TotalExecTime, true) + res[6] = "Rows: " + reform.Inspect(s.Rows, true) + res[7] = "SharedBlksHit: " + reform.Inspect(s.SharedBlksHit, true) + res[8] = "SharedBlksRead: " + reform.Inspect(s.SharedBlksRead, true) + res[9] = "SharedBlksDirtied: " + reform.Inspect(s.SharedBlksDirtied, true) + res[10] = "SharedBlksWritten: " + reform.Inspect(s.SharedBlksWritten, true) + res[11] = "LocalBlksHit: " + reform.Inspect(s.LocalBlksHit, true) + res[12] = "LocalBlksRead: " + reform.Inspect(s.LocalBlksRead, true) + res[13] = "LocalBlksDirtied: " + reform.Inspect(s.LocalBlksDirtied, true) + res[14] = "LocalBlksWritten: " + reform.Inspect(s.LocalBlksWritten, true) + res[15] = "TempBlksRead: " + reform.Inspect(s.TempBlksRead, true) + res[16] = "TempBlksWritten: " + reform.Inspect(s.TempBlksWritten, true) + res[17] = "SharedBlkReadTime: " + reform.Inspect(s.SharedBlkReadTime, true) + res[18] = "SharedBlkWriteTime: " + reform.Inspect(s.SharedBlkWriteTime, true) + return strings.Join(res, ", ") +} + +var ( + // Check interfaces. + _ reform.Struct = (*pgStatStatements)(nil) + _ fmt.Stringer = (*pgStatStatements)(nil) +) + +// pgStatStatementsExtended contains pgStatStatements data and extends it with database, username and tables data. +// It's made for performance reason. +type pgStatStatementsExtended struct { + pgStatStatements + + Database string + Username string + Tables []string + IsQueryTruncated bool + Comments map[string]string +} + +func (e *pgStatStatementsExtended) String() string { + return fmt.Sprintf("%q %q %v: %d: %s (truncated = %t) %v", + e.Database, e.Username, e.Tables, e.QueryID, e.Query, e.IsQueryTruncated, e.Comments) +} diff --git a/agent/agents/postgres/pgstatstatements/pgstatstatements.go b/agent/agents/postgres/pgstatstatements/pgstatstatements.go index 35b6df8845..61c302de60 100644 --- a/agent/agents/postgres/pgstatstatements/pgstatstatements.go +++ b/agent/agents/postgres/pgstatstatements/pgstatstatements.go @@ -48,7 +48,10 @@ const ( queryStatStatements = time.Minute ) -var pgStatVer18 = semver.MustParse("1.8.0") +var ( + pgStatVer1_8 = semver.MustParse("1.8.0") + pgStatVer1_11 = semver.MustParse("1.11.0") +) type statementsMap map[int64]*pgStatStatementsExtended @@ -127,20 +130,6 @@ func getPgStatVersion(q *reform.Querier) (semver.Version, error) { return semver.Parse(v) } -func rowsByVersion(q *reform.Querier, tail string) (*sql.Rows, error) { - pgStatVersion, err := getPgStatVersion(q) - if err != nil { - return nil, err - } - - columns := strings.Join(q.QualifiedColumns(pgStatStatementsView), ", ") - if pgStatVersion.GE(pgStatVer18) { - columns = strings.Replace(columns, `"total_time"`, `"total_exec_time"`, 1) - } - - return q.Query(fmt.Sprintf("SELECT /* %s */ %s FROM %s %s", queryTag, columns, q.QualifiedView(pgStatStatementsView), tail)) -} - // Run extracts stats data and sends it to the channel until ctx is canceled. func (m *PGStatStatementsQAN) Run(ctx context.Context) { defer func() { @@ -236,15 +225,22 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended( databases := queryDatabases(q) usernames := queryUsernames(q) - rows, err := rowsByVersion(q, "WHERE queryid IS NOT NULL AND query IS NOT NULL") + pgStatVersion, err := getPgStatVersion(q) + if err != nil { + return nil, nil, err + } + + row, view := newPgStatMonitorStructs(pgStatVersion) + columns := strings.Join(q.QualifiedColumns(view), ", ") + + rows, err := q.Query(fmt.Sprintf("SELECT /* %s */ %s FROM %s %s", queryTag, columns, q.QualifiedView(view), "WHERE queryid IS NOT NULL AND query IS NOT NULL")) if err != nil { return nil, nil, errors.Wrap(err, "couldn't get rows from pg_stat_statements") } defer rows.Close() //nolint:errcheck for ctx.Err() == nil { - var row pgStatStatements - if err = q.NextRow(&row, rows); err != nil { + if err = q.NextRow(row, rows); err != nil { if errors.Is(err, reform.ErrNoRows) { err = nil } @@ -252,7 +248,7 @@ func (m *PGStatStatementsQAN) getStatStatementsExtended( } totalN++ c := &pgStatStatementsExtended{ - pgStatStatements: row, + pgStatStatements: *row, Database: databases[row.DBID], Username: usernames[row.UserID], } @@ -372,7 +368,7 @@ func (m *PGStatStatementsQAN) makeBuckets(current, prev statementsMap) []*agentp cnt *float32 // MetricsBucket.XXXCnt field to write count }{ // convert milliseconds to seconds - {float32(currentPSS.TotalTime-prevPSS.TotalTime) / 1000, &mb.Common.MQueryTimeSum, &mb.Common.MQueryTimeCnt}, + {float32(currentPSS.TotalExecTime-prevPSS.TotalExecTime) / 1000, &mb.Common.MQueryTimeSum, &mb.Common.MQueryTimeCnt}, {float32(currentPSS.Rows - prevPSS.Rows), &mb.Postgresql.MRowsSum, &mb.Postgresql.MRowsCnt}, {float32(currentPSS.SharedBlksHit - prevPSS.SharedBlksHit), &mb.Postgresql.MSharedBlksHitSum, &mb.Postgresql.MSharedBlksHitCnt}, @@ -389,8 +385,10 @@ func (m *PGStatStatementsQAN) makeBuckets(current, prev statementsMap) []*agentp {float32(currentPSS.TempBlksWritten - prevPSS.TempBlksWritten), &mb.Postgresql.MTempBlksWrittenSum, &mb.Postgresql.MTempBlksWrittenCnt}, // convert milliseconds to seconds - {float32(currentPSS.BlkReadTime-prevPSS.BlkReadTime) / 1000, &mb.Postgresql.MBlkReadTimeSum, &mb.Postgresql.MBlkReadTimeCnt}, - {float32(currentPSS.BlkWriteTime-prevPSS.BlkWriteTime) / 1000, &mb.Postgresql.MBlkWriteTimeSum, &mb.Postgresql.MBlkWriteTimeCnt}, + {float32(currentPSS.SharedBlkReadTime-prevPSS.SharedBlkReadTime) / 1000, &mb.Postgresql.MSharedBlkReadTimeSum, &mb.Postgresql.MSharedBlkReadTimeCnt}, + {float32(currentPSS.SharedBlkWriteTime-prevPSS.SharedBlkWriteTime) / 1000, &mb.Postgresql.MSharedBlkWriteTimeSum, &mb.Postgresql.MSharedBlkWriteTimeCnt}, + {float32(currentPSS.LocalBlkReadTime-prevPSS.LocalBlkReadTime) / 1000, &mb.Postgresql.MLocalBlkReadTimeSum, &mb.Postgresql.MLocalBlkReadTimeCnt}, + {float32(currentPSS.LocalBlkWriteTime-prevPSS.LocalBlkWriteTime) / 1000, &mb.Postgresql.MLocalBlkWriteTimeSum, &mb.Postgresql.MLocalBlkWriteTimeCnt}, } { if p.value != 0 { *p.sum = p.value diff --git a/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go b/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go index d66cec2d9d..d102b7a488 100644 --- a/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go +++ b/agent/agents/postgres/pgstatstatements/pgstatstatements_test.go @@ -24,7 +24,6 @@ import ( "testing" "time" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -80,27 +79,13 @@ func TestPGStatStatementsQAN(t *testing.T) { structs, err := db.SelectAllFrom(pgStatDatabaseView, "") require.NoError(t, err) - rows, err := rowsByVersion(db.Querier, "") - require.NoError(t, err) - - defer func() { - e := rows.Close() - if err == nil { - err = e - } - }() + tests.LogTable(t, structs) - for { - str := pgStatStatementsView.NewStruct() - if err = db.Querier.NextRow(str, rows); err != nil { - break - } + pgStatVersion, err := getPgStatVersion(db.Querier) + require.NoError(t, err) - structs = append(structs, str) - } - if errors.Is(err, reform.ErrNoRows) { - err = nil - } + _, view := newPgStatMonitorStructs(pgStatVersion) + structs, err = db.SelectAllFrom(view, "") require.NoError(t, err) tests.LogTable(t, structs) @@ -125,44 +110,68 @@ func TestPGStatStatementsQAN(t *testing.T) { "$321, $322, $323, $324, $325, $326, $327, $328, $329, $330, $331, $332, $333, $334, $335, $336, $337, $338, $339, $340, " + "$341, $342, $343, $3 ..." + // Need to detect vendor because result for mSharedBlksReadSum are different for different images for postgres. + mSharedBlksHitSum := float32(33) + if strings.Contains(os.Getenv("POSTGRES_IMAGE"), "perconalab") { + mSharedBlksHitSum = 32 + } + truncatedMSharedBlksHitSum := mSharedBlksHitSum + engineVersion := tests.PostgreSQLVersion(t, sqlDB) var digests map[string]string // digest_text/fingerprint to digest/query_id switch engineVersion { case "9.4": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "3239586867", selectAllCitiesLong: "2745128652", } case "9.5", "9.6": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "3994135135", selectAllCitiesLong: "2677760328", } case "10": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "2229807896", selectAllCitiesLong: "3454929487", } case "11": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "-4056421706168012289", selectAllCitiesLong: "2233640464962569536", } case "12": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "5627444073676588515", selectAllCitiesLong: "-1605123213815583414", } case "13": + truncatedMSharedBlksHitSum = float32(1007) digests = map[string]string{ selectAllCities: "-32455482996301954", selectAllCitiesLong: "-4813789842463369261", } - case "14": + case "14", "15": digests = map[string]string{ selectAllCities: "5991662752016701281", selectAllCitiesLong: "-3564720362103294944", } + case "16": + digests = map[string]string{ + selectAllCities: "9094455616937907056", + selectAllCitiesLong: "-8264367755446145090", + } + case "17": + truncatedMSharedBlksHitSum = float32(8) + digests = map[string]string{ + selectAllCities: "1563925687573067138", + selectAllCitiesLong: "-3196437048361615995", + } default: t.Log("Unhandled version, assuming dummy digests.") digests = map[string]string{ @@ -171,12 +180,6 @@ func TestPGStatStatementsQAN(t *testing.T) { } } - // Need to detect vendor because result for mSharedBlksReadSum are different for different images for postgres. - mSharedBlksHitSum := float32(33) - if strings.Contains(os.Getenv("POSTGRES_IMAGE"), "perconalab") { - mSharedBlksHitSum = 32 - } - t.Run("AllCities", func(t *testing.T) { m := setup(t, db) @@ -209,19 +212,21 @@ func TestPGStatStatementsQAN(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, - MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, - MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 4079, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, + MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, + MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 4079, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) _, err = db.Exec(selectAllCities) require.NoError(t, err) @@ -250,17 +255,19 @@ func TestPGStatStatementsQAN(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: mSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 4079, - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: mSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 4079, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) }) t.Run("AllCitiesTruncated", func(t *testing.T) { @@ -284,7 +291,7 @@ func TestPGStatStatementsQAN(t *testing.T) { actual := buckets[0] assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09) - assert.InDelta(t, 1010, actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 3) + assert.InDelta(t, truncatedMSharedBlksHitSum, actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 3) assert.InDelta(t, 1.5, actual.Postgresql.MSharedBlksHitCnt+actual.Postgresql.MSharedBlksReadCnt, 0.5) expected := &agentpb.MetricsBucket{ Common: &agentpb.MetricsBucket_Common{ @@ -303,19 +310,21 @@ func TestPGStatStatementsQAN(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, - MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, - MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 499, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, + MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, + MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 499, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) _, err = db.Exec(q, args...) require.NoError(t, err) @@ -328,8 +337,8 @@ func TestPGStatStatementsQAN(t *testing.T) { actual = buckets[0] assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09) - assert.InDelta(t, 0, actual.Postgresql.MBlkReadTimeCnt, 1) - assert.InDelta(t, 1007, actual.Postgresql.MSharedBlksHitSum, 2) + assert.InDelta(t, 0, actual.Postgresql.MSharedBlkReadTimeCnt, 1) + assert.InDelta(t, truncatedMSharedBlksHitSum, actual.Postgresql.MSharedBlksHitSum, 2) expected = &agentpb.MetricsBucket{ Common: &agentpb.MetricsBucket_Common{ Fingerprint: selectAllCitiesLong, @@ -347,17 +356,19 @@ func TestPGStatStatementsQAN(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: actual.Postgresql.MBlkReadTimeCnt, - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: 1, - MRowsSum: 499, + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: 1, + MRowsSum: 499, }, } expected.Common.Queryid = digests[expected.Common.Fingerprint] tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) }) t.Run("CheckMBlkReadTime", func(t *testing.T) { @@ -408,7 +419,8 @@ func TestPGStatStatementsQAN(t *testing.T) { fingerprint = fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES ($1, $2, $3, $4)`, tableName) } actual := buckets[0] - assert.NotZero(t, actual.Postgresql.MBlkReadTimeSum) + assert.NotZero(t, actual.Postgresql.MSharedBlkReadTimeSum+actual.Postgresql.MSharedBlkWriteTimeSum) + assert.Equal(t, float32(n), actual.Postgresql.MSharedBlkReadTimeCnt+actual.Postgresql.MSharedBlkWriteTimeCnt) expected := &agentpb.MetricsBucket{ Common: &agentpb.MetricsBucket_Common{ Queryid: actual.Common.Queryid, @@ -426,21 +438,25 @@ func TestPGStatStatementsQAN(t *testing.T) { MQueryTimeSum: actual.Common.MQueryTimeSum, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MBlkReadTimeCnt: float32(n), - MBlkReadTimeSum: actual.Postgresql.MBlkReadTimeSum, - MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, - MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, - MSharedBlksWrittenCnt: actual.Postgresql.MSharedBlksWrittenCnt, - MSharedBlksWrittenSum: actual.Postgresql.MSharedBlksWrittenSum, - MSharedBlksDirtiedCnt: actual.Postgresql.MSharedBlksDirtiedCnt, - MSharedBlksDirtiedSum: actual.Postgresql.MSharedBlksDirtiedSum, - MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, - MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, - MRowsCnt: float32(n), - MRowsSum: float32(n), + MSharedBlkReadTimeCnt: actual.Postgresql.MSharedBlkReadTimeCnt, + MSharedBlkReadTimeSum: actual.Postgresql.MSharedBlkReadTimeSum, + MSharedBlkWriteTimeCnt: actual.Postgresql.MSharedBlkWriteTimeCnt, + MSharedBlkWriteTimeSum: actual.Postgresql.MSharedBlkWriteTimeSum, + MLocalBlkReadTimeCnt: actual.Postgresql.MLocalBlkReadTimeCnt, + MLocalBlkReadTimeSum: actual.Postgresql.MLocalBlkReadTimeSum, + MSharedBlksReadCnt: actual.Postgresql.MSharedBlksReadCnt, + MSharedBlksReadSum: actual.Postgresql.MSharedBlksReadSum, + MSharedBlksWrittenCnt: float32(n), + MSharedBlksWrittenSum: actual.Postgresql.MSharedBlksWrittenSum, + MSharedBlksDirtiedCnt: actual.Postgresql.MSharedBlksDirtiedCnt, + MSharedBlksDirtiedSum: actual.Postgresql.MSharedBlksDirtiedSum, + MSharedBlksHitCnt: actual.Postgresql.MSharedBlksHitCnt, + MSharedBlksHitSum: actual.Postgresql.MSharedBlksHitSum, + MRowsCnt: float32(n), + MRowsSum: float32(n), }, } tests.AssertBucketsEqual(t, expected, actual) - assert.LessOrEqual(t, actual.Postgresql.MBlkReadTimeSum, actual.Common.MQueryTimeSum) + assert.LessOrEqual(t, actual.Postgresql.MSharedBlkReadTimeSum, actual.Common.MQueryTimeSum) }) } diff --git a/agent/runner/actions/postgresql_query_show_action_test.go b/agent/runner/actions/postgresql_query_show_action_test.go index 8b0fd5d5f8..b62fdf91f0 100644 --- a/agent/runner/actions/postgresql_query_show_action_test.go +++ b/agent/runner/actions/postgresql_query_show_action_test.go @@ -49,13 +49,13 @@ func TestPostgreSQLQueryShow(t *testing.T) { b, err := a.Run(ctx) require.NoError(t, err) assert.LessOrEqual(t, 22000, len(b)) - assert.LessOrEqual(t, len(b), 33668) + assert.LessOrEqual(t, len(b), 37989) data, err := agentpb.UnmarshalActionQueryResult(b) require.NoError(t, err) t.Log(spew.Sdump(data)) assert.LessOrEqual(t, 200, len(data)) - assert.LessOrEqual(t, len(data), 358) + assert.LessOrEqual(t, len(data), 399) var found int for _, m := range data { diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go index e401b86cd0..ad9f9a31b6 100644 --- a/api/agentpb/collector.pb.go +++ b/api/agentpb/collector.pb.go @@ -1738,14 +1738,20 @@ type MetricsBucket_PostgreSQL struct { MTempBlksReadSum float32 `protobuf:"fixed32,20,opt,name=m_temp_blks_read_sum,json=mTempBlksReadSum,proto3" json:"m_temp_blks_read_sum,omitempty"` MTempBlksWrittenCnt float32 `protobuf:"fixed32,21,opt,name=m_temp_blks_written_cnt,json=mTempBlksWrittenCnt,proto3" json:"m_temp_blks_written_cnt,omitempty"` // Total number of temp blocks written by the statement. - MTempBlksWrittenSum float32 `protobuf:"fixed32,22,opt,name=m_temp_blks_written_sum,json=mTempBlksWrittenSum,proto3" json:"m_temp_blks_written_sum,omitempty"` - MBlkReadTimeCnt float32 `protobuf:"fixed32,23,opt,name=m_blk_read_time_cnt,json=mBlkReadTimeCnt,proto3" json:"m_blk_read_time_cnt,omitempty"` - // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - MBlkReadTimeSum float32 `protobuf:"fixed32,24,opt,name=m_blk_read_time_sum,json=mBlkReadTimeSum,proto3" json:"m_blk_read_time_sum,omitempty"` - MBlkWriteTimeCnt float32 `protobuf:"fixed32,25,opt,name=m_blk_write_time_cnt,json=mBlkWriteTimeCnt,proto3" json:"m_blk_write_time_cnt,omitempty"` - // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - MBlkWriteTimeSum float32 `protobuf:"fixed32,26,opt,name=m_blk_write_time_sum,json=mBlkWriteTimeSum,proto3" json:"m_blk_write_time_sum,omitempty"` - MCpuUserTimeCnt float32 `protobuf:"fixed32,27,opt,name=m_cpu_user_time_cnt,json=mCpuUserTimeCnt,proto3" json:"m_cpu_user_time_cnt,omitempty"` + MTempBlksWrittenSum float32 `protobuf:"fixed32,22,opt,name=m_temp_blks_written_sum,json=mTempBlksWrittenSum,proto3" json:"m_temp_blks_written_sum,omitempty"` + MSharedBlkReadTimeCnt float32 `protobuf:"fixed32,23,opt,name=m_shared_blk_read_time_cnt,json=mSharedBlkReadTimeCnt,proto3" json:"m_shared_blk_read_time_cnt,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkReadTimeSum float32 `protobuf:"fixed32,24,opt,name=m_shared_blk_read_time_sum,json=mSharedBlkReadTimeSum,proto3" json:"m_shared_blk_read_time_sum,omitempty"` + MSharedBlkWriteTimeCnt float32 `protobuf:"fixed32,25,opt,name=m_shared_blk_write_time_cnt,json=mSharedBlkWriteTimeCnt,proto3" json:"m_shared_blk_write_time_cnt,omitempty"` + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkWriteTimeSum float32 `protobuf:"fixed32,26,opt,name=m_shared_blk_write_time_sum,json=mSharedBlkWriteTimeSum,proto3" json:"m_shared_blk_write_time_sum,omitempty"` + MLocalBlkReadTimeCnt float32 `protobuf:"fixed32,50,opt,name=m_local_blk_read_time_cnt,json=mLocalBlkReadTimeCnt,proto3" json:"m_local_blk_read_time_cnt,omitempty"` + // Total time the statement spent reading local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkReadTimeSum float32 `protobuf:"fixed32,51,opt,name=m_local_blk_read_time_sum,json=mLocalBlkReadTimeSum,proto3" json:"m_local_blk_read_time_sum,omitempty"` + MLocalBlkWriteTimeCnt float32 `protobuf:"fixed32,52,opt,name=m_local_blk_write_time_cnt,json=mLocalBlkWriteTimeCnt,proto3" json:"m_local_blk_write_time_cnt,omitempty"` + // Total time the statement spent writing local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkWriteTimeSum float32 `protobuf:"fixed32,53,opt,name=m_local_blk_write_time_sum,json=mLocalBlkWriteTimeSum,proto3" json:"m_local_blk_write_time_sum,omitempty"` + MCpuUserTimeCnt float32 `protobuf:"fixed32,27,opt,name=m_cpu_user_time_cnt,json=mCpuUserTimeCnt,proto3" json:"m_cpu_user_time_cnt,omitempty"` // Total time user spent in query. MCpuUserTimeSum float32 `protobuf:"fixed32,28,opt,name=m_cpu_user_time_sum,json=mCpuUserTimeSum,proto3" json:"m_cpu_user_time_sum,omitempty"` MCpuSysTimeCnt float32 `protobuf:"fixed32,29,opt,name=m_cpu_sys_time_cnt,json=mCpuSysTimeCnt,proto3" json:"m_cpu_sys_time_cnt,omitempty"` @@ -1970,30 +1976,58 @@ func (x *MetricsBucket_PostgreSQL) GetMTempBlksWrittenSum() float32 { return 0 } -func (x *MetricsBucket_PostgreSQL) GetMBlkReadTimeCnt() float32 { +func (x *MetricsBucket_PostgreSQL) GetMSharedBlkReadTimeCnt() float32 { if x != nil { - return x.MBlkReadTimeCnt + return x.MSharedBlkReadTimeCnt } return 0 } -func (x *MetricsBucket_PostgreSQL) GetMBlkReadTimeSum() float32 { +func (x *MetricsBucket_PostgreSQL) GetMSharedBlkReadTimeSum() float32 { if x != nil { - return x.MBlkReadTimeSum + return x.MSharedBlkReadTimeSum } return 0 } -func (x *MetricsBucket_PostgreSQL) GetMBlkWriteTimeCnt() float32 { +func (x *MetricsBucket_PostgreSQL) GetMSharedBlkWriteTimeCnt() float32 { if x != nil { - return x.MBlkWriteTimeCnt + return x.MSharedBlkWriteTimeCnt } return 0 } -func (x *MetricsBucket_PostgreSQL) GetMBlkWriteTimeSum() float32 { +func (x *MetricsBucket_PostgreSQL) GetMSharedBlkWriteTimeSum() float32 { if x != nil { - return x.MBlkWriteTimeSum + return x.MSharedBlkWriteTimeSum + } + return 0 +} + +func (x *MetricsBucket_PostgreSQL) GetMLocalBlkReadTimeCnt() float32 { + if x != nil { + return x.MLocalBlkReadTimeCnt + } + return 0 +} + +func (x *MetricsBucket_PostgreSQL) GetMLocalBlkReadTimeSum() float32 { + if x != nil { + return x.MLocalBlkReadTimeSum + } + return 0 +} + +func (x *MetricsBucket_PostgreSQL) GetMLocalBlkWriteTimeCnt() float32 { + if x != nil { + return x.MLocalBlkWriteTimeCnt + } + return 0 +} + +func (x *MetricsBucket_PostgreSQL) GetMLocalBlkWriteTimeSum() float32 { + if x != nil { + return x.MLocalBlkWriteTimeSum } return 0 } @@ -2165,7 +2199,7 @@ var file_agentpb_collector_proto_rawDesc = []byte{ 0x0a, 0x17, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x70, 0x62, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x1a, 0x18, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x79, 0x70, 0x62, 0x2f, 0x61, 0x67, - 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x4d, 0x0a, 0x0d, 0x4d, + 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x4f, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x33, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x42, 0x75, 0x63, 0x6b, @@ -2644,7 +2678,7 @@ var file_agentpb_collector_proto_rawDesc = []byte{ 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x61, 0x78, 0x12, 0x2b, 0x0a, 0x12, 0x6d, 0x5f, 0x64, 0x6f, 0x63, 0x73, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x5f, 0x70, 0x39, 0x39, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x44, 0x6f, 0x63, 0x73, 0x53, 0x63, 0x61, 0x6e, - 0x6e, 0x65, 0x64, 0x50, 0x39, 0x39, 0x1a, 0xb2, 0x11, 0x0a, 0x0a, 0x50, 0x6f, 0x73, 0x74, 0x67, + 0x6e, 0x65, 0x64, 0x50, 0x39, 0x39, 0x1a, 0xce, 0x13, 0x0a, 0x0a, 0x50, 0x6f, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4c, 0x12, 0x1c, 0x0a, 0x0a, 0x6d, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x43, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x0a, 0x6d, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x5f, 0x73, 0x75, @@ -2715,99 +2749,116 @@ var file_agentpb_collector_proto_rawDesc = []byte{ 0x34, 0x0a, 0x17, 0x6d, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x62, 0x6c, 0x6b, 0x73, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x16, 0x20, 0x01, 0x28, 0x02, 0x52, 0x13, 0x6d, 0x54, 0x65, 0x6d, 0x70, 0x42, 0x6c, 0x6b, 0x73, 0x57, 0x72, 0x69, 0x74, 0x74, - 0x65, 0x6e, 0x53, 0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x13, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, - 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x17, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x43, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x13, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, - 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x18, 0x20, 0x01, 0x28, 0x02, - 0x52, 0x0f, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, - 0x6d, 0x12, 0x2e, 0x0a, 0x14, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x10, 0x6d, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, - 0x74, 0x12, 0x2e, 0x0a, 0x14, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x10, 0x6d, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, - 0x6d, 0x12, 0x2c, 0x0a, 0x13, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, - 0x6d, 0x43, 0x70, 0x75, 0x55, 0x73, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, - 0x2c, 0x0a, 0x13, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x43, - 0x70, 0x75, 0x55, 0x73, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x2a, 0x0a, - 0x12, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x73, 0x79, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, - 0x63, 0x6e, 0x74, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x43, 0x70, 0x75, 0x53, - 0x79, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x12, 0x6d, 0x5f, 0x63, - 0x70, 0x75, 0x5f, 0x73, 0x79, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, - 0x1e, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x43, 0x70, 0x75, 0x53, 0x79, 0x73, 0x54, 0x69, - 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6d, 0x64, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x2b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x29, 0x0a, 0x11, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, - 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x50, 0x6c, - 0x61, 0x6e, 0x73, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x29, 0x0a, 0x11, 0x6d, - 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x5f, 0x63, 0x6e, 0x74, - 0x18, 0x20, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x73, 0x43, 0x61, - 0x6c, 0x6c, 0x73, 0x43, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x11, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, - 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x21, 0x20, 0x01, 0x28, - 0x02, 0x52, 0x0e, 0x6d, 0x57, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x53, 0x75, - 0x6d, 0x12, 0x29, 0x0a, 0x11, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x73, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x22, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x57, - 0x61, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x43, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0d, - 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x23, 0x20, - 0x01, 0x28, 0x02, 0x52, 0x0a, 0x6d, 0x57, 0x61, 0x6c, 0x46, 0x70, 0x69, 0x53, 0x75, 0x6d, 0x12, - 0x21, 0x0a, 0x0d, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x63, 0x6e, 0x74, - 0x18, 0x24, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, 0x6d, 0x57, 0x61, 0x6c, 0x46, 0x70, 0x69, 0x43, - 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, - 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x25, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x57, 0x61, - 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x77, - 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x26, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x57, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x43, 0x6e, 0x74, - 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, - 0x73, 0x75, 0x6d, 0x18, 0x27, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, 0x6e, - 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, - 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x28, 0x20, 0x01, 0x28, 0x02, - 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x25, - 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, - 0x6e, 0x18, 0x29, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, - 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, - 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x1f, 0x0a, 0x0b, - 0x74, 0x6f, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x18, 0x2c, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x74, 0x6f, 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1b, 0x0a, - 0x09, 0x74, 0x6f, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x74, 0x6f, 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x29, 0x0a, 0x10, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x2d, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x69, 0x64, 0x18, - 0x2e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x69, 0x64, 0x12, 0x1d, 0x0a, - 0x0a, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x18, 0x30, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x6e, 0x12, 0x3d, 0x0a, 0x0f, - 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x31, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x48, 0x69, - 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0e, 0x68, 0x69, 0x73, - 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x43, 0x0a, 0x0d, 0x48, - 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, - 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x61, 0x6e, - 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, - 0x2a, 0x55, 0x0a, 0x0d, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x12, 0x1e, 0x0a, 0x16, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x46, 0x4f, 0x52, - 0x4d, 0x41, 0x54, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x1a, 0x02, 0x08, - 0x01, 0x12, 0x0f, 0x0a, 0x07, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x10, 0x01, 0x1a, 0x02, - 0x08, 0x01, 0x12, 0x13, 0x0a, 0x0b, 0x46, 0x49, 0x4e, 0x47, 0x45, 0x52, 0x50, 0x52, 0x49, 0x4e, - 0x54, 0x10, 0x02, 0x1a, 0x02, 0x08, 0x01, 0x2a, 0x5d, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, - 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, - 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, - 0x53, 0x4c, 0x4f, 0x57, 0x45, 0x53, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x41, 0x53, - 0x54, 0x45, 0x53, 0x54, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x45, - 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x42, 0x73, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x67, - 0x65, 0x6e, 0x74, 0x42, 0x0e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x22, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, - 0x02, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0xca, 0x02, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0xe2, - 0x02, 0x11, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x65, 0x6e, 0x53, 0x75, 0x6d, 0x12, 0x39, 0x0a, 0x1a, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, + 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, + 0x63, 0x6e, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x53, 0x68, 0x61, 0x72, + 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, + 0x12, 0x39, 0x0a, 0x1a, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, + 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x18, + 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, + 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x3b, 0x0a, 0x1b, 0x6d, + 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, + 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x02, + 0x52, 0x16, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x1b, 0x6d, 0x5f, 0x73, 0x68, + 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, + 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x16, 0x6d, + 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x37, 0x0a, 0x19, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, + 0x6e, 0x74, 0x18, 0x32, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, + 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x37, + 0x0a, 0x19, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, + 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x33, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x14, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, + 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x39, 0x0a, 0x1a, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x34, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x4c, 0x6f, + 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, + 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x1a, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, + 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, + 0x18, 0x35, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, + 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x2c, 0x0a, + 0x13, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x43, 0x70, 0x75, + 0x55, 0x73, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x13, 0x6d, + 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, + 0x75, 0x6d, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x43, 0x70, 0x75, 0x55, 0x73, + 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x2a, 0x0a, 0x12, 0x6d, 0x5f, 0x63, + 0x70, 0x75, 0x5f, 0x73, 0x79, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, + 0x1d, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x43, 0x70, 0x75, 0x53, 0x79, 0x73, 0x54, 0x69, + 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x12, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x73, + 0x79, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x1e, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x0e, 0x6d, 0x43, 0x70, 0x75, 0x53, 0x79, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, + 0x6d, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6d, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x2b, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x29, 0x0a, 0x11, + 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x5f, 0x73, 0x75, + 0x6d, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x73, 0x43, + 0x61, 0x6c, 0x6c, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x29, 0x0a, 0x11, 0x6d, 0x5f, 0x70, 0x6c, 0x61, + 0x6e, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x20, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x73, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x43, + 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x11, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x21, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, + 0x57, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x29, 0x0a, + 0x11, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x5f, 0x63, + 0x6e, 0x74, 0x18, 0x22, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0e, 0x6d, 0x57, 0x61, 0x6c, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x73, 0x43, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0d, 0x6d, 0x5f, 0x77, 0x61, + 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x23, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x0a, 0x6d, 0x57, 0x61, 0x6c, 0x46, 0x70, 0x69, 0x53, 0x75, 0x6d, 0x12, 0x21, 0x0a, 0x0d, 0x6d, + 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x24, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x0a, 0x6d, 0x57, 0x61, 0x6c, 0x46, 0x70, 0x69, 0x43, 0x6e, 0x74, 0x12, 0x25, + 0x0a, 0x0f, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x73, 0x75, + 0x6d, 0x18, 0x25, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x57, 0x61, 0x6c, 0x42, 0x79, 0x74, + 0x65, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x26, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, + 0x6d, 0x57, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x43, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0f, + 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, + 0x27, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, + 0x53, 0x75, 0x6d, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x28, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, + 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, + 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x29, 0x20, + 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69, + 0x6e, 0x12, 0x25, 0x0a, 0x0f, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x50, 0x6c, 0x61, + 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x6f, 0x70, 0x5f, + 0x71, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, + 0x6f, 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x6f, 0x70, + 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, + 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x29, 0x0a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x69, 0x64, 0x18, 0x2e, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x71, 0x75, 0x65, + 0x72, 0x79, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x18, 0x30, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x71, + 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x6e, 0x12, 0x3d, 0x0a, 0x0f, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x31, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, + 0x72, 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0e, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, + 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x43, 0x0a, 0x0d, 0x48, 0x69, 0x73, 0x74, 0x6f, + 0x67, 0x72, 0x61, 0x6d, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1c, + 0x0a, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x09, 0x66, 0x72, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x79, 0x2a, 0x55, 0x0a, 0x0d, + 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, + 0x16, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, + 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x0f, 0x0a, + 0x07, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x10, 0x01, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x13, + 0x0a, 0x0b, 0x46, 0x49, 0x4e, 0x47, 0x45, 0x52, 0x50, 0x52, 0x49, 0x4e, 0x54, 0x10, 0x02, 0x1a, + 0x02, 0x08, 0x01, 0x2a, 0x5d, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, + 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x4c, 0x4f, 0x57, + 0x45, 0x53, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x41, 0x53, 0x54, 0x45, 0x53, 0x54, + 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, + 0x10, 0x04, 0x42, 0x73, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x42, + 0x0e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x22, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, + 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x67, + 0x65, 0x6e, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02, 0x05, 0x41, 0x67, + 0x65, 0x6e, 0x74, 0xca, 0x02, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0xe2, 0x02, 0x11, 0x41, 0x67, + 0x65, 0x6e, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x02, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/agentpb/collector.pb.validate.go b/api/agentpb/collector.pb.validate.go index c7d33c5c44..b494b361d6 100644 --- a/api/agentpb/collector.pb.validate.go +++ b/api/agentpb/collector.pb.validate.go @@ -1043,13 +1043,21 @@ func (m *MetricsBucket_PostgreSQL) validate(all bool) error { // no validation rules for MTempBlksWrittenSum - // no validation rules for MBlkReadTimeCnt + // no validation rules for MSharedBlkReadTimeCnt - // no validation rules for MBlkReadTimeSum + // no validation rules for MSharedBlkReadTimeSum - // no validation rules for MBlkWriteTimeCnt + // no validation rules for MSharedBlkWriteTimeCnt - // no validation rules for MBlkWriteTimeSum + // no validation rules for MSharedBlkWriteTimeSum + + // no validation rules for MLocalBlkReadTimeCnt + + // no validation rules for MLocalBlkReadTimeSum + + // no validation rules for MLocalBlkWriteTimeCnt + + // no validation rules for MLocalBlkWriteTimeSum // no validation rules for MCpuUserTimeCnt diff --git a/api/agentpb/collector.proto b/api/agentpb/collector.proto index 49803abcbc..6de1717f26 100644 --- a/api/agentpb/collector.proto +++ b/api/agentpb/collector.proto @@ -307,12 +307,18 @@ message MetricsBucket { float m_temp_blks_written_cnt = 21; // Total number of temp blocks written by the statement. float m_temp_blks_written_sum = 22; - float m_blk_read_time_cnt = 23; - // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_read_time_sum = 24; - float m_blk_write_time_cnt = 25; - // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_write_time_sum = 26; + float m_shared_blk_read_time_cnt = 23; + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_read_time_sum = 24; + float m_shared_blk_write_time_cnt = 25; + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_write_time_sum = 26; + float m_local_blk_read_time_cnt = 50; + // Total time the statement spent reading local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_read_time_sum = 51; + float m_local_blk_write_time_cnt = 52; + // Total time the statement spent writing local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_write_time_sum = 53; float m_cpu_user_time_cnt = 27; // Total time user spent in query. float m_cpu_user_time_sum = 28; diff --git a/api/qanpb/collector.pb.go b/api/qanpb/collector.pb.go index e89b0abc4f..0d62c9fc0d 100644 --- a/api/qanpb/collector.pb.go +++ b/api/qanpb/collector.pb.go @@ -364,13 +364,31 @@ type MetricsBucket struct { MTempBlksWrittenCnt float32 `protobuf:"fixed32,218,opt,name=m_temp_blks_written_cnt,json=mTempBlksWrittenCnt,proto3" json:"m_temp_blks_written_cnt,omitempty"` // Total number of temp blocks written by the statement. MTempBlksWrittenSum float32 `protobuf:"fixed32,219,opt,name=m_temp_blks_written_sum,json=mTempBlksWrittenSum,proto3" json:"m_temp_blks_written_sum,omitempty"` - MBlkReadTimeCnt float32 `protobuf:"fixed32,220,opt,name=m_blk_read_time_cnt,json=mBlkReadTimeCnt,proto3" json:"m_blk_read_time_cnt,omitempty"` + // Deprecated: Marked as deprecated in qanpb/collector.proto. + MBlkReadTimeCnt float32 `protobuf:"fixed32,220,opt,name=m_blk_read_time_cnt,json=mBlkReadTimeCnt,proto3" json:"m_blk_read_time_cnt,omitempty"` // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - MBlkReadTimeSum float32 `protobuf:"fixed32,221,opt,name=m_blk_read_time_sum,json=mBlkReadTimeSum,proto3" json:"m_blk_read_time_sum,omitempty"` + // + // Deprecated: Marked as deprecated in qanpb/collector.proto. + MBlkReadTimeSum float32 `protobuf:"fixed32,221,opt,name=m_blk_read_time_sum,json=mBlkReadTimeSum,proto3" json:"m_blk_read_time_sum,omitempty"` + // Deprecated: Marked as deprecated in qanpb/collector.proto. MBlkWriteTimeCnt float32 `protobuf:"fixed32,222,opt,name=m_blk_write_time_cnt,json=mBlkWriteTimeCnt,proto3" json:"m_blk_write_time_cnt,omitempty"` // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - MBlkWriteTimeSum float32 `protobuf:"fixed32,223,opt,name=m_blk_write_time_sum,json=mBlkWriteTimeSum,proto3" json:"m_blk_write_time_sum,omitempty"` - MCpuUserTimeCnt float32 `protobuf:"fixed32,230,opt,name=m_cpu_user_time_cnt,json=mCpuUserTimeCnt,proto3" json:"m_cpu_user_time_cnt,omitempty"` + // + // Deprecated: Marked as deprecated in qanpb/collector.proto. + MBlkWriteTimeSum float32 `protobuf:"fixed32,223,opt,name=m_blk_write_time_sum,json=mBlkWriteTimeSum,proto3" json:"m_blk_write_time_sum,omitempty"` + MSharedBlkReadTimeCnt float32 `protobuf:"fixed32,255,opt,name=m_shared_blk_read_time_cnt,json=mSharedBlkReadTimeCnt,proto3" json:"m_shared_blk_read_time_cnt,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkReadTimeSum float32 `protobuf:"fixed32,256,opt,name=m_shared_blk_read_time_sum,json=mSharedBlkReadTimeSum,proto3" json:"m_shared_blk_read_time_sum,omitempty"` + MSharedBlkWriteTimeCnt float32 `protobuf:"fixed32,257,opt,name=m_shared_blk_write_time_cnt,json=mSharedBlkWriteTimeCnt,proto3" json:"m_shared_blk_write_time_cnt,omitempty"` + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkWriteTimeSum float32 `protobuf:"fixed32,258,opt,name=m_shared_blk_write_time_sum,json=mSharedBlkWriteTimeSum,proto3" json:"m_shared_blk_write_time_sum,omitempty"` + MLocalBlkReadTimeCnt float32 `protobuf:"fixed32,259,opt,name=m_local_blk_read_time_cnt,json=mLocalBlkReadTimeCnt,proto3" json:"m_local_blk_read_time_cnt,omitempty"` + // Total time the statement spent reading local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkReadTimeSum float32 `protobuf:"fixed32,260,opt,name=m_local_blk_read_time_sum,json=mLocalBlkReadTimeSum,proto3" json:"m_local_blk_read_time_sum,omitempty"` + MLocalBlkWriteTimeCnt float32 `protobuf:"fixed32,261,opt,name=m_local_blk_write_time_cnt,json=mLocalBlkWriteTimeCnt,proto3" json:"m_local_blk_write_time_cnt,omitempty"` + // Total time the statement spent writing local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkWriteTimeSum float32 `protobuf:"fixed32,262,opt,name=m_local_blk_write_time_sum,json=mLocalBlkWriteTimeSum,proto3" json:"m_local_blk_write_time_sum,omitempty"` + MCpuUserTimeCnt float32 `protobuf:"fixed32,230,opt,name=m_cpu_user_time_cnt,json=mCpuUserTimeCnt,proto3" json:"m_cpu_user_time_cnt,omitempty"` // Total time user spent in query. MCpuUserTimeSum float32 `protobuf:"fixed32,231,opt,name=m_cpu_user_time_sum,json=mCpuUserTimeSum,proto3" json:"m_cpu_user_time_sum,omitempty"` MCpuSysTimeCnt float32 `protobuf:"fixed32,232,opt,name=m_cpu_sys_time_cnt,json=mCpuSysTimeCnt,proto3" json:"m_cpu_sys_time_cnt,omitempty"` @@ -1800,6 +1818,7 @@ func (x *MetricsBucket) GetMTempBlksWrittenSum() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/collector.proto. func (x *MetricsBucket) GetMBlkReadTimeCnt() float32 { if x != nil { return x.MBlkReadTimeCnt @@ -1807,6 +1826,7 @@ func (x *MetricsBucket) GetMBlkReadTimeCnt() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/collector.proto. func (x *MetricsBucket) GetMBlkReadTimeSum() float32 { if x != nil { return x.MBlkReadTimeSum @@ -1814,6 +1834,7 @@ func (x *MetricsBucket) GetMBlkReadTimeSum() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/collector.proto. func (x *MetricsBucket) GetMBlkWriteTimeCnt() float32 { if x != nil { return x.MBlkWriteTimeCnt @@ -1821,6 +1842,7 @@ func (x *MetricsBucket) GetMBlkWriteTimeCnt() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/collector.proto. func (x *MetricsBucket) GetMBlkWriteTimeSum() float32 { if x != nil { return x.MBlkWriteTimeSum @@ -1828,6 +1850,62 @@ func (x *MetricsBucket) GetMBlkWriteTimeSum() float32 { return 0 } +func (x *MetricsBucket) GetMSharedBlkReadTimeCnt() float32 { + if x != nil { + return x.MSharedBlkReadTimeCnt + } + return 0 +} + +func (x *MetricsBucket) GetMSharedBlkReadTimeSum() float32 { + if x != nil { + return x.MSharedBlkReadTimeSum + } + return 0 +} + +func (x *MetricsBucket) GetMSharedBlkWriteTimeCnt() float32 { + if x != nil { + return x.MSharedBlkWriteTimeCnt + } + return 0 +} + +func (x *MetricsBucket) GetMSharedBlkWriteTimeSum() float32 { + if x != nil { + return x.MSharedBlkWriteTimeSum + } + return 0 +} + +func (x *MetricsBucket) GetMLocalBlkReadTimeCnt() float32 { + if x != nil { + return x.MLocalBlkReadTimeCnt + } + return 0 +} + +func (x *MetricsBucket) GetMLocalBlkReadTimeSum() float32 { + if x != nil { + return x.MLocalBlkReadTimeSum + } + return 0 +} + +func (x *MetricsBucket) GetMLocalBlkWriteTimeCnt() float32 { + if x != nil { + return x.MLocalBlkWriteTimeCnt + } + return 0 +} + +func (x *MetricsBucket) GetMLocalBlkWriteTimeSum() float32 { + if x != nil { + return x.MLocalBlkWriteTimeSum + } + return 0 +} + func (x *MetricsBucket) GetMCpuUserTimeCnt() float32 { if x != nil { return x.MCpuUserTimeCnt @@ -2038,7 +2116,7 @@ var file_qanpb_collector_proto_rawDesc = []byte{ 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x71, 0x61, 0x6e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x42, 0x75, - 0x63, 0x6b, 0x65, 0x74, 0x22, 0x95, 0x50, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, + 0x63, 0x6b, 0x65, 0x74, 0x22, 0x85, 0x54, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x71, 0x75, 0x65, 0x72, 0x79, 0x69, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x65, 0x78, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x5f, 0x66, 0x69, 0x6e, 0x67, @@ -2599,18 +2677,49 @@ var file_qanpb_collector_proto_rawDesc = []byte{ 0x74, 0x74, 0x65, 0x6e, 0x43, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x17, 0x6d, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x62, 0x6c, 0x6b, 0x73, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0xdb, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x13, 0x6d, 0x54, 0x65, 0x6d, 0x70, - 0x42, 0x6c, 0x6b, 0x73, 0x57, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x53, 0x75, 0x6d, 0x12, 0x2d, + 0x42, 0x6c, 0x6b, 0x73, 0x57, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x53, 0x75, 0x6d, 0x12, 0x31, 0x0a, 0x13, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xdc, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x42, - 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x2d, 0x0a, - 0x13, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x5f, 0x73, 0x75, 0x6d, 0x18, 0xdd, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x42, 0x6c, - 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x2f, 0x0a, 0x14, - 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xde, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x6d, 0x42, 0x6c, - 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x2f, 0x0a, - 0x14, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0xdf, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x6d, 0x42, + 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xdc, 0x01, 0x20, 0x01, 0x28, 0x02, 0x42, 0x02, 0x18, 0x01, + 0x52, 0x0f, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, + 0x74, 0x12, 0x31, 0x0a, 0x13, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0xdd, 0x01, 0x20, 0x01, 0x28, 0x02, 0x42, + 0x02, 0x18, 0x01, 0x52, 0x0f, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, + 0x65, 0x53, 0x75, 0x6d, 0x12, 0x33, 0x0a, 0x14, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, + 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xde, 0x01, 0x20, + 0x01, 0x28, 0x02, 0x42, 0x02, 0x18, 0x01, 0x52, 0x10, 0x6d, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x14, 0x6d, 0x5f, 0x62, + 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, + 0x6d, 0x18, 0xdf, 0x01, 0x20, 0x01, 0x28, 0x02, 0x42, 0x02, 0x18, 0x01, 0x52, 0x10, 0x6d, 0x42, + 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x3a, + 0x0a, 0x1a, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, + 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xff, 0x01, 0x20, + 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x52, + 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x1a, 0x6d, 0x5f, + 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x80, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x15, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, + 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x3c, 0x0a, 0x1b, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, + 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x81, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x16, 0x6d, 0x53, + 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x43, 0x6e, 0x74, 0x12, 0x3c, 0x0a, 0x1b, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, + 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, + 0x73, 0x75, 0x6d, 0x18, 0x82, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x16, 0x6d, 0x53, 0x68, 0x61, + 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, + 0x75, 0x6d, 0x12, 0x38, 0x0a, 0x19, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, + 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, + 0x83, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, + 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x43, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x19, + 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, + 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x84, 0x02, 0x20, 0x01, 0x28, 0x02, + 0x52, 0x14, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, + 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x3a, 0x0a, 0x1a, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x5f, 0x63, 0x6e, 0x74, 0x18, 0x85, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x4c, 0x6f, + 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x43, + 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x1a, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, + 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, + 0x18, 0x86, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x12, 0x2d, 0x0a, 0x13, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x74, 0x18, 0xe6, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x6d, 0x43, diff --git a/api/qanpb/collector.pb.validate.go b/api/qanpb/collector.pb.validate.go index 4a86009d50..596d00a9bf 100644 --- a/api/qanpb/collector.pb.validate.go +++ b/api/qanpb/collector.pb.validate.go @@ -589,6 +589,22 @@ func (m *MetricsBucket) validate(all bool) error { // no validation rules for MBlkWriteTimeSum + // no validation rules for MSharedBlkReadTimeCnt + + // no validation rules for MSharedBlkReadTimeSum + + // no validation rules for MSharedBlkWriteTimeCnt + + // no validation rules for MSharedBlkWriteTimeSum + + // no validation rules for MLocalBlkReadTimeCnt + + // no validation rules for MLocalBlkReadTimeSum + + // no validation rules for MLocalBlkWriteTimeCnt + + // no validation rules for MLocalBlkWriteTimeSum + // no validation rules for MCpuUserTimeCnt // no validation rules for MCpuUserTimeSum diff --git a/api/qanpb/collector.proto b/api/qanpb/collector.proto index 3a02b9d478..9b32e07e90 100644 --- a/api/qanpb/collector.proto +++ b/api/qanpb/collector.proto @@ -333,18 +333,31 @@ message MetricsBucket { float m_temp_blks_written_cnt = 218; // Total number of temp blocks written by the statement. float m_temp_blks_written_sum = 219; - float m_blk_read_time_cnt = 220; + float m_blk_read_time_cnt = 220 [deprecated = true]; // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_read_time_sum = 221; - float m_blk_write_time_cnt = 222; + float m_blk_read_time_sum = 221 [deprecated = true]; + float m_blk_write_time_cnt = 222 [deprecated = true]; // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_write_time_sum = 223; + float m_blk_write_time_sum = 223 [deprecated = true]; + float m_shared_blk_read_time_cnt = 255; + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_read_time_sum = 256; + float m_shared_blk_write_time_cnt = 257; + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_write_time_sum = 258; + float m_local_blk_read_time_cnt = 259; + // Total time the statement spent reading local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_read_time_sum = 260; + float m_local_blk_write_time_cnt = 261; + // Total time the statement spent writing local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_write_time_sum = 262; float m_cpu_user_time_cnt = 230; // Total time user spent in query. float m_cpu_user_time_sum = 231; float m_cpu_sys_time_cnt = 232; // Total time system spent in query. float m_cpu_sys_time_sum = 233; + // Type of SQL command. string cmd_type = 246; // diff --git a/api/qanpb/json/client/object_details/get_metrics_responses.go b/api/qanpb/json/client/object_details/get_metrics_responses.go index 23bcd854fc..4b5d88287a 100644 --- a/api/qanpb/json/client/object_details/get_metrics_responses.go +++ b/api/qanpb/json/client/object_details/get_metrics_responses.go @@ -963,6 +963,18 @@ type GetMetricsOKBodySparklineItems0 struct { // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). MBlkWriteTimeSumPerSec float32 `json:"m_blk_write_time_sum_per_sec,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkReadTimeSumPerSec float32 `json:"m_shared_blk_read_time_sum_per_sec,omitempty"` + + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkWriteTimeSumPerSec float32 `json:"m_shared_blk_write_time_sum_per_sec,omitempty"` + + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkReadTimeSumPerSec float32 `json:"m_local_blk_read_time_sum_per_sec,omitempty"` + + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkWriteTimeSumPerSec float32 `json:"m_local_blk_write_time_sum_per_sec,omitempty"` + // Total time user spent in query. MCPUUserTimeSumPerSec float32 `json:"m_cpu_user_time_sum_per_sec,omitempty"` diff --git a/api/qanpb/json/client/profile/get_report_responses.go b/api/qanpb/json/client/profile/get_report_responses.go index d72cc8a69f..bd3baae1ed 100644 --- a/api/qanpb/json/client/profile/get_report_responses.go +++ b/api/qanpb/json/client/profile/get_report_responses.go @@ -1019,6 +1019,18 @@ type GetReportOKBodyRowsItems0SparklineItems0 struct { // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). MBlkWriteTimeSumPerSec float32 `json:"m_blk_write_time_sum_per_sec,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkReadTimeSumPerSec float32 `json:"m_shared_blk_read_time_sum_per_sec,omitempty"` + + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkWriteTimeSumPerSec float32 `json:"m_shared_blk_write_time_sum_per_sec,omitempty"` + + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkReadTimeSumPerSec float32 `json:"m_local_blk_read_time_sum_per_sec,omitempty"` + + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkWriteTimeSumPerSec float32 `json:"m_local_blk_write_time_sum_per_sec,omitempty"` + // Total time user spent in query. MCPUUserTimeSumPerSec float32 `json:"m_cpu_user_time_sum_per_sec,omitempty"` diff --git a/api/qanpb/json/qanpb.json b/api/qanpb/json/qanpb.json index 08adc4f289..61b0a7b75e 100644 --- a/api/qanpb/json/qanpb.json +++ b/api/qanpb/json/qanpb.json @@ -450,13 +450,13 @@ "description": "Total time system spent in query.", "type": "number", "format": "float", - "x-order": 56 + "x-order": 60 }, "m_cpu_user_time_sum_per_sec": { "description": "Total time user spent in query.", "type": "number", "format": "float", - "x-order": 55 + "x-order": 59 }, "m_docs_returned_sum_per_sec": { "description": "MongoDB metrics.\n\nThe number of returned documents.", @@ -530,6 +530,18 @@ "format": "float", "x-order": 17 }, + "m_local_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 57 + }, + "m_local_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 58 + }, "m_local_blks_dirtied_sum_per_sec": { "description": "Total number of local blocks dirtied by the statement.", "type": "number", @@ -582,14 +594,14 @@ "description": "Plan time in per seconds.", "type": "number", "format": "float", - "x-order": 61 + "x-order": 65 }, "m_plans_calls_sum_per_sec": { "description": "Total number of planned calls.", "type": "number", "format": "float", "title": "pg_stat_monitor 0.9 metrics", - "x-order": 57 + "x-order": 61 }, "m_qc_hit_sum_per_sec": { "description": "Boolean metrics:\n- *_sum_per_sec - how many times this matric was true.\n\nQuery Cache hits.", @@ -657,6 +669,18 @@ "format": "float", "x-order": 33 }, + "m_shared_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 55 + }, + "m_shared_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 56 + }, "m_shared_blks_dirtied_sum_per_sec": { "description": "Total number of shared blocks dirtied by the statement.", "type": "number", @@ -745,19 +769,19 @@ "description": "Total bytes of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 60 + "x-order": 64 }, "m_wal_fpi_sum_per_sec": { "description": "Total number of FPI (full page images) in WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 59 + "x-order": 63 }, "m_wal_records_sum_per_sec": { "description": "Total number of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 58 + "x-order": 62 }, "num_queries_per_sec": { "description": "number of queries in bucket.", @@ -1371,13 +1395,13 @@ "description": "Total time system spent in query.", "type": "number", "format": "float", - "x-order": 56 + "x-order": 60 }, "m_cpu_user_time_sum_per_sec": { "description": "Total time user spent in query.", "type": "number", "format": "float", - "x-order": 55 + "x-order": 59 }, "m_docs_returned_sum_per_sec": { "description": "MongoDB metrics.\n\nThe number of returned documents.", @@ -1451,6 +1475,18 @@ "format": "float", "x-order": 17 }, + "m_local_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 57 + }, + "m_local_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 58 + }, "m_local_blks_dirtied_sum_per_sec": { "description": "Total number of local blocks dirtied by the statement.", "type": "number", @@ -1503,14 +1539,14 @@ "description": "Plan time in per seconds.", "type": "number", "format": "float", - "x-order": 61 + "x-order": 65 }, "m_plans_calls_sum_per_sec": { "description": "Total number of planned calls.", "type": "number", "format": "float", "title": "pg_stat_monitor 0.9 metrics", - "x-order": 57 + "x-order": 61 }, "m_qc_hit_sum_per_sec": { "description": "Boolean metrics:\n- *_sum_per_sec - how many times this matric was true.\n\nQuery Cache hits.", @@ -1578,6 +1614,18 @@ "format": "float", "x-order": 33 }, + "m_shared_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 55 + }, + "m_shared_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 56 + }, "m_shared_blks_dirtied_sum_per_sec": { "description": "Total number of shared blocks dirtied by the statement.", "type": "number", @@ -1666,19 +1714,19 @@ "description": "Total bytes of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 60 + "x-order": 64 }, "m_wal_fpi_sum_per_sec": { "description": "Total number of FPI (full page images) in WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 59 + "x-order": 63 }, "m_wal_records_sum_per_sec": { "description": "Total number of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 58 + "x-order": 62 }, "num_queries_per_sec": { "description": "number of queries in bucket.", diff --git a/api/qanpb/qan.pb.go b/api/qanpb/qan.pb.go index 6779e3a894..6e9938e5d8 100644 --- a/api/qanpb/qan.pb.go +++ b/api/qanpb/qan.pb.go @@ -253,9 +253,21 @@ type Point struct { // Total number of temp blocks written by the statement. MTempBlksWrittenSumPerSec float32 `protobuf:"fixed32,50,opt,name=m_temp_blks_written_sum_per_sec,json=mTempBlksWrittenSumPerSec,proto3" json:"m_temp_blks_written_sum_per_sec,omitempty"` // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + // + // Deprecated: Marked as deprecated in qanpb/qan.proto. MBlkReadTimeSumPerSec float32 `protobuf:"fixed32,51,opt,name=m_blk_read_time_sum_per_sec,json=mBlkReadTimeSumPerSec,proto3" json:"m_blk_read_time_sum_per_sec,omitempty"` // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + // + // Deprecated: Marked as deprecated in qanpb/qan.proto. MBlkWriteTimeSumPerSec float32 `protobuf:"fixed32,52,opt,name=m_blk_write_time_sum_per_sec,json=mBlkWriteTimeSumPerSec,proto3" json:"m_blk_write_time_sum_per_sec,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkReadTimeSumPerSec float32 `protobuf:"fixed32,63,opt,name=m_shared_blk_read_time_sum_per_sec,json=mSharedBlkReadTimeSumPerSec,proto3" json:"m_shared_blk_read_time_sum_per_sec,omitempty"` + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MSharedBlkWriteTimeSumPerSec float32 `protobuf:"fixed32,64,opt,name=m_shared_blk_write_time_sum_per_sec,json=mSharedBlkWriteTimeSumPerSec,proto3" json:"m_shared_blk_write_time_sum_per_sec,omitempty"` + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkReadTimeSumPerSec float32 `protobuf:"fixed32,65,opt,name=m_local_blk_read_time_sum_per_sec,json=mLocalBlkReadTimeSumPerSec,proto3" json:"m_local_blk_read_time_sum_per_sec,omitempty"` + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + MLocalBlkWriteTimeSumPerSec float32 `protobuf:"fixed32,66,opt,name=m_local_blk_write_time_sum_per_sec,json=mLocalBlkWriteTimeSumPerSec,proto3" json:"m_local_blk_write_time_sum_per_sec,omitempty"` // Total time user spent in query. MCpuUserTimeSumPerSec float32 `protobuf:"fixed32,56,opt,name=m_cpu_user_time_sum_per_sec,json=mCpuUserTimeSumPerSec,proto3" json:"m_cpu_user_time_sum_per_sec,omitempty"` // Total time system spent in query. @@ -675,6 +687,7 @@ func (x *Point) GetMTempBlksWrittenSumPerSec() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/qan.proto. func (x *Point) GetMBlkReadTimeSumPerSec() float32 { if x != nil { return x.MBlkReadTimeSumPerSec @@ -682,6 +695,7 @@ func (x *Point) GetMBlkReadTimeSumPerSec() float32 { return 0 } +// Deprecated: Marked as deprecated in qanpb/qan.proto. func (x *Point) GetMBlkWriteTimeSumPerSec() float32 { if x != nil { return x.MBlkWriteTimeSumPerSec @@ -689,6 +703,34 @@ func (x *Point) GetMBlkWriteTimeSumPerSec() float32 { return 0 } +func (x *Point) GetMSharedBlkReadTimeSumPerSec() float32 { + if x != nil { + return x.MSharedBlkReadTimeSumPerSec + } + return 0 +} + +func (x *Point) GetMSharedBlkWriteTimeSumPerSec() float32 { + if x != nil { + return x.MSharedBlkWriteTimeSumPerSec + } + return 0 +} + +func (x *Point) GetMLocalBlkReadTimeSumPerSec() float32 { + if x != nil { + return x.MLocalBlkReadTimeSumPerSec + } + return 0 +} + +func (x *Point) GetMLocalBlkWriteTimeSumPerSec() float32 { + if x != nil { + return x.MLocalBlkWriteTimeSumPerSec + } + return 0 +} + func (x *Point) GetMCpuUserTimeSumPerSec() float32 { if x != nil { return x.MCpuUserTimeSumPerSec @@ -796,8 +838,8 @@ var File_qanpb_qan_proto protoreflect.FileDescriptor var file_qanpb_qan_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x71, 0x61, 0x6e, 0x70, 0x62, 0x2f, 0x71, 0x61, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x12, 0x0b, 0x71, 0x61, 0x6e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x22, 0xc6, - 0x1c, 0x0a, 0x05, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x69, 0x6e, + 0x6f, 0x12, 0x0b, 0x71, 0x61, 0x6e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x22, 0xf2, + 0x1e, 0x0a, 0x05, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, @@ -993,64 +1035,83 @@ var file_qanpb_qan_proto_rawDesc = []byte{ 0x5f, 0x62, 0x6c, 0x6b, 0x73, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x32, 0x20, 0x01, 0x28, 0x02, 0x52, 0x19, 0x6d, 0x54, 0x65, 0x6d, 0x70, 0x42, 0x6c, 0x6b, 0x73, 0x57, 0x72, 0x69, 0x74, 0x74, 0x65, - 0x6e, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x3a, 0x0a, 0x1b, 0x6d, 0x5f, + 0x6e, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x3e, 0x0a, 0x1b, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, - 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x33, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x15, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, - 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x3c, 0x0a, 0x1c, 0x6d, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, - 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, - 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x34, 0x20, 0x01, 0x28, 0x02, 0x52, 0x16, 0x6d, 0x42, - 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, - 0x72, 0x53, 0x65, 0x63, 0x12, 0x3a, 0x0a, 0x1b, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, - 0x73, 0x65, 0x63, 0x18, 0x38, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x43, 0x70, 0x75, 0x55, - 0x73, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, - 0x12, 0x38, 0x0a, 0x1a, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x73, 0x79, 0x73, 0x5f, 0x74, 0x69, - 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x39, - 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, 0x43, 0x70, 0x75, 0x53, 0x79, 0x73, 0x54, 0x69, 0x6d, - 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x37, 0x0a, 0x19, 0x6d, 0x5f, - 0x70, 0x6c, 0x61, 0x6e, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x5f, - 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, - 0x50, 0x6c, 0x61, 0x6e, 0x73, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, - 0x53, 0x65, 0x63, 0x12, 0x37, 0x0a, 0x19, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, - 0x18, 0x3b, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, 0x57, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x73, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x2f, 0x0a, 0x15, - 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, - 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x6d, 0x57, 0x61, - 0x6c, 0x46, 0x70, 0x69, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x33, 0x0a, - 0x17, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x73, 0x75, 0x6d, - 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x02, 0x52, 0x12, - 0x6d, 0x57, 0x61, 0x6c, 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, - 0x65, 0x63, 0x12, 0x33, 0x0a, 0x17, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3e, 0x20, - 0x01, 0x28, 0x02, 0x52, 0x12, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, - 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x22, 0x37, 0x0a, 0x0d, 0x4d, 0x61, 0x70, 0x46, 0x69, - 0x65, 0x6c, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x2a, 0x55, 0x0a, 0x0d, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x12, 0x1e, 0x0a, 0x16, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x46, 0x4f, 0x52, - 0x4d, 0x41, 0x54, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x1a, 0x02, 0x08, - 0x01, 0x12, 0x0f, 0x0a, 0x07, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x10, 0x01, 0x1a, 0x02, - 0x08, 0x01, 0x12, 0x13, 0x0a, 0x0b, 0x46, 0x49, 0x4e, 0x47, 0x45, 0x52, 0x50, 0x52, 0x49, 0x4e, - 0x54, 0x10, 0x02, 0x1a, 0x02, 0x08, 0x01, 0x2a, 0x5d, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, - 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, - 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, - 0x53, 0x4c, 0x4f, 0x57, 0x45, 0x53, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x41, 0x53, - 0x54, 0x45, 0x53, 0x54, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x45, - 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x42, 0x95, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x71, - 0x61, 0x6e, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x08, 0x51, 0x61, 0x6e, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x71, 0x61, 0x6e, 0x70, 0x62, 0x3b, 0x71, 0x61, 0x6e, 0x76, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x51, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x51, 0x61, 0x6e, 0x2e, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x0b, 0x51, 0x61, 0x6e, 0x5c, 0x56, 0x31, - 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x17, 0x51, 0x61, 0x6e, 0x5c, 0x56, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x0c, 0x51, 0x61, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x33, 0x20, 0x01, 0x28, 0x02, 0x42, + 0x02, 0x18, 0x01, 0x52, 0x15, 0x6d, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, + 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x40, 0x0a, 0x1c, 0x6d, 0x5f, + 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, + 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x34, 0x20, 0x01, 0x28, 0x02, + 0x42, 0x02, 0x18, 0x01, 0x52, 0x16, 0x6d, 0x42, 0x6c, 0x6b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x47, 0x0a, 0x22, + 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x72, 0x65, 0x61, + 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, + 0x65, 0x63, 0x18, 0x3f, 0x20, 0x01, 0x28, 0x02, 0x52, 0x1b, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, + 0x64, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, + 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x49, 0x0a, 0x23, 0x6d, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, + 0x64, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x40, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x1c, 0x6d, 0x53, 0x68, 0x61, 0x72, 0x65, 0x64, 0x42, 0x6c, 0x6b, 0x57, 0x72, + 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, + 0x12, 0x45, 0x0a, 0x21, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, + 0x72, 0x65, 0x61, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, + 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x41, 0x20, 0x01, 0x28, 0x02, 0x52, 0x1a, 0x6d, 0x4c, 0x6f, + 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, + 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x47, 0x0a, 0x22, 0x6d, 0x5f, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x5f, 0x62, 0x6c, 0x6b, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x42, 0x20, + 0x01, 0x28, 0x02, 0x52, 0x1b, 0x6d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6b, 0x57, 0x72, + 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, + 0x12, 0x3a, 0x0a, 0x1b, 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x74, + 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, + 0x38, 0x20, 0x01, 0x28, 0x02, 0x52, 0x15, 0x6d, 0x43, 0x70, 0x75, 0x55, 0x73, 0x65, 0x72, 0x54, + 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x38, 0x0a, 0x1a, + 0x6d, 0x5f, 0x63, 0x70, 0x75, 0x5f, 0x73, 0x79, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, + 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x39, 0x20, 0x01, 0x28, 0x02, + 0x52, 0x14, 0x6d, 0x43, 0x70, 0x75, 0x53, 0x79, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, + 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x37, 0x0a, 0x19, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, + 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, + 0x73, 0x65, 0x63, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x02, 0x52, 0x14, 0x6d, 0x50, 0x6c, 0x61, 0x6e, + 0x73, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, + 0x37, 0x0a, 0x19, 0x6d, 0x5f, 0x77, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, + 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3b, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x14, 0x6d, 0x57, 0x61, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x53, + 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x2f, 0x0a, 0x15, 0x6d, 0x5f, 0x77, 0x61, + 0x6c, 0x5f, 0x66, 0x70, 0x69, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, + 0x63, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x02, 0x52, 0x10, 0x6d, 0x57, 0x61, 0x6c, 0x46, 0x70, 0x69, + 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x33, 0x0a, 0x17, 0x6d, 0x5f, 0x77, + 0x61, 0x6c, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x5f, 0x70, 0x65, 0x72, + 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x02, 0x52, 0x12, 0x6d, 0x57, 0x61, 0x6c, + 0x42, 0x79, 0x74, 0x65, 0x73, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x12, 0x33, + 0x0a, 0x17, 0x6d, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x75, + 0x6d, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x63, 0x18, 0x3e, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x12, 0x6d, 0x50, 0x6c, 0x61, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x6d, 0x50, 0x65, 0x72, + 0x53, 0x65, 0x63, 0x22, 0x37, 0x0a, 0x0d, 0x4d, 0x61, 0x70, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x55, 0x0a, 0x0d, + 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, + 0x16, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x5f, + 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x0f, 0x0a, + 0x07, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x10, 0x01, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x13, + 0x0a, 0x0b, 0x46, 0x49, 0x4e, 0x47, 0x45, 0x52, 0x50, 0x52, 0x49, 0x4e, 0x54, 0x10, 0x02, 0x1a, + 0x02, 0x08, 0x01, 0x2a, 0x5d, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x45, 0x58, 0x41, 0x4d, 0x50, 0x4c, 0x45, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, + 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x4c, 0x4f, 0x57, + 0x45, 0x53, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x41, 0x53, 0x54, 0x45, 0x53, 0x54, + 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, + 0x10, 0x04, 0x42, 0x95, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x71, 0x61, 0x6e, 0x2e, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x08, 0x51, 0x61, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, + 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x71, + 0x61, 0x6e, 0x70, 0x62, 0x3b, 0x71, 0x61, 0x6e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, + 0x02, 0x03, 0x51, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x51, 0x61, 0x6e, 0x2e, 0x56, 0x31, 0x62, 0x65, + 0x74, 0x61, 0x31, 0xca, 0x02, 0x0b, 0x51, 0x61, 0x6e, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, + 0x31, 0xe2, 0x02, 0x17, 0x51, 0x61, 0x6e, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x51, 0x61, + 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/api/qanpb/qan.pb.validate.go b/api/qanpb/qan.pb.validate.go index af061f436d..0955decf9d 100644 --- a/api/qanpb/qan.pb.validate.go +++ b/api/qanpb/qan.pb.validate.go @@ -166,6 +166,14 @@ func (m *Point) validate(all bool) error { // no validation rules for MBlkWriteTimeSumPerSec + // no validation rules for MSharedBlkReadTimeSumPerSec + + // no validation rules for MSharedBlkWriteTimeSumPerSec + + // no validation rules for MLocalBlkReadTimeSumPerSec + + // no validation rules for MLocalBlkWriteTimeSumPerSec + // no validation rules for MCpuUserTimeSumPerSec // no validation rules for MCpuSysTimeSumPerSec diff --git a/api/qanpb/qan.proto b/api/qanpb/qan.proto index 7bbb75dd03..8a3bd64dab 100644 --- a/api/qanpb/qan.proto +++ b/api/qanpb/qan.proto @@ -142,9 +142,17 @@ message Point { // Total number of temp blocks written by the statement. float m_temp_blks_written_sum_per_sec = 50; // Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_read_time_sum_per_sec = 51; + float m_blk_read_time_sum_per_sec = 51 [deprecated = true]; // Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). - float m_blk_write_time_sum_per_sec = 52; + float m_blk_write_time_sum_per_sec = 52 [deprecated = true]; + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_read_time_sum_per_sec = 63; + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_shared_blk_write_time_sum_per_sec = 64; + // Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_read_time_sum_per_sec = 65; + // Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero). + float m_local_blk_write_time_sum_per_sec = 66; // Total time user spent in query. float m_cpu_user_time_sum_per_sec = 56; // Total time system spent in query. diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json index ff8fe38d6e..cb544a74eb 100644 --- a/api/swagger/swagger-dev.json +++ b/api/swagger/swagger-dev.json @@ -786,48 +786,72 @@ "format": "float", "x-order": 54 }, + "m_shared_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 55 + }, + "m_shared_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 56 + }, + "m_local_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 57 + }, + "m_local_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 58 + }, "m_cpu_user_time_sum_per_sec": { "description": "Total time user spent in query.", "type": "number", "format": "float", - "x-order": 55 + "x-order": 59 }, "m_cpu_sys_time_sum_per_sec": { "description": "Total time system spent in query.", "type": "number", "format": "float", - "x-order": 56 + "x-order": 60 }, "m_plans_calls_sum_per_sec": { "description": "Total number of planned calls.", "type": "number", "format": "float", "title": "pg_stat_monitor 0.9 metrics", - "x-order": 57 + "x-order": 61 }, "m_wal_records_sum_per_sec": { "description": "Total number of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 58 + "x-order": 62 }, "m_wal_fpi_sum_per_sec": { "description": "Total number of FPI (full page images) in WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 59 + "x-order": 63 }, "m_wal_bytes_sum_per_sec": { "description": "Total bytes of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 60 + "x-order": 64 }, "m_plan_time_sum_per_sec": { "description": "Plan time in per seconds.", "type": "number", "format": "float", - "x-order": 61 + "x-order": 65 } } }, @@ -1669,48 +1693,72 @@ "format": "float", "x-order": 54 }, + "m_shared_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 55 + }, + "m_shared_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 56 + }, + "m_local_blk_read_time_sum_per_sec": { + "description": "Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 57 + }, + "m_local_blk_write_time_sum_per_sec": { + "description": "Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).", + "type": "number", + "format": "float", + "x-order": 58 + }, "m_cpu_user_time_sum_per_sec": { "description": "Total time user spent in query.", "type": "number", "format": "float", - "x-order": 55 + "x-order": 59 }, "m_cpu_sys_time_sum_per_sec": { "description": "Total time system spent in query.", "type": "number", "format": "float", - "x-order": 56 + "x-order": 60 }, "m_plans_calls_sum_per_sec": { "description": "Total number of planned calls.", "type": "number", "format": "float", "title": "pg_stat_monitor 0.9 metrics", - "x-order": 57 + "x-order": 61 }, "m_wal_records_sum_per_sec": { "description": "Total number of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 58 + "x-order": 62 }, "m_wal_fpi_sum_per_sec": { "description": "Total number of FPI (full page images) in WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 59 + "x-order": 63 }, "m_wal_bytes_sum_per_sec": { "description": "Total bytes of WAL (Write-ahead logging) records.", "type": "number", "format": "float", - "x-order": 60 + "x-order": 64 }, "m_plan_time_sum_per_sec": { "description": "Plan time in per seconds.", "type": "number", "format": "float", - "x-order": 61 + "x-order": 65 } } }, diff --git a/descriptor.bin b/descriptor.bin index 857e9d4320b2ef384099d19ca2eedd06fea50be7..20c48812ffcfbb40c5051d01f345f91e1d731f6c 100644 GIT binary patch delta 7120 zcmaKxd2kg)9>?k5Yv5&uD?>tFUJh~}j~qM_2!s$0_o&@f5wO;>)-?s1S`VTu#C89$ z_PNL*Tb65CmJ?V+Ek#$+QrxwktEDRoA}Ry|fj~k+FcAScBw)#U?S6kV)6$` zoMwcZ8kXI$aB1W1cGvSVJ(k+Ez$wjHeE0mug}2{$XH(-f_cU7x?HU#>zPn*5Vhzm* zHY~fZDHO^PB{csk=z{y2tm#IEO5vdQFTJz5(PeMDr#Y1Fu;aY6G33388>qxTLUZQu zC3GUpscVe%riR7$-nMY@Wu4~4lN>aq=~|Af;l{l24oY&;s;iLzIi)jEI^|`9t#-&% zKj$SwWwbbWaq{Od(S$;v{OuY70d2EU} z5zpYEvPm7sj|6rTJ zVcvalq{RG{eZv_Uv~N8vLwVYg21}eRqdZB-l5dfmV7Ht`wn9H!2<_gYl8DZhZppXN z(9KqId7_*nr+D~By~r!FK0IJqw%>$mDiQrVV2wu zhrJ|X7R^+B$%P2DT9gaX_C!%GMB7;ioRbFi@fApa{cgBSR~SplD;otzOb% zOYXC`oRhcME6!sWX}+r%E%#A4(;r5OCEH16+3%glFm$^Tv}@;f*LcQKOCBIO-oE82 za|(|j7%N4$P^G(7if$bsBi&C{3dsS=%=VK-EZG5x-yi}7DzqX3MMt6{0!0Tas=a

RV0UA_l%>-x;C2A%>b11PVWtQwr>`56EsL+ZsC^{1rWl(e` zD#|U{BUN!C~o zMeqwE%L@viC=OReCmI~7ia=vu(3oV8B}<+n8s|j`EQ(302=){i$*KtU6s4qkC`zY^ zGQD5`D2gLg5$I_enWl4cvfRZhzM}iPMPvquA2`GvR>T$K0?#cvpX z!|@B^mlW^0Xlxsr|HAK#(Z64K&yq!z__t!o(tDflwM_o+AEJvIn-@m&2D0NH{9ycY zgs8X2m}Y*~9100+Wz~kz-PYaExO73|ZPqONTGK3$+{9jDn&~(G+{n9RZ+pqMxM4}- z(uQS?w}oapJGYE0ch=Z2dgfmk`ATHZHOoJ5p+vm$}cwqNxx)DJmu^(KJi82&x>kThm}e17({ATZ;&m zdbVk>wTQ9`WvjL1I)9Lfd*yl2T8I!+qFRX7>G9P zHXYb{5zP1UPY1SMV5b{(usTa_u$v-gWpy2}4H~Nhwm}5*Jgg4b22ogST<2gjEcu+E zVte+Na!###HD`cFo$Boj@Xv{0uE);+|C}f&GUhmZy(Kp?uQpVX>U!X)Qg}V^jT)~9 zzLD`;9DJrFUlf#YKf2zWXOAi~hgHu6jw*%E1pcB3W_j6X0)J6puRGhpXIb(kL51!< zi1Fww;HXmgEZ{GR;CK(81^gv}Poq)?pKZxa_M2s9@ubh?5?ky1zxp$bx?$9v#{LNH`QHWH;Zt_qG8UWS!KL@!8R+*7ii^;@qbj9p?ndw zcg{02)0_o!bmD@^2L@65+p7n$?pRfJWWJdda>y}E`imQ*RrYTXja?ZSnJMV`wksPx11h3}`PEOjh|m0M*VE-g3`-sXkz;T~jE7YG=w#wH?rYqEh?8 zwdVMI_fuTZcHaH$r$XmQgCE`x(X0c_26^S+_@>1iW}jGVhP=;tM&RgRhnr~!6bFeS zcJ4Z4%6DG5f_8ALgH+_4XK<#E(5w^9u6#>+Ngi2eh88LOBgQ)!cawY!x{Js?MG^Ed z@9|I`?q&O!7oje~JHfpYA2Z%X1;zX>-1@{{oz_OFSeU4s8*KUZ0XaM-E8S&i#s!W5bh^Zmtzm(C@Xvqfb7X2Ik(wxC*B+SqbTTiV!ij4g$ZWiP@f>@Dleys3K`J;C1u z?xonv=m|s$IA7Fey;|CZYVEngEM>-I`fbYHV_1?vJa=ke>*1;B3 zD@zAkF7Vf!J6j!Wxj>-|?~XW#@K^lR=!Oq6jJB0<8z!&976bOqU>;$ z*NNMoGOJ^U*n(A{Z*?aQGmf&t4>SI)#t$?8 zt;V|%{!ZiFG3HUB_-^LE(|kAc-)X)F;qNuy!#K(c?_vCVjrTDAJ>yT4GYLl!UlE{; z@LwtCy2j?E@!F@&WDz^U9@MKR>v`xjw?46@j#{cR%zZyfQ%Qp6z8EWrg=L zzA}KXcK3eiWqf5IHRRz(5ndJW@9Cq?ETBU1N10z0NK*cz%&!Xg59g-{ug0Gvh$e(uhi0Jhj}`hM1}30P`9?PuMZ0A54}_WwA_d1O>zNZ2rqfaJ4~ NM*{H!&zkGr|3B3rM8*IB delta 4513 zcmZ{nYiv}<6~{ftgT20EFdo0w>(}nu*ck8&90KOmKtH7lNlBCzH4Pyx9};krP@fPP6HLSLPHIgvE4Pk=49(-P#pvR{#8|7n;{B`^5%r3rgOVh5B2iCtq#WwdU=W zs$gEB4Nhh7N9$kMu*M^6t=#5S&#zm%>NU=;+5p2) zk}^tW^~)kR{$jhlN_3e__<6N2p0-cUoh$woUvxqKIv~o;fon1{t;EW*(q&3&D&?nY z`5}d))+S-4*_i?@<0Q*NuNW~V!zMf`17>cGder=CREDEISpYK5OOd^Uve45;Lv6i2ajG9lz;ar?(yBNC9s4Qa5ah*%F zJjlAi236@g|62yje4+%zK_)6)qEySz&E)H{qN#Ke{v>H7+)D)~RF0nj{5j`vrV9H?9K~|BUfJq0Hh7+?E*76Wc5`r)+knkGO?siqhy@r#-RS=&@Hl40z4~sY5l#!TkIvu*6WL>qEz0f7PtHvxM;m=|P!JkQ9)iZ&g zA(fwKawhOIR9KXl!dY6LB^gQxX2Ajpe`Cyo#aU9hz5*6!sh}`nQKRKKdpX72Pgo5+ zknufg;Bk(Wzb|UwaV~jD)@pg4q`xR?VS$8iQ45Rnq_Puj)WYIC<>n{asM9eyMA9Fm z4jxGO9(C{-B9)i$sDsB41w#psdM$@Z)+Yq@(oSUhi8M}3_UEe}p2Ji$gB3CRb6pS9 zVXCRKGA$`nC`HQ=qFigTHHjne2m@XSdW15vyb$OJ=^PhD@dA-{ivlRZbT724fyrJ7 zGAnOfLj_i6$3#p)C#- zSxYRE=|ZPnrIbu_IU(_zgkKtd>G%ck%ZO)ASO+K3$g`$P zs51JpI6fxSqnV<~G)+Lal`{PH1lMws+wG9YaZ6} zO+nSpQ5mgM#YN@rG(U_dds9?S$EnI|YMz!`&8Y@eXU^8C{L-kang`WZF|Epa%vR0U za+{zk=fHYnwn}T9kLg3oTSD_OecMDJ;^OmxZxa=j)>0d9(sDcFe`!+>n=!_lfFtGM zO~AMNcoXpLj6Y-J3$$zzRBoQwtA1$X4GVxH<>3o}w}?QAJNg3PEdm#ZM{IndmOIV< zIciD6LSQ?6Y$33nB2eaH3xVwv(F&{D#ujP0%S0OSncp&7P0M5tkOLq zWv>vSXToOxgsL{JjcP$`k4Rpxt%98G;jCAL-lF66+A1=f4S_1GTSeAXf4#N|ck^IH z;`@QnvYU05Z=1kJj6Vhl;nXIyv$*q|_1h*wMfUpL@X{Qs=aPBtA@v@;^+ddEt_qgR z8t-yzmakN4Ip4k9)|j;`Rq+D_zS`FD)wZN@#dmMDb^qs9dro-Q+Ww!Y4w?DKx7=&( zeF~Z1-&UpZL(i$F1^t)exYzbC7EyD1hib^)DC~#(2Oh4QDEi=rc+_<6RP|Gw8TbOC zm8r`Cz3r#Che8iUHz9R^}^IVw@a0kIH#DPFL~qlQfb7hw}M@ir^ZDhJ zk1>we!;dk3*~gDDewp#5b`#wwUm+?D&2gKkY*&r3ZgxT1bLnQ6D-*Zd}WP#*Q0=wTeOhxaf(>f=3(kNS8o%40s>8)F^`kMCuE%;$TVAM^P> zl*fI(k8#8v-pBa3kM}V?&Ug#ilhBX)Eux~(?8;d-wq3cliqF)q&q7o#zgJ8s&RL-bd%Oh=E7K z<4-exk1}#x{xlDNkMav$eh}peqUmmVkWVDURw9Po1mCNj;Ro4nf^;Mi!)}5qsw@j9 bCoYxur%+1BQdX+utJ!^u|7oB4^TGcC(bD6N diff --git a/managed/services/qan/client.go b/managed/services/qan/client.go index b84f4b87e8..0ad26286fb 100644 --- a/managed/services/qan/client.go +++ b/managed/services/qan/client.go @@ -541,10 +541,14 @@ func fillPostgreSQL(mb *qanpb.MetricsBucket, bp *agentpb.MetricsBucket_PostgreSQ mb.MTempBlksWrittenCnt = bp.MTempBlksWrittenCnt mb.MTempBlksWrittenSum = bp.MTempBlksWrittenSum - mb.MBlkReadTimeCnt = bp.MBlkReadTimeCnt - mb.MBlkReadTimeSum = bp.MBlkReadTimeSum - mb.MBlkWriteTimeCnt = bp.MBlkWriteTimeCnt - mb.MBlkWriteTimeSum = bp.MBlkWriteTimeSum + mb.MSharedBlkReadTimeCnt = bp.MSharedBlkReadTimeCnt + mb.MSharedBlkReadTimeSum = bp.MSharedBlkReadTimeSum + mb.MSharedBlkWriteTimeCnt = bp.MSharedBlkWriteTimeCnt + mb.MSharedBlkWriteTimeSum = bp.MSharedBlkWriteTimeSum + mb.MLocalBlkReadTimeCnt = bp.MLocalBlkReadTimeCnt + mb.MLocalBlkReadTimeSum = bp.MLocalBlkReadTimeSum + mb.MLocalBlkWriteTimeCnt = bp.MLocalBlkWriteTimeCnt + mb.MLocalBlkWriteTimeSum = bp.MLocalBlkWriteTimeSum mb.MCpuSysTimeCnt = bp.MCpuSysTimeCnt mb.MCpuSysTimeSum = bp.MCpuSysTimeSum diff --git a/managed/services/qan/client_test.go b/managed/services/qan/client_test.go index 700840abd2..d12fbd2f69 100644 --- a/managed/services/qan/client_test.go +++ b/managed/services/qan/client_test.go @@ -301,36 +301,40 @@ func TestClient(t *testing.T) { MQueryTimeSum: 55, }, Postgresql: &agentpb.MetricsBucket_PostgreSQL{ - MRowsCnt: 1, - MRowsSum: 4079, - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: 33, - MSharedBlksReadCnt: 1, - MSharedBlksReadSum: 2, - MSharedBlksDirtiedCnt: 3, - MSharedBlksDirtiedSum: 4, - MSharedBlksWrittenCnt: 5, - MSharedBlksWrittenSum: 6, - MLocalBlksHitCnt: 7, - MLocalBlksHitSum: 8, - MLocalBlksReadCnt: 9, - MLocalBlksReadSum: 10, - MLocalBlksDirtiedCnt: 11, - MLocalBlksDirtiedSum: 12, - MLocalBlksWrittenCnt: 13, - MLocalBlksWrittenSum: 14, - MTempBlksReadCnt: 15, - MTempBlksReadSum: 16, - MTempBlksWrittenCnt: 17, - MTempBlksWrittenSum: 18, - MBlkReadTimeCnt: 19, - MBlkReadTimeSum: 20, - MBlkWriteTimeCnt: 21, - MBlkWriteTimeSum: 22, - MCpuSysTimeCnt: 23, - MCpuSysTimeSum: 24, - MCpuUserTimeCnt: 25, - MCpuUserTimeSum: 26, + MRowsCnt: 1, + MRowsSum: 4079, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: 33, + MSharedBlksReadCnt: 1, + MSharedBlksReadSum: 2, + MSharedBlksDirtiedCnt: 3, + MSharedBlksDirtiedSum: 4, + MSharedBlksWrittenCnt: 5, + MSharedBlksWrittenSum: 6, + MLocalBlksHitCnt: 7, + MLocalBlksHitSum: 8, + MLocalBlksReadCnt: 9, + MLocalBlksReadSum: 10, + MLocalBlksDirtiedCnt: 11, + MLocalBlksDirtiedSum: 12, + MLocalBlksWrittenCnt: 13, + MLocalBlksWrittenSum: 14, + MTempBlksReadCnt: 15, + MTempBlksReadSum: 16, + MTempBlksWrittenCnt: 17, + MTempBlksWrittenSum: 18, + MSharedBlkReadTimeCnt: 19, + MSharedBlkReadTimeSum: 20, + MSharedBlkWriteTimeCnt: 21, + MSharedBlkWriteTimeSum: 22, + MLocalBlkReadTimeCnt: 23, + MLocalBlkReadTimeSum: 24, + MLocalBlkWriteTimeCnt: 25, + MLocalBlkWriteTimeSum: 26, + MCpuSysTimeCnt: 27, + MCpuSysTimeSum: 28, + MCpuUserTimeCnt: 29, + MCpuUserTimeSum: 30, }, }, } @@ -364,37 +368,41 @@ func TestClient(t *testing.T) { "_service_label": "bar", }, - MRowsSentCnt: 1, - MRowsSentSum: 4079, - MSharedBlksHitCnt: 1, - MSharedBlksHitSum: 33, - MSharedBlksReadCnt: 1, - MSharedBlksReadSum: 2, - MSharedBlksDirtiedCnt: 3, - MSharedBlksDirtiedSum: 4, - MSharedBlksWrittenCnt: 5, - MSharedBlksWrittenSum: 6, - MLocalBlksHitCnt: 7, - MLocalBlksHitSum: 8, - MLocalBlksReadCnt: 9, - MLocalBlksReadSum: 10, - MLocalBlksDirtiedCnt: 11, - MLocalBlksDirtiedSum: 12, - MLocalBlksWrittenCnt: 13, - MLocalBlksWrittenSum: 14, - MTempBlksReadCnt: 15, - MTempBlksReadSum: 16, - MTempBlksWrittenCnt: 17, - MTempBlksWrittenSum: 18, - MBlkReadTimeCnt: 19, - MBlkReadTimeSum: 20, - MBlkWriteTimeCnt: 21, - MBlkWriteTimeSum: 22, - MCpuSysTimeCnt: 23, - MCpuSysTimeSum: 24, - MCpuUserTimeCnt: 25, - MCpuUserTimeSum: 26, - HistogramItems: []string{}, + MRowsSentCnt: 1, + MRowsSentSum: 4079, + MSharedBlksHitCnt: 1, + MSharedBlksHitSum: 33, + MSharedBlksReadCnt: 1, + MSharedBlksReadSum: 2, + MSharedBlksDirtiedCnt: 3, + MSharedBlksDirtiedSum: 4, + MSharedBlksWrittenCnt: 5, + MSharedBlksWrittenSum: 6, + MLocalBlksHitCnt: 7, + MLocalBlksHitSum: 8, + MLocalBlksReadCnt: 9, + MLocalBlksReadSum: 10, + MLocalBlksDirtiedCnt: 11, + MLocalBlksDirtiedSum: 12, + MLocalBlksWrittenCnt: 13, + MLocalBlksWrittenSum: 14, + MTempBlksReadCnt: 15, + MTempBlksReadSum: 16, + MTempBlksWrittenCnt: 17, + MTempBlksWrittenSum: 18, + MSharedBlkReadTimeCnt: 19, + MSharedBlkReadTimeSum: 20, + MSharedBlkWriteTimeCnt: 21, + MSharedBlkWriteTimeSum: 22, + MLocalBlkReadTimeCnt: 23, + MLocalBlkReadTimeSum: 24, + MLocalBlkWriteTimeCnt: 25, + MLocalBlkWriteTimeSum: 26, + MCpuSysTimeCnt: 27, + MCpuSysTimeSum: 28, + MCpuUserTimeCnt: 29, + MCpuUserTimeSum: 30, + HistogramItems: []string{}, }, }} c.AssertCalled(t, "Collect", ctx, expectedRequest) diff --git a/qan-api2/migrations/sql/17_shared_blk_columns.down.sql b/qan-api2/migrations/sql/17_shared_blk_columns.down.sql new file mode 100644 index 0000000000..ed66b42396 --- /dev/null +++ b/qan-api2/migrations/sql/17_shared_blk_columns.down.sql @@ -0,0 +1,11 @@ +ALTER TABLE metrics + DROP COLUMN m_local_blk_read_time_cnt, + DROP COLUMN m_local_blk_read_time_sum, + DROP COLUMN m_local_blk_write_time_cnt, + DROP COLUMN m_local_blk_write_time_sum, + RENAME COLUMN m_shared_blk_read_time_cnt to m_blk_read_time_cnt, + RENAME COLUMN m_shared_blk_read_time_sum to m_blk_read_time_sum, + COMMENT COLUMN m_blk_read_time_sum 'Total time the statement spent reading blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).', + RENAME COLUMN m_shared_blk_write_time_cnt to m_blk_write_time_cnt, + RENAME COLUMN m_shared_blk_write_time_sum to m_blk_write_time_sum, + COMMENT COLUMN m_blk_write_time_sum 'Total time the statement spent writing blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).'; \ No newline at end of file diff --git a/qan-api2/migrations/sql/17_shared_blk_columns.up.sql b/qan-api2/migrations/sql/17_shared_blk_columns.up.sql new file mode 100644 index 0000000000..01a7707f0a --- /dev/null +++ b/qan-api2/migrations/sql/17_shared_blk_columns.up.sql @@ -0,0 +1,11 @@ +ALTER TABLE metrics + RENAME COLUMN m_blk_read_time_cnt to m_shared_blk_read_time_cnt, + RENAME COLUMN m_blk_read_time_sum to m_shared_blk_read_time_sum, + COMMENT COLUMN m_shared_blk_read_time_sum 'Total time the statement spent reading shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).', + RENAME COLUMN m_blk_write_time_cnt to m_shared_blk_write_time_cnt, + RENAME COLUMN m_blk_write_time_sum to m_shared_blk_write_time_sum, + COMMENT COLUMN m_shared_blk_write_time_sum 'Total time the statement spent writing shared blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).', + ADD COLUMN m_local_blk_read_time_cnt Float32, + ADD COLUMN m_local_blk_read_time_sum Float32 COMMENT 'Total time the statement spent reading local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).', + ADD COLUMN m_local_blk_write_time_cnt Float32, + ADD COLUMN m_local_blk_write_time_sum Float32 COMMENT 'Total time the statement spent writing local blocks, in milliseconds (if track_io_timing is enabled, otherwise zero).'; \ No newline at end of file diff --git a/qan-api2/models/base.go b/qan-api2/models/base.go index 45a3493b98..19fae7aa33 100644 --- a/qan-api2/models/base.go +++ b/qan-api2/models/base.go @@ -79,8 +79,10 @@ var sparklinePointAllFields = []string{ "m_local_blks_written_sum_per_sec", "m_temp_blks_read_sum_per_sec", "m_temp_blks_written_sum_per_sec", - "m_blk_read_time_sum_per_sec", - "m_blk_write_time_sum_per_sec", + "m_shared_blk_read_time_sum_per_sec", + "m_shared_blk_write_time_sum_per_sec", + "m_local_blk_read_time_sum_per_sec", + "m_local_blk_write_time_sum_per_sec", "m_cpu_user_time_sum_per_sec", "m_cpu_sys_time_sum_per_sec", "m_plans_calls_sum_per_sec", @@ -145,8 +147,10 @@ func getPointFieldsList(point *qanpb.Point, fields []string) []interface{} { "m_local_blks_written_sum_per_sec": &point.MLocalBlksWrittenSumPerSec, "m_temp_blks_read_sum_per_sec": &point.MTempBlksReadSumPerSec, "m_temp_blks_written_sum_per_sec": &point.MTempBlksWrittenSumPerSec, - "m_blk_read_time_sum_per_sec": &point.MBlkReadTimeSumPerSec, - "m_blk_write_time_sum_per_sec": &point.MBlkWriteTimeSumPerSec, + "m_shared_blk_read_time_sum_per_sec": &point.MSharedBlkReadTimeSumPerSec, + "m_shared_blk_write_time_sum_per_sec": &point.MSharedBlkWriteTimeSumPerSec, + "m_local_blk_read_time_sum_per_sec": &point.MLocalBlkReadTimeSumPerSec, + "m_local_blk_write_time_sum_per_sec": &point.MLocalBlkWriteTimeSumPerSec, "m_cpu_user_time_sum_per_sec": &point.MCpuUserTimeSumPerSec, "m_cpu_sys_time_sum_per_sec": &point.MCpuSysTimeSumPerSec, "m_plans_calls_sum_per_sec": &point.MPlansCallsSumPerSec, @@ -325,10 +329,14 @@ func isValidMetricColumn(name string) bool { "m_temp_blks_read_sum": {}, "m_temp_blks_written_cnt": {}, "m_temp_blks_written_sum": {}, - "m_blk_read_time_cnt": {}, - "m_blk_read_time_sum": {}, - "m_blk_write_time_cnt": {}, - "m_blk_write_time_sum": {}, + "m_shared_blk_read_time_cnt": {}, + "m_shared_blk_read_time_sum": {}, + "m_shared_blk_write_time_cnt": {}, + "m_shared_blk_write_time_sum": {}, + "m_local_blk_read_time_cnt": {}, + "m_local_blk_read_time_sum": {}, + "m_local_blk_write_time_cnt": {}, + "m_local_blk_write_time_sum": {}, "m_cpu_user_time_cnt": {}, "m_cpu_sys_time_cnt": {}, "m_cpu_user_time_sum": {}, diff --git a/qan-api2/models/data_ingestion.go b/qan-api2/models/data_ingestion.go index d530832078..a5552b3a56 100644 --- a/qan-api2/models/data_ingestion.go +++ b/qan-api2/models/data_ingestion.go @@ -237,10 +237,14 @@ const insertSQL = ` m_temp_blks_read_sum, m_temp_blks_written_cnt, m_temp_blks_written_sum, - m_blk_read_time_cnt, - m_blk_read_time_sum, - m_blk_write_time_cnt, - m_blk_write_time_sum, + m_shared_blk_read_time_cnt, + m_shared_blk_read_time_sum, + m_shared_blk_write_time_cnt, + m_shared_blk_write_time_sum, + m_local_blk_read_time_cnt, + m_local_blk_read_time_sum, + m_local_blk_write_time_cnt, + m_local_blk_write_time_sum, m_cpu_user_time_cnt, m_cpu_user_time_sum, m_cpu_sys_time_cnt, @@ -463,10 +467,14 @@ const insertSQL = ` :m_temp_blks_read_sum, :m_temp_blks_written_cnt, :m_temp_blks_written_sum, - :m_blk_read_time_cnt, - :m_blk_read_time_sum, - :m_blk_write_time_cnt, - :m_blk_write_time_sum, + :m_shared_blk_read_time_cnt, + :m_shared_blk_read_time_sum, + :m_shared_blk_write_time_cnt, + :m_shared_blk_write_time_sum, + :m_local_blk_read_time_cnt, + :m_local_blk_read_time_sum, + :m_local_blk_write_time_cnt, + :m_local_blk_write_time_sum, :m_cpu_user_time_cnt, :m_cpu_user_time_sum, :m_cpu_sys_time_cnt, diff --git a/qan-api2/models/metrics.go b/qan-api2/models/metrics.go index 6db8380acf..3932927bc2 100644 --- a/qan-api2/models/metrics.go +++ b/qan-api2/models/metrics.go @@ -290,8 +290,10 @@ SUM(m_local_blks_written_sum) AS m_local_blks_written_sum, SUM(m_temp_blks_read_sum) AS m_temp_blks_read_sum, SUM(m_temp_blks_written_sum) AS m_temp_blks_written_sum, -SUM(m_blk_read_time_sum) AS m_blk_read_time_sum, -SUM(m_blk_write_time_sum) AS m_blk_write_time_sum, +SUM(m_shared_blk_read_time_sum) AS m_shared_blk_read_time_sum, +SUM(m_shared_blk_write_time_sum) AS m_shared_blk_write_time_sum, +SUM(m_local_blk_read_time_sum) AS m_local_blk_read_time_sum, +SUM(m_local_blk_write_time_sum) AS m_local_blk_write_time_sum, SUM(m_cpu_user_time_sum) AS m_cpu_user_time_sum, SUM(m_cpu_sys_time_sum) AS m_cpu_sys_time_sum, @@ -389,8 +391,10 @@ if(SUM(m_local_blks_dirtied_cnt) == 0, NaN, SUM(m_local_blks_dirtied_sum) / time if(SUM(m_local_blks_written_cnt) == 0, NaN, SUM(m_local_blks_written_sum) / time_frame) AS m_local_blks_written_sum_per_sec, if(SUM(m_temp_blks_read_cnt) == 0, NaN, SUM(m_temp_blks_read_sum) / time_frame) AS m_temp_blks_read_sum_per_sec, if(SUM(m_temp_blks_written_cnt) == 0, NaN, SUM(m_temp_blks_written_sum) / time_frame) AS m_temp_blks_written_sum_per_sec, -if(SUM(m_blk_read_time_cnt) == 0, NaN, SUM(m_blk_read_time_sum) / time_frame) AS m_blk_read_time_sum_per_sec, -if(SUM(m_blk_write_time_cnt) == 0, NaN, SUM(m_blk_write_time_sum) / time_frame) AS m_blk_write_time_sum_per_sec, +if(SUM(m_shared_blk_read_time_cnt) == 0, NaN, SUM(m_shared_blk_read_time_sum) / time_frame) AS m_shared_blk_read_time_sum_per_sec, +if(SUM(m_shared_blk_write_time_cnt) == 0, NaN, SUM(m_shared_blk_write_time_sum) / time_frame) AS m_shared_blk_write_time_sum_per_sec, +if(SUM(m_local_blk_read_time_cnt) == 0, NaN, SUM(m_local_blk_read_time_sum) / time_frame) AS m_local_blk_read_time_sum_per_sec, +if(SUM(m_local_blk_write_time_cnt) == 0, NaN, SUM(m_local_blk_write_time_sum) / time_frame) AS m_local_blk_write_time_sum_per_sec, if(SUM(m_cpu_user_time_cnt) == 0, NaN, SUM(m_cpu_user_time_sum) / time_frame) AS m_cpu_user_time_sum_per_sec, if(SUM(m_cpu_sys_time_cnt) == 0, NaN, SUM(m_cpu_sys_time_sum) / time_frame) AS m_cpu_sys_time_sum_per_sec, if(SUM(m_plans_calls_cnt) == 0, NaN, SUM(m_plans_calls_sum) / time_frame) AS m_plans_calls_sum_per_sec, @@ -500,6 +504,11 @@ func (m *Metrics) SelectSparklines(ctx context.Context, periodStartFromSec, peri if err != nil { return nil, errors.Wrap(err, "DimensionReport scan error") } + + // Fill deprecated fields for compatibility + p.MBlkReadTimeSumPerSec = p.MSharedBlksReadSumPerSec + p.MBlkWriteTimeSumPerSec = p.MSharedBlkWriteTimeSumPerSec + resultsWithGaps[p.Point] = &p } diff --git a/qan-api2/services/analytics/base.go b/qan-api2/services/analytics/base.go index 5d91cf5014..184f8626d8 100644 --- a/qan-api2/services/analytics/base.go +++ b/qan-api2/services/analytics/base.go @@ -77,6 +77,10 @@ var sumColumnNames = map[string]struct{}{ "temp_blks_written": {}, "blk_read_time": {}, "blk_write_time": {}, + "shared_blk_read_time": {}, + "shared_blk_write_time": {}, + "local_blk_read_time": {}, + "local_blk_write_time": {}, "cpu_user_time": {}, "cpu_sys_time": {}, "plans_calls": {}, @@ -191,16 +195,20 @@ func isDimension(name string) bool { // isTimeMetric checks if a metric in the time metrics group. func isTimeMetric(name string) bool { timeColumnNames := map[string]struct{}{ - "query_time": {}, - "lock_time": {}, - "innodb_io_r_wait": {}, - "innodb_rec_lock_wait": {}, - "innodb_queue_wait": {}, - "blk_read_time": {}, - "blk_write_time": {}, - "cpu_user_time": {}, - "cpu_sys_time": {}, - "plan_time": {}, + "query_time": {}, + "lock_time": {}, + "innodb_io_r_wait": {}, + "innodb_rec_lock_wait": {}, + "innodb_queue_wait": {}, + "blk_read_time": {}, + "blk_write_time": {}, + "shared_blk_read_time": {}, + "shared_blk_write_time": {}, + "local_blk_read_time": {}, + "local_blk_write_time": {}, + "cpu_user_time": {}, + "cpu_sys_time": {}, + "plan_time": {}, } _, ok := timeColumnNames[name] diff --git a/qan-api2/services/analytics/metrics_names.go b/qan-api2/services/analytics/metrics_names.go index 4f913d80dd..e5090b64b5 100644 --- a/qan-api2/services/analytics/metrics_names.go +++ b/qan-api2/services/analytics/metrics_names.go @@ -23,69 +23,73 @@ import ( // metricsNames is a map of metrics names and keys. var metricsNames = map[string]string{ - "load": "Load", - "count": "Count", - "latency": "Latency", - "query_time": "Query Time", - "lock_time": "Lock Time", - "rows_sent": "Rows Sent", - "rows_examined": "Rows Examined", - "rows_affected": "Rows Affected", - "rows_read": "Rows Read", - "merge_passes": "Merge Passes", - "innodb_io_r_ops": "Innodb IO R Ops", - "innodb_io_r_bytes": "Innodb IO R Bytes", - "innodb_io_r_wait": "Innodb IO R Wait", - "innodb_rec_lock_wait": "Innodb Rec Lock Wait", - "innodb_queue_wait": "Innodb Queue Wait", - "innodb_pages_distinct": "Innodb Pages Distinct", - "query_length": "Query Length", - "bytes_sent": "Bytes Sent", - "tmp_tables": "Tmp Tables", - "tmp_disk_tables": "Tmp Disk Tables", - "tmp_table_sizes": "Tmp Table Sizes", - "qc_hit": "Query Cache Hit", - "full_scan": "Full Scan", - "full_join": "Full Join", - "tmp_table": "Tmp Table", - "tmp_table_on_disk": "Tmp Table on Disk", - "filesort": "Filesort", - "filesort_on_disk": "Filesort on Disk", - "select_full_range_join": "Select Full Range Join", - "select_range": "Select Range", - "select_range_check": "Select Range Check", - "sort_range": "Sort Range", - "sort_rows": "Sort Rows", - "sort_scan": "Sort Scan", - "no_index_used": "No Index Used", - "no_good_index_used": "No Good Index Used", - "docs_returned": "Docs Returned", - "response_length": "Response Length", - "docs_scanned": "Docs Scanned", - "m_shared_blks_hit": "Shared blocks cache hits", - "m_shared_blks_read": "Shared blocks read", - "m_shared_blks_dirtied": "Shared blocks dirtied", - "m_shared_blks_written": "Shared blocks written", - "m_local_blks_hit": "Local blocks cache hits", - "m_local_blks_read": "Local blocks read", - "m_local_blks_dirtied": "Local blocks dirtied", - "m_local_blks_written": "Local blocks written", - "m_temp_blks_read": "Temp blocks read", - "m_temp_blks_written": "Temp blocks written", - "m_blk_read_time": "Time the statement spent reading blocks", - "m_blk_write_time": "Time the statement spent writing blocks", - "m_cpu_user_time": "Total time user spent in query", - "m_cpu_sys_time": "Total time system spent in query", - "m_plans_calls": "Total number of planned calls", - "m_wal_records": "Total number of WAL (Write-ahead logging) records", - "m_wal_fpi": "Total number of FPI (full page images) in WAL (Write-ahead logging) records", - "m_wal_bytes": "Total bytes of WAL (Write-ahead logging) records", - "m_plan_time": "Total plan time spent in query", - "cmd_type": "Type of SQL command used in the query", - "top_queryid": "Top parent query ID", - "top_query": "Top query plain text", - "application_name": "Name provided by pg_stat_monitor", - "planid": "Plan ID for query", + "load": "Load", + "count": "Count", + "latency": "Latency", + "query_time": "Query Time", + "lock_time": "Lock Time", + "rows_sent": "Rows Sent", + "rows_examined": "Rows Examined", + "rows_affected": "Rows Affected", + "rows_read": "Rows Read", + "merge_passes": "Merge Passes", + "innodb_io_r_ops": "Innodb IO R Ops", + "innodb_io_r_bytes": "Innodb IO R Bytes", + "innodb_io_r_wait": "Innodb IO R Wait", + "innodb_rec_lock_wait": "Innodb Rec Lock Wait", + "innodb_queue_wait": "Innodb Queue Wait", + "innodb_pages_distinct": "Innodb Pages Distinct", + "query_length": "Query Length", + "bytes_sent": "Bytes Sent", + "tmp_tables": "Tmp Tables", + "tmp_disk_tables": "Tmp Disk Tables", + "tmp_table_sizes": "Tmp Table Sizes", + "qc_hit": "Query Cache Hit", + "full_scan": "Full Scan", + "full_join": "Full Join", + "tmp_table": "Tmp Table", + "tmp_table_on_disk": "Tmp Table on Disk", + "filesort": "Filesort", + "filesort_on_disk": "Filesort on Disk", + "select_full_range_join": "Select Full Range Join", + "select_range": "Select Range", + "select_range_check": "Select Range Check", + "sort_range": "Sort Range", + "sort_rows": "Sort Rows", + "sort_scan": "Sort Scan", + "no_index_used": "No Index Used", + "no_good_index_used": "No Good Index Used", + "docs_returned": "Docs Returned", + "response_length": "Response Length", + "docs_scanned": "Docs Scanned", + "m_shared_blks_hit": "Shared blocks cache hits", + "m_shared_blks_read": "Shared blocks read", + "m_shared_blks_dirtied": "Shared blocks dirtied", + "m_shared_blks_written": "Shared blocks written", + "m_local_blks_hit": "Local blocks cache hits", + "m_local_blks_read": "Local blocks read", + "m_local_blks_dirtied": "Local blocks dirtied", + "m_local_blks_written": "Local blocks written", + "m_temp_blks_read": "Temp blocks read", + "m_temp_blks_written": "Temp blocks written", + "m_blk_read_time": "Time the statement spent reading blocks [deprecated]", + "m_blk_write_time": "Time the statement spent writing blocks [deprecated]", + "m_shared_blk_read_time": "Time the statement spent reading shared blocks", + "m_shared_blk_write_time": "Time the statement spent writing shared blocks", + "m_local_blk_read_time": "Time the statement spent reading local_blocks", + "m_local_blk_write_time": "Time the statement spent writing local_blocks", + "m_cpu_user_time": "Total time user spent in query", + "m_cpu_sys_time": "Total time system spent in query", + "m_plans_calls": "Total number of planned calls", + "m_wal_records": "Total number of WAL (Write-ahead logging) records", + "m_wal_fpi": "Total number of FPI (full page images) in WAL (Write-ahead logging) records", + "m_wal_bytes": "Total bytes of WAL (Write-ahead logging) records", + "m_plan_time": "Total plan time spent in query", + "cmd_type": "Type of SQL command used in the query", + "top_queryid": "Top parent query ID", + "top_query": "Top query plain text", + "application_name": "Name provided by pg_stat_monitor", + "planid": "Plan ID for query", } // GetMetricsNames implements rpc to get list of available metrics. diff --git a/qan-api2/test_data/GetMetrics_group_by_queryid.json b/qan-api2/test_data/GetMetrics_group_by_queryid.json index c383b330df..3d7856ba32 100644 --- a/qan-api2/test_data/GetMetrics_group_by_queryid.json +++ b/qan-api2/test_data/GetMetrics_group_by_queryid.json @@ -5,6 +5,18 @@ }, "blk_write_time": { + }, + "shared_blk_read_time": { + + }, + "shared_blk_write_time": { + + }, + "local_blk_read_time": { + + }, + "local_blk_write_time": { + }, "bytes_sent": { "rate": 2.1030555, @@ -250,6 +262,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -304,6 +320,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -363,6 +383,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -417,6 +441,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -491,6 +519,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -545,6 +577,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -599,6 +635,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -663,6 +703,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -712,6 +756,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -776,6 +824,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -830,6 +882,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -884,6 +940,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -933,6 +993,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -992,6 +1056,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1046,6 +1114,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1095,6 +1167,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1159,6 +1235,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1208,6 +1288,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1257,6 +1341,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1311,6 +1399,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1360,6 +1452,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1409,6 +1505,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1458,6 +1558,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1522,6 +1626,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1576,6 +1684,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1630,6 +1742,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1699,6 +1815,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1763,6 +1883,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1817,6 +1941,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1866,6 +1994,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1925,6 +2057,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1999,6 +2135,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2053,6 +2193,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2112,6 +2256,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2161,6 +2309,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2215,6 +2367,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2264,6 +2420,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2313,6 +2473,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2362,6 +2526,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2411,6 +2579,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2480,6 +2652,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2534,6 +2710,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2588,6 +2768,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2637,6 +2821,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2686,6 +2874,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2735,6 +2927,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2799,6 +2995,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2853,6 +3053,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2902,6 +3106,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2956,6 +3164,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3005,6 +3217,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3054,6 +3270,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3103,6 +3323,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3157,6 +3381,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3211,6 +3439,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3226,6 +3458,18 @@ }, "blk_write_time": { + }, + "shared_blk_read_time": { + + }, + "shared_blk_write_time": { + + }, + "local_blk_read_time": { + + }, + "local_blk_write_time": { + }, "bytes_sent": { "rate": 593.79974, diff --git a/qan-api2/test_data/GetMetrics_sparklines_90_points.json b/qan-api2/test_data/GetMetrics_sparklines_90_points.json index 91cedf727d..c64546e030 100644 --- a/qan-api2/test_data/GetMetrics_sparklines_90_points.json +++ b/qan-api2/test_data/GetMetrics_sparklines_90_points.json @@ -5,6 +5,18 @@ }, "blk_write_time": { + }, + "shared_blk_read_time": { + + }, + "shared_blk_write_time": { + + }, + "local_blk_read_time": { + + }, + "local_blk_write_time": { + }, "bytes_sent": { "rate": 2.7203703, @@ -255,6 +267,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -309,6 +325,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -463,6 +483,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -547,6 +571,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -616,6 +644,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -670,6 +702,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -769,6 +805,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -823,6 +863,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -897,6 +941,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -961,6 +1009,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1020,6 +1072,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1114,6 +1170,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1203,6 +1263,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1228,6 +1292,18 @@ }, "blk_write_time": { + }, + "shared_blk_read_time": { + + }, + "shared_blk_write_time": { + + }, + "local_blk_read_time": { + + }, + "local_blk_write_time": { + }, "bytes_sent": { "rate": 604.05927, diff --git a/qan-api2/test_data/GetMetrics_total.json b/qan-api2/test_data/GetMetrics_total.json index d144f24dd5..9530cfd8dc 100644 --- a/qan-api2/test_data/GetMetrics_total.json +++ b/qan-api2/test_data/GetMetrics_total.json @@ -49,6 +49,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -103,6 +107,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -157,6 +165,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -211,6 +223,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -265,6 +281,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -319,6 +339,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -373,6 +397,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -427,6 +455,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -481,6 +513,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -535,6 +571,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -589,6 +629,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -643,6 +687,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -697,6 +745,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -751,6 +803,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -805,6 +861,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -859,6 +919,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -913,6 +977,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -967,6 +1035,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1021,6 +1093,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1075,6 +1151,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1129,6 +1209,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1183,6 +1267,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1237,6 +1325,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1291,6 +1383,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1345,6 +1441,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1399,6 +1499,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1453,6 +1557,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1507,6 +1615,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1561,6 +1673,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1615,6 +1731,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1669,6 +1789,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1723,6 +1847,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1777,6 +1905,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1831,6 +1963,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1885,6 +2021,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1939,6 +2079,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -1993,6 +2137,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2047,6 +2196,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2101,6 +2255,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2155,6 +2314,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2209,6 +2373,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2263,6 +2432,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2317,6 +2491,11 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2371,6 +2550,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2425,6 +2608,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2479,6 +2666,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2533,6 +2724,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2587,6 +2782,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2641,6 +2840,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2695,6 +2898,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2749,6 +2956,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2803,6 +3014,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2857,6 +3072,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2911,6 +3130,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -2965,6 +3188,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3019,6 +3246,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3073,6 +3304,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3127,6 +3362,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3181,6 +3420,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3235,6 +3478,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3289,6 +3536,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3343,6 +3594,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3397,6 +3652,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3451,6 +3710,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3505,6 +3768,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3559,6 +3826,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3613,6 +3884,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3667,6 +3942,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3721,6 +4000,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3775,6 +4058,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3829,6 +4116,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3883,6 +4174,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3937,6 +4232,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -3991,6 +4290,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4045,6 +4348,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4099,6 +4406,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4153,6 +4464,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4207,6 +4522,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4261,6 +4580,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4315,6 +4638,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4369,6 +4696,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4423,6 +4754,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4477,6 +4812,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4531,6 +4870,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4585,6 +4928,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4639,6 +4986,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4693,6 +5044,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4747,6 +5102,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4801,6 +5160,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4855,6 +5218,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4909,6 +5276,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -4963,6 +5334,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5017,6 +5392,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5071,6 +5450,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5125,6 +5508,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5179,6 +5566,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5233,6 +5624,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5287,6 +5682,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5341,6 +5740,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5395,6 +5798,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5449,6 +5856,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5503,6 +5914,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5557,6 +5972,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5611,6 +6030,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5665,6 +6088,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5719,6 +6146,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5773,6 +6204,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5827,6 +6262,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5881,6 +6320,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5935,6 +6378,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -5989,6 +6436,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6043,6 +6494,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6097,6 +6552,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6151,6 +6610,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6205,6 +6668,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6259,6 +6726,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6313,6 +6784,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6367,6 +6842,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6421,6 +6900,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6475,6 +6958,10 @@ "mTempBlksWrittenSumPerSec": "NaN", "mBlkReadTimeSumPerSec": "NaN", "mBlkWriteTimeSumPerSec": "NaN", + "mSharedBlkReadTimeSumPerSec": "NaN", + "mSharedBlkWriteTimeSumPerSec": "NaN", + "mLocalBlkReadTimeSumPerSec": "NaN", + "mLocalBlkWriteTimeSumPerSec": "NaN", "mCpuUserTimeSumPerSec": "NaN", "mCpuSysTimeSumPerSec": "NaN", "mPlansCallsSumPerSec": "NaN", @@ -6490,6 +6977,18 @@ }, "blk_write_time": { + }, + "shared_blk_read_time": { + + }, + "shared_blk_write_time": { + + }, + "local_blk_read_time": { + + }, + "local_blk_write_time": { + }, "bytes_sent": { "rate": 593.79974, From 2842c7d76d66761a80389688da80e78ef4c87e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:22:26 +0300 Subject: [PATCH 04/17] Bump eslint-plugin-playwright from 1.6.0 to 1.7.0 in /cli-tests (#3237) Bumps [eslint-plugin-playwright](https://github.com/playwright-community/eslint-plugin-playwright) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/playwright-community/eslint-plugin-playwright/releases) - [Changelog](https://github.com/playwright-community/eslint-plugin-playwright/blob/main/CHANGELOG.md) - [Commits](https://github.com/playwright-community/eslint-plugin-playwright/compare/v1.6.0...v1.7.0) --- updated-dependencies: - dependency-name: eslint-plugin-playwright dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 8 ++++---- cli-tests/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 6fa3ad7535..b5284989f6 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -26,7 +26,7 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^18.0.0", "eslint-plugin-import": "^2.31.0", - "eslint-plugin-playwright": "^1.6.0" + "eslint-plugin-playwright": "^1.7.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1514,9 +1514,9 @@ } }, "node_modules/eslint-plugin-playwright": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.6.0.tgz", - "integrity": "sha512-tI1E/EDbHT4Fx5KvukUG3RTIT0gk44gvTP8bNwxLCFsUXVM98ZJG5zWU6Om5JOzH9FrmN4AhMu/UKyEsu0ZoDA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-1.7.0.tgz", + "integrity": "sha512-pDp2jFeWbBmlwDfZ39Ypdlz1+IafmRKvFTnnonX0TbS7hAByy4oh7Y6ioZRKvLGE+djd/e2VbqOo9sxgZSY2ow==", "dev": true, "dependencies": { "globals": "^13.23.0" diff --git a/cli-tests/package.json b/cli-tests/package.json index 867f774c20..3d8dfbb1e7 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -30,6 +30,6 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^18.0.0", "eslint-plugin-import": "^2.31.0", - "eslint-plugin-playwright": "^1.6.0" + "eslint-plugin-playwright": "^1.7.0" } } From 1360266000a17faf31434e8f757ddbe80dc223c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:11:57 +0300 Subject: [PATCH 05/17] Bump @typescript-eslint/eslint-plugin from 8.8.0 to 8.9.0 in /cli-tests (#3240) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.8.0 to 8.9.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.9.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 120 ++++++++++++++++++------------------ cli-tests/package.json | 2 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index b5284989f6..5ef36d02ec 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -20,7 +20,7 @@ "devDependencies": { "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", - "@typescript-eslint/eslint-plugin": "^8.8.0", + "@typescript-eslint/eslint-plugin": "^8.9.0", "@typescript-eslint/parser": "^7.18.0", "eslint": "8.57", "eslint-config-airbnb-base": "^15.0.0", @@ -257,16 +257,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.0.tgz", - "integrity": "sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.9.0.tgz", + "integrity": "sha512-Y1n621OCy4m7/vTXNlCbMVp87zSd7NH0L9cXD8aIpOaNlzeWxIK4+Q19A68gSmTNRZn92UjocVUWDthGxtqHFg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.8.0", - "@typescript-eslint/type-utils": "8.8.0", - "@typescript-eslint/utils": "8.8.0", - "@typescript-eslint/visitor-keys": "8.8.0", + "@typescript-eslint/scope-manager": "8.9.0", + "@typescript-eslint/type-utils": "8.9.0", + "@typescript-eslint/utils": "8.9.0", + "@typescript-eslint/visitor-keys": "8.9.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -290,13 +290,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz", - "integrity": "sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.9.0.tgz", + "integrity": "sha512-bZu9bUud9ym1cabmOYH9S6TnbWRzpklVmwqICeOulTCZ9ue2/pczWzQvt/cGj2r2o1RdKoZbuEMalJJSYw3pHQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", - "@typescript-eslint/visitor-keys": "8.8.0" + "@typescript-eslint/types": "8.9.0", + "@typescript-eslint/visitor-keys": "8.9.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -307,9 +307,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz", - "integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.9.0.tgz", + "integrity": "sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -320,12 +320,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz", - "integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.9.0.tgz", + "integrity": "sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/types": "8.9.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -382,13 +382,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.0.tgz", - "integrity": "sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.9.0.tgz", + "integrity": "sha512-JD+/pCqlKqAk5961vxCluK+clkppHY07IbV3vett97KOV+8C6l+CPEPwpUuiMwgbOz/qrN3Ke4zzjqbT+ls+1Q==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "8.8.0", - "@typescript-eslint/utils": "8.8.0", + "@typescript-eslint/typescript-estree": "8.9.0", + "@typescript-eslint/utils": "8.9.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -406,9 +406,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz", - "integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.9.0.tgz", + "integrity": "sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -419,13 +419,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz", - "integrity": "sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.9.0.tgz", + "integrity": "sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", - "@typescript-eslint/visitor-keys": "8.8.0", + "@typescript-eslint/types": "8.9.0", + "@typescript-eslint/visitor-keys": "8.9.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -447,12 +447,12 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz", - "integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.9.0.tgz", + "integrity": "sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/types": "8.9.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -553,15 +553,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz", - "integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.9.0.tgz", + "integrity": "sha512-PKgMmaSo/Yg/F7kIZvrgrWa1+Vwn036CdNUvYFEkYbPwOH4i8xvkaRlu148W3vtheWK9ckKRIz7PBP5oUlkrvQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.8.0", - "@typescript-eslint/types": "8.8.0", - "@typescript-eslint/typescript-estree": "8.8.0" + "@typescript-eslint/scope-manager": "8.9.0", + "@typescript-eslint/types": "8.9.0", + "@typescript-eslint/typescript-estree": "8.9.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -575,13 +575,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz", - "integrity": "sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.9.0.tgz", + "integrity": "sha512-bZu9bUud9ym1cabmOYH9S6TnbWRzpklVmwqICeOulTCZ9ue2/pczWzQvt/cGj2r2o1RdKoZbuEMalJJSYw3pHQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", - "@typescript-eslint/visitor-keys": "8.8.0" + "@typescript-eslint/types": "8.9.0", + "@typescript-eslint/visitor-keys": "8.9.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -592,9 +592,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz", - "integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.9.0.tgz", + "integrity": "sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -605,13 +605,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz", - "integrity": "sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.9.0.tgz", + "integrity": "sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", - "@typescript-eslint/visitor-keys": "8.8.0", + "@typescript-eslint/types": "8.9.0", + "@typescript-eslint/visitor-keys": "8.9.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -633,12 +633,12 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz", - "integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.9.0.tgz", + "integrity": "sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/types": "8.9.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { diff --git a/cli-tests/package.json b/cli-tests/package.json index 3d8dfbb1e7..6d674c50a7 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -24,7 +24,7 @@ "devDependencies": { "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", - "@typescript-eslint/eslint-plugin": "^8.8.0", + "@typescript-eslint/eslint-plugin": "^8.9.0", "@typescript-eslint/parser": "^7.18.0", "eslint": "8.57", "eslint-config-airbnb-base": "^15.0.0", From 766d5c7eb7da0f0bf35baf4264996b39237414b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:14:19 +0300 Subject: [PATCH 06/17] Bump google.golang.org/grpc from 1.65.0 to 1.67.1 (#3233) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.65.0 to 1.67.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.65.0...v1.67.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 14c67d0dc2..acdeaaa28d 100644 --- a/go.mod +++ b/go.mod @@ -80,9 +80,9 @@ require ( golang.org/x/sys v0.24.0 golang.org/x/text v0.17.0 golang.org/x/tools v0.24.0 - google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a - google.golang.org/genproto/googleapis/rpc v0.0.0-20240723171418-e6d459c13d2a - google.golang.org/grpc v1.65.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 + google.golang.org/grpc v1.67.1 google.golang.org/protobuf v1.34.2 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/reform.v1 v1.5.1 @@ -261,7 +261,7 @@ require ( go.opentelemetry.io/otel/trace v1.26.0 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/term v0.23.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.3.0 // indirect diff --git a/go.sum b/go.sum index 79d5ab4d66..ba1e91dbed 100644 --- a/go.sum +++ b/go.sum @@ -940,8 +940,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1172,10 +1172,10 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a h1:YIa/rzVqMEokBkPtydCkx1VLmv3An1Uw7w1P1m6EhOY= -google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240723171418-e6d459c13d2a h1:hqK4+jJZXCU4pW7jsAdGOVFIfLHQeV7LaizZKnZ84HI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240723171418-e6d459c13d2a/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1188,8 +1188,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From af76cddef975aff212eeafa53e3aedb8162873e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:24:47 +0000 Subject: [PATCH 07/17] Bump github.com/go-sql-driver/mysql from 1.7.1 to 1.8.1 (#2932) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump github.com/go-sql-driver/mysql from 1.7.1 to 1.8.1 Bumps [github.com/go-sql-driver/mysql](https://github.com/go-sql-driver/mysql) from 1.7.1 to 1.8.1. - [Release notes](https://github.com/go-sql-driver/mysql/releases) - [Changelog](https://github.com/go-sql-driver/mysql/blob/v1.8.1/CHANGELOG.md) - [Commits](https://github.com/go-sql-driver/mysql/compare/v1.7.1...v1.8.1) --- updated-dependencies: - dependency-name: github.com/go-sql-driver/mysql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * PMM-7 Fix tests. * PMM-12155 fix tests. * PMM-7 fix tests. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jiří Čtvrtka <62988319+JiriCtvrtka@users.noreply.github.com> Co-authored-by: Nurlan Moldomurov Co-authored-by: Nurlan Moldomurov --- .../runner/actions/mysql_explain_action_test.go | 6 +++--- .../actions/mysql_show_index_action_test.go | 16 ++++++++-------- go.mod | 3 ++- go.sum | 6 ++++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/agent/runner/actions/mysql_explain_action_test.go b/agent/runner/actions/mysql_explain_action_test.go index ecc628fbe4..1d381b6ece 100644 --- a/agent/runner/actions/mysql_explain_action_test.go +++ b/agent/runner/actions/mysql_explain_action_test.go @@ -161,9 +161,9 @@ func TestMySQLExplain(t *testing.T) { assert.Contains(t, actual[0], "Extra") // Checks some stable values - assert.Equal(t, actual[1][0], "1") // id - assert.Equal(t, actual[1][1], "SIMPLE") // select_type - assert.Equal(t, actual[1][2], "city") // table + assert.Equal(t, float64(1), actual[1][0]) // id + assert.Equal(t, "SIMPLE", actual[1][1]) // select_type + assert.Equal(t, "city", actual[1][2]) // table }) t.Run("Error", func(t *testing.T) { diff --git a/agent/runner/actions/mysql_show_index_action_test.go b/agent/runner/actions/mysql_show_index_action_test.go index 00fdbf83b9..25fd424d1e 100644 --- a/agent/runner/actions/mysql_show_index_action_test.go +++ b/agent/runner/actions/mysql_show_index_action_test.go @@ -70,32 +70,32 @@ func TestMySQLShowIndex(t *testing.T) { "Table", "Non_unique", "Key_name", "Seq_in_index", "Column_name", "Collation", "Cardinality", "Sub_part", "Packed", "Null", "Index_type", "Comment", "Index_comment", "Ignored", }, actual[0]) - assert.Equal(t, []interface{}{"city", "0", "PRIMARY", "1", "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "NO"}, actual[1]) - assert.Equal(t, []interface{}{"city", "1", "CountryCode", "1", "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "NO"}, actual[2]) + assert.Equal(t, []interface{}{"city", float64(0), "PRIMARY", float64(1), "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "NO"}, actual[1]) + assert.Equal(t, []interface{}{"city", float64(1), "CountryCode", float64(1), "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "NO"}, actual[2]) case mySQLVersion.String() == "5.6" || mySQLVendor == version.MariaDBVendor: assert.Equal(t, []interface{}{ "Table", "Non_unique", "Key_name", "Seq_in_index", "Column_name", "Collation", "Cardinality", "Sub_part", "Packed", "Null", "Index_type", "Comment", "Index_comment", }, actual[0]) - assert.Equal(t, []interface{}{"city", "0", "PRIMARY", "1", "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[1]) - assert.Equal(t, []interface{}{"city", "1", "CountryCode", "1", "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[2]) + assert.Equal(t, []interface{}{"city", float64(0), "PRIMARY", float64(1), "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[1]) + assert.Equal(t, []interface{}{"city", float64(1), "CountryCode", float64(1), "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[2]) case mySQLVersion.String() == "5.7": assert.Equal(t, []interface{}{ "Table", "Non_unique", "Key_name", "Seq_in_index", "Column_name", "Collation", "Cardinality", "Sub_part", "Packed", "Null", "Index_type", "Comment", "Index_comment", }, actual[0]) - assert.Equal(t, []interface{}{"city", "0", "PRIMARY", "1", "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[1]) - assert.Equal(t, []interface{}{"city", "1", "CountryCode", "1", "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[2]) + assert.Equal(t, []interface{}{"city", float64(0), "PRIMARY", float64(1), "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[1]) + assert.Equal(t, []interface{}{"city", float64(1), "CountryCode", float64(1), "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", ""}, actual[2]) case mySQLVersion.String() == "8.0": assert.Equal(t, []interface{}{ "Table", "Non_unique", "Key_name", "Seq_in_index", "Column_name", "Collation", "Cardinality", "Sub_part", "Packed", "Null", "Index_type", "Comment", "Index_comment", "Visible", "Expression", }, actual[0]) - assert.Equal(t, []interface{}{"city", "0", "PRIMARY", "1", "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "YES", nil}, actual[1]) - assert.Equal(t, []interface{}{"city", "1", "CountryCode", "1", "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "YES", nil}, actual[2]) + assert.Equal(t, []interface{}{"city", float64(0), "PRIMARY", float64(1), "ID", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "YES", nil}, actual[1]) + assert.Equal(t, []interface{}{"city", float64(1), "CountryCode", float64(1), "CountryCode", "A", "CARDINALITY", nil, nil, "", "BTREE", "", "", "YES", nil}, actual[2]) default: t.Fatal("Unhandled version.") diff --git a/go.mod b/go.mod index acdeaaa28d..83990675c6 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/go-openapi/strfmt v0.23.0 github.com/go-openapi/swag v0.23.0 github.com/go-openapi/validate v0.24.0 - github.com/go-sql-driver/mysql v1.7.1 + github.com/go-sql-driver/mysql v1.8.1 github.com/golang-migrate/migrate/v4 v4.17.0 github.com/google/uuid v1.6.0 github.com/grafana/grafana-api-golang-client v0.27.0 @@ -97,6 +97,7 @@ require ( ) require ( + filippo.io/edwards25519 v1.1.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect github.com/Azure/azure-storage-blob-go v0.14.0 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect diff --git a/go.sum b/go.sum index ba1e91dbed..54c2bbefae 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/3rf/mongo-lint v0.0.0-20140604191638-3550fdcf1f43/go.mod h1:ggh9ZlgUveoGPv/xlt2+6f/bGVEl/h+WlV4LX/dyxEI= github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE= github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= @@ -283,8 +285,8 @@ github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= From a53c6bafadae13e8e3f4491673755f725f647f6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:12:52 +0100 Subject: [PATCH 08/17] Bump k8s.io/apiextensions-apiserver from 0.30.3 to 0.31.1 (#3241) Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.30.3 to 0.31.1. - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.30.3...v0.31.1) --- updated-dependencies: - dependency-name: k8s.io/apiextensions-apiserver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 19 ++++++++++--------- go.sum | 56 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/go.mod b/go.mod index 83990675c6..78eac484dc 100644 --- a/go.mod +++ b/go.mod @@ -87,11 +87,11 @@ require ( gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/reform.v1 v1.5.1 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.31.0 - k8s.io/apiextensions-apiserver v0.30.3 - k8s.io/apimachinery v0.31.0 + k8s.io/api v0.31.1 + k8s.io/apiextensions-apiserver v0.31.1 + k8s.io/apimachinery v0.31.1 k8s.io/cli-runtime v0.30.3 - k8s.io/client-go v0.31.0 + k8s.io/client-go v0.31.1 k8s.io/kubectl v0.30.3 sigs.k8s.io/controller-runtime v0.14.6 ) @@ -142,6 +142,7 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-proto-validators v0.3.2 // indirect + github.com/onsi/gomega v1.33.1 // indirect github.com/percona/percona-backup-mongodb v1.8.1 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/posener/complete v1.2.3 // indirect @@ -151,9 +152,9 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.26.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/time v0.3.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect @@ -183,7 +184,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charmbracelet/harmonica v0.2.0 // indirect github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect @@ -258,8 +259,8 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - go.opentelemetry.io/otel v1.26.0 // indirect - go.opentelemetry.io/otel/trace v1.26.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect diff --git a/go.sum b/go.sum index 54c2bbefae..145cf9d257 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,8 @@ github.com/brianvoe/gofakeit v3.18.0+incompatible h1:wDOmHc9DLG4nRjUVVaxA+CEglKO github.com/brianvoe/gofakeit v3.18.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc= github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4= github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs= -github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -629,8 +629,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE= -github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -822,23 +822,23 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= -go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= -go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= -go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= -go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= -go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= -go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= -go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= -go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.starlark.net v0.0.0-20230717150657-8a3343210976 h1:7ljYNcZU84T2N0tZdDgvL7U3M4iFmglAUUU1gRFE/2Q= go.starlark.net v0.0.0-20230717150657-8a3343210976/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -867,8 +867,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo= -golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1246,16 +1246,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= -k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= -k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= -k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= -k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= -k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= +k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k= k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30= -k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= -k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= From 1141b6e5930fb68a49d9cd9416bd284a012302ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:31:11 +0300 Subject: [PATCH 09/17] Bump golang.org/x/tools from 0.24.0 to 0.26.0 (#3243) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.24.0 to 0.26.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.24.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 14 +++++++------- go.sum | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 78eac484dc..7612476757 100644 --- a/go.mod +++ b/go.mod @@ -75,11 +75,11 @@ require ( github.com/stretchr/testify v1.9.0 go.mongodb.org/mongo-driver v1.16.1 go.starlark.net v0.0.0-20230717150657-8a3343210976 - golang.org/x/crypto v0.26.0 + golang.org/x/crypto v0.28.0 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.24.0 - golang.org/x/text v0.17.0 - golang.org/x/tools v0.24.0 + golang.org/x/sys v0.26.0 + golang.org/x/text v0.19.0 + golang.org/x/tools v0.26.0 google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 google.golang.org/grpc v1.67.1 @@ -261,10 +261,10 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/term v0.23.0 // indirect + golang.org/x/term v0.25.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.3.0 // indirect ) diff --git a/go.sum b/go.sum index 145cf9d257..8e0d0b2361 100644 --- a/go.sum +++ b/go.sum @@ -893,8 +893,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -934,8 +934,8 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1022,16 +1022,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1045,8 +1045,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1109,8 +1109,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 4948fe686e3a85e4b521f71319f04e9eacb2ccad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 08:43:46 +0000 Subject: [PATCH 10/17] Bump github.com/charmbracelet/bubbles from 0.18.0 to 0.20.0 (#3242) Bumps [github.com/charmbracelet/bubbles](https://github.com/charmbracelet/bubbles) from 0.18.0 to 0.20.0. - [Release notes](https://github.com/charmbracelet/bubbles/releases) - [Changelog](https://github.com/charmbracelet/bubbles/blob/master/.goreleaser.yml) - [Commits](https://github.com/charmbracelet/bubbles/compare/v0.18.0...v0.20.0) --- updated-dependencies: - dependency-name: github.com/charmbracelet/bubbles dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 16 ++++++---------- go.sum | 34 ++++++++++++---------------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 7612476757..3f732cb4b1 100644 --- a/go.mod +++ b/go.mod @@ -26,9 +26,9 @@ require ( github.com/aws/aws-sdk-go v1.55.3 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.28.0 - github.com/charmbracelet/bubbles v0.18.0 - github.com/charmbracelet/bubbletea v0.26.6 - github.com/charmbracelet/lipgloss v0.12.1 + github.com/charmbracelet/bubbles v0.20.0 + github.com/charmbracelet/bubbletea v1.1.0 + github.com/charmbracelet/lipgloss v0.13.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/docker/docker v27.3.0+incompatible github.com/docker/go-connections v0.5.0 @@ -103,10 +103,8 @@ require ( github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/charmbracelet/x/ansi v0.1.4 // indirect - github.com/charmbracelet/x/input v0.1.0 // indirect - github.com/charmbracelet/x/term v0.1.1 // indirect - github.com/charmbracelet/x/windows v0.1.0 // indirect + github.com/charmbracelet/x/ansi v0.2.3 // indirect + github.com/charmbracelet/x/term v0.2.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect @@ -151,7 +149,6 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect - github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -222,7 +219,7 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-localereader v0.0.1 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.50 // indirect github.com/minio/md5-simd v1.1.2 // indirect @@ -233,7 +230,6 @@ require ( github.com/montanaflynn/stats v0.7.1 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect - github.com/muesli/reflow v0.3.0 // indirect github.com/muesli/termenv v0.15.2 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/oklog/run v1.1.0 // indirect diff --git a/go.sum b/go.sum index 8e0d0b2361..742663c033 100644 --- a/go.sum +++ b/go.sum @@ -148,22 +148,18 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= -github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= -github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s= -github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk= +github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE= +github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU= +github.com/charmbracelet/bubbletea v1.1.0 h1:FjAl9eAL3HBCHenhz/ZPjkKdScmaS5SK69JAK2YJK9c= +github.com/charmbracelet/bubbletea v1.1.0/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4= github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ= github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= -github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs= -github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8= -github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM= -github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= -github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ= -github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28= -github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI= -github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw= -github.com/charmbracelet/x/windows v0.1.0 h1:gTaxdvzDM5oMa/I2ZNF7wN78X/atWemG9Wph7Ika2k4= -github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ= +github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw= +github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY= +github.com/charmbracelet/x/ansi v0.2.3 h1:VfFN0NUpcjBRd4DnKfRaIRo53KRgey/nhOoEqosGDEY= +github.com/charmbracelet/x/ansi v0.2.3/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= +github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0= +github.com/charmbracelet/x/term v0.2.0/go.mod h1:GVxgxAbjUrmpvIINHIQnJJKpMlHiZ4cktEQCN6GWyF0= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -558,9 +554,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= -github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -609,8 +604,6 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= -github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= -github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -725,7 +718,6 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/ramr/go-reaper v0.2.1 h1:zww+wlQOvTjBZuk1920R/e0GFEb6O7+B0WQLV6dM924= github.com/ramr/go-reaper v0.2.1/go.mod h1:AVypdzrcCXjSc/JYnlXl8TsB+z84WyFzxWE8Jh0MOJc= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -801,8 +793,6 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= From 7735139aa736ae974c309f4e3155b77cacb6f184 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 08:51:51 +0000 Subject: [PATCH 11/17] Bump k8s.io/cli-runtime from 0.30.3 to 0.31.1 (#3244) Bumps [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) from 0.30.3 to 0.31.1. - [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.30.3...v0.31.1) --- updated-dependencies: - dependency-name: k8s.io/cli-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 9 +++------ go.sum | 14 ++++++-------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 3f732cb4b1..a85053f780 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.1 - k8s.io/cli-runtime v0.30.3 + k8s.io/cli-runtime v0.31.1 k8s.io/client-go v0.31.1 k8s.io/kubectl v0.30.3 sigs.k8s.io/controller-runtime v0.14.6 @@ -109,7 +109,6 @@ require ( github.com/distribution/reference v0.6.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -140,12 +139,10 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-proto-validators v0.3.2 // indirect - github.com/onsi/gomega v1.33.1 // indirect github.com/percona/percona-backup-mongodb v1.8.1 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/posener/complete v1.2.3 // indirect github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab // indirect - github.com/sergi/go-diff v1.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect @@ -161,8 +158,8 @@ require ( k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect - sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect + sigs.k8s.io/kustomize/api v0.17.2 // indirect + sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 742663c033..fcf466e640 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,6 @@ github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6 github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= @@ -1242,8 +1240,8 @@ k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/ k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k= -k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30= +k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= +k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= @@ -1262,10 +1260,10 @@ sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92 sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= -sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY= -sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U= -sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag= +sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= +sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= +sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= +sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= From 6712d56199c6a80891358416c9e9268dd2032c5d Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Wed, 16 Oct 2024 17:54:02 +0300 Subject: [PATCH 12/17] PMM-13207 Update go version. (#3235) * PMM-13207 Update go version. (cherry picked from commit 0a3894bdcfbda537d2aab89438a0a1acbe2bfdfb) * PMM-13207 go mod tidy. --- .github/workflows/clean.yml | 2 +- build/docker/rpmbuild/Dockerfile | 2 +- build/docker/rpmbuild/Dockerfile.el9 | 2 +- devcontainer.Dockerfile | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- tools/go.mod | 2 +- update/.devcontainer/install-dev-tools.sh | 2 +- update/docker-compose.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index c3e0ad8709..0f7cf8fb07 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: go: - - version: 1.22.x + - version: 1.23.x may-fail: false - version: tip may-fail: true diff --git a/build/docker/rpmbuild/Dockerfile b/build/docker/rpmbuild/Dockerfile index f6ddc34db3..98561c7831 100644 --- a/build/docker/rpmbuild/Dockerfile +++ b/build/docker/rpmbuild/Dockerfile @@ -23,7 +23,7 @@ RUN yum update -y && \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.22.2 +ENV GO_VERSION 1.23.2 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9 index aaee21b90a..be5f1458f7 100644 --- a/build/docker/rpmbuild/Dockerfile.el9 +++ b/build/docker/rpmbuild/Dockerfile.el9 @@ -28,7 +28,7 @@ RUN yum install -y gcc gcc-c++ \ yum clean all && rm -rf /var/cache/yum # keep that format for easier search -ENV GO_VERSION 1.22.3 +ENV GO_VERSION 1.23.2 ENV GO_RELEASER_VERSION 1.24.0 RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ diff --git a/devcontainer.Dockerfile b/devcontainer.Dockerfile index 10a3a94498..64e5ecb040 100644 --- a/devcontainer.Dockerfile +++ b/devcontainer.Dockerfile @@ -2,7 +2,7 @@ ARG PMM_SERVER_IMAGE="perconalab/pmm-server:dev-latest" FROM $PMM_SERVER_IMAGE ARG PMM_SERVER_IMAGE -ARG GO_VERSION="1.22.x" +ARG GO_VERSION="1.23.x" RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE" ENV GOPATH=/root/go diff --git a/go.mod b/go.mod index a85053f780..b44df65a24 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm -go 1.22.7 +go 1.23.2 // Update saas with // go get -v github.com/percona-platform/saas@latest @@ -23,7 +23,7 @@ require ( github.com/alecthomas/kong v0.9.0 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go v1.55.3 + github.com/aws/aws-sdk-go v1.55.5 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.28.0 github.com/charmbracelet/bubbles v0.20.0 diff --git a/go.sum b/go.sum index fcf466e640..2b73851556 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E= -github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/tools/go.mod b/tools/go.mod index d6ff51b44c..c0c01ff7d9 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/percona/pmm/tools -go 1.22.7 +go 1.23.2 replace github.com/go-openapi/spec => github.com/Percona-Lab/spec v0.20.5-percona diff --git a/update/.devcontainer/install-dev-tools.sh b/update/.devcontainer/install-dev-tools.sh index c5e9b3faa5..a2618ac3db 100755 --- a/update/.devcontainer/install-dev-tools.sh +++ b/update/.devcontainer/install-dev-tools.sh @@ -8,7 +8,7 @@ set -o errexit set -o xtrace # download (in the background) the same verison as used by PMM build process -curl -sSL https://dl.google.com/go/go1.22.5.linux-amd64.tar.gz -o /tmp/golang.tar.gz & +curl -sSL https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz -o /tmp/golang.tar.gz & # to install man pages sed -i '/nodocs/d' /etc/yum.conf diff --git a/update/docker-compose.yml b/update/docker-compose.yml index dab0b29593..ed9e2adf71 100644 --- a/update/docker-compose.yml +++ b/update/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: # for tests - PMM_SERVER_IMAGE=${PMM_SERVER_IMAGE:-percona/pmm-server:2} - - GO_VERSION=${GO_VERSION:-1.22.x} + - GO_VERSION=${GO_VERSION:-1.23.x} - PATH=/root/go/bin:$PATH - REVIEWDOG_GITHUB_API_TOKEN=${REVIEWDOG_GITHUB_API_TOKEN} volumes: From 7cdb65929767e8b71913f5519a6c67e005bba104 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 17 Oct 2024 17:03:30 +0300 Subject: [PATCH 13/17] PMM-7 Update default RPM build vars (#3245) * PMM-7 Update default RPM build vars * PMM-7 remove Dockerfile(s) for RHEL7 * PMM-7 remove submodules update * PMM-7 revert the default docker image value --- build/docker/rpmbuild/Dockerfile | 52 -------------------------------- build/docker/server/Dockerfile | 36 ---------------------- build/scripts/build-submodules | 3 -- build/scripts/vars | 2 +- 4 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 build/docker/rpmbuild/Dockerfile delete mode 100644 build/docker/server/Dockerfile diff --git a/build/docker/rpmbuild/Dockerfile b/build/docker/rpmbuild/Dockerfile deleted file mode 100644 index 98561c7831..0000000000 --- a/build/docker/rpmbuild/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM centos:7 - -# enable nodesource repo for nodejs -RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash - -RUN curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo - -RUN yum update -y && \ - yum install -y --setopt=skip_missing_names_on_install=False \ - gcc gcc-c++ \ - nodejs \ - libtool libtool-ltdl \ - make cmake \ - git \ - pkgconfig \ - sudo \ - automake autoconf \ - rpmdevtools createrepo_c epel-release \ - yum-utils rpm-build \ - wget \ - glibc-static \ - yarn && \ - yum -y remove nodesource-release-el7-1.noarch && \ - yum clean all && rm -rf /var/cache/yum - -# keep that format for easier search -ENV GO_VERSION 1.23.2 -ENV GO_RELEASER_VERSION 1.24.0 - -RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \ - wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz -O /tmp/golang.tar.gz && \ - wget --progress=dot:giga https://github.com/goreleaser/goreleaser/releases/download/v${GO_RELEASER_VERSION}/goreleaser-${GO_RELEASER_VERSION}-1.`uname -i`.rpm -O /tmp/goreleaser.rpm && \ - tar -C /usr/local -xzf /tmp/golang.tar.gz && \ - yum install -y /tmp/goreleaser.rpm && \ - rm /tmp/golang.tar.gz /tmp/goreleaser.rpm - -RUN update-alternatives --install "/usr/bin/go" "go" "/usr/local/go/bin/go" 0 -RUN update-alternatives --set go /usr/local/go/bin/go -RUN update-alternatives --install "/usr/bin/gofmt" "gofmt" "/usr/local/go/bin/gofmt" 0 -RUN update-alternatives --set gofmt /usr/local/go/bin/gofmt - -RUN useradd builder -u 1000 -m -G users,wheel && \ - echo "builder ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - echo "# macros" > /home/builder/.rpmmacros && \ - echo "%_topdir /home/builder/rpm" >> /home/builder/.rpmmacros && \ - mkdir /home/builder/rpm && \ - chmod 755 /home/builder && \ - chown -R builder:builder /home/builder - -USER builder - -ENV FLAVOR=rpmbuild OS=centos DIST=el7 -WORKDIR /home/builder/rpm diff --git a/build/docker/server/Dockerfile b/build/docker/server/Dockerfile deleted file mode 100644 index ca48e5d55e..0000000000 --- a/build/docker/server/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM centos:7 - -ARG VERSION -ARG BUILD_DATE - -LABEL org.opencontainers.image.created ${BUILD_DATE} -LABEL org.opencontainers.image.licenses AGPL-3.0 -LABEL org.opencontainers.image.title Percona Monitoring and Management -LABEL org.opencontainers.image.vendor Percona -LABEL org.opencontainers.image.version ${VERSION} - -EXPOSE 80 443 - -WORKDIR /opt - -# Disable fastestmirror plugin and update repo URLs -RUN sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf && \ - sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo && \ - sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo - -# Install EPEL repository and Ansible -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - yum -y install ansible - -COPY RPMS /tmp/RPMS -COPY gitCommit /tmp/gitCommit - -COPY ansible /opt/ansible -RUN cp -r /opt/ansible/roles /opt/ansible/pmm2-docker/roles -RUN ansible-playbook -vvv -i 'localhost,' -c local /opt/ansible/pmm2-docker/main.yml \ - && ansible-playbook -vvv -i 'localhost,' -c local /usr/share/pmm-update/ansible/playbook/tasks/update.yml \ - && ansible-playbook -vvv -i 'localhost,' -c local /opt/ansible/pmm2/post-build-actions.yml - -COPY entrypoint.sh /opt/entrypoint.sh -HEALTHCHECK --interval=3s --timeout=2s --start-period=10s --retries=3 CMD curl -f http://127.0.0.1/v1/readyz || exit 1 -CMD ["/opt/entrypoint.sh"] diff --git a/build/scripts/build-submodules b/build/scripts/build-submodules index e7dc1d7c47..aabb5e66c6 100755 --- a/build/scripts/build-submodules +++ b/build/scripts/build-submodules @@ -1,9 +1,6 @@ #!/bin/bash set -o errexit -git submodule update --init --jobs 10 -git submodule status - if [ -s ci.yml ]; then if [ -f /home/ec2-user/venv/bin/activate ]; then source /home/ec2-user/venv/bin/activate diff --git a/build/scripts/vars b/build/scripts/vars index bf567ce109..26f95d44ac 100644 --- a/build/scripts/vars +++ b/build/scripts/vars @@ -45,7 +45,7 @@ echo -e "\n\n\n>>> full_pmm_version=${full_pmm_version} pmm_version=${pmm_versio rpmbuild_docker_image=${RPMBUILD_DOCKER_IMAGE:-public.ecr.aws/e7j3v3n0/rpmbuild:2} rpms_dir=${root_dir}/tmp/pmm-server/RPMS rpmbuild_dir=${root_dir}/sources/pmm/src/github.com/percona/pmm/build/packages/rpm/server -rpmbuild_dist=${RPMBUILD_DIST:-"el7"} +rpmbuild_dist=${RPMBUILD_DIST:-"el9"} source_dir=${root_dir}/tmp/source/pmm2-client-${pmm_version} binary_dir=${root_dir}/tmp/binary/pmm2-client-${pmm_version} client_properties=${root_dir}/results/pmm-client.properties From 191c89f0d941b18bc2436ef15e305262aad4c606 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:11:53 +0000 Subject: [PATCH 14/17] Bump google.golang.org/protobuf from 1.34.2 to 1.35.1 (#3250) Bumps google.golang.org/protobuf from 1.34.2 to 1.35.1. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b44df65a24..b85ea9695b 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 google.golang.org/grpc v1.67.1 - google.golang.org/protobuf v1.34.2 + google.golang.org/protobuf v1.35.1 gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/reform.v1 v1.5.1 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 2b73851556..46c760827b 100644 --- a/go.sum +++ b/go.sum @@ -1193,8 +1193,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 5d78a4dcf3583e9675646a4be56c37cd1f4fd0ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:20:32 +0000 Subject: [PATCH 15/17] Bump github.com/alecthomas/kong from 0.9.0 to 1.2.1 (#3247) Bumps [github.com/alecthomas/kong](https://github.com/alecthomas/kong) from 0.9.0 to 1.2.1. - [Commits](https://github.com/alecthomas/kong/compare/v0.9.0...v1.2.1) --- updated-dependencies: - dependency-name: github.com/alecthomas/kong dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b85ea9695b..d4279e0221 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/ClickHouse/clickhouse-go/151 v0.0.0-00010101000000-000000000000 github.com/ClickHouse/clickhouse-go/v2 v2.29.0 github.com/DATA-DOG/go-sqlmock v1.5.0 - github.com/alecthomas/kong v0.9.0 + github.com/alecthomas/kong v1.2.1 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/aws/aws-sdk-go v1.55.5 diff --git a/go.sum b/go.sum index 46c760827b..10313b18be 100644 --- a/go.sum +++ b/go.sum @@ -94,11 +94,11 @@ github.com/Percona-Lab/spec v0.20.5-percona h1:ViCJVq52QIZxpP8/Nv4/nIed+WnqUirNj github.com/Percona-Lab/spec v0.20.5-percona/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU= -github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= +github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= -github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA= -github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os= +github.com/alecthomas/kong v1.2.1 h1:E8jH4Tsgv6wCRX2nGrdPyHDUCSG83WH2qE4XLACD33Q= +github.com/alecthomas/kong v1.2.1/go.mod h1:rKTSFhbdp3Ryefn8x5MOEprnRFQ7nlmMC01GKhehhBM= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= From 24586c6747b3541bbf5afd4e8882eb4ed9b928e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:29:18 +0000 Subject: [PATCH 16/17] Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity (#3248) Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.7.0...sdk/azcore/v1.8.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index d4279e0221..7bfeb71b82 100644 --- a/go.mod +++ b/go.mod @@ -165,9 +165,9 @@ require ( ) require ( - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 - github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/ClickHouse/ch-go v0.61.5 // indirect diff --git a/go.sum b/go.sum index 10313b18be..9580dea724 100644 --- a/go.sum +++ b/go.sum @@ -39,12 +39,14 @@ github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0 h1:+m0M/LFxN43KvULkDNfdXOgrjtg6UYJPFBJyuEcRCAw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0/go.mod h1:PwOyop78lveYMRs6oCxjiVyBdyCgIYH6XHIVZO9/SFQ= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 h1:zLzoX5+W2l95UJoVwiyNS4dX8vHyQ6x2xRLoBBL9wMk= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0/go.mod h1:wVEOJfGTj0oPAUGA1JuRAvz/lxXQsWW16axmHPP47Bk= github.com/Azure/azure-storage-blob-go v0.13.0/go.mod h1:pA9kNqtjUeQF2zOSu4s//nUdBD+e64lEuc4sVnuOfNs= @@ -66,6 +68,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -183,6 +187,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8Yc github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dhui/dktest v0.4.0 h1:z05UmuXZHO/bgj/ds2bGMBu8FI4WA+Ag/m3ghL+om7M= github.com/dhui/dktest v0.4.0/go.mod h1:v/Dbz1LgCBOi2Uki2nUqLBGa83hWBGFMu5MrgMDCc78= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -493,6 +499,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -716,6 +724,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/ramr/go-reaper v0.2.1 h1:zww+wlQOvTjBZuk1920R/e0GFEb6O7+B0WQLV6dM924= github.com/ramr/go-reaper v0.2.1/go.mod h1:AVypdzrcCXjSc/JYnlXl8TsB+z84WyFzxWE8Jh0MOJc= +github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= +github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= From de95e53dc5b89172326766f8b42f45f7af15a141 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:37:53 +0000 Subject: [PATCH 17/17] Bump github.com/prometheus/common from 0.55.0 to 0.60.0 (#3249) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.55.0 to 0.60.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](https://github.com/prometheus/common/compare/v0.55.0...v0.60.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 7bfeb71b82..7aaecde9b3 100644 --- a/go.mod +++ b/go.mod @@ -66,8 +66,8 @@ require ( github.com/pkg/sftp v1.13.6 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 github.com/prometheus/alertmanager v0.27.0 - github.com/prometheus/client_golang v1.19.1 - github.com/prometheus/common v0.55.0 + github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/common v0.60.0 github.com/ramr/go-reaper v0.2.1 github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.9.3 @@ -209,7 +209,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect @@ -256,7 +256,7 @@ require ( go.opentelemetry.io/otel/trace v1.28.0 // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/net v0.30.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/term v0.25.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.3.0 // indirect diff --git a/go.sum b/go.sum index 9580dea724..e7584d08e6 100644 --- a/go.sum +++ b/go.sum @@ -508,8 +508,8 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.10.1/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= @@ -696,8 +696,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -709,8 +709,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA= +github.com/prometheus/common v0.60.0/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g= @@ -940,8 +940,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=