google-api-client 0.9.28 → 0.10.0

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

@@ -58,13 +58,13 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class LogSink
+      class WriteLogEntriesRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class WriteLogEntriesRequest
+      class LogSink
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -157,17 +157,17 @@ module Google
       class ListMonitoredResourceDescriptorsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :next_page_token, as: 'nextPageToken'
           collection :resource_descriptors, as: 'resourceDescriptors', class: Google::Apis::LoggingV2beta1::MonitoredResourceDescriptor, decorator: Google::Apis::LoggingV2beta1::MonitoredResourceDescriptor::Representation
       
-          property :next_page_token, as: 'nextPageToken'
         end
       end
       
       class SourceReference
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :revision_id, as: 'revisionId'
           property :repository, as: 'repository'
+          property :revision_id, as: 'revisionId'
         end
       end
       
@@ -205,19 +205,6 @@ module Google
         end
       end
       
-      class LogSink
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :name, as: 'name'
-          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'
-        end
-      end
-      
       class WriteLogEntriesRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -231,17 +218,37 @@ module Google
         end
       end
       
+      class LogSink
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :name, as: 'name'
+          property :filter, as: 'filter'
+          property :destination, as: 'destination'
+          property :end_time, as: 'endTime'
+          property :start_time, as: 'startTime'
+          property :writer_identity, as: 'writerIdentity'
+          property :output_version_format, as: 'outputVersionFormat'
+        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 HttpRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :user_agent, as: 'userAgent'
+          property :latency, as: 'latency'
+          property :cache_fill_bytes, as: 'cacheFillBytes'
+          property :request_method, as: 'requestMethod'
+          property :response_size, as: 'responseSize'
+          property :request_size, as: 'requestSize'
+          property :request_url, as: 'requestUrl'
           property :server_ip, as: 'serverIp'
           property :remote_ip, as: 'remoteIp'
           property :cache_lookup, as: 'cacheLookup'
@@ -249,31 +256,24 @@ module Google
           property :cache_validated_with_origin_server, as: 'cacheValidatedWithOriginServer'
           property :status, as: 'status'
           property :referer, as: 'referer'
-          property :user_agent, as: 'userAgent'
-          property :latency, as: 'latency'
-          property :cache_fill_bytes, as: 'cacheFillBytes'
-          property :request_method, as: 'requestMethod'
-          property :request_size, as: 'requestSize'
-          property :response_size, as: 'responseSize'
-          property :request_url, as: 'requestUrl'
         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
       
-          property :next_page_token, as: 'nextPageToken'
         end
       end
       
       class LabelDescriptor
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :value_type, as: 'valueType'
           property :key, as: 'key'
           property :description, as: 'description'
+          property :value_type, as: 'valueType'
         end
       end
       
@@ -292,29 +292,29 @@ module Google
       class LogEntrySourceLocation
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :file, as: 'file'
           property :function, as: 'function'
           property :line, as: 'line'
-          property :file, as: 'file'
         end
       end
       
       class ListLogEntriesResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :next_page_token, as: 'nextPageToken'
           collection :entries, as: 'entries', class: Google::Apis::LoggingV2beta1::LogEntry, decorator: Google::Apis::LoggingV2beta1::LogEntry::Representation
       
+          property :next_page_token, as: 'nextPageToken'
         end
       end
       
       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'
+          property :severity, as: 'severity'
+          property :log_message, as: 'logMessage'
         end
       end
       
@@ -330,14 +330,11 @@ module Google
       class LogEntry
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
-          property :source_location, as: 'sourceLocation', class: Google::Apis::LoggingV2beta1::LogEntrySourceLocation, decorator: Google::Apis::LoggingV2beta1::LogEntrySourceLocation::Representation
-      
-          property :timestamp, as: 'timestamp'
           property :log_name, as: 'logName'
-          property :resource, as: 'resource', class: Google::Apis::LoggingV2beta1::MonitoredResource, decorator: Google::Apis::LoggingV2beta1::MonitoredResource::Representation
-      
           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
@@ -347,6 +344,9 @@ module Google
           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
       
@@ -370,8 +370,8 @@ module Google
         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'
+          collection :project_ids, as: 'projectIds'
           property :page_token, as: 'pageToken'
           property :page_size, as: 'pageSize'
         end
