Merge branch 'master' into fix-scaleio

sodafoundation · Nov 23, 2022 · 3ce4591 · 3ce4591
2 parents e6fda78 + 2874260
commit 3ce4591
Show file tree

Hide file tree

Showing 16 changed files with 3,420 additions and 12 deletions.
diff --git a/.github/workflows/delfin_ci.yml b/.github/workflows/delfin_ci.yml
@@ -7,8 +7,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        platform:
-          - ubuntu-18.04
+        platform: [ubuntu-18.04, ubuntu-20.04]
         python-version: [ 3.6, 3.7, 3.8 ]
 
     steps:

diff --git a/.github/workflows/delfin_e2e_test.yml b/.github/workflows/delfin_e2e_test.yml
@@ -7,8 +7,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        platform:
-          - ubuntu-18.04
+        platform: [ubuntu-18.04, ubuntu-20.04]
         python-version: [ 3.6 ]
 
     steps:

diff --git a/delfin/common/constants.py b/delfin/common/constants.py
@@ -492,6 +492,9 @@ class StorageMetric:
     RESPONSE_TIME = Metrics.RESPONSE_TIME
     READ_RESPONSE_TIME = Metrics.READ_RESPONSE_TIME
     WRITE_RESPONSE_TIME = Metrics.WRITE_RESPONSE_TIME
+    CACHE_HIT_RATIO = Metrics.CACHE_HIT_RATIO
+    READ_CACHE_HIT_RATIO = Metrics.READ_CACHE_HIT_RATIO
+    WRITE_CACHE_HIT_RATIO = Metrics.WRITE_CACHE_HIT_RATIO
 
 
 class StoragePoolMetric:
@@ -503,6 +506,11 @@ class StoragePoolMetric:
     READ_THROUGHPUT = Metrics.READ_THROUGHPUT
     WRITE_THROUGHPUT = Metrics.WRITE_THROUGHPUT
     RESPONSE_TIME = Metrics.RESPONSE_TIME
+    READ_RESPONSE_TIME = Metrics.READ_RESPONSE_TIME
+    WRITE_RESPONSE_TIME = Metrics.WRITE_RESPONSE_TIME
+    CACHE_HIT_RATIO = Metrics.CACHE_HIT_RATIO
+    READ_CACHE_HIT_RATIO = Metrics.READ_CACHE_HIT_RATIO
+    WRITE_CACHE_HIT_RATIO = Metrics.WRITE_CACHE_HIT_RATIO
 
 
 class VolumeMetric:
@@ -545,6 +553,11 @@ class PortMetric:
     READ_THROUGHPUT = Metrics.READ_THROUGHPUT
     WRITE_THROUGHPUT = Metrics.WRITE_THROUGHPUT
     RESPONSE_TIME = Metrics.RESPONSE_TIME
+    READ_RESPONSE_TIME = Metrics.READ_RESPONSE_TIME
+    WRITE_RESPONSE_TIME = Metrics.WRITE_RESPONSE_TIME
+    CACHE_HIT_RATIO = Metrics.CACHE_HIT_RATIO
+    READ_CACHE_HIT_RATIO = Metrics.READ_CACHE_HIT_RATIO
+    WRITE_CACHE_HIT_RATIO = Metrics.WRITE_CACHE_HIT_RATIO
 
 
 class DiskMetric:
@@ -556,6 +569,11 @@ class DiskMetric:
     READ_THROUGHPUT = Metrics.READ_THROUGHPUT
     WRITE_THROUGHPUT = Metrics.WRITE_THROUGHPUT
     RESPONSE_TIME = Metrics.RESPONSE_TIME
+    READ_RESPONSE_TIME = Metrics.READ_RESPONSE_TIME
+    WRITE_RESPONSE_TIME = Metrics.WRITE_RESPONSE_TIME
+    CACHE_HIT_RATIO = Metrics.CACHE_HIT_RATIO
+    READ_CACHE_HIT_RATIO = Metrics.READ_CACHE_HIT_RATIO
+    WRITE_CACHE_HIT_RATIO = Metrics.WRITE_CACHE_HIT_RATIO
 
 
 class FileSystemMetric:

diff --git a/delfin/drivers/macro_san/__init__.py b/delfin/drivers/macro_san/__init__.py
diff --git a/delfin/drivers/macro_san/ms/__init__.py b/delfin/drivers/macro_san/ms/__init__.py