diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt
index 1d9c459..4e2bc91 100644
--- a/pkg/pip_requirements.txt
+++ b/pkg/pip_requirements.txt
@@ -3,4 +3,5 @@ schematics
 MarkupSafe>=2.0.0rc2
 google-cloud-storage
 requests
-beautifulsoup4
\ No newline at end of file
+beautifulsoup4
+grpcio
\ No newline at end of file
diff --git a/src/VERSION b/src/VERSION
index 24d07aa..5e99adf 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.4.26
+1.4.27
diff --git a/src/setup.py b/src/setup.py
index 8f10f59..ad55afc 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -31,6 +31,7 @@
     license="Apache License 2.0",
     packages=find_packages(),
     install_requires=[
+        "grpcio",
         "spaceone-api",
         "schematics",
         "google-api-python-client",
diff --git a/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/namespace.yaml b/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/namespace.yaml
index 2055039..162d3db 100644
--- a/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/namespace.yaml
+++ b/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-bigquery-sqlworkspace
+namespace_id: ns-google-cloud-bigquery-sqlworkspace
 name: BigQuery/SQLWorkspace
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Big_Query.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.BigQuery.SQLWorkspace
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/sqlworkspace_count.yaml b/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/sqlworkspace_count.yaml
index 53f3faf..4a0f156 100644
--- a/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/sqlworkspace_count.yaml
+++ b/src/spaceone/inventory/metrics/BigQuery/SQLWorkspace/sqlworkspace_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-bigquery-workspace-count
+metric_id: metric-google-cloud-bigquery-workspace-count
 name: SQLWorkspace Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.BigQuery.SQLWorkspace
@@ -21,5 +21,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-bigquery-sqlworkspace
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-bigquery-sqlworkspace
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudFunctions/Function/function_count.yaml b/src/spaceone/inventory/metrics/CloudFunctions/Function/function_count.yaml
index f241a11..fdfb1fc 100644
--- a/src/spaceone/inventory/metrics/CloudFunctions/Function/function_count.yaml
+++ b/src/spaceone/inventory/metrics/CloudFunctions/Function/function_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-cf-function-count
+metric_id: metric-google-cloud-cf-function-count
 name: Function Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.CloudFunctions.Function
@@ -14,9 +14,9 @@ query_options:
       reference:
         resource_type: inventory.Region
         reference_key: region_code
-    - key: data.state
-      name: Function State
-      search_key: data.state
+    - key: data.status
+      name: Function Status
+      search_key: data.status
       default: true
     - key: data.display.environment
       name: Environment
@@ -24,15 +24,15 @@ query_options:
     - key: data.display.trigger
       name: Trigger
       search_key: data.display.trigger
-    - key: data.service_config.ingress_settings
+    - key: data.ingress_settings
       name: Ingress Settings
-      search_key: data.service_config.ingress_settings
-    - key: data.build_config.runtime
+      search_key: data.ingress_settings
+    - key: data.runtime
       name: Runtime
-      search_key: data.build_config.runtime
+      search_key: data.runtime
   fields:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-cloudfunctions-function
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-cloudfunctions-function
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudFunctions/Function/namespace.yaml b/src/spaceone/inventory/metrics/CloudFunctions/Function/namespace.yaml
index 253152e..54f2b07 100644
--- a/src/spaceone/inventory/metrics/CloudFunctions/Function/namespace.yaml
+++ b/src/spaceone/inventory/metrics/CloudFunctions/Function/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-cloudfunctions-function
+namespace_id: ns-google-cloud-cloudfunctions-function
 name: CloudFunctions/Function
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/cloud_functions.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.CloudFunctions.Function
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudSQL/Instance/database_count.yaml b/src/spaceone/inventory/metrics/CloudSQL/Instance/database_count.yaml
index a433ae4..a777453 100644
--- a/src/spaceone/inventory/metrics/CloudSQL/Instance/database_count.yaml
+++ b/src/spaceone/inventory/metrics/CloudSQL/Instance/database_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-sql-database-count
+metric_id: metric-google-cloud-sql-database-count
 name: Database Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.CloudSQL.Instance
@@ -32,5 +32,5 @@ query_options:
       key: data.stats.database_count
       operator: sum
 unit: Count
-namespace_id: ns-gcp-cloudsql-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-cloudsql-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudSQL/Instance/instance_count.yaml b/src/spaceone/inventory/metrics/CloudSQL/Instance/instance_count.yaml
index 68b8d15..26fa978 100644
--- a/src/spaceone/inventory/metrics/CloudSQL/Instance/instance_count.yaml
+++ b/src/spaceone/inventory/metrics/CloudSQL/Instance/instance_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-sql-instance-count
+metric_id: metric-google-cloud-sql-instance-count
 name: Instance Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.CloudSQL.Instance
@@ -31,5 +31,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-cloudsql-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-cloudsql-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudSQL/Instance/namespace.yaml b/src/spaceone/inventory/metrics/CloudSQL/Instance/namespace.yaml
index 3b445aa..a44cd96 100644
--- a/src/spaceone/inventory/metrics/CloudSQL/Instance/namespace.yaml
+++ b/src/spaceone/inventory/metrics/CloudSQL/Instance/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-cloudsql-instance
+namespace_id: ns-google-cloud-cloudsql-instance
 name: CloudSQL/Instance
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Cloud_SQL.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.CloudSQL.Instance
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudSQL/Instance/user_count.yaml b/src/spaceone/inventory/metrics/CloudSQL/Instance/user_count.yaml
index 6bf5272..ccae300 100644
--- a/src/spaceone/inventory/metrics/CloudSQL/Instance/user_count.yaml
+++ b/src/spaceone/inventory/metrics/CloudSQL/Instance/user_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-sql-user-count
+metric_id: metric-google-cloud-sql-user-count
 name: User Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.CloudSQL.Instance
@@ -32,5 +32,5 @@ query_options:
       key: data.stats.user_count
       operator: sum
 unit: Count
-namespace_id: ns-gcp-cloudsql-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-cloudsql-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudStorage/Bucket/bucket_count.yaml b/src/spaceone/inventory/metrics/CloudStorage/Bucket/bucket_count.yaml
index 053d55e..2192d91 100644
--- a/src/spaceone/inventory/metrics/CloudStorage/Bucket/bucket_count.yaml
+++ b/src/spaceone/inventory/metrics/CloudStorage/Bucket/bucket_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-cs-bucket-count
+metric_id: metric-google-cloud-cs-bucket-count
 name: Bucket Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.CloudStorage.Bucket
@@ -24,5 +24,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-cloudstorage-bucket
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-cloudstorage-bucket
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/CloudStorage/Bucket/namespace.yaml b/src/spaceone/inventory/metrics/CloudStorage/Bucket/namespace.yaml
index 81c730d..f08d641 100644
--- a/src/spaceone/inventory/metrics/CloudStorage/Bucket/namespace.yaml
+++ b/src/spaceone/inventory/metrics/CloudStorage/Bucket/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-cloudstorage-bucket
+namespace_id: ns-google-cloud-cloudstorage-bucket
 name: CloudStorage/Bucket
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Cloud_Storage.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.CloudStorage.Bucket
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Disk/disk_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Disk/disk_count.yaml
index e155c74..7101cbe 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Disk/disk_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Disk/disk_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-disk-count
+metric_id: metric-google-cloud-ce-disk-count
 name: Disk Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Disk
@@ -14,9 +14,9 @@ query_options:
     - key: account
       name: Project ID
       search_key: account
-    - key: data.state
+    - key: state
       name: State
-      search_key: data.state
+      search_key: state
     - key: data.encryption
       name: Encryption
       search_key: data.encryption
@@ -27,5 +27,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-ce-disk
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-disk
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Disk/namespace.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Disk/namespace.yaml
index ec75846..94f3faa 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Disk/namespace.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Disk/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-ce-disk
+namespace_id: ns-google-cloud-ce-disk
 name: ComputeEngine/Disk
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.ComputeEngine.Disk
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Disk/read_iops_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Disk/read_iops_count.yaml
index a22ae0c..bbf2e5d 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Disk/read_iops_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Disk/read_iops_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-disk-ri-count
+metric_id: metric-google-cloud-ce-disk-ri-count
 name: Read IOPS Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Disk
@@ -14,9 +14,9 @@ query_options:
     - key: account
       name: Project ID
       search_key: account
-    - key: data.state
+    - key: state
       name: State
-      search_key: data.state
+      search_key: state
     - key: data.encryption
       name: Encryption
       search_key: data.encryption
@@ -28,5 +28,5 @@ query_options:
       key: data.read_iops
       operator: sum
 unit: Count
-namespace_id: ns-gcp-ce-disk
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-disk
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Disk/write_iops_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Disk/write_iops_count.yaml
index 0917479..3e47984 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Disk/write_iops_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Disk/write_iops_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-disk-wi-count
+metric_id: metric-google-cloud-ce-disk-wi-count
 name: Write IOPS Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Disk
@@ -14,9 +14,9 @@ query_options:
     - key: account
       name: Project ID
       search_key: account
-    - key: data.state
+    - key: state
       name: State
-      search_key: data.state
+      search_key: state
     - key: data.encryption
       name: Encryption
       search_key: data.encryption
@@ -28,5 +28,5 @@ query_options:
       key: data.write_iops
       operator: sum
 unit: Count
-namespace_id: ns-gcp-ce-disk
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-disk
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Instance/disk_size.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Instance/disk_size.yaml
index c9e2815..7fd3123 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Instance/disk_size.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Instance/disk_size.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-instance-disk-size
+metric_id: metric-google-cloud-ce-instance-disk-size
 name: Disk Size
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Instance
@@ -23,12 +23,10 @@ query_options:
     - key: data.os.os_type
       name: OS Type
       search_key: data.os.os_type
-  unwind:
-    - path: data.disks
   fields:
     value:
       key: data.disks.size
       operator: sum
 unit: BYTES
-namespace_id: ns-gcp-ce-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Instance/instance_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Instance/instance_count.yaml
index 8c0db28..3d408e2 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Instance/instance_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Instance/instance_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-instance-count
+metric_id: metric-google-cloud-ce-instance-count
 name: Instance Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Instance
@@ -31,5 +31,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-ce-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Instance/memory_size.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Instance/memory_size.yaml
index c041402..5fa2f04 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Instance/memory_size.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Instance/memory_size.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-instance-memory-size
+metric_id: metric-google-cloud-ce-instance-memory-size
 name: Memory Size
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Instance
@@ -28,5 +28,5 @@ query_options:
       key: data.hardware.memory
       operator: sum
 unit: GB
-namespace_id: ns-gcp-ce-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Instance/namespace.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Instance/namespace.yaml
index e5c0c1d..87746e3 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Instance/namespace.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Instance/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-ce-instance
+namespace_id: ns-google-cloud-ce-instance
 name: ComputeEngine/Instance
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.ComputeEngine.Instance
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/Instance/vcpu_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/Instance/vcpu_count.yaml
index 760ec8c..4a2e861 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/Instance/vcpu_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/Instance/vcpu_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-instance-vcpu-count
+metric_id: metric-google-cloud-ce-instance-vcpu-count
 name: vCPU Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.Instance
@@ -28,5 +28,5 @@ query_options:
       key: data.hardware.core
       operator: sum
 unit: Core
-namespace_id: ns-gcp-ce-instance
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_count.yaml
index bcf8949..54b5072 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-ig-in-count
+metric_id: metric-google-cloud-ce-ig-in-count
 name: Instance Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.InstanceGroup
@@ -31,5 +31,5 @@ query_options:
       key: data.instance_counts
       operator: sum
 unit: Count
-namespace_id: ns-gcp-ce-instance-group
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance-group
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_group_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_group_count.yaml
index c87b2e7..bb78022 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_group_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/instance_group_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-ig-count
+metric_id: metric-google-cloud-ce-ig-count
 name: InstanceGroup Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.InstanceGroup
@@ -30,5 +30,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-ce-instance-group
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance-group
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/namespace.yaml b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/namespace.yaml
index bd6acde..d1a0795 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/namespace.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/InstanceGroup/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-ce-instance-group
+namespace_id: ns-google-cloud-ce-instance-group
 name: ComputeEngine/InstanceGroup
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.ComputeEngine.InstanceGroup
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/instance_template_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/instance_template_count.yaml
index 5e33cb9..9cb13d4 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/instance_template_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/instance_template_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-it-count
+metric_id: metric-google-cloud-ce-it-count
 name: InstanceTemplate Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.InstanceTemplate
@@ -24,5 +24,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-ce-instance-template
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-instance-template
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/namespace.yaml b/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/namespace.yaml
index 3bfe0e9..3f1b55a 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/namespace.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/InstanceTemplate/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-ce-instance-template
+namespace_id: ns-google-cloud-ce-instance-template
 name: ComputeEngine/InstanceTemplate
 category: ASSET
-provider: google_cloud
-icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
-version: '1.0'
\ No newline at end of file
+icon: 'https://spaceoneock-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.ComputeEngine.InstanceTemplate
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/machine_image_count.yaml b/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/machine_image_count.yaml
index c16c6e9..58ab3fa 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/machine_image_count.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/machine_image_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-ce-mi-count
+metric_id: metric-google-cloud-ce-mi-count
 name: MachineImage Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.ComputeEngine.MachineImage
@@ -25,5 +25,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-ce-machine-image
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-ce-machine-image
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/namespace.yaml b/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/namespace.yaml
index 351401e..bfd2084 100644
--- a/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/namespace.yaml
+++ b/src/spaceone/inventory/metrics/ComputeEngine/MachineImage/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-ce-machine-image
+namespace_id: ns-google-cloud-ce-machine-image
 name: ComputeEngine/MachineImage
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Compute_Engine.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.ComputeEngine.MachineImage
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/eip_count.yaml b/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/eip_count.yaml
index 4f1ca16..fa09c27 100644
--- a/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/eip_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/eip_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-eip-count
+metric_id: metric-google-cloud-net-eip-count
 name: EIP Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.ExternalIPAddress
@@ -26,9 +26,6 @@ query_options:
     - key: data.network_tier
       name: Network Tier
       search_key: data.network_tier
-    - key: data.purpose
-      name: Purpose
-      search_key: data.purpose
     - key: data.ip_version_display
       name: IP Version
       search_key: data.ip_version_display
@@ -36,5 +33,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-networking-eip
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-eip
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/namespace.yaml b/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/namespace.yaml
index bfff13b..a2c3355 100644
--- a/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/namespace.yaml
+++ b/src/spaceone/inventory/metrics/Networking/ExternalIPAddress/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-networking-eip
+namespace_id: ns-google-cloud-networking-eip
 name: Networking/ExternalIPAddress
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/External_IP_Address.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.Networking.ExternalIPAddress
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Firewall/firewall_count.yaml b/src/spaceone/inventory/metrics/Networking/Firewall/firewall_count.yaml
index c3d8500..991040d 100644
--- a/src/spaceone/inventory/metrics/Networking/Firewall/firewall_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Firewall/firewall_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-firewall-count
+metric_id: metric-google-cloud-net-firewall-count
 name: Firewall Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.Firewall
@@ -27,5 +27,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-networking-firewall
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-firewall
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Firewall/instance_count.yaml b/src/spaceone/inventory/metrics/Networking/Firewall/instance_count.yaml
index 5cc40ba..53d9fdc 100644
--- a/src/spaceone/inventory/metrics/Networking/Firewall/instance_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Firewall/instance_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-fw-instance-count
+metric_id: metric-google-cloud-net-fw-instance-count
 name: Affected Instance Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.Firewall
@@ -28,5 +28,5 @@ query_options:
       key: data.display.affected_instance_count
       operator: sum
 unit: Count
-namespace_id: ns-gcp-networking-firewall
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-firewall
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Firewall/namespace.yaml b/src/spaceone/inventory/metrics/Networking/Firewall/namespace.yaml
index ae28fba..eae0abc 100644
--- a/src/spaceone/inventory/metrics/Networking/Firewall/namespace.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Firewall/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-networking-firewall
+namespace_id: ns-google-cloud-networking-firewall
 name: Networking/Firewall
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Firewall_Rule.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.Networking.Firewall
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/LoadBalancing/loadbalancing_count.yaml b/src/spaceone/inventory/metrics/Networking/LoadBalancing/loadbalancing_count.yaml
index 28366ff..33473ab 100644
--- a/src/spaceone/inventory/metrics/Networking/LoadBalancing/loadbalancing_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/LoadBalancing/loadbalancing_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-lb-count
+metric_id: metric-google-cloud-net-lb-count
 name: LoadBalancing Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.LoadBalancing
@@ -27,5 +27,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-networking-loadbalancing
-version: '1.0'
+namespace_id: ns-google-cloud-networking-loadbalancing
+version: '1.1'
diff --git a/src/spaceone/inventory/metrics/Networking/LoadBalancing/namespace.yaml b/src/spaceone/inventory/metrics/Networking/LoadBalancing/namespace.yaml
index e186d60..905c5c4 100644
--- a/src/spaceone/inventory/metrics/Networking/LoadBalancing/namespace.yaml
+++ b/src/spaceone/inventory/metrics/Networking/LoadBalancing/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-networking-loadbalancing
+namespace_id: ns-google-cloud-networking-loadbalancing
 name: Networking/LoadBalancing
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Load_Balancing.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.Networking.LoadBalancing
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Route/instance_count.yaml b/src/spaceone/inventory/metrics/Networking/Route/instance_count.yaml
index e940458..1ca774b 100644
--- a/src/spaceone/inventory/metrics/Networking/Route/instance_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Route/instance_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-route-in-count
+metric_id: metric-google-cloud-net-route-in-count
 name: Instance Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.Route
@@ -25,5 +25,5 @@ query_options:
       key: data.display.affected_instance_count
       operator: sum
 unit: Count
-namespace_id: ns-gcp-networking-route
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-route
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Route/namespace.yaml b/src/spaceone/inventory/metrics/Networking/Route/namespace.yaml
index 5537220..974cdf2 100644
--- a/src/spaceone/inventory/metrics/Networking/Route/namespace.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Route/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-networking-route
+namespace_id: ns-google-cloud-networking-route
 name: Networking/Route
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/Route.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.Networking.Route
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/Route/route_count.yaml b/src/spaceone/inventory/metrics/Networking/Route/route_count.yaml
index 749f817..cfb2336 100644
--- a/src/spaceone/inventory/metrics/Networking/Route/route_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/Route/route_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-route-count
+metric_id: metric-google-cloud-net-route-count
 name: Route Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.Route
@@ -24,5 +24,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-networking-route
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-route
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/VPCNetwork/firewall_count.yaml b/src/spaceone/inventory/metrics/Networking/VPCNetwork/firewall_count.yaml
index 3de4715..3aa0511 100644
--- a/src/spaceone/inventory/metrics/Networking/VPCNetwork/firewall_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/VPCNetwork/firewall_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-vpc-fw-count
+metric_id: metric-google-cloud-net-vpc-fw-count
 name: Firewall Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.VPCNetwork
@@ -25,5 +25,5 @@ query_options:
       key: data.firewall_data.total_number
       operator: sum
 unit: Count
-namespace_id: ns-gcp-networking-vpc
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-vpc
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/VPCNetwork/namespace.yaml b/src/spaceone/inventory/metrics/Networking/VPCNetwork/namespace.yaml
index 07e3d36..d451502 100644
--- a/src/spaceone/inventory/metrics/Networking/VPCNetwork/namespace.yaml
+++ b/src/spaceone/inventory/metrics/Networking/VPCNetwork/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-networking-vpc
+namespace_id: ns-google-cloud-networking-vpc
 name: Networking/VPCNetwork
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/VPC.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.Networking.VPCNetwork
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/VPCNetwork/route_count.yaml b/src/spaceone/inventory/metrics/Networking/VPCNetwork/route_count.yaml
index c45ed2e..c47f30e 100644
--- a/src/spaceone/inventory/metrics/Networking/VPCNetwork/route_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/VPCNetwork/route_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-vpc-route-count
+metric_id: metric-google-cloud-net-vpc-route-count
 name: Route Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.VPCNetwork
@@ -25,5 +25,5 @@ query_options:
       key: data.route_data.total_number
       operator: sum
 unit: Count
-namespace_id: ns-gcp-networking-vpc
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-vpc
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/VPCNetwork/subnet_count.yaml b/src/spaceone/inventory/metrics/Networking/VPCNetwork/subnet_count.yaml
index 1798520..6038167 100644
--- a/src/spaceone/inventory/metrics/Networking/VPCNetwork/subnet_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/VPCNetwork/subnet_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-vpc-sn-count
+metric_id: metric-google-cloud-net-vpc-sn-count
 name: Subnet Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.VPCNetwork
@@ -25,5 +25,5 @@ query_options:
       key: data.subnetwork_data.total_number
       operator: sum
 unit: Count
-namespace_id: ns-gcp-networking-vpc
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-vpc
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/Networking/VPCNetwork/vpc_count.yaml b/src/spaceone/inventory/metrics/Networking/VPCNetwork/vpc_count.yaml
index 449b248..2a020cb 100644
--- a/src/spaceone/inventory/metrics/Networking/VPCNetwork/vpc_count.yaml
+++ b/src/spaceone/inventory/metrics/Networking/VPCNetwork/vpc_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-net-vpc-count
+metric_id: metric-google-cloud-net-vpc-count
 name: VPC Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.Networking.VPCNetwork
@@ -24,5 +24,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-networking-vpc
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-networking-vpc
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Schema/namespace.yaml b/src/spaceone/inventory/metrics/PubSub/Schema/namespace.yaml
index 97e4389..35e887e 100644
--- a/src/spaceone/inventory/metrics/PubSub/Schema/namespace.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Schema/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-pubsub-schema
+namespace_id: ns-google-cloud-pubsub-schema
 name: PubSub/Schema
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/cloud_pubsub.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.PubSub.Schema
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Schema/schema_count.yaml b/src/spaceone/inventory/metrics/PubSub/Schema/schema_count.yaml
index e0ab6ff..440936f 100644
--- a/src/spaceone/inventory/metrics/PubSub/Schema/schema_count.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Schema/schema_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-pubsub-schema-count
+metric_id: metric-google-cloud-pubsub-schema-count
 name: Schema Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.PubSub.Schema
@@ -21,5 +21,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-pubsub-schema
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-pubsub-schema
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Snapshot/namespace.yaml b/src/spaceone/inventory/metrics/PubSub/Snapshot/namespace.yaml
index 37d7148..dc9d32c 100644
--- a/src/spaceone/inventory/metrics/PubSub/Snapshot/namespace.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Snapshot/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-pubsub-snapshot
+namespace_id: ns-google-cloud-pubsub-snapshot
 name: PubSub/Snapshot
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/cloud_pubsub.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.PubSub.Snapshot
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Snapshot/snapshot_count.yaml b/src/spaceone/inventory/metrics/PubSub/Snapshot/snapshot_count.yaml
index ea78058..fdbd333 100644
--- a/src/spaceone/inventory/metrics/PubSub/Snapshot/snapshot_count.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Snapshot/snapshot_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-pubsub-snapshot-count
+metric_id: metric-google-cloud-pubsub-snapshot-count
 name: Snapshot Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.PubSub.Snapshot
@@ -21,5 +21,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-pubsub-snapshot
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-pubsub-snapshot
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Subscription/namespace.yaml b/src/spaceone/inventory/metrics/PubSub/Subscription/namespace.yaml
index facf477..efaaa61 100644
--- a/src/spaceone/inventory/metrics/PubSub/Subscription/namespace.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Subscription/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-pubsub-subscription
+namespace_id: ns-google-cloud-pubsub-subscription
 name: PubSub/Subscription
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/cloud_pubsub.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.PubSub.Subscription
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Subscription/subscription_count.yaml b/src/spaceone/inventory/metrics/PubSub/Subscription/subscription_count.yaml
index 6c78630..1b104ef 100644
--- a/src/spaceone/inventory/metrics/PubSub/Subscription/subscription_count.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Subscription/subscription_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-pubsub-subscription-count
+metric_id: metric-google-cloud-pubsub-subscription-count
 name: Subscription Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.PubSub.Subscription
@@ -24,5 +24,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-pubsub-subscription
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-pubsub-subscription
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Topic/namespace.yaml b/src/spaceone/inventory/metrics/PubSub/Topic/namespace.yaml
index 45d43c8..1d6dc70 100644
--- a/src/spaceone/inventory/metrics/PubSub/Topic/namespace.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Topic/namespace.yaml
@@ -1,7 +1,8 @@
 ---
-namespace_id: ns-gcp-pubsub-topic
+namespace_id: ns-google-cloud-pubsub-topic
 name: PubSub/Topic
 category: ASSET
-provider: google_cloud
 icon: 'https://spaceone-custom-assets.s3.ap-northeast-2.amazonaws.com/console-assets/icons/cloud-services/google_cloud/cloud_pubsub.svg'
-version: '1.0'
\ No newline at end of file
+version: '1.1'
+resource_type: inventory.CloudService:google_cloud.PubSub.Topic
+group: google_cloud
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Topic/subscription_count.yaml b/src/spaceone/inventory/metrics/PubSub/Topic/subscription_count.yaml
index fe8b825..4551d95 100644
--- a/src/spaceone/inventory/metrics/PubSub/Topic/subscription_count.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Topic/subscription_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-pubsub-topic-sub-count
+metric_id: metric-google-cloud-pubsub-topic-sub-count
 name: Subscription Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.PubSub.Topic
@@ -19,5 +19,5 @@ query_options:
       key: data.display.subscription_count
       operator: sum
 unit: Count
-namespace_id: ns-gcp-pubsub-topic
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-pubsub-topic
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/metrics/PubSub/Topic/topic_count.yaml b/src/spaceone/inventory/metrics/PubSub/Topic/topic_count.yaml
index 3a7684b..5d75ff1 100644
--- a/src/spaceone/inventory/metrics/PubSub/Topic/topic_count.yaml
+++ b/src/spaceone/inventory/metrics/PubSub/Topic/topic_count.yaml
@@ -1,5 +1,5 @@
 ---
-metric_id: metric-gcp-pubsub-topic-count
+metric_id: metric-google-cloud-pubsub-topic-count
 name: Topic Count
 metric_type: GAUGE
 resource_type: inventory.CloudService:google_cloud.PubSub.Topic
@@ -18,5 +18,5 @@ query_options:
     value:
       operator: count
 unit: Count
-namespace_id: ns-gcp-pubsub-topic
-version: '1.0'
\ No newline at end of file
+namespace_id: ns-google-cloud-pubsub-topic
+version: '1.1'
\ No newline at end of file
diff --git a/src/spaceone/inventory/service/collector_service.py b/src/spaceone/inventory/service/collector_service.py
index 41edded..369eade 100644
--- a/src/spaceone/inventory/service/collector_service.py
+++ b/src/spaceone/inventory/service/collector_service.py
@@ -136,9 +136,9 @@ def collect(self, params):
                     _LOGGER.debug(error_resource_response)
                     yield error_resource_response.to_primitive()
 
-        # for service in CLOUD_SERVICE_GROUP_MAP.keys():
-        #     for response in self.collect_metrics(service):
-        #         yield response
+        for service in CLOUD_SERVICE_GROUP_MAP.keys():
+            for response in self.collect_metrics(service):
+                yield response
 
         _LOGGER.debug(f"TOTAL TIME : {time.time() - start_time} Seconds")
 
@@ -189,10 +189,6 @@ def generate_error_response(e, cloud_service_group, cloud_service_type):
         return error_resource_response
 
     def collect_metrics(self, service: str) -> dict:
-
-        if service == "Pub/Sub":
-            service = "PubSub"
-
         for dirname in os.listdir(os.path.join(_METRIC_DIR, service)):
             for filename in os.listdir(os.path.join(_METRIC_DIR, service, dirname)):
                 if filename.endswith(".yaml"):