google-api-client 0.13.0 → 0.13.1

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

@@ -47,96 +47,9 @@ module Google
           @batch_path = 'batch'
         end
         
-        # Deletes all the log entries in a log. The log reappears if it receives new
-        # entries. Log entries written shortly before the delete operation might not be
-        # deleted.
-        # @param [String] log_name
-        #   Required. The resource name of the log to delete:
-        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
-        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
-        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
-        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
-        #   2Factivity". For more information about log names, see LogEntry.
-        # @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::LoggingV2::Empty] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2::Empty]
-        #
-        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
-        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
-        # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_project_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+logName}', options)
-          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2::Empty
-          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 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]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
-        #   "folders/[FOLDER_ID]"
-        # @param [String] page_token
-        #   Optional. If present, then retrieve the next batch of results from the
-        #   preceding call to this method. pageToken must be the value of nextPageToken
-        #   from the previous response. The values of other method parameters should be
-        #   identical to those in the previous call.
-        # @param [Fixnum] page_size
-        #   Optional. The maximum number of results to return from this request. Non-
-        #   positive values are ignored. The presence of nextPageToken in the response
-        #   indicates that more results might be available.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
-        # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
-        # @param [Google::Apis::RequestOptions] options
-        #   Request-specific options
-        #
-        # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListLogsResponse] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2::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_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+parent}/logs', options)
-          command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.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.
+        # Gets a sink.
         # @param [String] sink_name
-        #   Required. The full resource name of the sink to delete, including the parent
-        #   resource and the sink identifier:
+        #   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]"
@@ -151,18 +64,18 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::Empty]
+        # @return [Google::Apis::LoggingV2::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_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+sinkName}', options)
-          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2::Empty
+        def get_project_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
+          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
+          command.response_class = Google::Apis::LoggingV2::LogSink
           command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -214,41 +127,6 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # 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] 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::LoggingV2::LogSink] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2::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_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
-          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
-          command.response_class = Google::Apis::LoggingV2::LogSink
-          command.params['sinkName'] = sink_name unless sink_name.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
         # 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:
@@ -357,10 +235,16 @@ module Google
           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 a sink. If the sink has a unique writer_identity, then that service
+        # account is also deleted.
+        # @param [String] sink_name
+        #   Required. The full resource name of the sink to delete, including the parent
+        #   resource and the sink identifier:
+        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
+        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
+        #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
+        #   Example: "projects/my-project-id/sinks/my-sink-id".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -378,29 +262,72 @@ 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, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+metricName}', options)
+        def delete_project_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+sinkName}', options)
           command.response_representation = Google::Apis::LoggingV2::Empty::Representation
           command.response_class = Google::Apis::LoggingV2::Empty
-          command.params['metricName'] = metric_name unless metric_name.nil?
+          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists logs-based metrics.
+        # Deletes all the log entries in a log. The log reappears if it receives new
+        # entries. Log entries written shortly before the delete operation might not be
+        # deleted.
+        # @param [String] log_name
+        #   Required. The resource name of the log to delete:
+        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
+        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
+        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
+        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
+        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
+        #   2Factivity". For more information about log names, see LogEntry.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2::Empty]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_project_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+logName}', options)
+          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2::Empty
+          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 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]"
-        # @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.
+        #   "organizations/[ORGANIZATION_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
         # @param [String] page_token
         #   Optional. If present, then retrieve the next batch of results from the
         #   preceding call to this method. pageToken must be the value of nextPageToken
         #   from the previous response. The values of other method parameters should be
         #   identical to those in the previous call.
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -410,29 +337,29 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListLogMetricsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::ListLogsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::ListLogMetricsResponse]
+        # @return [Google::Apis::LoggingV2::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_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+parent}/metrics', options)
-          command.response_representation = Google::Apis::LoggingV2::ListLogMetricsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::ListLogMetricsResponse
+        def list_project_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+parent}/logs', options)
+          command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Gets a logs-based metric.
+        # Deletes a logs-based metric.
         # @param [String] metric_name
-        #   The resource name of the desired metric:
+        #   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.
@@ -443,32 +370,28 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::LogMetric] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::LogMetric]
+        # @return [Google::Apis::LoggingV2::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 get_project_metric(metric_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+metricName}', options)
-          command.response_representation = Google::Apis::LoggingV2::LogMetric::Representation
-          command.response_class = Google::Apis::LoggingV2::LogMetric
+        def delete_project_metric(metric_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+metricName}', options)
+          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2::Empty
           command.params['metricName'] = metric_name unless metric_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates or updates a logs-based metric.
