google-api-client 0.9.25 → 0.9.26

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

@@ -32,72 +32,126 @@ 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/', '')
         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 [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, 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
+        
+        # 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] 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::ListMonitoredResourceDescriptorsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::ListMonitoredResourceDescriptorsResponse]
+        # @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 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 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
         
-        # 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.
+        # 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
         #
@@ -110,119 +164,123 @@ 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_organization_log(log_name, quota_user: nil, fields: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2beta1/{+logName}', options)
+        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['logName'] = log_name unless log_name.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          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
         
-        # Lists the logs in projects or organizations. 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]"
+        # @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 [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 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 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
         
-        # Writes log entries to Stackdriver Logging. All log entries are written by this
-        # method.
-        # @param [Google::Apis::LoggingV2beta1::WriteLogEntriesRequest] write_log_entries_request_object
+        # 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 [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 result [Google::Apis::LoggingV2beta1::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::WriteLogEntriesResponse]
+        # @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 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 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
         
@@ -235,11 +293,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
         #
@@ -252,13 +310,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
         
@@ -277,11 +335,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
         #
@@ -294,15 +352,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?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -315,11 +373,11 @@ module Google
         #   "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.
+        # @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
         #
@@ -332,13 +390,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_project_sink(sink_name, quota_user: nil, fields: nil, options: nil, &block)
+        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['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
         
@@ -355,11 +413,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
         #
@@ -372,15 +430,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
         
@@ -390,11 +448,11 @@ module Google
         #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
         #   "organizations/[ORGANIZATION_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
         #
@@ -407,13 +465,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
         
@@ -439,11 +497,11 @@ module Google
         #   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] 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
         #
@@ -456,7 +514,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
@@ -464,8 +522,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
         
@@ -484,17 +542,17 @@ module Google
         #   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@
-        #   google.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.
+        #   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] 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
         #
@@ -507,7 +565,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
@@ -515,20 +573,25 @@ 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
         
-        # 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.
+        # @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.
+        # @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
         #
@@ -541,20 +604,22 @@ 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.
+        # Lists the logs in projects or organizations. 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]"
         # @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
@@ -564,135 +629,70 @@ 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::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_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['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
         
-        # 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.
+        # Lists the descriptors for monitored resource types used by Stackdriver Logging.
+        # @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 [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 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
-        
-        # 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.
-        # @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::ListMonitoredResourceDescriptorsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2beta1::LogMetric]
+        # @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 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?
+        def list_monitored_resource_descriptors(page_size: nil, page_token: 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['pageSize'] = page_size unless page_size.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
         
@@ -705,11 +705,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
         #
@@ -722,13 +722,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
         
@@ -747,11 +747,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
         #
@@ -764,23 +764,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