google-api-client 0.11.1 → 0.11.2

data/generated/google/apis/logging_v2beta1/representations.rb

@@ -22,6 +22,36 @@ module Google
   module Apis
     module LoggingV2beta1
       
+      class ListLogMetricsResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class Empty
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class LogEntry
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class SourceLocation
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class ListLogEntriesRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class RequestLog
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -40,13 +70,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class LogMetric
+      class LogEntryOperation
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class LogEntryOperation
+      class LogMetric
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -82,13 +112,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class HttpRequest
+      class ListSinksResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class ListSinksResponse
+      class HttpRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -125,48 +155,67 @@ module Google
       end
       
       class ListLogMetricsResponse
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :metrics, as: 'metrics', class: Google::Apis::LoggingV2beta1::LogMetric, decorator: Google::Apis::LoggingV2beta1::LogMetric::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+          property :next_page_token, as: 'nextPageToken'
+        end
       end
       
       class Empty
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+        end
       end
       
       class LogEntry
-        class Representation < Google::Apis::Core::JsonRepresentation; end
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :timestamp, as: 'timestamp'
+          property :log_name, as: 'logName'
+          property :resource, as: 'resource', class: Google::Apis::LoggingV2beta1::MonitoredResource, decorator: Google::Apis::LoggingV2beta1::MonitoredResource::Representation
       
-        include Google::Apis::Core::JsonObjectSupport
+          property :http_request, as: 'httpRequest', class: Google::Apis::LoggingV2beta1::HttpRequest, decorator: Google::Apis::LoggingV2beta1::HttpRequest::Representation
+      
+          hash :json_payload, as: 'jsonPayload'
+          property :insert_id, as: 'insertId'
+          property :operation, as: 'operation', class: Google::Apis::LoggingV2beta1::LogEntryOperation, decorator: Google::Apis::LoggingV2beta1::LogEntryOperation::Representation
+      
+          property :text_payload, as: 'textPayload'
+          hash :proto_payload, as: 'protoPayload'
+          hash :labels, as: 'labels'
+          property :trace, as: 'trace'
+          property :severity, as: 'severity'
+          property :source_location, as: 'sourceLocation', class: Google::Apis::LoggingV2beta1::LogEntrySourceLocation, decorator: Google::Apis::LoggingV2beta1::LogEntrySourceLocation::Representation
+      
+        end
       end
       
       class SourceLocation
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :file, as: 'file'
+          property :function_name, as: 'functionName'
+          property :line, :numeric_string => true, as: 'line'
+        end
       end
       
       class ListLogEntriesRequest
-        class Representation < Google::Apis::Core::JsonRepresentation; end
-      
-        include Google::Apis::Core::JsonObjectSupport
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :order_by, as: 'orderBy'
+          collection :resource_names, as: 'resourceNames'
+          collection :project_ids, as: 'projectIds'
+          property :filter, as: 'filter'
+          property :page_token, as: 'pageToken'
+          property :page_size, as: 'pageSize'
+        end
       end
       
       class RequestLog
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :request_id, as: 'requestId'
-          property :nickname, as: 'nickname'
-          property :status, as: 'status'
-          property :pending_time, as: 'pendingTime'
-          property :resource, as: 'resource'
-          property :task_name, as: 'taskName'
-          property :url_map_entry, as: 'urlMapEntry'
-          property :instance_index, as: 'instanceIndex'
-          property :finished, as: 'finished'
-          property :host, as: 'host'
           property :http_version, as: 'httpVersion'
           property :start_time, as: 'startTime'
           property :latency, as: 'latency'
@@ -191,6 +240,16 @@ module Google
       
           property :referrer, as: 'referrer'
           property :task_queue_name, as: 'taskQueueName'
