fog-google 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 700ff2a01dca32bc1c4508a52cc1b579f1bb42ca
-  data.tar.gz: 4c469d31400a3a9fb0787de5fe25cd4ccda3db03
+  metadata.gz: 9f523ba80fe04d0964f24b91dd5972d5a1761171
+  data.tar.gz: 0ec90da4720232b7cecec4262c4f2f93798b0366
 SHA512:
-  metadata.gz: 9669170e0b975040b8c44bd054fe51b30408c0fef952431635bd051fe63dc4f4916dc7d186fa4811c0f31b6d06dec2cf6e37e5e3dd6f1f30af87d1d361425a5f
-  data.tar.gz: efba4ba3ddffa5346f4d18eae18bcd491d69788dcc0cbd870d128e4e92132659d49e0845fc4735f922ca44ebfa97be25c3d40c123ccf42c707b3039130d6c901
+  metadata.gz: 5188db685057edfdd2d96e0a754a66aedb81ef62e416086f9888ca4dc851d1338bac5e46c4ae0d21e83fbbee73518474d9ef96a6868df2510b2dae06ee18abb8
+  data.tar.gz: b6620918dd17cb4e759e1cde19b90e322039b00779f78a0c4ef70539d47b3fd881fafa7df1a9ed3faba162a51c70a10204a4bc3c8a18e350a59e87b4c279f746

data/README.md

