Skip to content

Commit

Permalink
Merge branch 'gh-98-cloud-service' into gh-21-virtual-device
Browse files Browse the repository at this point in the history
  • Loading branch information
at055612 committed Jun 10, 2024
2 parents f468074 + b045bc5 commit 07823ce
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 0 deletions.
42 changes: 42 additions & 0 deletions event-logging.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -1394,6 +1394,48 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="CloudServiceComplexType">
<xs:annotation>
<xs:documentation>Describes a service on a cloud provider, e.g. an AWS Lambda or a Google BigQuery database. This normally descirbes a Software As A Serivce offering. Cloud infrastructure such as AWS EC2s should be modelled with the VirtualDevice object type instead.</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="evt:BaseObjectComplexType">
<xs:sequence>
<xs:element name="Provder" type="xs:string">
<xs:annotation>
<xs:documentation>The name of the provider, providing the cloud service, e.g. AWS, Google, Azure, etc.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CloudType">
<xs:annotation>
<xs:documentation>The type of cloud the service exists in, e.g. Public or Private.</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="Private"/>
<xs:enumeration value="Public"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element minOccurs="0" name="Region" type="xs:string">
<xs:annotation>
<xs:documentation>The cloud region that the service is deployed in. A region typically contains multiple zones.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="Zone" type="xs:string">
<xs:annotation>
<xs:documentation>The cloud zone that the service is deployed in. A zone is typically a sub-division of a region.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Data" type="evt:DataComplexType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Any other event data that does not fit into a schema element but may be useful for the purpose of audit.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DataComplexType">
<xs:annotation>
<xs:documentation>Describes any other event data that does not fit into a schema element but may be useful for the purpose of audit. The recursive nature of this type means it can be used to model a tree of data.</xs:documentation>
Expand Down
24 changes: 24 additions & 0 deletions unreleased_changes/20240610_094322_596__98.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
* Issue **#98** : Add the object type `CloudService`.


```sh
# ********************************************************************************
# Issue title: Add a new object type of `CloudService`
# Issue link: https://github.com/gchq/event-logging-schema/issues/98
# ********************************************************************************

# ONLY the top line will be included as a change entry in the CHANGELOG.
# The entry should be in GitHub flavour markdown and should be written on a SINGLE
# line with no hard breaks. You can have multiple change files for a single GitHub issue.
# The entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
# 'Fixed nasty bug'.
#
# Examples of acceptable entries are:
#
#
# * Issue **123** : Fix bug with an associated GitHub issue in this repository
#
# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
#
# * Fix bug with no associated GitHub issue.
```

0 comments on commit 07823ce

Please sign in to comment.