Merge branch 'v3' into PMM-10308-Mysql-Instance-Summary-Dashboard-multiple-panels-do-not-have-data

Author: dmitri-saricev-3pillargloball

pmm-app/src/pmm-qan/panel/QueryAnalytics.constants.test.tsx

@@ -110,12 +110,14 @@ const metrics = {
 };
 
 const EMPTY_RELATIONS_METRICS = [
-  'blk_read_time',
-  'blk_write_time',
+  'local_blk_read_time',
+  'local_blk_write_time',
   'local_blks_dirtied',
   'local_blks_hit',
   'local_blks_read',
   'local_blks_written',
+  'shared_blk_read_time',
+  'shared_blk_write_time',
   'shared_blks_dirtied',
   'shared_blks_hit',
   'shared_blks_read',

pmm-app/src/pmm-qan/panel/QueryAnalytics.constants.ts

@@ -69,11 +69,11 @@ export const METRIC_CATALOGUE = {
       perQueryStatsPipe: 'size',
     },
   },
-  blk_read_time: {
-    humanizeName: 'Reading Blocks Time',
+  local_blk_read_time: {
+    humanizeName: 'Reading Local Blocks Time',
     tooltipText:
-      'Total time the statement spent reading blocks (if track_io_timing is enabled, otherwise zero)',
-    simpleName: 'blk_read_time',
+      'Total time the statement spent reading local blocks (if track_io_timing is enabled, otherwise zero)',
+    simpleName: 'local_blk_read_time',
     serviceTypes: [Databases.postgresql],
     metricRelation: () => '',
     units: Units.PER_SEC,
@@ -85,11 +85,11 @@ export const METRIC_CATALOGUE = {
       perQueryStatsPipe: 'time',
     },
   },
-  blk_write_time: {
-    humanizeName: 'Writing Blocks Time',
+  local_blk_write_time: {
+    humanizeName: 'Writing Local  Blocks Time',
     tooltipText:
-      'Total time the statement spent writing blocks (if track_io_timing is enabled, otherwise zero)',
-    simpleName: 'blk_write_time',
+      'Total time the statement spent writing local blocks (if track_io_timing is enabled, otherwise zero)',
+    simpleName: 'local_blk_write_time',
     serviceTypes: [Databases.postgresql],
     metricRelation: () => '',
     units: Units.PER_SEC,
@@ -176,6 +176,38 @@ export const METRIC_CATALOGUE = {
       perQueryStatsPipe: 'number',
     },
   },
+  shared_blk_read_time: {
+    humanizeName: 'Reading Shared Blocks Time',
+    tooltipText:
+      'Total time the statement spent reading shared blocks (if track_io_timing is enabled, otherwise zero)',
+    simpleName: 'shared_blk_read_time',
+    serviceTypes: [Databases.postgresql],
+    metricRelation: () => '',
+    units: Units.PER_SEC,
+    pipeTypes: {
+      ratePipe: 'number',
+      sumPipe: 'time',
+      subSumPipe: 'percent',
+      sparklineType: 'number',
+      perQueryStatsPipe: 'time',
+    },
+  },
+  shared_blk_write_time: {
+    humanizeName: 'Writing Shared Blocks Time',
+    tooltipText:
+      'Total time the statement spent writing shared blocks (if track_io_timing is enabled, otherwise zero)',
+    simpleName: 'shared_blk_write_time',
+    serviceTypes: [Databases.postgresql],
+    metricRelation: () => '',
+    units: Units.PER_SEC,
+    pipeTypes: {
+      ratePipe: 'number',
+      sumPipe: 'time',
+      subSumPipe: 'percent',
+      sparklineType: 'number',
+      perQueryStatsPipe: 'time',
+    },
+  },
   shared_blks_hit: {
     humanizeName: 'Shared Block Cache Hits',
     tooltipText: 'Total number of shared block cache hits by the statement',

pmm-app/src/shared/components/Elements/Charts/TimeDistribution/TimeDistribution.constants.ts

@@ -1,26 +1,30 @@
 export const TIME_METRICS = [
   'lock_time',
   'query_time',
-  'blk_read_time',
-  'blk_write_time',
   'innodb_io_r_wait',
   'innodb_queue_wait',
   'innodb_rec_lock_wait',
   // PG metrics
   'cpu_user_time',
   'cpu_sys_time',
+  'local_blk_read_time',
+  'local_blk_write_time',
+  'shared_blk_read_time',
+  'shared_blk_write_time',
 ];
 
 export const METRICS_COLORS = {
   lock_time: '#BD4848',
-  blk_read_time: '#4e378c',
-  blk_write_time: '#fcc200',
   innodb_io_r_wait: '#3c3c3c',
   innodb_queue_wait: '#7e4291',
   innodb_rec_lock_wait: '#e97e03',
   // PG metrics
   cpu_user_time: '#a87067',
   cpu_sys_time: '#23b899',
+  local_blk_read_time: '#4e378c',
+  local_blk_write_time: '#fcc200',
+  shared_blk_read_time: '#4e378c',
+  shared_blk_write_time: '#fcc200',
 };
 
 export const PERCENT_COUNT = 100;