+          property :request_id, as: 'requestId'
+          property :nickname, as: 'nickname'
+          property :pending_time, as: 'pendingTime'
+          property :resource, as: 'resource'
+          property :status, as: 'status'
+          property :task_name, as: 'taskName'
+          property :url_map_entry, as: 'urlMapEntry'
+          property :instance_index, as: 'instanceIndex'
+          property :finished, as: 'finished'
+          property :host, as: 'host'
         end
       end
       
@@ -206,18 +265,8 @@ module Google
       class SourceReference
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :revision_id, as: 'revisionId'
           property :repository, as: 'repository'
-        end
-      end
-      
-      class LogMetric
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :version, as: 'version'
-          property :filter, as: 'filter'
-          property :name, as: 'name'
-          property :description, as: 'description'
+          property :revision_id, as: 'revisionId'
         end
       end
       
@@ -231,6 +280,16 @@ module Google
         end
       end
       
+      class LogMetric
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :name, as: 'name'
+          property :description, as: 'description'
+          property :version, as: 'version'
+          property :filter, as: 'filter'
+        end
+      end
+      
       class WriteLogEntriesResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -240,8 +299,8 @@ module Google
       class MonitoredResource
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          hash :labels, as: 'labels'
           property :type, as: 'type'
+          hash :labels, as: 'labels'
         end
       end
       
@@ -261,33 +320,37 @@ module Google
       class LogSink
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :destination, as: 'destination'
+          property :filter, as: 'filter'
+          property :end_time, as: 'endTime'
           property :start_time, as: 'startTime'
           property :writer_identity, as: 'writerIdentity'
           property :output_version_format, as: 'outputVersionFormat'
           property :name, as: 'name'
-          property :destination, as: 'destination'
-          property :filter, as: 'filter'
-          property :end_time, as: 'endTime'
+          property :include_children, as: 'includeChildren'
         end
       end
       
       class ListLogsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :next_page_token, as: 'nextPageToken'
           collection :log_names, as: 'logNames'
+          property :next_page_token, as: 'nextPageToken'
+        end
+      end
+      
+      class ListSinksResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
+          collection :sinks, as: 'sinks', class: Google::Apis::LoggingV2beta1::LogSink, decorator: Google::Apis::LoggingV2beta1::LogSink::Representation
+      
         end
       end
       
       class HttpRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :user_agent, as: 'userAgent'
-          property :latency, as: 'latency'
-          property :cache_fill_bytes, :numeric_string => true, as: 'cacheFillBytes'
-          property :request_method, as: 'requestMethod'
-          property :request_size, :numeric_string => true, as: 'requestSize'
-          property :response_size, :numeric_string => true, as: 'responseSize'
           property :request_url, as: 'requestUrl'
           property :server_ip, as: 'serverIp'
           property :remote_ip, as: 'remoteIp'
@@ -296,36 +359,33 @@ module Google
           property :cache_validated_with_origin_server, as: 'cacheValidatedWithOriginServer'
           property :status, as: 'status'
           property :referer, as: 'referer'
-        end
-      end
-      
-      class ListSinksResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :sinks, as: 'sinks', class: Google::Apis::LoggingV2beta1::LogSink, decorator: Google::Apis::LoggingV2beta1::LogSink::Representation
-      
-          property :next_page_token, as: 'nextPageToken'
+          property :user_agent, as: 'userAgent'
+          property :latency, as: 'latency'
+          property :cache_fill_bytes, :numeric_string => true, as: 'cacheFillBytes'
+          property :request_method, as: 'requestMethod'
+          property :request_size, :numeric_string => true, as: 'requestSize'
+          property :response_size, :numeric_string => true, as: 'responseSize'
         end
       end
       
       class LabelDescriptor
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :key, as: 'key'
           property :description, as: 'description'
           property :value_type, as: 'valueType'
+          property :key, as: 'key'
         end
       end
       
       class MonitoredResourceDescriptor
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :type, as: 'type'
           collection :labels, as: 'labels', class: Google::Apis::LoggingV2beta1::LabelDescriptor, decorator: Google::Apis::LoggingV2beta1::LabelDescriptor::Representation
       
           property :name, as: 'name'
           property :display_name, as: 'displayName'
           property :description, as: 'description'
