aws-sdk-health 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040eef9ba937590643d7290afee70fc7a003260f
-  data.tar.gz: cb3c12338f735782a2cc6fb38e6bfbdd12ef7b93
+  metadata.gz: ade9468f1c3087397993fe4b5125d8ae533d70ac
+  data.tar.gz: 3b566684b34eff2d804bab0f4fc184d54b692bae
 SHA512:
-  metadata.gz: d970c4c5f5058d59f04554bedd915cb0ca084468388e3819072e2c2b5f4457f7623d56674b9764d81ee774130a7b1b1454e29ac0a38c0fb5e47931006109b399
-  data.tar.gz: 48b1b3de833c3e76d6ca19841572b98b5bd48330d4eb95b74ca8c4f87715dd807cef4dd0045b88501974c229ef5c616f3b8a2c6c03ae191657dc11ee6f411c83
+  metadata.gz: 6fa35e3ea38111b9c1691a62c001072c31aa5db7674b56e919ba3a573a58b6f1b794229dc1f59df043a9681340ff31ace73410492b1017f911b74f43f086b058
+  data.tar.gz: 14703b3fdf60bbeba3e1410b4a8c7c918b0874e403d9776d7c50e0839ed4f816a3bdc8fab1122008dd96d0154fd3f647902d255a79d1a0da992ffd444bd679f6

data/lib/aws-sdk-health.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-health/customizations'
 # @service
 module Aws::Health
 
-  GEM_VERSION = '1.20.0'
+  GEM_VERSION = '1.21.0'
 
 end

data/lib/aws-sdk-health/client.rb

@@ -264,6 +264,59 @@ module Aws::Health
 
     # @!group API Operations
 
+    # Returns a list of accounts in the organization from AWS Organizations
+    # that are affected by the provided event.
+    #
+    # Before you can call this operation, you must first enable AWS Health
+    # to work with AWS Organizations. To do this, call the
+    # EnableHealthServiceAccessForOrganization operation from your
+    # organization's master account.
+    #
+    # @option params [required, String] :event_arn
+    #   The unique identifier for the event. Format:
+    #   `arn:aws:health:event-region::event/SERVICE/EVENT_TYPE_CODE/EVENT_TYPE_PLUS_ID
+    #   `. Example: `Example:
+    #   arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456`
+    #
+    # @option params [String] :next_token
+    #   If the results of a search are large, only a portion of the results
+    #   are returned, and a `nextToken` pagination token is returned in the
+    #   response. To retrieve the next batch of results, reissue the search
+    #   request and include the returned token. When all results have been
+    #   returned, the response does not contain a pagination token value.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of items to return in one batch, between 10 and
+    #   100, inclusive.
+    #
+    # @return [Types::DescribeAffectedAccountsForOrganizationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeAffectedAccountsForOrganizationResponse#affected_accounts #affected_accounts} => Array<String>
+    #   * {Types::DescribeAffectedAccountsForOrganizationResponse#next_token #next_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_affected_accounts_for_organization({
+    #     event_arn: "eventArn", # required
+    #     next_token: "nextToken",
+    #     max_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.affected_accounts #=> Array
+    #   resp.affected_accounts[0] #=> String
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DescribeAffectedAccountsForOrganization AWS API Documentation
+    #
+    # @overload describe_affected_accounts_for_organization(params = {})
+    # @param [Hash] params ({})
+    def describe_affected_accounts_for_organization(params = {}, options = {})
+      req = build_request(:describe_affected_accounts_for_organization, params)
+      req.send_request(options)
+    end
+
     # Returns a list of entities that have been affected by the specified
     # events, based on the specified filter criteria. Entities can refer to
     # individual customer resources, groups of customer resources, or any
@@ -346,6 +399,87 @@ module Aws::Health
       req.send_request(options)
     end
 
