fog-google 0.5.5 → 0.6.0

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

@@ -0,0 +1,63 @@
+module Fog
+  module Google
+    class Monitoring
+      ##
+      # Describes the schema of a MonitoredResource (a resource object that can be used for monitoring, logging,
+      # billing, or other purposes) using a type name and a set of labels.
+      #
+      # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.monitoredResourceDescriptors/list
+      class Real
+        def list_monitored_resource_descriptors(options = {})
+          api_method = @monitoring.projects.monitored_resource_descriptors.list
+          parameters = {
+            "name" => "projects/#{@project}"
+          }
+
+          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)
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def list_monitored_resource_descriptors(_options = {})
+          body = {
+            "resourceDescriptors" => [
+              {
+                "type" => "api",
+                "displayName" => "Produced API",
+                "description" => "An API provided by the producer.",
+                "labels" => [
+                  {
+                    "key" => "project_id",
+                    "description" => "The identifier of the GCP project associated with this resource (e.g., my-project)."
+                  },
+                  {
+                    "key" => "service",
+                    "description" => "API service name e.g. \"cloudsql.googleapis.com\"."
+                  },
+                  {
+                    "key" => "method",
+                    "description" => "API method e.g. \"disks.list\"."
+                  },
+                  {
+                    "key" => "version",
+                    "description" => "API version e.g. \"v1\"."
+                  },
+                  {
+                    "key" => "location",
+                    "description" => "The service specific notion of location. This can be a name of a zone, region, or \"global."
+                  }
+                ],
+                "name" => "projects/#{@project}/monitoredResourceDescriptors/api"
+              }
+            ]
+          }
+          build_excon_response(body)
+        end
+      end
+    end
+  end
+end

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

@@ -5,55 +5,74 @@ module Fog
       # List the data points of the time series that match the metric and labels values and that have data points
       # in the interval
       #
-      # https://developers.google.com/cloud-monitoring/v2beta1/timeseries
+      # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.timeSeries/list
       class Real
-        def list_timeseries(metric, youngest, options = {})
-          api_method = @monitoring.timeseries.list
+        def list_timeseries(options = {})
+          api_method = @monitoring.projects.time_series.list
           parameters = {
-            "project" => @project,
-            "metric" => metric,
-            "youngest" => youngest
+            "name" => "projects/#{@project}"
           }
+          if options.key?(:interval)
+            interval = options[:interval]
+            parameters["interval.endTime"] = interval[:end_time] if interval.key?(:end_time)
+            parameters["interval.startTime"] = interval[:start_time] if interval.key?(:start_time)
+          end
 
-          parameters["count"] = options[:count] if options.key?(:count)
-          parameters["labels"] = options[:labels] if options.key?(:labels)
-          parameters["oldest"] = options[:oldest] if options.key?(:oldest)
+          if options.key?(:aggregation)
+            aggregation = options[:aggregation]
+            parameters["aggregation.alignmentPeriod"] = aggregation[:alignment_period] if aggregation.key?(:alignment_period)
+            parameters["aggregation.crossSeriesReducer"] = aggregation[:cross_series_reducer] if aggregation.key?(:cross_series_reducer)
+            parameters["aggregation.groupByFields"] = aggregation[:group_by_fields] if aggregation.key?(:group_by_fields)
+            parameters["aggregation.perSeriesAligner"] = aggregation[:per_series_aligner] if aggregation.key?(:per_series_aligner)
+          end
+
+          parameters["filter"] = options[:filter] if options.key?(:filter)
+          parameters["orderBy"] = options[:order_by] if options.key?(:order_by)
+          parameters["pageSize"] = options[:page_size] if options.key?(:page_size)
           parameters["pageToken"] = options[:page_token] if options.key?(:page_token)