+        # Gets a logs-based metric.
         # @param [String] metric_name
-        #   The resource name of the metric to update:
+        #   The resource name of the desired metric:
         #   "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::LoggingV2::LogMetric] log_metric_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -486,10 +409,8 @@ 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_metric(metric_name, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:put, 'v2/{+metricName}', options)
-          command.request_representation = Google::Apis::LoggingV2::LogMetric::Representation
-          command.request_object = log_metric_object
+        def get_project_metric(metric_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+metricName}', options)
           command.response_representation = Google::Apis::LoggingV2::LogMetric::Representation
           command.response_class = Google::Apis::LoggingV2::LogMetric
           command.params['metricName'] = metric_name unless metric_name.nil?
@@ -498,11 +419,55 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a logs-based metric.
+        # Lists logs-based metrics.
         # @param [String] parent
-        #   The resource name of the project in which to create the metric:
+        #   Required. The name of the project containing the metrics:
         #   "projects/[PROJECT_ID]"
-        #   The new metric must be provided in the request.
+        # @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 [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::LoggingV2::ListLogMetricsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2::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_project_metrics(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+parent}/metrics', options)
+          command.response_representation = Google::Apis::LoggingV2::ListLogMetricsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Creates or updates a logs-based metric.
+        # @param [String] metric_name
+        #   The resource name of the metric to update:
+        #   "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
+        #   The updated metric must be provided in the request and it's name field must be
+        #   the same as [METRIC_ID] If the metric does not exist in [PROJECT_ID], then a
+        #   new metric is created.
         # @param [Google::Apis::LoggingV2::LogMetric] log_metric_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -521,30 +486,24 @@ 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_metric(parent, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:post, 'v2/{+parent}/metrics', options)
+        def update_project_metric(metric_name, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'v2/{+metricName}', options)
           command.request_representation = Google::Apis::LoggingV2::LogMetric::Representation
           command.request_object = log_metric_object
           command.response_representation = Google::Apis::LoggingV2::LogMetric::Representation
           command.response_class = Google::Apis::LoggingV2::LogMetric
-          command.params['parent'] = parent unless parent.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
         
-        # 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.
+        # 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::LoggingV2::LogMetric] log_metric_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -554,41 +513,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::LogMetric] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::Empty]
+        # @return [Google::Apis::LoggingV2::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_billing_account_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+logName}', options)
-          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2::Empty
-          command.params['logName'] = log_name unless log_name.nil?
+        def create_project_metric(parent, log_metric_object = nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'v2/{+parent}/metrics', options)
+          command.request_representation = Google::Apis::LoggingV2::LogMetric::Representation
+          command.request_object = log_metric_object
+          command.response_representation = Google::Apis::LoggingV2::LogMetric::Representation
+          command.response_class = Google::Apis::LoggingV2::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
         
-        # 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]"
-        #   "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.
+        # 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] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -598,21 +550,19 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListLogsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::ListLogsResponse]
+        # @return [Google::Apis::LoggingV2::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 list_billing_account_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+parent}/logs', options)
-          command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::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 get_billing_account_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
+          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
+          command.response_class = Google::Apis::LoggingV2::LogSink
+          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
@@ -663,41 +613,6 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # 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] 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::LoggingV2::LogSink] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2::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_billing_account_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
-          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
-          command.response_class = Google::Apis::LoggingV2::LogSink
-          command.params['sinkName'] = sink_name unless sink_name.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          execute_or_queue_command(command, &block)
-        end
-        
         # 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:
@@ -843,45 +758,6 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes all the log entries in a log. The log reappears if it receives new
-        # entries. Log entries written shortly before the delete operation might not be
-        # deleted.
-        # @param [String] log_name
-        #   Required. The resource name of the log to delete:
-        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
-        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
-        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
-        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
-        #   2Factivity". For more information about log names, see LogEntry.
-        # @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::LoggingV2::Empty] parsed result object
-        # @yieldparam err [StandardError] error object if request failed
-        #
-        # @return [Google::Apis::LoggingV2::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_folder_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+logName}', options)
-          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2::Empty
-          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 the logs in projects, organizations, folders, or billing accounts. Only
         # logs that have entries are listed.
         # @param [String] parent
@@ -916,7 +792,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 list_folder_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+        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, 'v2/{+parent}/logs', options)
           command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
           command.response_class = Google::Apis::LoggingV2::ListLogsResponse
