[PLINT-347] Add volume_type tag to cinder volumes for ceph monitoring (#17643)

* [PLINT-347] Add volume_type tag to cinder volumes for ceph monitoring

* empty trigger

* empty trigger again

* added changelog

Signed-off-by: rahulkaukuntla <rahul.kaukuntla@datadoghq.com>

---------

Signed-off-by: rahulkaukuntla <rahul.kaukuntla@datadoghq.com>

Author: rahulkaukuntla

openstack_controller/changelog.d/17643.added

@@ -0,0 +1 @@
+Added volume_type tag to cinder volumes for ceph monitoring

openstack_controller/datadog_checks/openstack_controller/metrics.py

@@ -378,7 +378,7 @@
 CINDER_VOLUME_PREFIX = f"{CINDER_METRICS_PREFIX}.volume"
 CINDER_VOLUME_COUNT = f"{CINDER_VOLUME_PREFIX}.count"
 CINDER_VOLUME_METRICS = {f"{CINDER_VOLUME_PREFIX}.size": {}}
-CINDER_VOLUME_TAGS = {'id': 'volume_id', 'name': 'volume_name', 'status': 'volume_status'}
+CINDER_VOLUME_TAGS = {'id': 'volume_id', 'name': 'volume_name', 'status': 'volume_status', 'volume_type': 'volume_type'}
 
 IRONIC_METRICS_PREFIX = "openstack.ironic"
 IRONIC_SERVICE_CHECK = f"{IRONIC_METRICS_PREFIX}.api.up"

openstack_controller/tests/test_unit_cinder.py

@@ -278,6 +278,7 @@ def test_block_storage_metrics(aggregator, check, dd_run_check):
             'volume_id:9c762008-d70f-44d1-af02-98e1da79ee4b',
             'volume_name:first_volume',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -292,6 +293,7 @@ def test_block_storage_metrics(aggregator, check, dd_run_check):
             'volume_id:259b16de-727f-4011-8388-84d17a9ae594',
             'volume_name:',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -306,6 +308,7 @@ def test_block_storage_metrics(aggregator, check, dd_run_check):
             'volume_id:9c762008-d70f-44d1-af02-98e1da79ee4b',
             'volume_name:first_volume',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -320,6 +323,7 @@ def test_block_storage_metrics(aggregator, check, dd_run_check):
             'volume_id:259b16de-727f-4011-8388-84d17a9ae594',
             'volume_name:',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -647,6 +651,7 @@ def test_block_storage_volumes_pagination(
             'volume_id:9c762008-d70f-44d1-af02-98e1da79ee4b',
             'volume_name:first_volume',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -661,6 +666,7 @@ def test_block_storage_volumes_pagination(
             'volume_id:259b16de-727f-4011-8388-84d17a9ae594',
             'volume_name:',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -675,6 +681,7 @@ def test_block_storage_volumes_pagination(
             'volume_id:9c762008-d70f-44d1-af02-98e1da79ee4b',
             'volume_name:first_volume',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )
@@ -689,6 +696,7 @@ def test_block_storage_volumes_pagination(
             'volume_id:259b16de-727f-4011-8388-84d17a9ae594',
             'volume_name:',
             'volume_status:in-use',
+            'volume_type:lvmdriver-1',
             'keystone_server:http://127.0.0.1:8080/identity',
         ],
     )