+    # Returns a list of entities that have been affected by one or more
+    # events for one or more accounts in your organization in AWS
+    # Organizations, based on the filter criteria. Entities can refer to
+    # individual customer resources, groups of customer resources, or any
+    # other construct, depending on the AWS service.
+    #
+    # At least one event ARN and account ID are required. Results are sorted
+    # by the `lastUpdatedTime` of the entity, starting with the most recent.
+    #
+    # Before you can call this operation, you must first enable AWS Health
+    # to work with AWS Organizations. To do this, call the
+    # EnableHealthServiceAccessForOrganization operation from your
+    # organization's master account.
+    #
+    # @option params [required, Array<Types::EventAccountFilter>] :organization_entity_filters
+    #   A JSON set of elements including the `awsAccountId` and the
+    #   `eventArn`.
+    #
+    # @option params [String] :locale
+    #   The locale (language) to return information in. English (en) is the
+    #   default and the only supported value at this time.
+    #
+    # @option params [String] :next_token
+    #   If the results of a search are large, only a portion of the results
+    #   are returned, and a `nextToken` pagination token is returned in the
+    #   response. To retrieve the next batch of results, reissue the search
+    #   request and include the returned token. When all results have been
+    #   returned, the response does not contain a pagination token value.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of items to return in one batch, between 10 and
+    #   100, inclusive.
+    #
+    # @return [Types::DescribeAffectedEntitiesForOrganizationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeAffectedEntitiesForOrganizationResponse#entities #entities} => Array&lt;Types::AffectedEntity&gt;
+    #   * {Types::DescribeAffectedEntitiesForOrganizationResponse#failed_set #failed_set} => Array&lt;Types::OrganizationAffectedEntitiesErrorItem&gt;
+    #   * {Types::DescribeAffectedEntitiesForOrganizationResponse#next_token #next_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_affected_entities_for_organization({
+    #     organization_entity_filters: [ # required
+    #       {
+    #         event_arn: "eventArn", # required
+    #         aws_account_id: "accountId", # required
+    #       },
+    #     ],
+    #     locale: "locale",
+    #     next_token: "nextToken",
+    #     max_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.entities #=> Array
+    #   resp.entities[0].entity_arn #=> String
+    #   resp.entities[0].event_arn #=> String
+    #   resp.entities[0].entity_value #=> String
+    #   resp.entities[0].entity_url #=> String
+    #   resp.entities[0].aws_account_id #=> String
+    #   resp.entities[0].last_updated_time #=> Time
+    #   resp.entities[0].status_code #=> String, one of "IMPAIRED", "UNIMPAIRED", "UNKNOWN"
+    #   resp.entities[0].tags #=> Hash
+    #   resp.entities[0].tags["tagKey"] #=> String
+    #   resp.failed_set #=> Array
+    #   resp.failed_set[0].aws_account_id #=> String
+    #   resp.failed_set[0].event_arn #=> String
+    #   resp.failed_set[0].error_name #=> String
+    #   resp.failed_set[0].error_message #=> String
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DescribeAffectedEntitiesForOrganization AWS API Documentation
+    #
+    # @overload describe_affected_entities_for_organization(params = {})
+    # @param [Hash] params ({})
+    def describe_affected_entities_for_organization(params = {}, options = {})
+      req = build_request(:describe_affected_entities_for_organization, params)
+      req.send_request(options)
+    end
+
     # Returns the number of entities that are affected by each of the
     # specified events. If no events are specified, the counts of all
     # affected entities are returned.
@@ -465,8 +599,8 @@ module Aws::Health
     end
 
     # Returns detailed information about one or more specified events.
-    # Information includes standard event data (region, service, etc., as
-    # returned by DescribeEvents), a detailed event description, and
+    # Information includes standard event data (region, service, and so on,
+    # as returned by DescribeEvents), a detailed event description, and
     # possible additional metadata that depends upon the nature of the
     # event. Affected entities are not included; to retrieve those, use the
     # DescribeAffectedEntities operation.
@@ -525,6 +659,76 @@ module Aws::Health
       req.send_request(options)
     end
 
+    # Returns detailed information about one or more specified events for
+    # one or more accounts in your organization. Information includes
+    # standard event data (Region, service, and so on, as returned by
+    # DescribeEventsForOrganization, a detailed event description, and
+    # possible additional metadata that depends upon the nature of the
+    # event. Affected entities are not included; to retrieve those, use the
+    # DescribeAffectedEntitiesForOrganization operation.
+    #
+    # Before you can call this operation, you must first enable AWS Health
+    # to work with AWS Organizations. To do this, call the
+    # EnableHealthServiceAccessForOrganization operation from your
+    # organization's master account.
+    #
+    # @option params [required, Array<Types::EventAccountFilter>] :organization_event_detail_filters
+    #   A set of JSON elements that includes the `awsAccountId` and the
+    #   `eventArn`.
+    #
+    # @option params [String] :locale
+    #   The locale (language) to return information in. English (en) is the
+    #   default and the only supported value at this time.
+    #
+    # @return [Types::DescribeEventDetailsForOrganizationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeEventDetailsForOrganizationResponse#successful_set #successful_set} => Array&lt;Types::OrganizationEventDetails&gt;
+    #   * {Types::DescribeEventDetailsForOrganizationResponse#failed_set #failed_set} => Array&lt;Types::OrganizationEventDetailsErrorItem&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_event_details_for_organization({
+    #     organization_event_detail_filters: [ # required
+    #       {
+    #         event_arn: "eventArn", # required
+    #         aws_account_id: "accountId", # required
+    #       },
+    #     ],
+    #     locale: "locale",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.successful_set #=> Array
+    #   resp.successful_set[0].aws_account_id #=> String
+    #   resp.successful_set[0].event.arn #=> String
+    #   resp.successful_set[0].event.service #=> String
+    #   resp.successful_set[0].event.event_type_code #=> String
+    #   resp.successful_set[0].event.event_type_category #=> String, one of "issue", "accountNotification", "scheduledChange", "investigation"
+    #   resp.successful_set[0].event.region #=> String
+    #   resp.successful_set[0].event.availability_zone #=> String
+    #   resp.successful_set[0].event.start_time #=> Time
+    #   resp.successful_set[0].event.end_time #=> Time
+    #   resp.successful_set[0].event.last_updated_time #=> Time
+    #   resp.successful_set[0].event.status_code #=> String, one of "open", "closed", "upcoming"
+    #   resp.successful_set[0].event_description.latest_description #=> String
+    #   resp.successful_set[0].event_metadata #=> Hash
+    #   resp.successful_set[0].event_metadata["metadataKey"] #=> String
+    #   resp.failed_set #=> Array
+    #   resp.failed_set[0].aws_account_id #=> String
+    #   resp.failed_set[0].event_arn #=> String
+    #   resp.failed_set[0].error_name #=> String
+    #   resp.failed_set[0].error_message #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DescribeEventDetailsForOrganization AWS API Documentation
+    #
+    # @overload describe_event_details_for_organization(params = {})
+    # @param [Hash] params ({})
+    def describe_event_details_for_organization(params = {}, options = {})
+      req = build_request(:describe_event_details_for_organization, params)
+      req.send_request(options)
+    end
+
     # Returns the event types that meet the specified filter criteria. If no
     # filter criteria are specified, all event types are returned, in no
     # particular order.
