Merge pull request #945 from gh-ca/macro

add macro_san storge
sodafoundation · Nov 22, 2022 · a43a376 · a43a376
2 parents ca0ba06 + 3ebd6d8
commit a43a376
Show file tree

Hide file tree

Showing 14 changed files with 3,418 additions and 8 deletions.
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