@@ -380,6 +380,23 @@ module Google
       class RequestLog
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
+          property :nickname, as: 'nickname'
+          property :status, as: 'status'
+          property :resource, as: 'resource'
+          property :pending_time, as: 'pendingTime'
+          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'
+          property :ip, as: 'ip'
+          property :app_id, as: 'appId'
+          property :app_engine_release, as: 'appEngineRelease'
+          property :method_prop, as: 'method'
+          property :cost, as: 'cost'
           property :instance_id, as: 'instanceId'
           property :mega_cycles, as: 'megaCycles'
           property :first, as: 'first'
@@ -394,26 +411,9 @@ module Google
           property :trace_id, as: 'traceId'
           collection :line, as: 'line', class: Google::Apis::LoggingV2beta1::LogLine, decorator: Google::Apis::LoggingV2beta1::LogLine::Representation
       
-          property :task_queue_name, as: 'taskQueueName'
           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 :host, as: 'host'
-          property :finished, as: 'finished'
-          property :http_version, as: 'httpVersion'
-          property :start_time, as: 'startTime'
-          property :latency, as: 'latency'
-          property :ip, as: 'ip'
-          property :app_id, as: 'appId'
-          property :app_engine_release, as: 'appEngineRelease'
-          property :method_prop, as: 'method'
-          property :cost, as: 'cost'
         end
       end
     end

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

@@ -46,40 +46,18 @@ module Google
           super('https://logging.googleapis.com/', '')
         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
-        # @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::ListLogEntriesResponse] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @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_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?
-          command.query['fields'] = fields unless fields.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
-        # Writes log entries to Stackdriver Logging. All log entries are written by this
-        # method.
-        # @param [Google::Apis::LoggingV2beta1::WriteLogEntriesRequest] write_log_entries_request_object
+        # 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] 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.
@@ -89,29 +67,32 @@ module Google
         #   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
+        def delete_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?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists logs-based metrics.
+        # Lists the logs in projects, organizations, folders, or billing accounts. Only
+        # logs that have entries are listed.
         # @param [String] parent
-        #   Required. The name of the project containing the metrics:
+        #   Required. The resource name that owns the logs:
         #   "projects/[PROJECT_ID]"
+        #   "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
@@ -130,18 +111,18 @@ module Google
         #   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::ListLogsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListLogMetricsResponse]
+        # @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 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
+        def list_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
           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?
@@ -150,10 +131,29 @@ module Google
           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]"
+        # Creates a sink that exports specified log entries to a destination. The export
+        # of newly-ingested log entries begins immediately, unless the current time is
+        # outside the sink's start and end times or the sink's writer_identity is not
+        # permitted to write to the destination. A sink can export log entries only from
+        # the resource owning the sink.
+        # @param [String] parent
+        #   Required. The resource in which to create the sink:
+        #   "projects/[PROJECT_ID]"
+        #   "organizations/[ORGANIZATION_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
+        #   Examples: "projects/my-logging-project", "organizations/123456789".
+        # @param [Google::Apis::LoggingV2beta1::LogSink] log_sink_object
+        # @param [Boolean] unique_writer_identity
+        #   Optional. Determines the kind of IAM identity returned as writer_identity in
+        #   the new sink. If this value is omitted or set to false, and if the sink's
+        #   parent is a project, then the value returned as writer_identity is cloud-logs@
+        #   system.gserviceaccount.com, the same identity used before the addition of
+        #   writer identities to this API. The sink's destination must be in the same
+        #   project as the sink itself.If this field is set to true, or if the sink is
+        #   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] 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.
@@ -163,32 +163,37 @@ module Google
         #   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::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        # @return [Google::Apis::LoggingV2beta1::LogSink]
         #
         # @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?
+        def create_project_sink(parent, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: 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
+          command.response_representation = Google::Apis::LoggingV2beta1::LogSink::Representation
+          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?
           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] 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.
@@ -198,32 +203,40 @@ module Google
         #   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?
+        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
         
-        # Creates a logs-based metric.
+        # Lists sinks.
         # @param [String] parent
-        #   The resource name of the project in which to create the metric:
+        #   Required. The parent resource whose sinks are to be listed:
         #   "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] 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.
@@ -233,30 +246,34 @@ module Google
         #   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::ListSinksResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        # @return [Google::Apis::LoggingV2beta1::ListSinksResponse]
         #
         # @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_project_sinks(parent, page_token: nil, page_size: nil, quota_user: nil, fields: 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?
           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]"