@@ -680,6 +884,159 @@ module Aws::Health
       req.send_request(options)
     end
 
+    # Returns information about events across your organization in AWS
+    # Organizations, meeting the specified filter criteria. Events are
+    # returned in a summary form and do not include the accounts impacted,
+    # detailed description, any additional metadata that depends on the
+    # event type, or any affected resources. To retrieve that information,
+    # use the DescribeAffectedAccountsForOrganization,
+    # DescribeEventDetailsForOrganization, and
+    # DescribeAffectedEntitiesForOrganization operations.
+    #
+    # If no filter criteria are specified, all events across your
+    # organization are returned. Results are sorted by `lastModifiedTime`,
+    # starting with the most recent.
+    #
+    # Before you can call this operation, you must first enable Health to
+    # work with AWS Organizations. To do this, call the
+    # EnableHealthServiceAccessForOrganization operation from your
+    # organization's master account.
+    #
+    # @option params [Types::OrganizationEventFilter] :filter
+    #   Values to narrow the results returned.
+    #
+    # @option params [String] :next_token
+    #   If the results of a search are large, only a portion of the results
+    #   are returned, and a `nextToken` pagination token is returned in the
+    #   response. To retrieve the next batch of results, reissue the search
+    #   request and include the returned token. When all results have been
+    #   returned, the response does not contain a pagination token value.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of items to return in one batch, between 10 and
+    #   100, inclusive.
+    #
+    # @option params [String] :locale
+    #   The locale (language) to return information in. English (en) is the
+    #   default and the only supported value at this time.
+    #
+    # @return [Types::DescribeEventsForOrganizationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeEventsForOrganizationResponse#events #events} => Array&lt;Types::OrganizationEvent&gt;
+    #   * {Types::DescribeEventsForOrganizationResponse#next_token #next_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_events_for_organization({
+    #     filter: {
+    #       event_type_codes: ["eventType"],
+    #       aws_account_ids: ["accountId"],
+    #       services: ["service"],
+    #       regions: ["region"],
+    #       start_time: {
+    #         from: Time.now,
+    #         to: Time.now,
+    #       },
+    #       end_time: {
+    #         from: Time.now,
+    #         to: Time.now,
+    #       },
+    #       last_updated_time: {
+    #         from: Time.now,
+    #         to: Time.now,
+    #       },
+    #       entity_arns: ["entityArn"],
+    #       entity_values: ["entityValue"],
+    #       event_type_categories: ["issue"], # accepts issue, accountNotification, scheduledChange, investigation
+    #       event_status_codes: ["open"], # accepts open, closed, upcoming
+    #     },
+    #     next_token: "nextToken",
+    #     max_results: 1,
+    #     locale: "locale",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.events #=> Array
+    #   resp.events[0].arn #=> String
+    #   resp.events[0].service #=> String
+    #   resp.events[0].event_type_code #=> String
+    #   resp.events[0].event_type_category #=> String, one of "issue", "accountNotification", "scheduledChange", "investigation"
+    #   resp.events[0].region #=> String
+    #   resp.events[0].start_time #=> Time
+    #   resp.events[0].end_time #=> Time
+    #   resp.events[0].last_updated_time #=> Time
+    #   resp.events[0].status_code #=> String, one of "open", "closed", "upcoming"
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DescribeEventsForOrganization AWS API Documentation
+    #
+    # @overload describe_events_for_organization(params = {})
+    # @param [Hash] params ({})
+    def describe_events_for_organization(params = {}, options = {})
+      req = build_request(:describe_events_for_organization, params)
+      req.send_request(options)
+    end
+
+    # This operation provides status information on enabling or disabling
+    # AWS Health to work with your organization. To call this operation, you
+    # must sign in as an IAM user, assume an IAM role, or sign in as the
+    # root user (not recommended) in the organization's master account.
+    #
+    # @return [Types::DescribeHealthServiceStatusForOrganizationResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeHealthServiceStatusForOrganizationResponse#health_service_access_status_for_organization #health_service_access_status_for_organization} => String
+    #
+    # @example Response structure
+    #
+    #   resp.health_service_access_status_for_organization #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DescribeHealthServiceStatusForOrganization AWS API Documentation
+    #
+    # @overload describe_health_service_status_for_organization(params = {})
+    # @param [Hash] params ({})
+    def describe_health_service_status_for_organization(params = {}, options = {})
+      req = build_request(:describe_health_service_status_for_organization, params)
+      req.send_request(options)
+    end
+
+    # Calling this operation disables Health from working with AWS
+    # Organizations. This does not remove the Service Linked Role (SLR) from
+    # the the master account in your organization. Use the IAM console, API,
+    # or AWS CLI to remove the SLR if desired. To call this operation, you
+    # must sign in as an IAM user, assume an IAM role, or sign in as the
+    # root user (not recommended) in the organization's master account.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/DisableHealthServiceAccessForOrganization AWS API Documentation
+    #
+    # @overload disable_health_service_access_for_organization(params = {})
+    # @param [Hash] params ({})
+    def disable_health_service_access_for_organization(params = {}, options = {})
+      req = build_request(:disable_health_service_access_for_organization, params)
+      req.send_request(options)
+    end
+
+    # Calling this operation enables AWS Health to work with AWS
+    # Organizations. This applies a Service Linked Role (SLR) to the master
+    # account in the organization. To learn more about the steps in this
+    # process, visit enabling service access for AWS Health in AWS
+    # Organizations. To call this operation, you must sign in as an IAM
+    # user, assume an IAM role, or sign in as the root user (not
+    # recommended) in the organization's master account.
+    #
+    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/health-2016-08-04/EnableHealthServiceAccessForOrganization AWS API Documentation
+    #
+    # @overload enable_health_service_access_for_organization(params = {})
+    # @param [Hash] params ({})
+    def enable_health_service_access_for_organization(params = {}, options = {})
+      req = build_request(:enable_health_service_access_for_organization, params)
+      req.send_request(options)
+    end
+
     # @!endgroup
 
     # @param params ({})