@@ -928,6 +804,45 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Deletes all the log entries in a log. The log reappears if it receives new
+        # entries. Log entries written shortly before the delete operation might not be
+        # deleted.
+        # @param [String] log_name
+        #   Required. The resource name of the log to delete:
+        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
+        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
+        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
+        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
+        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
+        #   2Factivity". For more information about log names, see LogEntry.
+        # @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::LoggingV2::Empty] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2::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_billing_account_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+logName}', options)
+          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2::Empty
+          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
+        
         # Deletes a sink. If the sink has a unique writer_identity, then that service
         # account is also deleted.
         # @param [String] sink_name
@@ -965,22 +880,14 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists sinks.
-        # @param [String] parent
-        #   Required. The parent resource whose sinks are to be listed:
-        #   "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
-        #   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.
+        # 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] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -990,34 +897,40 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListSinksResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::LogSink] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::ListSinksResponse]
+        # @return [Google::Apis::LoggingV2::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 list_folder_sinks(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+parent}/sinks', options)
-          command.response_representation = Google::Apis::LoggingV2::ListSinksResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::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?
+        def get_folder_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
+          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
+          command.response_class = Google::Apis::LoggingV2::LogSink
+          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # 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".
+        # Lists sinks.
+        # @param [String] parent
+        #   Required. The parent resource whose sinks are to be listed:
+        #   "projects/[PROJECT_ID]"
+        #   "organizations/[ORGANIZATION_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
+        # @param [String] page_token
+        #   Optional. If present, then retrieve the next batch of results from the
+        #   preceding call to this method. pageToken must be the value of nextPageToken
+        #   from the previous response. The values of other method parameters should be
+        #   identical to those in the previous call.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1027,19 +940,21 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::LogSink] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::ListSinksResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::LogSink]
+        # @return [Google::Apis::LoggingV2::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 get_folder_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+sinkName}', options)
-          command.response_representation = Google::Apis::LoggingV2::LogSink::Representation
-          command.response_class = Google::Apis::LoggingV2::LogSink
-          command.params['sinkName'] = sink_name unless sink_name.nil?
+        def list_folder_sinks(parent, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+parent}/sinks', options)
+          command.response_representation = Google::Apis::LoggingV2::ListSinksResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
@@ -1153,16 +1068,18 @@ module Google
           execute_or_queue_command(command, &block)
         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.
+        # Deletes all the log entries in a log. The log reappears if it receives new
+        # entries. Log entries written shortly before the delete operation might not be
+        # deleted.
+        # @param [String] log_name
+        #   Required. The resource name of the log to delete:
+        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
+        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
+        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
+        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
+        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
+        #   2Factivity". For more information about log names, see LogEntry.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1172,20 +1089,19 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse]
+        # @return [Google::Apis::LoggingV2::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_monitored_resource_descriptors(page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/monitoredResourceDescriptors', options)
-          command.response_representation = Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['pageSize'] = page_size unless page_size.nil?
+        def delete_folder_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+logName}', options)
+          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2::Empty
+          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)
@@ -1199,15 +1115,15 @@ module Google
         #   "organizations/[ORGANIZATION_ID]"
         #   "billingAccounts/[BILLING_ACCOUNT_ID]"
         #   "folders/[FOLDER_ID]"
-        # @param [Fixnum] page_size
-        #   Optional. The maximum number of results to return from this request. Non-
-        #   positive values are ignored. The presence of nextPageToken in the response
-        #   indicates that more results might be available.
         # @param [String] page_token
         #   Optional. If present, then retrieve the next batch of results from the
         #   preceding call to this method. pageToken must be the value of nextPageToken
         #   from the previous response. The values of other method parameters should be
         #   identical to those in the previous call.
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1225,30 +1141,28 @@ 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, fields: nil, quota_user: nil, options: nil, &block)
+        def list_folder_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v2/{+parent}/logs', options)
           command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
           command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes all the log entries in a log. The log reappears if it receives new