@@ -34,7 +34,12 @@ Fog implements [v1](https://cloud.google.com/dns/api/v1/) of the Google Cloud DN
 
 ## Monitoring
 
-Fog implements [v2beta2](https://cloud.google.com/monitoring/v2beta2/) of the Google Cloud Monitoring API. As of 2016-03-15, we believe Fog for Google Cloud Monitoring is feature complete. We are always looking for people to improve our code and test coverage, so please [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
+Fog mostly implements [v3](https://cloud.google.com/monitoring/api/ref_v3/rest/) of the Google Cloud Monitoring API. 
+
+As of 2017-09-26, some less common API methods are missing and may be added as requested. Feature requests or pull requests for 
+additions are welcome. 
+ 
+We are always looking for people to improve our code and test coverage, so please [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
 
 ## Pubsub
 

data/examples/monitoring/metric_descriptors.rb

@@ -17,7 +17,7 @@ def test
 
   puts "\nListing all MetricDescriptors related to Google Compute Engine..."
   puts "-----------------------------------------------------------------"
-  md = connection.metric_descriptors.all(:query => "compute")
+  md = connection.metric_descriptors.all(:filter => 'metric.type = starts_with("compute.googleapis.com")')
   puts "Number of compute metric descriptors: #{md.length}"
 end
 

data/examples/monitoring/monitored_resource_descriptors.rb

@@ -0,0 +1,24 @@
+# All examples presume that you have a ~/.fog credentials file set up.
+# # More info on it can be found here: http://fog.io/about/getting_started.html
+#
+require "bundler"
+Bundler.require(:default, :development)
+# Uncomment this if you want to make real requests to GCE (you _will_ be billed!)
+# WebMock.disable!
+#
+
+def test
+  connection = Fog::Google::Monitoring.new
+
+  puts "Listing all MonitoredResourceDescriptors..."
+  puts "--------------------------------"
+  md = connection.monitored_resource_descriptors
+  puts "Number of all monitored resource descriptors: #{md.length}"
+
+  puts "\nListing MonitoredResourceDescriptors related to Google Compute Engine..."
+  puts "-----------------------------------------------------------------"
+  md = connection.monitored_resource_descriptors.all(:filter => 'resource.type = starts_with("gce_")')
+  puts "Number of compute monitored resource : #{md.length}"
+end
+
+test

data/examples/monitoring/timeseries_collection.rb

@@ -8,19 +8,24 @@ Bundler.require(:default, :development)
 
 def test
   connection = Fog::Google::Monitoring.new
-
-  puts "Listing all Timeseries for the metric compute.googleapis.com/instance/uptime..."
+  interval = {
+    :start_time => (DateTime.now - 1).rfc3339,
+    :end_time => DateTime.now.rfc3339
+  }
+  puts "Listing Timeseries from the last hour for metric compute.googleapis.com/instance/uptime..."
   puts "-------------------------------------------------------------------------------"
-  tc = connection.timeseries_collection.all("compute.googleapis.com/instance/uptime",
-                                            DateTime.now.rfc3339)
+  tc = connection.timeseries_collection.all(:filter => 'metric.type = "compute.googleapis.com/instance/uptime"',
+                                            :interval => interval)
   puts "Number of matches: #{tc.length}"
 
-  puts "\nListing all Timeseries for the metric compute.googleapis.com/instance/uptime &"
+  puts "\nListing all Timeseries for metric compute.googleapis.com/instance/uptime &"
   puts "the region us-central1..."
   puts "------------------------------------------------------------------------------"
-  tc = connection.timeseries_collection.all("compute.googleapis.com/instance/uptime",
-                                            DateTime.now.rfc3339,
-                                            :labels => "cloud.googleapis.com/location=~us-central1.*")
+  filter = [
+    'metric.type = "compute.googleapis.com/instance/uptime"',
+    'resource.label.zone = "us-central1-c"'
+  ].join(" AND ")
+  tc = connection.timeseries_collection.all(:filter => filter, :interval => interval)
   puts "Number of matches: #{tc.length}"
 end
 

data/lib/fog/google/models/monitoring/metric_descriptor.rb

@@ -4,16 +4,19 @@ module Fog
   module Google
     class Monitoring
       ##
-      # A metricDescriptor defines the name, label keys, and data type of a particular metric.
+      # A metricDescriptor defines a metric type and its schema.
       #
-      # @see https://cloud.google.com/monitoring/v2beta2/metricDescriptors#resource
+      # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors#MetricDescriptor
       class MetricDescriptor < Fog::Model
         identity :name
 
         attribute :description
+        attribute :display_name, :aliases => "displayName"
         attribute :labels
-        attribute :project
-        attribute :type_descriptor, :aliases => "typeDescriptor"
+        attribute :metric_kind, :aliases => "metricKind"
+        attribute :type
+        attribute :value_type, :aliases => "valueType"
+        attribute :unit
       end
     end
   end

data/lib/fog/google/models/monitoring/metric_descriptors.rb

@@ -11,15 +11,13 @@ module Fog
         # Lists all Metric Descriptors.
         #
         # @param [Hash] options Optional query parameters.
-        # @option options [String] count Maximum number of time series descriptors per page. Used for pagination.
+        # @option options [String] page_size Maximum number of metric descriptors per page. Used for pagination.
         # @option options [String] page_token The pagination token, which is used to page through large result sets.
-        # @option options [String] query The query used to search against existing metrics. Separate keywords with a space;
-        #   the service joins all keywords with AND, meaning that all keywords must match for a metric to be returned.
-        #   If this field is omitted, all metrics are returned. If an empty string is passed with this field,
-        #   no metrics are returned.
+        # @option options [String] filter Monitoring filter specifying which metric descriptors are to be returned.
+        # @see https://cloud.google.com/monitoring/api/v3/filters filter documentation
         # @return [Array<Fog::Google::Monitoring::MetricDescriptor>] List of Metric Descriptors.
         def all(options = {})
-          data = service.list_metric_descriptors(options).body["metrics"] || []
+          data = service.list_metric_descriptors(options).body["metricDescriptors"] || []
           load(data)
         end
       end

data/lib/fog/google/models/monitoring/monitored_resource_descriptor.rb

@@ -0,0 +1,20 @@
+require "fog/core/model"
+
+module Fog
+  module Google
+    class Monitoring
+      ##
+      # A monitoredResourceDescriptor defines a metric type and its schema.
+      #
+      # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.monitoredResourceDescriptors#MonitoredResourceDescriptor
+      class MonitoredResourceDescriptor < Fog::Model
+        identity :name
+
+        attribute :description
+        attribute :display_name, :aliases => "displayName"
+        attribute :type
+        attribute :labels
+      end
+    end
+  end
+end

data/lib/fog/google/models/monitoring/monitored_resource_descriptors.rb

@@ -0,0 +1,26 @@
+require "fog/core/collection"
+require "fog/google/models/monitoring/monitored_resource_descriptor"
+
+module Fog
+  module Google
+    class Monitoring
+      class MonitoredResourceDescriptors < Fog::Collection
+        model Fog::Google::Monitoring::MonitoredResourceDescriptor
+
+        ##
+        # Lists all Monitored Resource Descriptors.
+        #
+        # @param [Hash] options Optional query parameters.
+        # @option options [String] page_size Maximum number of metric descriptors per page. Used for pagination.
+        # @option options [String] page_token The pagination token, which is used to page through large result sets.
+        # @option options [String] filter The monitoring filter used to search against existing descriptors.
+        #   See
+        # @return [Array<Fog::Google::Monitoring::MetricDescriptor>] List of Monitored Resource Descriptors.
+        def all(options = {})
+          data = service.list_monitored_resource_descriptors(options).body["resourceDescriptors"] || []
+          load(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/models/monitoring/timeseries.rb

@@ -6,10 +6,12 @@ module Fog
       ##
       # A time series is a collection of data points that represents the value of a metric of a project over time.
       #
-      # @see https://developers.google.com/cloud-monitoring/v2beta1/timeseries
+      # https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list
       class Timeseries < Fog::Model
-        identity :time_series_desc, :aliases => "timeseriesDesc"
-
+        attribute :metric
+        attribute :resource
+        attribute :metric_kind, :aliases => "metricKind"
+        attribute :value_type, :aliases => "valueType"
         attribute :points
       end
     end

data/lib/fog/google/models/monitoring/timeseries_collection.rb

@@ -10,19 +10,26 @@ module Fog
         ##
         # Lists all Timeseries.
         #
-        # @param [String] metric The name of the metric (Metric names are protocol-free URLs).
-        # @param [String] youngest End of the time interval (inclusive), which is expressed as an RFC 3339 timestamp.
-        # @param [Hash] options Optional query parameters.
-        # @option options [String] count Maximum number of time series descriptors per page. Used for pagination.
-        # @option options [String] labels A collection of labels for the matching time series.
-        # @option options [String] oldest Start of the time interval (exclusive), which is expressed as an RFC 3339
-        #   timestamp.
-        # @options options [String] page_token The pagination token, which is used to page through large result sets.
-        # @options options [String] timespan Length of the time interval to query, which is an alternative way to
-        #   declare the interval.
+        # @param [Hash] options Query parameters.
+        # @option [String] filter  A monitoring filter that specifies which time series should be returned.
+        #   The filter must specify a single metric type, and can additionally specify metric labels and other
+        #   information.
+        # @option options [Hash] interval Required. The time interval for which results should be returned.
+        # @option interval [String] end_time Required RFC3339 timestamp marking the end of interval
+        # @option interval [String] start_time Optional RFC3339 timestamp marking start of interval.
+        # @option options [Hash] aggregation
+        # @option aggregation [String] alignment_period
+        # @option aggregation [String] cross_series_reducer
+        # @option aggregation [String] group_by_fields
+        # @option aggregation [String] per_series_aligner
+        # @option options [String] order_by
+        # @option options [String] page_size
+        # @option options [String] page_token
+        # @option options [String] view
+        #
         # @return [Array<Fog::Google::Monitoring::Timeseries>] List of Timeseries.
-        def all(metric, youngest, options = {})
-          data = service.list_timeseries(metric, youngest, options).body["timeseries"] || []
+        def all(options = {})
+          data = service.list_timeseries(options).body["timeSeries"] || []
           load(data)
         end
       end

data/lib/fog/google/monitoring.rb

@@ -17,9 +17,9 @@ module Fog
         :google_json_key_string
       )
 
-      GOOGLE_MONITORING_API_VERSION    = "v2beta2".freeze
-      GOOGLE_MONITORING_BASE_URL       = "https://www.googleapis.com/cloudmonitoring/"
-      GOOGLE_MONITORING_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/monitoring)
+      GOOGLE_MONITORING_API_VERSION    = "v3".freeze
+      GOOGLE_MONITORING_BASE_URL       = "https://monitoring.googleapis.com/".freeze
+      GOOGLE_MONITORING_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/monitoring).freeze
 
       ##
       # MODELS
@@ -29,14 +29,14 @@ module Fog
       model :timeseries
       collection :timeseries_collection
 
-      # TimeseriesDescriptors
-      model :timeseries_descriptor
-      collection :timeseries_descriptors
-
       # MetricDescriptors
       model :metric_descriptor
       collection :metric_descriptors
 
+      # MonitoredResourceDescriptors
+      model :monitored_resource_descriptor
+      collection :monitored_resource_descriptors
+
       ##
       # REQUESTS
       request_path "fog/google/requests/monitoring"
@@ -44,11 +44,11 @@ module Fog
       # Timeseries
       request :list_timeseries
 
-      # TimeseriesDescriptors
-      request :list_timeseries_descriptors
-
       # MetricDescriptors
       request :list_metric_descriptors
+
+      # MonitoredResourceDescriptors
+      request :list_monitored_resource_descriptors
     end
   end
 end

data/lib/fog/google/monitoring/mock.rb

@@ -12,7 +12,7 @@ module Fog
           @data ||= Hash.new do |hash, key|
             hash[key] = {
               :timeseries => {},
-              :timeseries_descriptors => {},
+              :monitored_resource_descriptor => {},
               :metric_descriptors => {}
             }
           end

data/lib/fog/google/monitoring/real.rb

@@ -12,7 +12,7 @@ module Fog
           options[:google_api_scope_url] = GOOGLE_MONITORING_API_SCOPE_URLS.join(" ")
 
           @client = initialize_google_client(options)
-          @monitoring = @client.discovered_api("cloudmonitoring", api_version)
+          @monitoring = @client.discovered_api("monitoring", api_version)
         end
       end
     end

data/lib/fog/google/requests/monitoring/list_metric_descriptors.rb

@@ -2,21 +2,20 @@ module Fog
   module Google
     class Monitoring
       ##
-      # List metric descriptors that match the query. If the query is not set, then all of the metric descriptors
-      # will be returned.
+      # Lists metric descriptors that match a filter.
       #
-      # @see https://cloud.google.com/monitoring/v2beta2/metricDescriptors/list
+      # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors/list
       class Real
         def list_metric_descriptors(options = {})
-          api_method = @monitoring.metric_descriptors.list
+          api_method = @monitoring.projects.metric_descriptors.list
           parameters = {
-            "project" => @project
+            "name" => "projects/#{@project}"
           }
-
-          parameters["count"] = options[:count] if options.key?(:count)
+          parameters["filter"] = options[:filter] if options.key?(:filter)
+          parameters["pageSize"] = options[:page_size] if options.key?(:page_size)
           parameters["pageToken"] = options[:page_token] if options.key?(:page_token)
-          parameters["query"] = options[:query] if options.key?(:query)
 
+          puts parameters
           request(api_method, parameters)
         end
       end
@@ -24,161 +23,219 @@ module Fog
       class Mock
         def list_metric_descriptors(_options = {})
           body = {
-            "kind" => 'cloudmonitoring#listMetricDescriptorsResponse',
-            "metrics" => [
-              { "name" => "compute.googleapis.com/instance/cpu/reserved_cores",
-                "project" => @project,
-                "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
-                ],
-                "typeDescriptor" => { "metricType" => "gauge", "valueType" => "double" },
-                "description" => "Number of cores reserved on the host of the instance."
-              },
+            "metricDescriptors" => [
               {
-                "name" => "compute.googleapis.com/instance/cpu/usage_time",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/cpu/reserved_cores",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/cpu/reserved_cores",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "double" },
-                "description" => "Delta CPU usage time. Units are seconds. You can get the per-core CPU utilization ratio by performing a rate operation on a point: doubleValue/(end-start), then divide by compute.googleapis.com/instance/cpu/reserved_cores at the corresponding end timestamp."
+                "metricKind" => "GAUGE",
+                "valueType" => "DOUBLE",
+                "unit" => "1",
+                "description" => "Number of cores reserved on the host of the instance.",
+                "displayName" => "Reserved cores"
               },
               {
-                "name" => "compute.googleapis.com/instance/disk/read_bytes_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/cpu/usage_time",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/cpu/usage_time",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/device_name" },
-                  { "key" => "compute.googleapis.com/device_type" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of bytes read from disk."
+                "metricKind" => "DELTA",
+                "valueType" => "DOUBLE",
+                "unit" => "s",
+                "description" => "Delta CPU usage for all cores, in seconds. To compute the per-core CPU utilization fraction, divide this value by (end-start)*N, where end and start define this value's time interval and N is `compute.googleapis.com/instance/cpu/reserved_cores` at the end of the interval.",
+                "displayName" => "CPU usage"
               },
               {
-                "name" => "compute.googleapis.com/instance/disk/read_ops_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/disk/read_bytes_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/disk/read_bytes_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/device_name" },
-                  { "key" => "compute.googleapis.com/device_type" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "device_name",
+                    "description" => "The name of the disk device."
+                  },
+                  {
+                    "key" => "storage_type",
+                    "description" => "The storage type => `pd-standard` or `pd-ssd`."
+                  },
+                  {
+                    "key" => "device_type",
+                    "description" => "The disk type => `ephemeral` or `permanent`."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of disk read IO operations."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "By",
+                "description" => "Delta count of bytes read from disk.",
+                "displayName" => "Disk read bytes"
               },
               {
-                "name" => "compute.googleapis.com/instance/disk/write_bytes_count",
-                "project" => @project,
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/disk/read_ops_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/device_name" },
-                  { "key" => "compute.googleapis.com/device_type" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => '"compute.googleapis.com/resource_id' },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "device_name",
+                    "description" => "The name of the disk device."
+                  },
+                  {
+                    "key" => "storage_type",
+                    "description" => "The storage type => `pd-standard` or `pd-ssd`."
+                  },
+                  {
+                    "key" => "device_type",
+                    "description" => "The disk type => `ephemeral` or `permanent`."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of bytes written to disk."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "1",
+                "description" => "Delta count of disk read IO operations.",
+                "displayName" => "Disk read operations",
+                "type" => "compute.googleapis.com/instance/disk/read_ops_count"
               },
               {
-                "name" => "compute.googleapis.com/instance/disk/write_ops_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/disk/write_bytes_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/disk/write_bytes_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/device_name" },
-                  { "key" => '"compute.googleapis.com/device_type' },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "device_name",
+                    "description" => "The name of the disk device."
+                  },
+                  {
+                    "key" => "storage_type",
+                    "description" => "The storage type => `pd-standard` or `pd-ssd`."
+                  },
+                  {
+                    "key" => "device_type",
+                    "description" => "The disk type => `ephemeral` or `permanent`."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of disk write IO operations."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "By",
+                "description" => "Delta count of bytes written to disk.",
+                "displayName" => "Disk write bytes"
               },
               {
-                "name" => "compute.googleapis.com/instance/network/received_bytes_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/disk/write_ops_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/disk/write_ops_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/loadbalanced" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "device_name",
+                    "description" => "The name of the disk device."
+                  },
+                  {
+                    "key" => "storage_type",
+                    "description" => "The storage type => `pd-standard` or `pd-ssd`."
+                  },
+                  {
+                    "key" => "device_type",
+                    "description" => "The disk type => `ephemeral` or `permanent`."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of bytes received from network."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "1",
+                "description" => "Delta count of disk write IO operations.",
+                "displayName" => "Disk write operations"
               },
               {
-                "name" => "compute.googleapis.com/instance/network/received_packets_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/network/received_packets_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/network/received_packets_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/loadbalanced" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "loadbalanced",
+                    "valueType" => "BOOL",
+                    "description" => "Whether traffic was received by an L3 loadbalanced IP address assigned to the VM. Traffic that is externally routed to the VM's standard internal or external IP address, such as L7 loadbalanced traffic, is not considered to be loadbalanced in this metric."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of packets received from network."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "1",
+                "description" => "Delta count of packets received from the network.",
+                "displayName" => "Received packets"
               },
               {
-                "name" => "compute.googleapis.com/instance/network/sent_bytes_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/network/sent_bytes_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/network/sent_bytes_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/loadbalanced" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "loadbalanced",
+                    "valueType" => "BOOL",
+                    "description" => "Whether traffic was sent from an L3 loadbalanced IP address assigned to the VM. Traffic that is externally routed from the VM's standard internal or external IP address, such as L7 loadbalanced traffic, is not considered to be loadbalanced in this metric."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of bytes sent over network."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "By",
+                "description" => "Delta count of bytes sent over the network.",
+                "displayName" => "Sent bytes"
               },
               {
-                "name" => "compute.googleapis.com/instance/network/sent_packets_count",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/network/sent_packets_count",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/network/sent_packets_count",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "compute.googleapis.com/loadbalanced" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  },
+                  {
+                    "key" => "loadbalanced",
+                    "valueType" => "BOOL",
+                    "description" => "Whether traffic was sent from an L3 loadbalanced IP address assigned to the VM. Traffic that is externally routed from the VM's standard internal or external IP address, such as L7 loadbalanced traffic, is not considered to be loadbalanced in this metric."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "int64" },
-                "description" => "Delta count of packets sent over network."
+                "metricKind" => "DELTA",
+                "valueType" => "INT64",
+                "unit" => "1",
+                "description" => "Delta count of packets sent over the network.",
+                "displayName" => "Sent packets"
               },
               {
-                "name" => "compute.googleapis.com/instance/uptime",
-                "project" => @project,
+                "type" => "compute.googleapis.com/instance/uptime",
+                "name" => "projects/#{@project}/metricDescriptors/compute.googleapis.com/instance/uptime",
                 "labels" => [
-                  { "key" => "compute.googleapis.com/instance_name" },
-                  { "key" => "cloud.googleapis.com/location" },
-                  { "key" => "compute.googleapis.com/resource_id" },
-                  { "key" => "compute.googleapis.com/resource_type" },
-                  { "key" => "cloud.googleapis.com/service" }
+                  {
+                    "key" => "instance_name",
+                    "description" => "The name of the VM instance."
+                  }
                 ],
-                "typeDescriptor" => { "metricType" => "delta", "valueType" => "double" },
-                "description" => "Indicates the VM running time in seconds."
+                "metricKind" => "DELTA",
+                "valueType" => "DOUBLE",
+                "unit" => "s",
+                "description" => "How long the VM has been running, in seconds.",
+                "displayName" => "Uptime"
               }
             ]
           }