@@ -693,7 +1050,7 @@ module Aws::Health
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-health'
-      context[:gem_version] = '1.20.0'
+      context[:gem_version] = '1.21.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-health/client_api.rb

@@ -12,7 +12,13 @@ module Aws::Health
     include Seahorse::Model
 
     AffectedEntity = Shapes::StructureShape.new(name: 'AffectedEntity')
+    ConcurrentModificationException = Shapes::StructureShape.new(name: 'ConcurrentModificationException')
     DateTimeRange = Shapes::StructureShape.new(name: 'DateTimeRange')
+    DescribeAffectedAccountsForOrganizationRequest = Shapes::StructureShape.new(name: 'DescribeAffectedAccountsForOrganizationRequest')
+    DescribeAffectedAccountsForOrganizationResponse = Shapes::StructureShape.new(name: 'DescribeAffectedAccountsForOrganizationResponse')
+    DescribeAffectedEntitiesForOrganizationFailedSet = Shapes::ListShape.new(name: 'DescribeAffectedEntitiesForOrganizationFailedSet')
+    DescribeAffectedEntitiesForOrganizationRequest = Shapes::StructureShape.new(name: 'DescribeAffectedEntitiesForOrganizationRequest')
+    DescribeAffectedEntitiesForOrganizationResponse = Shapes::StructureShape.new(name: 'DescribeAffectedEntitiesForOrganizationResponse')
     DescribeAffectedEntitiesRequest = Shapes::StructureShape.new(name: 'DescribeAffectedEntitiesRequest')
     DescribeAffectedEntitiesResponse = Shapes::StructureShape.new(name: 'DescribeAffectedEntitiesResponse')
     DescribeEntityAggregatesRequest = Shapes::StructureShape.new(name: 'DescribeEntityAggregatesRequest')
@@ -20,18 +26,26 @@ module Aws::Health
     DescribeEventAggregatesRequest = Shapes::StructureShape.new(name: 'DescribeEventAggregatesRequest')
     DescribeEventAggregatesResponse = Shapes::StructureShape.new(name: 'DescribeEventAggregatesResponse')
     DescribeEventDetailsFailedSet = Shapes::ListShape.new(name: 'DescribeEventDetailsFailedSet')
+    DescribeEventDetailsForOrganizationFailedSet = Shapes::ListShape.new(name: 'DescribeEventDetailsForOrganizationFailedSet')
+    DescribeEventDetailsForOrganizationRequest = Shapes::StructureShape.new(name: 'DescribeEventDetailsForOrganizationRequest')
+    DescribeEventDetailsForOrganizationResponse = Shapes::StructureShape.new(name: 'DescribeEventDetailsForOrganizationResponse')
+    DescribeEventDetailsForOrganizationSuccessfulSet = Shapes::ListShape.new(name: 'DescribeEventDetailsForOrganizationSuccessfulSet')
     DescribeEventDetailsRequest = Shapes::StructureShape.new(name: 'DescribeEventDetailsRequest')
     DescribeEventDetailsResponse = Shapes::StructureShape.new(name: 'DescribeEventDetailsResponse')
     DescribeEventDetailsSuccessfulSet = Shapes::ListShape.new(name: 'DescribeEventDetailsSuccessfulSet')
     DescribeEventTypesRequest = Shapes::StructureShape.new(name: 'DescribeEventTypesRequest')
     DescribeEventTypesResponse = Shapes::StructureShape.new(name: 'DescribeEventTypesResponse')
+    DescribeEventsForOrganizationRequest = Shapes::StructureShape.new(name: 'DescribeEventsForOrganizationRequest')
+    DescribeEventsForOrganizationResponse = Shapes::StructureShape.new(name: 'DescribeEventsForOrganizationResponse')
     DescribeEventsRequest = Shapes::StructureShape.new(name: 'DescribeEventsRequest')
     DescribeEventsResponse = Shapes::StructureShape.new(name: 'DescribeEventsResponse')