+        # Gets a sink.
+        # @param [String] sink_name
+        #   Required. The resource name of the sink:
+        #   "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.
@@ -266,33 +283,48 @@ module Google
         #   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::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
+        # @return [Google::Apis::LoggingV2beta1::LogSink]
         #
         # @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)
-          command.response_representation = Google::Apis::LoggingV2beta1::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2beta1::Empty
-          command.params['metricName'] = metric_name unless metric_name.nil?
+        def get_project_sink(sink_name, quota_user: nil, fields: 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?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes all the log entries in a log. The log reappears if it receives new
-        # entries.
-        # @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]"
-        #   [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.
+        # Updates a sink. If the named sink doesn't exist, then this method is identical
+        # to sinks.create. If the named sink does exist, then this method replaces the
+        # following fields in the existing sink with values from the new sink:
+        # destination, filter, output_version_format, start_time, and end_time. The
+        # updated filter might also have a new writer_identity; see the
+        # unique_writer_identity field.
+        # @param [String] sink_name
+        #   Required. The full resource name of the sink to update, 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 [Google::Apis::LoggingV2beta1::LogSink] log_sink_object
+        # @param [Boolean] unique_writer_identity
+        #   Optional. See sinks.create for a description of this field. When updating a
+        #   sink, the effect of this field on the value of writer_identity in the updated
+        #   sink depends on both the old and new values of this field:
+        #   If the old and new values of this field are both false or both true, then
+        #   there is no change to the sink's writer_identity.
+        #   If the old value was 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 was true and the new value is false.
         # @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.
@@ -302,39 +334,31 @@ module Google
         #   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::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
+        # @return [Google::Apis::LoggingV2beta1::LogSink]
         #
         # @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)
-          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?
+        def update_project_sink(sink_name, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: 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
+          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['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?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the logs in projects or organizations. Only logs that have entries are
-        # listed.
-        # @param [String] parent
-        #   Required. The resource name that owns the logs:
-        #   "projects/[PROJECT_ID]"
-        #   "organizations/[ORGANIZATION_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.
+        # 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] 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.
@@ -344,74 +368,37 @@ module Google
         #   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::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListLogsResponse]
+        # @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 list_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
-          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?
+        def delete_project_metric(metric_name, quota_user: nil, fields: 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['quotaUser'] = quota_user unless quota_user.nil?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists sinks.
+        # Lists logs-based metrics.
         # @param [String] parent
-        #   Required. The parent resource whose sinks are to be listed. Examples: "
-        #   projects/my-logging-project", "organizations/123456789".
-        # @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.
+        #   Required. The name of the project containing the metrics:
+        #   "projects/[PROJECT_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 [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::ListSinksResponse] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2beta1::ListSinksResponse]
-        #
-        # @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_size: nil, page_token: nil, quota_user: nil, fields: 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['pageSize'] = page_size unless page_size.nil?
-          command.query['pageToken'] = page_token unless page_token.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 sink.
-        # @param [String] sink_name
-        #   Required. The parent resource name of the sink:
-        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-        #   Example: "projects/my-project-id/sinks/my-sink-id".
+        #   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] 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.
@@ -421,46 +408,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogSink] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::ListLogMetricsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogSink]
+        # @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 get_project_sink(sink_name, quota_user: nil, fields: 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?
+        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?
+          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
         
-        # Updates a sink. If the named sink doesn't exist, then this method is identical
-        # to sinks.create. If the named sink does exist, then this method replaces the
-        # following fields in the existing sink with values from the new sink:
-        # destination, filter, output_version_format, start_time, and end_time. The
-        # updated filter might also have a new writer_identity; see the
-        # unique_writer_identity field.
-        # @param [String] sink_name
-        #   Required. The full resource name of the sink to update, including the parent
-        #   resource and the sink identifier:
-        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-        #   Example: "projects/my-project-id/sinks/my-sink-id".
-        # @param [Google::Apis::LoggingV2beta1::LogSink] log_sink_object
-        # @param [Boolean] unique_writer_identity
-        #   Optional. See sinks.create for a description of this field. When updating a
-        #   sink, the effect of this field on the value of writer_identity in the updated
-        #   sink depends on both the old and new values of this field:
-        #   If the old and new values of this field are both false or both true, then
-        #   there is no change to the sink's writer_identity.
-        #   If the old value was 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 was true and the new value is false.
+        # 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.
@@ -470,48 +441,32 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogSink] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogSink]
+        # @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 update_project_sink(sink_name, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: 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
-          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['uniqueWriterIdentity'] = unique_writer_identity unless unique_writer_identity.nil?
+        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
         
