Skip to content

Commit f682244

Browse files
committed
doc/radosgw: Small fixes and improvements in notifications.rst, part 2
Use double backticks for data like configuration parameters. Break very long lines around standard line length. Don't list same parameter "user/password" in multiple list items, instead just list all concerns under the same list item. Add missing empty line before child unordered list. Expand "args" in text to "arguments". Start sentences with capital case and end in full stop consistently. Remove indent from one whole unordered list that shouldn't be indented (probably a copy-paste from a sub-list). Indent lists inside notes with same amount of spaces everywhere. Signed-off-by: Ville Ojamo <[email protected]>
1 parent f5aafe0 commit f682244

File tree

1 file changed

+95
-90
lines changed

1 file changed

+95
-90
lines changed

doc/radosgw/notifications.rst

Lines changed: 95 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -394,31 +394,33 @@ The response has the following format:
394394
</ResponseMetadata>
395395
</GetTopicAttributesResponse>
396396

397-
- User: the name of the user that created the topic.
398-
- Name: the name of the topic.
399-
- EndPoint: The JSON-formatted endpoint parameters, including:
400-
- EndpointAddress: The push-endpoint URL.
401-
- EndpointArgs: The push-endpoint args.
402-
- EndpointTopic: The topic name to be sent to the endpoint (can be different
403-
than the above topic name).
404-
- HasStoredSecret: This is "true" if the endpoint URL contains user/password
397+
- ``User``: the name of the user that created the topic
398+
- ``Name``: the name of the topic
399+
- ``EndPoint``: the JSON-formatted endpoint parameters, including:
400+
401+
- ``EndpointAddress``: the push-endpoint URL
402+
- ``EndpointArgs``: the push-endpoint arguments
403+
- ``EndpointTopic``: the topic name to be sent to the endpoint (can be different
404+
than the above topic name)
405+
- ``HasStoredSecret``: This is "true" if the endpoint URL contains ``user``/``password``
405406
information. In this case, the request must be made over HTTPS. The "topic
406407
get" request will otherwise be rejected.
407-
- Persistent: This is "true" if the topic is persistent.
408-
- TimeToLive: This will limit the time (in seconds) to retain the notifications.
409-
- MaxRetries: This will limit the max retries before expiring notifications.
410-
- RetrySleepDuration: This will control the frequency of retrying the notifications.
411-
- TopicArn: topic `ARN
412-
<https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html>`_.
413-
- OpaqueData: The opaque data set on the topic.
414-
- Policy: Any access permission set on the topic.
408+
- ``Persistent``: This is "true" if the topic is persistent.
409+
- ``TimeToLive``: This will limit the time (in seconds) to retain the notifications.
410+
- ``MaxRetries``: This will limit the max retries before expiring notifications.
411+
- ``RetrySleepDuration``: This will control the frequency of retrying the notifications.
412+
413+
- ``TopicArn``: topic `ARN
414+
<https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html>`_
415+
- ``OpaqueData``: the opaque data set on the topic
416+
- ``Policy``: any access permission set on the topic
415417