+    DescribeHealthServiceStatusForOrganizationResponse = Shapes::StructureShape.new(name: 'DescribeHealthServiceStatusForOrganizationResponse')
     EntityAggregate = Shapes::StructureShape.new(name: 'EntityAggregate')
     EntityAggregateList = Shapes::ListShape.new(name: 'EntityAggregateList')
     EntityFilter = Shapes::StructureShape.new(name: 'EntityFilter')
     EntityList = Shapes::ListShape.new(name: 'EntityList')
     Event = Shapes::StructureShape.new(name: 'Event')
+    EventAccountFilter = Shapes::StructureShape.new(name: 'EventAccountFilter')
     EventAggregate = Shapes::StructureShape.new(name: 'EventAggregate')
     EventAggregateList = Shapes::ListShape.new(name: 'EventAggregateList')
     EventArnsList = Shapes::ListShape.new(name: 'EventArnsList')
@@ -46,11 +60,21 @@ module Aws::Health
     EventTypeFilter = Shapes::StructureShape.new(name: 'EventTypeFilter')
     EventTypeList = Shapes::ListShape.new(name: 'EventTypeList')
     InvalidPaginationToken = Shapes::StructureShape.new(name: 'InvalidPaginationToken')
+    OrganizationAffectedEntitiesErrorItem = Shapes::StructureShape.new(name: 'OrganizationAffectedEntitiesErrorItem')
+    OrganizationEntityFiltersList = Shapes::ListShape.new(name: 'OrganizationEntityFiltersList')
+    OrganizationEvent = Shapes::StructureShape.new(name: 'OrganizationEvent')
+    OrganizationEventDetailFiltersList = Shapes::ListShape.new(name: 'OrganizationEventDetailFiltersList')
+    OrganizationEventDetails = Shapes::StructureShape.new(name: 'OrganizationEventDetails')
+    OrganizationEventDetailsErrorItem = Shapes::StructureShape.new(name: 'OrganizationEventDetailsErrorItem')
+    OrganizationEventFilter = Shapes::StructureShape.new(name: 'OrganizationEventFilter')
+    OrganizationEventList = Shapes::ListShape.new(name: 'OrganizationEventList')
     UnsupportedLocale = Shapes::StructureShape.new(name: 'UnsupportedLocale')
     accountId = Shapes::StringShape.new(name: 'accountId')
+    affectedAccountsList = Shapes::ListShape.new(name: 'affectedAccountsList')
     aggregateValue = Shapes::StringShape.new(name: 'aggregateValue')
     availabilityZone = Shapes::StringShape.new(name: 'availabilityZone')
     availabilityZones = Shapes::ListShape.new(name: 'availabilityZones')
+    awsAccountIdsList = Shapes::ListShape.new(name: 'awsAccountIdsList')
     count = Shapes::IntegerShape.new(name: 'count')
     dateTimeRangeList = Shapes::ListShape.new(name: 'dateTimeRangeList')
     entityArn = Shapes::StringShape.new(name: 'entityArn')
@@ -72,6 +96,7 @@ module Aws::Health
     eventTypeCategoryList = Shapes::ListShape.new(name: 'eventTypeCategoryList')
     eventTypeCode = Shapes::StringShape.new(name: 'eventTypeCode')
     eventTypeList = Shapes::ListShape.new(name: 'eventTypeList')
+    healthServiceAccessStatusForOrganization = Shapes::StringShape.new(name: 'healthServiceAccessStatusForOrganization')
     locale = Shapes::StringShape.new(name: 'locale')
     maxResults = Shapes::IntegerShape.new(name: 'maxResults')
     metadataKey = Shapes::StringShape.new(name: 'metadataKey')
@@ -98,10 +123,35 @@ module Aws::Health
     AffectedEntity.add_member(:tags, Shapes::ShapeRef.new(shape: tagSet, location_name: "tags"))
     AffectedEntity.struct_class = Types::AffectedEntity
 
+    ConcurrentModificationException.add_member(:message, Shapes::ShapeRef.new(shape: string, location_name: "message"))
+    ConcurrentModificationException.struct_class = Types::ConcurrentModificationException
+
     DateTimeRange.add_member(:from, Shapes::ShapeRef.new(shape: timestamp, location_name: "from"))
     DateTimeRange.add_member(:to, Shapes::ShapeRef.new(shape: timestamp, location_name: "to"))
     DateTimeRange.struct_class = Types::DateTimeRange
 