-          property :type, as: 'type'
         end
       end
       
@@ -350,70 +410,11 @@ module Google
       class LogLine
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :severity, as: 'severity'
-          property :log_message, as: 'logMessage'
           property :source_location, as: 'sourceLocation', class: Google::Apis::LoggingV2beta1::SourceLocation, decorator: Google::Apis::LoggingV2beta1::SourceLocation::Representation
       
           property :time, as: 'time'
-        end
-      end
-      
-      class ListLogMetricsResponse
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :next_page_token, as: 'nextPageToken'
-          collection :metrics, as: 'metrics', class: Google::Apis::LoggingV2beta1::LogMetric, decorator: Google::Apis::LoggingV2beta1::LogMetric::Representation
-      
-        end
-      end
-      
-      class Empty
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-        end
-      end
-      
-      class LogEntry
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :log_name, as: 'logName'
-          property :http_request, as: 'httpRequest', class: Google::Apis::LoggingV2beta1::HttpRequest, decorator: Google::Apis::LoggingV2beta1::HttpRequest::Representation
-      
-          property :resource, as: 'resource', class: Google::Apis::LoggingV2beta1::MonitoredResource, decorator: Google::Apis::LoggingV2beta1::MonitoredResource::Representation
-      
-          hash :json_payload, as: 'jsonPayload'
-          property :insert_id, as: 'insertId'
-          property :operation, as: 'operation', class: Google::Apis::LoggingV2beta1::LogEntryOperation, decorator: Google::Apis::LoggingV2beta1::LogEntryOperation::Representation
-      
-          property :text_payload, as: 'textPayload'
-          hash :proto_payload, as: 'protoPayload'
-          property :trace, as: 'trace'
-          hash :labels, as: 'labels'
           property :severity, as: 'severity'
-          property :source_location, as: 'sourceLocation', class: Google::Apis::LoggingV2beta1::LogEntrySourceLocation, decorator: Google::Apis::LoggingV2beta1::LogEntrySourceLocation::Representation
-      
-          property :timestamp, as: 'timestamp'
-        end
-      end
-      
-      class SourceLocation
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :file, as: 'file'
-          property :function_name, as: 'functionName'
-          property :line, :numeric_string => true, as: 'line'
-        end
-      end
-      
-      class ListLogEntriesRequest
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :order_by, as: 'orderBy'
-          collection :resource_names, as: 'resourceNames'
-          property :filter, as: 'filter'
-          collection :project_ids, as: 'projectIds'
-          property :page_token, as: 'pageToken'
-          property :page_size, as: 'pageSize'
+          property :log_message, as: 'logMessage'
         end
       end
     end

data/generated/google/apis/logging_v2beta1/service.rb

@@ -32,202 +32,255 @@ module Google
       #
       # @see https://cloud.google.com/logging/docs/
       class LoggingService < Google::Apis::Core::BaseService
-        # @return [String]
-        #  Available to use for quota purposes for server-side applications. Can be any
-        #  arbitrary string assigned to a user, but should not exceed 40 characters.
-        attr_accessor :quota_user
-
         # @return [String]
         #  API key. Your API key identifies your project and provides you with API access,
         #  quota, and reports. Required unless you provide an OAuth 2.0 token.
         attr_accessor :key
 
+        # @return [String]
+        #  Available to use for quota purposes for server-side applications. Can be any
+        #  arbitrary string assigned to a user, but should not exceed 40 characters.
+        attr_accessor :quota_user
+
         def initialize
           super('https://logging.googleapis.com/', '')
           @batch_path = 'batch'
         end
         