-        # Creates a sink that exports specified log entries to a destination. The export
-        # of newly-ingested log entries begins immediately, unless the current time is
-        # outside the sink's start and end times or the sink's writer_identity is not
-        # permitted to write to the destination. A sink can export log entries only from
-        # the resource owning the sink.
-        # @param [String] parent
-        #   Required. The resource in which to create the sink:
-        #   "projects/[PROJECT_ID]"
-        #   "organizations/[ORGANIZATION_ID]"
-        #   Examples: "projects/my-logging-project", "organizations/123456789".
-        # @param [Google::Apis::LoggingV2beta1::LogSink] log_sink_object
-        # @param [Boolean] unique_writer_identity
-        #   Optional. Determines the kind of IAM identity returned as writer_identity in
-        #   the new sink. If this value is omitted or set to false, and if the sink's
-        #   parent is a project, then the value returned as writer_identity is cloud-logs@
-        #   system.gserviceaccount.com, the same identity used before the addition of
-        #   writer identities to this API. The sink's destination must be in the same
-        #   project as the sink itself.If this field is set to true, or if the sink is
-        #   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.
+        # 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] 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.
@@ -521,36 +476,32 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2beta1::LogSink] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogSink]
+        # @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_sink(parent, log_sink_object = nil, unique_writer_identity: nil, quota_user: nil, fields: 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
-          command.response_representation = Google::Apis::LoggingV2beta1::LogSink::Representation
-          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?
+        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?
           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]"
-        #   It is an error if the sink does not exist. Example: "projects/my-project-id/
-        #   sinks/my-sink-id". It is an error if the sink does not exist.
+        # 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] 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.
@@ -560,30 +511,35 @@ module Google
         #   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::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
+        # @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 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?
+        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
+          command.params['parent'] = parent unless parent.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 all the log entries in a log. The log reappears if it receives new
-        # entries.
+        # 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.
@@ -614,21 +570,23 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the logs in projects or organizations. Only logs that have entries are
-        # listed.
+        # Lists the logs in projects, organizations, folders, or billing accounts. Only
+        # logs that have entries are listed.
         # @param [String] parent
         #   Required. The resource name that owns the logs:
         #   "projects/[PROJECT_ID]"
         #   "organizations/[ORGANIZATION_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.
+        #   "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] 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.
@@ -646,13 +604,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 list_billing_account_logs(parent, page_size: nil, page_token: nil, quota_user: nil, fields: nil, options: nil, &block)
+        def list_billing_account_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
           command.params['parent'] = parent unless parent.nil?
-          command.query['pageSize'] = page_size unless page_size.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)
@@ -696,21 +654,62 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the logs in projects or organizations. Only logs that have entries are
-        # listed.
+        # 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] 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_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?
+          command.query['fields'] = fields unless fields.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.
         # @param [String] parent
         #   Required. The resource name that owns the logs:
         #   "projects/[PROJECT_ID]"
         #   "organizations/[ORGANIZATION_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.
+        #   "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] 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.
@@ -728,27 +727,21 @@ 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_organization_logs(parent, page_size: nil, page_token: nil, quota_user: nil, fields: nil, options: nil, &block)
+        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
           command.params['parent'] = parent unless parent.nil?
-          command.query['pageSize'] = page_size unless page_size.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 all the log entries in a log. The log reappears if it receives new
-        # entries.
-        # @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]"
-        #   [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.
+        # 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] 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.
@@ -758,19 +751,51 @@ module Google
         #   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::ListLogEntriesResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::Empty]
+        # @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 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?
+        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?
+          command.query['fields'] = fields unless fields.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Writes log entries to Stackdriver Logging. All log entries are written by this
+        # method.
+        # @param [Google::Apis::LoggingV2beta1::WriteLogEntriesRequest] write_log_entries_request_object
+        # @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::WriteLogEntriesResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @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 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?
           command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)