+    DescribeAffectedAccountsForOrganizationRequest.add_member(:event_arn, Shapes::ShapeRef.new(shape: eventArn, required: true, location_name: "eventArn"))
+    DescribeAffectedAccountsForOrganizationRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeAffectedAccountsForOrganizationRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: maxResults, location_name: "maxResults"))
+    DescribeAffectedAccountsForOrganizationRequest.struct_class = Types::DescribeAffectedAccountsForOrganizationRequest
+
+    DescribeAffectedAccountsForOrganizationResponse.add_member(:affected_accounts, Shapes::ShapeRef.new(shape: affectedAccountsList, location_name: "affectedAccounts"))
+    DescribeAffectedAccountsForOrganizationResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeAffectedAccountsForOrganizationResponse.struct_class = Types::DescribeAffectedAccountsForOrganizationResponse
+
+    DescribeAffectedEntitiesForOrganizationFailedSet.member = Shapes::ShapeRef.new(shape: OrganizationAffectedEntitiesErrorItem)
+
+    DescribeAffectedEntitiesForOrganizationRequest.add_member(:organization_entity_filters, Shapes::ShapeRef.new(shape: OrganizationEntityFiltersList, required: true, location_name: "organizationEntityFilters"))
+    DescribeAffectedEntitiesForOrganizationRequest.add_member(:locale, Shapes::ShapeRef.new(shape: locale, location_name: "locale"))
+    DescribeAffectedEntitiesForOrganizationRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeAffectedEntitiesForOrganizationRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: maxResults, location_name: "maxResults"))
+    DescribeAffectedEntitiesForOrganizationRequest.struct_class = Types::DescribeAffectedEntitiesForOrganizationRequest
+
+    DescribeAffectedEntitiesForOrganizationResponse.add_member(:entities, Shapes::ShapeRef.new(shape: EntityList, location_name: "entities"))
+    DescribeAffectedEntitiesForOrganizationResponse.add_member(:failed_set, Shapes::ShapeRef.new(shape: DescribeAffectedEntitiesForOrganizationFailedSet, location_name: "failedSet"))
+    DescribeAffectedEntitiesForOrganizationResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeAffectedEntitiesForOrganizationResponse.struct_class = Types::DescribeAffectedEntitiesForOrganizationResponse
+
     DescribeAffectedEntitiesRequest.add_member(:filter, Shapes::ShapeRef.new(shape: EntityFilter, required: true, location_name: "filter"))
     DescribeAffectedEntitiesRequest.add_member(:locale, Shapes::ShapeRef.new(shape: locale, location_name: "locale"))
     DescribeAffectedEntitiesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
@@ -130,6 +180,18 @@ module Aws::Health
 
     DescribeEventDetailsFailedSet.member = Shapes::ShapeRef.new(shape: EventDetailsErrorItem)
 
+    DescribeEventDetailsForOrganizationFailedSet.member = Shapes::ShapeRef.new(shape: OrganizationEventDetailsErrorItem)
+
+    DescribeEventDetailsForOrganizationRequest.add_member(:organization_event_detail_filters, Shapes::ShapeRef.new(shape: OrganizationEventDetailFiltersList, required: true, location_name: "organizationEventDetailFilters"))
+    DescribeEventDetailsForOrganizationRequest.add_member(:locale, Shapes::ShapeRef.new(shape: locale, location_name: "locale"))
+    DescribeEventDetailsForOrganizationRequest.struct_class = Types::DescribeEventDetailsForOrganizationRequest
+
+    DescribeEventDetailsForOrganizationResponse.add_member(:successful_set, Shapes::ShapeRef.new(shape: DescribeEventDetailsForOrganizationSuccessfulSet, location_name: "successfulSet"))
+    DescribeEventDetailsForOrganizationResponse.add_member(:failed_set, Shapes::ShapeRef.new(shape: DescribeEventDetailsForOrganizationFailedSet, location_name: "failedSet"))
+    DescribeEventDetailsForOrganizationResponse.struct_class = Types::DescribeEventDetailsForOrganizationResponse
+
+    DescribeEventDetailsForOrganizationSuccessfulSet.member = Shapes::ShapeRef.new(shape: OrganizationEventDetails)
+
     DescribeEventDetailsRequest.add_member(:event_arns, Shapes::ShapeRef.new(shape: eventArnList, required: true, location_name: "eventArns"))
     DescribeEventDetailsRequest.add_member(:locale, Shapes::ShapeRef.new(shape: locale, location_name: "locale"))
     DescribeEventDetailsRequest.struct_class = Types::DescribeEventDetailsRequest
@@ -150,6 +212,16 @@ module Aws::Health
     DescribeEventTypesResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
     DescribeEventTypesResponse.struct_class = Types::DescribeEventTypesResponse
 
+    DescribeEventsForOrganizationRequest.add_member(:filter, Shapes::ShapeRef.new(shape: OrganizationEventFilter, location_name: "filter"))
+    DescribeEventsForOrganizationRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeEventsForOrganizationRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: maxResults, location_name: "maxResults"))
+    DescribeEventsForOrganizationRequest.add_member(:locale, Shapes::ShapeRef.new(shape: locale, location_name: "locale"))
+    DescribeEventsForOrganizationRequest.struct_class = Types::DescribeEventsForOrganizationRequest
+
+    DescribeEventsForOrganizationResponse.add_member(:events, Shapes::ShapeRef.new(shape: OrganizationEventList, location_name: "events"))
+    DescribeEventsForOrganizationResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
+    DescribeEventsForOrganizationResponse.struct_class = Types::DescribeEventsForOrganizationResponse
+
     DescribeEventsRequest.add_member(:filter, Shapes::ShapeRef.new(shape: EventFilter, location_name: "filter"))
     DescribeEventsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
     DescribeEventsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: maxResults, location_name: "maxResults"))