416418
Get Topic Information
417419
`````````````````````
418420

419421
This returns information about a specific topic. This includes push-endpoint
420422
information, if provided. Note that this API is now deprecated in favor of the
421-
AWS compliant `GetTopicAttributes` API.
423+
AWS compliant ``GetTopicAttributes`` API.
422424

423425
::
424426

@@ -452,20 +454,20 @@ The response has the following format:
452454
</ResponseMetadata>
453455
</GetTopicResponse>
454456

455-
- User: The name of the user that created the topic.
456-
- Name: The name of the topic.
457-
- EndpointAddress: The push-endpoint URL.
458-
- EndpointArgs: The push-endpoint args.
459-
- EndpointTopic: The topic name to be sent to the endpoint (which can be
460-
different than the above topic name).
461-
- HasStoredSecret: This is "true" if the endpoint URL contains user/password
457+
- ``User``: the name of the user that created the topic
458+
- ``Name``: the name of the topic
459+
- ``EndpointAddress``: the push-endpoint URL
460+
- ``EndpointArgs``: the push-endpoint arguments
461+
- ``EndpointTopic``: the topic name to be sent to the endpoint (which can be
462+
different than the above topic name)
463+
- ``HasStoredSecret``: This is "true" if the endpoint URL contains user/password
462464
information. In this case, the request must be made over HTTPS. The "topic
463465
get" request will otherwise be rejected.
464-
- Persistent: "true" if topic is persistent.
465-
- TopicArn: topic `ARN
466-
<https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html>`_.
467-
- OpaqueData: the opaque data set on the topic.
468-
- Policy: Any access permission set on the topic.
466+
- ``Persistent``: "true" if topic is persistent
467+
- ``TopicArn``: topic `ARN
468+
<https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html>`_
469+
- ``OpaqueData``: the opaque data set on the topic
470+
- ``Policy``: any access permission set on the topic
469471

470472
Delete Topic
471473
````````````
@@ -481,10 +483,10 @@ This deletes the specified topic.
481483

482484
.. note::
483485

484-
- Deleting an unknown notification (for example, double delete) is not
485-
considered an error.
486-
- Deleting a topic does not automatically delete all notifications associated
487-
with it.
486+
- Deleting an unknown notification (for example, double delete) is not
487+
considered an error.
488+
- Deleting a topic does not automatically delete all notifications associated
489+
with it.
488490

489491
The response has the following format:
490492

@@ -550,8 +552,9 @@ This allows to set/modify existing attributes on the specified topic.
550552

551553
.. note::
552554

553-
- The AttributeName passed will either be updated or created (if not exist) with AttributeValue passed.
554-
- Any unsupported AttributeName passed will result in error 400.
555+
- The ``AttributeName`` passed will either be updated or created (if not
556+
exist) with ``AttributeValue`` passed.
557+
- Any unsupported ``AttributeName`` passed will result in error 400.
555558

556559
The response has the following format:
557560

@@ -563,34 +566,35 @@ The response has the following format:
563566
</ResponseMetadata>
564567
</SetTopicAttributesResponse>
565568

566-
Valid AttributeName that can be passed:
567-
568-
- push-endpoint: This is the URI of an endpoint to send push notifications to.
569-
- OpaqueData: Opaque data is set in the topic configuration and added to all
570-
notifications that are triggered by the topic.
571-
- persistent: This indicates whether notifications to this endpoint are
572-
persistent (=asynchronous) or not persistent. (This is "false" by default.)
573-
- time_to_live: This will limit the time (in seconds) to retain the notifications.
574-
- max_retries: This will limit the max retries before expiring notifications.
575-
- retry_sleep_duration: This will control the frequency of retrying the notifications.
576-
- Policy: This will control who can access the topic other than owner of the topic.
577-
- verify-ssl: This indicates whether the server certificates must be validated by
578-
the client. This is "true" by default.
579-
- ``use-ssl``: If this is set to "true", a secure connection is used to
580-
connect to the broker. This is "false" by default.
581-
- cloudevents: This indicates whether the HTTP header should contain
582-
attributes according to the `S3 CloudEvents Spec`_.
583-
- amqp-exchange: The exchanges must exist and must be able to route messages
584-
based on topics.
585-
- amqp-ack-level: No end2end acknowledgement is required. Messages may persist in the
586-
broker before being delivered to their final destinations.
587-
- ``ca-location``: If this is provided and a secure connection is used, the
588-
specified CA will be used instead of the default CA to authenticate the
589-
broker.
590-
- mechanism: may be provided together with user/password (default: ``PLAIN``).
591-
- kafka-ack-level: No end2end acknowledgement is required. Messages may persist in the
592-
broker before being delivered to their final destinations.
593-
- kafka-brokers: Set endpoint with broker(s) as a comma-separated list of host or host:port (default port 9092).
569+
Valid ``AttributeName`` that can be passed:
570+
571+
- ``push-endpoint``: This is the URI of an endpoint to send push notifications to.
572+
- ``OpaqueData``: Opaque data is set in the topic configuration and added to all
573+
notifications that are triggered by the topic.
574+
- ``persistent``: This indicates whether notifications to this endpoint are
575+
persistent (=asynchronous) or not persistent. (This is "false" by default.)
576+
- ``time_to_live``: This will limit the time (in seconds) to retain the notifications.
577+
- ``max_retries``: This will limit the max retries before expiring notifications.
578+
- ``retry_sleep_duration``: This will control the frequency of retrying the notifications.
579+
- ``Policy``: This will control who can access the topic other than owner of the topic.
580+
- ``verify-ssl``: This indicates whether the server certificates must be validated by
581+
the client. This is "true" by default.
582+
- ``use-ssl``: If this is set to "true", a secure connection is used to
583+
connect to the broker. This is "false" by default.
584+
- ``cloudevents``: This indicates whether the HTTP header should contain
585+
attributes according to the `S3 CloudEvents Spec`_.
586+
- ``amqp-exchange``: The exchanges must exist and must be able to route messages
587+
based on topics.
588+
- ``amqp-ack-level``: No end2end acknowledgement is required. Messages may persist in the
589+
broker before being delivered to their final destinations.
590+
- ``ca-location``: If this is provided and a secure connection is used, the
591+
specified CA will be used instead of the default CA to authenticate the
592+
broker.
593+
- ``mechanism``: may be provided together with ``user``/``password`` (default: ``PLAIN``)
594+
- ``kafka-ack-level``: No end2end acknowledgement is required. Messages may persist in the
595+
broker before being delivered to their final destinations.
596+
- ``kafka-brokers``: Set endpoint with broker(s) as a comma-separated list of
597+
``host`` or ``host:port`` (default port 9092).
594598

595599
Notifications
596600
~~~~~~~~~~~~~
@@ -599,8 +603,9 @@ Detailed under: :ref:`radosgw-bucketops`.
599603

600604
.. note::
601605

602-
- "Abort Multipart Upload" request does not emit a notification
603-
- Both "Initiate Multipart Upload" and "POST Object" requests will emit an ``s3:ObjectCreated:Post`` notification
606+
- "Abort Multipart Upload" request does not emit a notification.
607+
- Both "Initiate Multipart Upload" and "POST Object" requests will emit
608+
an ``s3:ObjectCreated:Post`` notification.
604609

605610
Events
606611
~~~~~~
@@ -653,36 +658,36 @@ For example:
653658
}
654659
]}
655660

656-
- awsRegion: The zonegroup.
657-
- eventTime: The timestamp, indicating when the event was triggered.
658-
- eventName: For the list of supported events see: :ref:`radosgw-s3-notification-compatibility`.
659-
Note that eventName values do not start with the `s3:` prefix.
660-
- userIdentity.principalId: The user that triggered the change.
661-
- requestParameters.sourceIPAddress: not supported
662-
- responseElements.x-amz-request-id: The request ID of the original change.
663-
- responseElements.x_amz_id_2: The RGW on which the change was made.
664-
- s3.configurationId: The notification ID that created the event.
665-
- s3.bucket.name: The name of the bucket.
666-
- s3.bucket.ownerIdentity.principalId: The owner of the bucket.
667-
- s3.bucket.arn: The ARN of the bucket.
668-
- s3.bucket.id: The ID of the bucket. (This is an extension to the S3
661+
- ``awsRegion``: the zonegroup
662+
- ``eventTime``: the timestamp, indicating when the event was triggered
663+
- ``eventName``: For a list of supported events, see: :ref:`radosgw-s3-notification-compatibility`.
664+
Note that ``eventName`` values do not start with the ``s3:`` prefix.
665+
- ``userIdentity.principalId``: the user that triggered the change
666+
- ``requestParameters.sourceIPAddress``: not supported
667+
- ``responseElements.x-amz-request-id``: the request ID of the original change
668+
- ``responseElements.x_amz_id_2``: the RGW on which the change was made
669+
- ``s3.configurationId``: the notification ID that created the event
670+
- ``s3.bucket.name``: the name of the bucket
671+
- ``s3.bucket.ownerIdentity.principalId``: the owner of the bucket
672+
- ``s3.bucket.arn``: the ARN of the bucket
673+
- ``s3.bucket.id``: the ID of the bucket (This is an extension to the S3
669674
notification API.)
670-
- s3.object.key: The object key.
671-
- s3.object.size: The object size.
672-
- s3.object.eTag: The object etag.
673-
- s3.object.versionId: The object version, if the bucket is versioned. When a
674-
copy is made, it includes the version of the target object. When a delete
675-
marker is created, it includes the version of the delete marker.
676-
- s3.object.sequencer: The monotonically-increasing identifier of the "change
677-
per object" (hexadecimal format).
678-
- s3.object.metadata: Any metadata set on the object that is sent as
675+
- ``s3.object.key``: the object key
676+
- ``s3.object.size``: the object size
677+
- ``s3.object.eTag``: the object etag
678+
- ``s3.object.versionId``: This contains the object version, if the bucket is
679+
versioned. When a copy is made, it includes the version of the target object.
680+
When a delete marker is created, it includes the version of the delete marker.
681+
- ``s3.object.sequencer``: the monotonically-increasing identifier of the "change
682+
per object" (hexadecimal format)
683+
- ``s3.object.metadata``: Any metadata set on the object that is sent as
679684
``x-amz-meta-`` (that is, any metadata set on the object that is sent as an
680685
extension to the S3 notification API).
681-
- s3.object.tags: Any tags set on the object. (This is an extension to the S3
686+
- ``s3.object.tags``: any tags set on the object (This is an extension to the S3
682687
notification API.)
683-
- s3.eventId: The unique ID of the event, which could be used for acking. (This
688+
- ``s3.eventId``: the unique ID of the event, which could be used for acking (This
684689
is an extension to the S3 notification API.)
685-
- s3.opaqueData: This means that "opaque data" is set in the topic configuration
690+
- ``s3.opaqueData``: This means that "opaque data" is set in the topic configuration
686691
and is added to all notifications triggered by the topic. (This is an
687692
extension to the S3 notification API.)
688693

0 commit comments

Comments
 (0)