-          parameters["timespan"] = options[:timespan] if options.key?(:timespan)
+          parameters["view"] = options[:view] if options.key?(:view)
+
+          unless parameters.key?("interval.startTime")
+            raise ArgumentError.new("option :interval must have :start_time value for listing timeseries")
+          end
+
+          unless parameters.key?("interval.endTime")
+            raise ArgumentError.new("option :interval must have :end_time value for listing timeseries")
+          end
+
+          unless parameters.key?("filter")
+            raise ArgumentError.new("options[:filter] value is required to list timeseries")
+          end
 
           request(api_method, parameters)
         end
       end
 
       class Mock
-        def list_timeseries(metric, youngest, _options = {})
+        def list_timeseries(interval, _options = {})
           body = {
-            "kind" => 'cloudmonitoring#listTimeseriesResponse',
-            "youngest" => youngest,
-            "oldest" => youngest,
-            "timeseries" => [
+            "timeSeries" => [
               {
-                "timeseriesDesc" => {
-                  "project" => @project,
-                  "metric" => metric,
+                "metric" => {
+                  "labels" => { "instance_name" => "emilyye-dev" },
+                  "type" => "compute.googleapis.com/instance/cpu/usage_time"
+                },
+                "resource" => {
+                  "type" => "gce_instance",
                   "labels" => {
-                    "cloud.googleapis.com/service" => "compute.googleapis.com",
-                    "compute.googleapis.com/resource_type" => "instance",
-                    "cloud.googleapis.com/location" => "us-central1-a",
-                    "compute.googleapis.com/resource_id" => Fog::Mock.random_numbers(20).to_s,
-                    "compute.googleapis.com/instance_name" => Fog::Mock.random_hex(40)
+                    "instance_id" => "3959348537894302241",
+                    "zone" => "us-central1-c",
+                    "project_id" => @project
                   }
                 },
+                "metricKind" => "DELTA",
+                "valueType" => "DOUBLE",
                 "points" => [
                   {
-                    "start" => "2014-07-17T20:06:58.000Z",
-                    "end" => "2014-07-17T20:07:58.000Z",
-                    "doubleValue" => 60.0
-                  },
-                  {
-                    "start" => "2014-07-17T20:05:58.000Z",
-                    "end" => "2014-07-17T20:06:58.000Z",
-                    "doubleValue" => 60.0
+                    "interval" => interval,
+                    "value" => {
+                      "doubleValue" => 1.8277230720141233
+                    }
                   }
                 ]
               }

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.5.5".freeze
+    VERSION = "0.6.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -232,8 +232,8 @@ files:
 - examples/load-balance.rb
 - examples/metadata.rb
 - examples/monitoring/metric_descriptors.rb
+- examples/monitoring/monitored_resource_descriptors.rb
 - examples/monitoring/timeseries_collection.rb
-- examples/monitoring/timeseries_descriptors.rb
 - examples/network.rb
 - examples/precreated_client.rb
 - examples/pubsub/subscriptions.rb
@@ -486,10 +486,10 @@ files:
 - lib/fog/google/mock.rb
 - lib/fog/google/models/monitoring/metric_descriptor.rb
 - lib/fog/google/models/monitoring/metric_descriptors.rb
+- lib/fog/google/models/monitoring/monitored_resource_descriptor.rb
+- lib/fog/google/models/monitoring/monitored_resource_descriptors.rb
 - lib/fog/google/models/monitoring/timeseries.rb
 - lib/fog/google/models/monitoring/timeseries_collection.rb
-- lib/fog/google/models/monitoring/timeseries_descriptor.rb
-- lib/fog/google/models/monitoring/timeseries_descriptors.rb
 - lib/fog/google/models/pubsub/received_message.rb
 - lib/fog/google/models/pubsub/subscription.rb
 - lib/fog/google/models/pubsub/subscriptions.rb
@@ -514,8 +514,8 @@ files:
 - lib/fog/google/pubsub/mock.rb
 - lib/fog/google/pubsub/real.rb
 - lib/fog/google/requests/monitoring/list_metric_descriptors.rb
+- lib/fog/google/requests/monitoring/list_monitored_resource_descriptors.rb
 - lib/fog/google/requests/monitoring/list_timeseries.rb
-- lib/fog/google/requests/monitoring/list_timeseries_descriptors.rb
 - lib/fog/google/requests/pubsub/acknowledge_subscription.rb
 - lib/fog/google/requests/pubsub/create_subscription.rb
 - lib/fog/google/requests/pubsub/create_topic.rb
@@ -679,9 +679,6 @@ files:
 - tests/models/dns/records_tests.rb
 - tests/models/dns/zone_tests.rb
 - tests/models/dns/zones_tests.rb
-- tests/models/monitoring/metric_descriptors_tests.rb
-- tests/models/monitoring/timeseries_collection_tests.rb
-- tests/models/monitoring/timeseries_descriptors_tests.rb
 - tests/models/pubsub/received_message_tests.rb
 - tests/models/pubsub/subscription_tests.rb
 - tests/models/pubsub/subscriptions_tests.rb
@@ -716,9 +713,6 @@ files:
 - tests/requests/dns/managed_zone_tests.rb
 - tests/requests/dns/project_tests.rb
 - tests/requests/dns/record_tests.rb
-- tests/requests/monitoring/metric_descriptor_tests.rb
-- tests/requests/monitoring/timeseries_collection_tests.rb
-- tests/requests/monitoring/timeseries_descriptor_tests.rb
 - tests/requests/sql/flag_tests.rb
 - tests/requests/sql/instance_tests.rb
 - tests/requests/sql/operation_tests.rb
@@ -746,7 +740,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.

data/examples/monitoring/timeseries_descriptors.rb

@@ -1,27 +0,0 @@
-# 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 TimeseriesDescriptors for the metric compute.googleapis.com/instance/uptime..."
-  puts "------------------------------------------------------------------------------------------"
-  td = connection.timeseries_descriptors.all("compute.googleapis.com/instance/uptime",
-                                             DateTime.now.rfc3339)
-  puts "Number of matches: #{td.length}"
-
-  puts "Listing all TimeseriesDescriptors for the metric compute.googleapis.com/instance/uptime &"
-  puts "the region us-central1..."
-  puts "-----------------------------------------------------------------------------------------"
-  td = connection.timeseries_descriptors.all("compute.googleapis.com/instance/uptime",
-                                             DateTime.now.rfc3339,
-                                             :labels => "cloud.googleapis.com/location=~us-central1.*")
-  puts "Number of matches: #{td.length}"
-end
-
-test

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

@@ -1,20 +0,0 @@
-require "fog/core/model"
-
-module Fog
-  module Google
-    class Monitoring
-      ##
-      # A time series is a collection of data points that represents the value of a metric of a project over time.
-      # The metric is described by the time-series descriptor. Each time-series descriptor is uniquely identified by
-      # its metric name and a set of labels.
-      #
-      # @see https://developers.google.com/cloud-monitoring/v2beta1/timeseriesDescriptors
-      class TimeseriesDescriptor < Fog::Model
-        identity :metric
-
-        attribute :labels
-        attribute :project
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-require "fog/core/collection"
-require "fog/google/models/monitoring/timeseries_descriptor"
-
-module Fog
-  module Google
-    class Monitoring
-      class TimeseriesDescriptors < Fog::Collection
-        model Fog::Google::Monitoring::TimeseriesDescriptor
-
-        ##
-        # Lists all Timeseries Descriptors.
-        #
-        # @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.
-        # @return [Array<Fog::Google::Monitoring::TimeseriesDescriptor>] List of Timeseries Descriptors.
-        def all(metric, youngest, options = {})
-          data = service.list_timeseries_descriptors(metric, youngest, options).body["timeseries"] || []
-          load(data)
-        end
-      end
-    end
-  end
-end

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

@@ -1,87 +0,0 @@
-module Fog
-  module Google
-    class Monitoring
-      ##
-      # List the descriptors of the time series that match the metric and labels values and that have data points
-      # in the interval.
-      #
-      # @see https://developers.google.com/cloud-monitoring/v2beta1/timeseriesDescriptors/list
-      class Real
-        def list_timeseries_descriptors(metric, youngest, options = {})
-          api_method = @monitoring.timeseries_descriptors.list
-          parameters = {
-            "project" => @project,
-            "metric" => metric,
-            "youngest" => youngest
-          }
-
-          parameters["count"] = options[:count] if options.key?(:count)
-          parameters["labels"] = options[:labels] if options.key?(:labels)
-          parameters["oldest"] = options[:oldest] if options.key?(:oldest)
-          parameters["pageToken"] = options[:page_token] if options.key?(:page_token)
-          parameters["timespan"] = options[:timespan] if options.key?(:timespan)
-
-          request(api_method, parameters)
-        end
-      end
-
-      class Mock
-        def list_timeseries_descriptors(metric, youngest, _options = {})
-          body = {
-            "kind" => 'cloudmonitoring#listTimeseriesDescriptorsResponse',
-            "youngest" => youngest,
-            "oldest" => youngest,
-            "timeseries" => [
-              {
-                "project" => @project,
-                "metric" => metric,
-                "labels" => {
-                  "cloud.googleapis.com/service" => "compute.googleapis.com",
-                  "compute.googleapis.com/resource_type" => "instance",
-                  "cloud.googleapis.com/location" => "us-central1-a",
-                  "compute.googleapis.com/resource_id" => Fog::Mock.random_numbers(20).to_s,
-                  "compute.googleapis.com/instance_name" => Fog::Mock.random_hex(40)
-                }
-              },
-              {
-                "project" => @project,
-                "metric" => metric,
-                "labels" => {
-                  "cloud.googleapis.com/service" => "compute.googleapis.com",
-                  "compute.googleapis.com/resource_type" => "instance",
-                  "cloud.googleapis.com/location" => "us-central1-a",
-                  "compute.googleapis.com/resource_id" => Fog::Mock.random_numbers(20).to_s,
-                  "compute.googleapis.com/instance_name" => Fog::Mock.random_hex(40)
-                }
-              },
-              {
-                "project" => @project,
-                "metric" => metric,
-                "labels" => {
-                  "cloud.googleapis.com/service" => "compute.googleapis.com",
-                  "compute.googleapis.com/resource_type" => "instance",
-                  "cloud.googleapis.com/location" => "us-central1-a",
-                  "compute.googleapis.com/resource_id" => Fog::Mock.random_numbers(20).to_s,
-                  "compute.googleapis.com/instance_name" => Fog::Mock.random_hex(40)
-                }
-              },
-              {
-                "project" => @project,
-                "metric" => metric,
-                "labels" => {
-                  "cloud.googleapis.com/service" => "compute.googleapis.com",
-                  "compute.googleapis.com/resource_type" => "instance",
-                  "cloud.googleapis.com/location" => "us-central1-a",
-                  "compute.googleapis.com/resource_id" => Fog::Mock.random_numbers(20).to_s,
-                  "compute.googleapis.com/instance_name" => Fog::Mock.random_hex(40)
-                }
-              }
-            ]
-          }
-
-          build_excon_response(body)
-        end
-      end
-    end
-  end
-end

data/tests/models/monitoring/metric_descriptors_tests.rb

@@ -1,9 +0,0 @@
-Shindo.tests("Fog::Google[:monitoring] | metric_descriptors model", ["google"]) do
-  @metric_descriptors = Fog::Google[:monitoring].metric_descriptors
-
-  tests("success") do
-    tests('#all').succeeds do
-      @metric_descriptors.all
-    end
-  end
-end

data/tests/models/monitoring/timeseries_collection_tests.rb

@@ -1,9 +0,0 @@
-Shindo.tests("Fog::Google[:monitoring] | timeseries_collection model", ["google"]) do
-  @timeseries_collection = Fog::Google[:monitoring].timeseries_collection
-
-  tests("success") do
-    tests('#all').succeeds do
-      @timeseries_collection.all("compute.googleapis.com/instance/uptime", Time.now.strftime("%Y-%m-%dT%H:%M:%S%:z"))
-    end
-  end
-end