@@ -160,6 +232,9 @@ module Aws::Health
     DescribeEventsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: nextToken, location_name: "nextToken"))
     DescribeEventsResponse.struct_class = Types::DescribeEventsResponse
 
+    DescribeHealthServiceStatusForOrganizationResponse.add_member(:health_service_access_status_for_organization, Shapes::ShapeRef.new(shape: healthServiceAccessStatusForOrganization, location_name: "healthServiceAccessStatusForOrganization"))
+    DescribeHealthServiceStatusForOrganizationResponse.struct_class = Types::DescribeHealthServiceStatusForOrganizationResponse
+
     EntityAggregate.add_member(:event_arn, Shapes::ShapeRef.new(shape: eventArn, location_name: "eventArn"))
     EntityAggregate.add_member(:count, Shapes::ShapeRef.new(shape: count, location_name: "count"))
     EntityAggregate.struct_class = Types::EntityAggregate
@@ -188,6 +263,10 @@ module Aws::Health
     Event.add_member(:status_code, Shapes::ShapeRef.new(shape: eventStatusCode, location_name: "statusCode"))
     Event.struct_class = Types::Event
 
+    EventAccountFilter.add_member(:event_arn, Shapes::ShapeRef.new(shape: eventArn, required: true, location_name: "eventArn"))
+    EventAccountFilter.add_member(:aws_account_id, Shapes::ShapeRef.new(shape: accountId, required: true, location_name: "awsAccountId"))
+    EventAccountFilter.struct_class = Types::EventAccountFilter
+
     EventAggregate.add_member(:aggregate_value, Shapes::ShapeRef.new(shape: aggregateValue, location_name: "aggregateValue"))
     EventAggregate.add_member(:count, Shapes::ShapeRef.new(shape: count, location_name: "count"))
     EventAggregate.struct_class = Types::EventAggregate
@@ -245,11 +324,63 @@ module Aws::Health
     InvalidPaginationToken.add_member(:message, Shapes::ShapeRef.new(shape: string, location_name: "message"))
     InvalidPaginationToken.struct_class = Types::InvalidPaginationToken
 
+    OrganizationAffectedEntitiesErrorItem.add_member(:aws_account_id, Shapes::ShapeRef.new(shape: accountId, location_name: "awsAccountId"))
+    OrganizationAffectedEntitiesErrorItem.add_member(:event_arn, Shapes::ShapeRef.new(shape: eventArn, location_name: "eventArn"))
+    OrganizationAffectedEntitiesErrorItem.add_member(:error_name, Shapes::ShapeRef.new(shape: string, location_name: "errorName"))
+    OrganizationAffectedEntitiesErrorItem.add_member(:error_message, Shapes::ShapeRef.new(shape: string, location_name: "errorMessage"))
+    OrganizationAffectedEntitiesErrorItem.struct_class = Types::OrganizationAffectedEntitiesErrorItem
+
+    OrganizationEntityFiltersList.member = Shapes::ShapeRef.new(shape: EventAccountFilter)
+
+    OrganizationEvent.add_member(:arn, Shapes::ShapeRef.new(shape: eventArn, location_name: "arn"))
+    OrganizationEvent.add_member(:service, Shapes::ShapeRef.new(shape: service, location_name: "service"))
+    OrganizationEvent.add_member(:event_type_code, Shapes::ShapeRef.new(shape: eventTypeCode, location_name: "eventTypeCode"))
+    OrganizationEvent.add_member(:event_type_category, Shapes::ShapeRef.new(shape: eventTypeCategory, location_name: "eventTypeCategory"))
+    OrganizationEvent.add_member(:region, Shapes::ShapeRef.new(shape: region, location_name: "region"))
+    OrganizationEvent.add_member(:start_time, Shapes::ShapeRef.new(shape: timestamp, location_name: "startTime"))
+    OrganizationEvent.add_member(:end_time, Shapes::ShapeRef.new(shape: timestamp, location_name: "endTime"))
+    OrganizationEvent.add_member(:last_updated_time, Shapes::ShapeRef.new(shape: timestamp, location_name: "lastUpdatedTime"))
+    OrganizationEvent.add_member(:status_code, Shapes::ShapeRef.new(shape: eventStatusCode, location_name: "statusCode"))
+    OrganizationEvent.struct_class = Types::OrganizationEvent
+
+    OrganizationEventDetailFiltersList.member = Shapes::ShapeRef.new(shape: EventAccountFilter)
+
+    OrganizationEventDetails.add_member(:aws_account_id, Shapes::ShapeRef.new(shape: accountId, location_name: "awsAccountId"))
+    OrganizationEventDetails.add_member(:event, Shapes::ShapeRef.new(shape: Event, location_name: "event"))
+    OrganizationEventDetails.add_member(:event_description, Shapes::ShapeRef.new(shape: EventDescription, location_name: "eventDescription"))
+    OrganizationEventDetails.add_member(:event_metadata, Shapes::ShapeRef.new(shape: eventMetadata, location_name: "eventMetadata"))
+    OrganizationEventDetails.struct_class = Types::OrganizationEventDetails
+
+    OrganizationEventDetailsErrorItem.add_member(:aws_account_id, Shapes::ShapeRef.new(shape: accountId, location_name: "awsAccountId"))
+    OrganizationEventDetailsErrorItem.add_member(:event_arn, Shapes::ShapeRef.new(shape: eventArn, location_name: "eventArn"))
+    OrganizationEventDetailsErrorItem.add_member(:error_name, Shapes::ShapeRef.new(shape: string, location_name: "errorName"))
+    OrganizationEventDetailsErrorItem.add_member(:error_message, Shapes::ShapeRef.new(shape: string, location_name: "errorMessage"))
+    OrganizationEventDetailsErrorItem.struct_class = Types::OrganizationEventDetailsErrorItem
+
+    OrganizationEventFilter.add_member(:event_type_codes, Shapes::ShapeRef.new(shape: eventTypeList, location_name: "eventTypeCodes"))
+    OrganizationEventFilter.add_member(:aws_account_ids, Shapes::ShapeRef.new(shape: awsAccountIdsList, location_name: "awsAccountIds"))
+    OrganizationEventFilter.add_member(:services, Shapes::ShapeRef.new(shape: serviceList, location_name: "services"))
+    OrganizationEventFilter.add_member(:regions, Shapes::ShapeRef.new(shape: regionList, location_name: "regions"))
+    OrganizationEventFilter.add_member(:start_time, Shapes::ShapeRef.new(shape: DateTimeRange, location_name: "startTime"))
+    OrganizationEventFilter.add_member(:end_time, Shapes::ShapeRef.new(shape: DateTimeRange, location_name: "endTime"))
+    OrganizationEventFilter.add_member(:last_updated_time, Shapes::ShapeRef.new(shape: DateTimeRange, location_name: "lastUpdatedTime"))
+    OrganizationEventFilter.add_member(:entity_arns, Shapes::ShapeRef.new(shape: entityArnList, location_name: "entityArns"))
+    OrganizationEventFilter.add_member(:entity_values, Shapes::ShapeRef.new(shape: entityValueList, location_name: "entityValues"))
+    OrganizationEventFilter.add_member(:event_type_categories, Shapes::ShapeRef.new(shape: eventTypeCategoryList, location_name: "eventTypeCategories"))
+    OrganizationEventFilter.add_member(:event_status_codes, Shapes::ShapeRef.new(shape: eventStatusCodeList, location_name: "eventStatusCodes"))
+    OrganizationEventFilter.struct_class = Types::OrganizationEventFilter
+
+    OrganizationEventList.member = Shapes::ShapeRef.new(shape: OrganizationEvent)
+
     UnsupportedLocale.add_member(:message, Shapes::ShapeRef.new(shape: string, location_name: "message"))
     UnsupportedLocale.struct_class = Types::UnsupportedLocale
 