-        # entries. Log entries written shortly before the delete operation might not be
-        # deleted.
-        # @param [String] log_name
-        #   Required. The resource name of the log to delete:
-        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
-        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
-        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
-        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
-        #   2Factivity". For more information about log names, see LogEntry.
+        # 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.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1258,40 +1172,35 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::Empty]
+        # @return [Google::Apis::LoggingV2::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 delete_organization_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+logName}', options)
-          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
-          command.response_class = Google::Apis::LoggingV2::Empty
-          command.params['logName'] = log_name unless log_name.nil?
+        def list_monitored_resource_descriptors(page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/monitoredResourceDescriptors', options)
+          command.response_representation = Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::ListMonitoredResourceDescriptorsResponse
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['pageSize'] = page_size unless page_size.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists sinks.
-        # @param [String] parent
-        #   Required. The parent resource whose sinks are to be listed:
-        #   "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
-        #   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 sink. If the sink has a unique writer_identity, then that service
+        # account is also deleted.
+        # @param [String] sink_name
+        #   Required. The full resource name of the sink to delete, including the parent
+        #   resource and the sink identifier:
+        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
+        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
+        #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
+        #   Example: "projects/my-project-id/sinks/my-sink-id".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1301,21 +1210,19 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::LoggingV2::ListSinksResponse] parsed result object
+        # @yieldparam result [Google::Apis::LoggingV2::Empty] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::LoggingV2::ListSinksResponse]
+        # @return [Google::Apis::LoggingV2::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_organization_sinks(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:get, 'v2/{+parent}/sinks', options)
-          command.response_representation = Google::Apis::LoggingV2::ListSinksResponse::Representation
-          command.response_class = Google::Apis::LoggingV2::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?
+        def delete_organization_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+sinkName}', options)
+          command.response_representation = Google::Apis::LoggingV2::Empty::Representation
+          command.response_class = Google::Apis::LoggingV2::Empty
+          command.params['sinkName'] = sink_name unless sink_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)
@@ -1356,6 +1263,51 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Lists sinks.
+        # @param [String] parent
+        #   Required. The parent resource whose sinks are to be listed:
+        #   "projects/[PROJECT_ID]"
+        #   "organizations/[ORGANIZATION_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
+        # @param [String] page_token
+        #   Optional. If present, then retrieve the next batch of results from the
+        #   preceding call to this method. pageToken must be the value of nextPageToken
+        #   from the previous response. The values of other method parameters should be
+        #   identical to those in the previous call.
+        # @param [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::LoggingV2::ListSinksResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2::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_organization_sinks(parent, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+parent}/sinks', options)
+          command.response_representation = Google::Apis::LoggingV2::ListSinksResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.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:
@@ -1464,16 +1416,18 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a sink. If the sink has a unique writer_identity, then that service
-        # account is also deleted.
-        # @param [String] sink_name
-        #   Required. The full resource name of the sink to delete, including the parent
-        #   resource and the sink identifier:
-        #   "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-        #   "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-        #   "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-        #   "folders/[FOLDER_ID]/sinks/[SINK_ID]"
-        #   Example: "projects/my-project-id/sinks/my-sink-id".
+        # Deletes all the log entries in a log. The log reappears if it receives new
+        # entries. Log entries written shortly before the delete operation might not be
+        # deleted.
+        # @param [String] log_name
+        #   Required. The resource name of the log to delete:
+        #   "projects/[PROJECT_ID]/logs/[LOG_ID]"
+        #   "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
+        #   "folders/[FOLDER_ID]/logs/[LOG_ID]"
+        #   [LOG_ID] must be URL-encoded. For example, "projects/my-project-id/logs/syslog"
+        #   , "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%
+        #   2Factivity". For more information about log names, see LogEntry.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1491,11 +1445,57 @@ 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_sink(sink_name, fields: nil, quota_user: nil, options: nil, &block)
-          command =  make_simple_command(:delete, 'v2/{+sinkName}', options)
+        def delete_organization_log(log_name, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'v2/{+logName}', options)
           command.response_representation = Google::Apis::LoggingV2::Empty::Representation
           command.response_class = Google::Apis::LoggingV2::Empty
-          command.params['sinkName'] = sink_name unless sink_name.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 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]"
+        #   "billingAccounts/[BILLING_ACCOUNT_ID]"
+        #   "folders/[FOLDER_ID]"
+        # @param [String] page_token
+        #   Optional. If present, then retrieve the next batch of results from the
+        #   preceding call to this method. pageToken must be the value of nextPageToken
+        #   from the previous response. The values of other method parameters should be
+        #   identical to those in the previous call.
+        # @param [Fixnum] page_size
+        #   Optional. The maximum number of results to return from this request. Non-
+        #   positive values are ignored. The presence of nextPageToken in the response
+        #   indicates that more results might be available.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::LoggingV2::ListLogsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::LoggingV2::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_organization_logs(parent, page_token: nil, page_size: nil, fields: nil, quota_user: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'v2/{+parent}/logs', options)
+          command.response_representation = Google::Apis::LoggingV2::ListLogsResponse::Representation
+          command.response_class = Google::Apis::LoggingV2::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['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           execute_or_queue_command(command, &block)