-        # Lists the descriptors for monitored resource types used by Stackdriver Logging.
-        # @param [String] page_token
-        #   Optional. If present, then retrieve the next batch of results from the
-        #   preceding call to this method. pageToken must be the value of nextPageToken
-        #   from the previous response. The values of other method parameters should be
-        #   identical to those in the previous call.
-        # @param [Fixnum] page_size
-        #   Optional. The maximum number of results to return from this request. Non-
-        #   positive values are ignored. The presence of nextPageToken in the response
-        #   indicates that more results might be available.
+        # Lists log entries. Use this method to retrieve log entries from Stackdriver
+        # Logging. For ways to export log entries, see Exporting Logs.
+        # @param [Google::Apis::LoggingV2beta1::ListLogEntriesRequest] list_log_entries_request_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogEntriesResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse]
+        # @return [Google::Apis::LoggingV2beta1::ListLogEntriesResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_monitored_resource_descriptors(page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2beta1/monitoredResourceDescriptors', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+        def list_entry_log_entries(list_log_entries_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v2beta1/entries:list', options)
+          command.request_representation = Google::Apis::LoggingV2beta1::ListLogEntriesRequest::Representation
+          command.request_object = list_log_entries_request_object
+          command.response_representation = Google::Apis::LoggingV2beta1::ListLogEntriesResponse::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::ListLogEntriesResponse
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes all the log entries in a log. The log reappears if it receives new
-        # entries. Log entries written shortly before the delete operation might not be
-        # deleted.
-        # @param [String] log_name
-        #   Required. The resource name of the log to delete:
-        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
-        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
-        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
-        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
-        #   2Factivity". For more information about log names, see LogEntry.
+        # Writes log entries to Stackdriver Logging.
+        # @param [Google::Apis::LoggingV2beta1::WriteLogEntriesRequest] write_log_entries_request_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::Empty] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
+        # @return [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_organization_log(log_name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2beta1/{+logName}', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::Empty
-          command.params['logName'] = log_name unless log_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+        def write_entry_log_entries(write_log_entries_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v2beta1/entries:write', options)
+          command.request_representation = Google::Apis::LoggingV2beta1::WriteLogEntriesRequest::Representation
+          command.request_object = write_log_entries_request_object
+          command.response_representation = Google::Apis::LoggingV2beta1::WriteLogEntriesResponse::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::WriteLogEntriesResponse
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the logs in projects, organizations, folders, or billing accounts. Only
-        # logs that have entries are listed.
+        # Lists logs-based metrics.
         # @param [String] parent
-        #   Required. The resource name that owns the logs:
+        #   Required. The name of the project containing the metrics:
         #   "projects/[PROJECT_ID]"
-        #   "organizations/[ORGANIZATION_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
-        #   "folders/[FOLDER_ID]"
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
         # @param [String] page_token
         #   Optional. If present, then retrieve the next batch of results from the
         #   preceding call to this method. pageToken must be the value of nextPageToken
         #   from the previous response. The values of other method parameters should be
         #   identical to those in the previous call.
-        # @param [Fixnum] page_size
-        #   Optional. The maximum number of results to return from this request. Non-
-        #   positive values are ignored. The presence of nextPageToken in the response
-        #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogMetricsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListLogsResponse]
+        # @return [Google::Apis::LoggingV2beta1::ListLogMetricsResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_organization_logs(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2beta1/{+parent}/logs', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::ListLogsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::ListLogsResponse
+        def list_project_metrics(parent, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2beta1/{+parent}/metrics', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::ListLogMetricsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::ListLogMetricsResponse
           command.params['parent'] = parent unless parent.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists log entries. Use this method to retrieve log entries from Stackdriver
-        # Logging. For ways to export log entries, see Exporting Logs.
-        # @param [Google::Apis::LoggingV2beta1::ListLogEntriesRequest] list_log_entries_request_object
+        # Gets a logs-based metric.
+        # @param [String] metric_name
+        #   The resource name of the desired metric:
+        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_project_metric(metric_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2beta1/{+metricName}', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
+          command.params['metricName'] = metric_name unless metric_name.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Creates or updates a logs-based metric.
+        # @param [String] metric_name
+        #   The resource name of the metric to update:
+        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
+        #   The updated metric must be provided in the request and it's name field must be
+        #   the same as [METRIC_ID] If the metric does not exist in [PROJECT_ID], then a
+        #   new metric is created.
+        # @param [Google::Apis::LoggingV2beta1::LogMetric] log_metric_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogEntriesResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListLogEntriesResponse]
+        # @return [Google::Apis::LoggingV2beta1::LogMetric]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_entry_log_entries(list_log_entries_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v2beta1/entries:list', options)
-          command.request_representation = Google::Apis::LoggingV2beta1::ListLogEntriesRequest::Representation
-          command.request_object = list_log_entries_request_object
-          command.response_representation = Google::Apis::LoggingV2beta1::ListLogEntriesResponse::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::ListLogEntriesResponse
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+        def update_project_metric(metric_name, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'v2beta1/{+metricName}', options)
+          command.request_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
+          command.request_object = log_metric_object
+          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
+          command.params['metricName'] = metric_name unless metric_name.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Writes log entries to Stackdriver Logging.
-        # @param [Google::Apis::LoggingV2beta1::WriteLogEntriesRequest] write_log_entries_request_object
+        # Creates a logs-based metric.
+        # @param [String] parent
+        #   The resource name of the project in which to create the metric:
+        #   "projects/[PROJECT_ID]"
+        #   The new metric must be provided in the request.
+        # @param [Google::Apis::LoggingV2beta1::LogMetric] log_metric_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def create_project_metric(parent, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v2beta1/{+parent}/metrics', options)
+          command.request_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
+          command.request_object = log_metric_object
+          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
+          command.params['parent'] = parent unless parent.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Deletes a logs-based metric.
+        # @param [String] metric_name
+        #   The resource name of the metric to delete:
+        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse]
+        # @return [Google::Apis::LoggingV2beta1::Empty]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def write_entry_log_entries(write_log_entries_request_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v2beta1/entries:write', options)
-          command.request_representation = Google::Apis::LoggingV2beta1::WriteLogEntriesRequest::Representation
-          command.request_object = write_log_entries_request_object
-          command.response_representation = Google::Apis::LoggingV2beta1::WriteLogEntriesResponse::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::WriteLogEntriesResponse
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+        def delete_project_metric(metric_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2beta1/{+metricName}', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::Empty
+          command.params['metricName'] = metric_name unless metric_name.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -243,11 +296,11 @@ module Google
         #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
         #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
         #   2Factivity". For more information about log names, see LogEntry.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -260,13 +313,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_log(log_name, quota_user: nil, fields: nil, options: nil, &block)
+        def delete_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:delete, 'v2beta1/{+logName}', options)
           command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
           command.response_class = Google::Apis::LoggingV2beta1::Empty
           command.params['logName'] = log_name unless log_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -287,11 +340,11 @@ module Google
         #   Optional. The maximum number of results to return from this request. Non-
         #   positive values are ignored. The presence of nextPageToken in the response
         #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -304,52 +357,15 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_logs(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def list_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v2beta1/{+parent}/logs', options)
           command.response_representation = Google::Apis::LoggingV2beta1::ListLogsResponse::Representation
           command.response_class = Google::Apis::LoggingV2beta1::ListLogsResponse
           command.params['parent'] = parent unless parent.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Deletes a sink. If the sink has a unique writer_identity, then that service
-        # account is also deleted.
-        # @param [String] sink_name
-        #   Required. The full resource name of the sink to delete, including the parent
-        #   resource and the sink identifier:
-        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-        #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
-        #   Example: "projects/my-project-id/sinks/my-sink-id".
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::Empty] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_project_sink(sink_name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2beta1/{+sinkName}', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::Empty
-          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -369,11 +385,11 @@ module Google
         #   Optional. The maximum number of results to return from this request. Non-
         #   positive values are ignored. The presence of nextPageToken in the response
         #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -386,15 +402,15 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_project_sinks(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def list_project_sinks(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v2beta1/{+parent}/sinks', options)
           command.response_representation = Google::Apis::LoggingV2beta1::ListSinksResponse::Representation
           command.response_class = Google::Apis::LoggingV2beta1::ListSinksResponse
           command.params['parent'] = parent unless parent.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -406,11 +422,11 @@ module Google
         #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
         #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
         #   Example: "projects/my-project-id/sinks/my-sink-id".
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -423,13 +439,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_project_sink(sink_name, quota_user: nil, fields: nil, options: nil, &block)
+        def get_project_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v2beta1/{+sinkName}', options)
           command.response_representation = Google::Apis::LoggingV2beta1::LogSink::Representation
           command.response_class = Google::Apis::LoggingV2beta1::LogSink
           command.params['sinkName'] = sink_name unless sink_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -457,11 +473,11 @@ module Google
         #   If the old value is false and the new value is true, then writer_identity is
         #   changed to a unique service account.
         #   It is an error if the old value is true and the new value is false.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -474,7 +490,7 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_project_sink(sink_name, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def update_project_sink(sink_name, log_sink_object = nil, unique_writer_identity: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:put, 'v2beta1/{+sinkName}', options)
           command.request_representation = Google::Apis::LoggingV2beta1::LogSink::Representation
           command.request_object = log_sink_object
@@ -482,8 +498,8 @@ module Google
           command.response_class = Google::Apis::LoggingV2beta1::LogSink
           command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['uniqueWriterIdentity'] = unique_writer_identity unless unique_writer_identity.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -510,11 +526,11 @@ module Google
         #   owned by a non-project resource such as an organization, then the value of
         #   writer_identity will be a unique service account used only for exports from
         #   the new sink. For more information, see writer_identity in LogSink.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -527,7 +543,7 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_project_sink(parent, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def create_project_sink(parent, log_sink_object = nil, unique_writer_identity: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:post, 'v2beta1/{+parent}/sinks', options)
           command.request_representation = Google::Apis::LoggingV2beta1::LogSink::Representation
           command.request_object = log_sink_object
@@ -535,92 +551,111 @@ module Google
           command.response_class = Google::Apis::LoggingV2beta1::LogSink
           command.params['parent'] = parent unless parent.nil?
           command.query['uniqueWriterIdentity'] = unique_writer_identity unless unique_writer_identity.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates or updates a logs-based metric.
-        # @param [String] metric_name
-        #   The resource name of the metric to update:
-        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-        #   The updated metric must be provided in the request and it's name field must be
-        #   the same as [METRIC_ID] If the metric does not exist in [PROJECT_ID], then a
-        #   new metric is created.
-        # @param [Google::Apis::LoggingV2beta1::LogMetric] log_metric_object
+        # Deletes a sink. If the sink has a unique writer_identity, then that service
+        # account is also deleted.
+        # @param [String] sink_name
+        #   Required. The full resource name of the sink to delete, including the parent
+        #   resource and the sink identifier:
+        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
+        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
+        #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
+        #   Example: "projects/my-project-id/sinks/my-sink-id".
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        # @return [Google::Apis::LoggingV2beta1::Empty]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_project_metric(metric_name, log_metric_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:put, 'v2beta1/{+metricName}', options)
-          command.request_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
-          command.request_object = log_metric_object
-          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
-          command.params['metricName'] = metric_name unless metric_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+        def delete_project_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2beta1/{+sinkName}', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::Empty
+          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a logs-based metric.
+        # Lists the logs in projects, organizations, folders, or billing accounts. Only
+        # logs that have entries are listed.
         # @param [String] parent
-        #   The resource name of the project in which to create the metric:
+        #   Required. The resource name that owns the logs:
         #   "projects/[PROJECT_ID]"
-        #   The new metric must be provided in the request.
-        # @param [Google::Apis::LoggingV2beta1::LogMetric] log_metric_object
+        #   "organizations/[ORGANIZATION_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
+        # @param [String] page_token
+        #   Optional. If present, then retrieve the next batch of results from the
+        #   preceding call to this method. pageToken must be the value of nextPageToken
+        #   from the previous response. The values of other method parameters should be
+        #   identical to those in the previous call.
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        # @return [Google::Apis::LoggingV2beta1::ListLogsResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_project_metric(parent, log_metric_object = nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v2beta1/{+parent}/metrics', options)
-          command.request_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
-          command.request_object = log_metric_object
-          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
+        def list_billing_account_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2beta1/{+parent}/logs', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::ListLogsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::ListLogsResponse
           command.params['parent'] = parent unless parent.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a logs-based metric.
-        # @param [String] metric_name
-        #   The resource name of the metric to delete:
-        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
+        # Deletes all the log entries in a log. The log reappears if it receives new
+        # entries. Log entries written shortly before the delete operation might not be
+        # deleted.
+        # @param [String] log_name
+        #   Required. The resource name of the log to delete:
+        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
+        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
+        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
+        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
+        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
+        #   2Factivity". For more information about log names, see LogEntry.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -633,20 +668,17 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_project_metric(metric_name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2beta1/{+metricName}', options)
+        def delete_billing_account_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2beta1/{+logName}', options)
           command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
           command.response_class = Google::Apis::LoggingV2beta1::Empty
-          command.params['metricName'] = metric_name unless metric_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.params['logName'] = log_name unless log_name.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists logs-based metrics.
-        # @param [String] parent
-        #   Required. The name of the project containing the metrics:
-        #   "projects/[PROJECT_ID]"
+        # Lists the descriptors for monitored resource types used by Stackdriver Logging.
         # @param [String] page_token
         #   Optional. If present, then retrieve the next batch of results from the
         #   preceding call to this method. pageToken must be the value of nextPageToken
@@ -656,63 +688,31 @@ module Google
         #   Optional. The maximum number of results to return from this request. Non-
         #   positive values are ignored. The presence of nextPageToken in the response
         #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogMetricsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListLogMetricsResponse]
+        # @return [Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_project_metrics(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2beta1/{+parent}/metrics', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::ListLogMetricsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::ListLogMetricsResponse
-          command.params['parent'] = parent unless parent.nil?
+        def list_monitored_resource_descriptors(page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2beta1/monitoredResourceDescriptors', options)
+          command.response_representation = Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Gets a logs-based metric.
-        # @param [String] metric_name
-        #   The resource name of the desired metric:
-        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_project_metric(metric_name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2beta1/{+metricName}', options)
-          command.response_representation = Google::Apis::LoggingV2beta1::LogMetric::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::LogMetric
-          command.params['metricName'] = metric_name unless metric_name.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -728,11 +728,11 @@ module Google
         #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
         #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
         #   2Factivity". For more information about log names, see LogEntry.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -745,13 +745,13 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_billing_account_log(log_name, quota_user: nil, fields: nil, options: nil, &block)
+        def delete_organization_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:delete, 'v2beta1/{+logName}', options)
           command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
           command.response_class = Google::Apis::LoggingV2beta1::Empty
           command.params['logName'] = log_name unless log_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -772,11 +772,11 @@ module Google
         #   Optional. The maximum number of results to return from this request. Non-
         #   positive values are ignored. The presence of nextPageToken in the response
         #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -789,23 +789,23 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_billing_account_logs(parent, page_token: nil, page_size: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def list_organization_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v2beta1/{+parent}/logs', options)
           command.response_representation = Google::Apis::LoggingV2beta1::ListLogsResponse::Representation
           command.response_class = Google::Apis::LoggingV2beta1::ListLogsResponse
           command.params['parent'] = parent unless parent.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
           command.query['pageSize'] = page_size unless page_size.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
 
         protected
 
         def apply_command_defaults(command)
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['key'] = key unless key.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
         end
       end
     end