+    affectedAccountsList.member = Shapes::ShapeRef.new(shape: accountId)
+
     availabilityZones.member = Shapes::ShapeRef.new(shape: availabilityZone)
 
+    awsAccountIdsList.member = Shapes::ShapeRef.new(shape: accountId)
+
     dateTimeRangeList.member = Shapes::ShapeRef.new(shape: DateTimeRange)
 
     entityArnList.member = Shapes::ShapeRef.new(shape: entityArn)
@@ -297,6 +428,21 @@ module Aws::Health
         "uid" => "health-2016-08-04",
       }
 
+      api.add_operation(:describe_affected_accounts_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeAffectedAccountsForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeAffectedAccountsForOrganizationRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeAffectedAccountsForOrganizationResponse)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidPaginationToken)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_affected_entities, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeAffectedEntities"
         o.http_method = "POST"
@@ -313,6 +459,22 @@ module Aws::Health
         )
       end)
 
+      api.add_operation(:describe_affected_entities_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeAffectedEntitiesForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeAffectedEntitiesForOrganizationRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeAffectedEntitiesForOrganizationResponse)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidPaginationToken)
+        o.errors << Shapes::ShapeRef.new(shape: UnsupportedLocale)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_entity_aggregates, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeEntityAggregates"
         o.http_method = "POST"
@@ -345,6 +507,15 @@ module Aws::Health
         o.errors << Shapes::ShapeRef.new(shape: UnsupportedLocale)
       end)
 
+      api.add_operation(:describe_event_details_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeEventDetailsForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeEventDetailsForOrganizationRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeEventDetailsForOrganizationResponse)
+        o.errors << Shapes::ShapeRef.new(shape: UnsupportedLocale)
+      end)
+
       api.add_operation(:describe_event_types, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeEventTypes"
         o.http_method = "POST"
@@ -376,6 +547,48 @@ module Aws::Health
           }
         )
       end)
+
+      api.add_operation(:describe_events_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeEventsForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeEventsForOrganizationRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeEventsForOrganizationResponse)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidPaginationToken)
+        o.errors << Shapes::ShapeRef.new(shape: UnsupportedLocale)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_health_service_status_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeHealthServiceStatusForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.output = Shapes::ShapeRef.new(shape: DescribeHealthServiceStatusForOrganizationResponse)
+      end)
+
+      api.add_operation(:disable_health_service_access_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisableHealthServiceAccessForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: ConcurrentModificationException)
+      end)
+
+      api.add_operation(:enable_health_service_access_for_organization, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "EnableHealthServiceAccessForOrganization"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.errors << Shapes::ShapeRef.new(shape: ConcurrentModificationException)
+      end)
     end
 
   end