Skip to content

Commit 4f05a11

Browse files
committed
Fixed links + search
1 parent 35cae7a commit 4f05a11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+452
-458
lines changed

source/includes/_administration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Administration API
1+
# Administration
22

33
The following sections describe the various endpoints exposed by CloudMC to manage customer's configuration and interact with various core functionality of the system. Using these, you can automate various workflows without having to log into the portal, or simply integrate different aspects of CloudMC with your own toolchain.
44
<aside class="notice">

source/includes/_cloudstack.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# CloudStack API
1+
# CloudStack plugin
22

3-
The CloudStack API provides endpoints for carrying out operations on CloudMC compute and networking entities. While each operation has its own validation and required fields, all operations need to specify the service code and environment in which they should be carried out. The following example URL describes how to specify this information for all entities.
3+
The CloudStack plugin provides endpoints for carrying out operations on CloudMC compute and networking entities. While each operation has its own validation and required fields, all operations need to specify the service code and environment in which they should be carried out. The following example URL describes how to specify this information for all entities.
44

5-
<code>https://cloudmc_endpoint/v1/services/<a href="#service-connections">:service_code</a>/<a href="#environments">:environment_name</a>/:entity_type</code>
6-
7-
The two CloudStack service codes currently available in CloudMC correspond to compute regions: `compute-qc` for Québec, and `compute-on` for Ontario.
5+
<code>https://cloudmc_endpoint/v1/services/<a href="#administration-service-connections">:service_code</a>/<a href="#administration-environments">:environment_name</a>/:entity_type</code>
86

97
<aside class="notice">
108
An easy way to remember the structure of API endpoints is that going from left to right, the scope gets progressively more specific. First service, then environment of that service, then entity type, then operation on that entity type, etc.

source/includes/_getting_started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ When an API request is successful, the response body will contain the `data` fie
7979
Attributes | &nbsp;
8080
--- | ---
8181
`data` | The data field contains the object requested by the API caller
82-
`taskId` | The [task id](#tasks) of an operation executed through the [compute API](#compute-api)
83-
`taskStatus` | The status of a [task](#tasks) of an operation executed through the [compute API](#compute-api)
82+
`taskId` | The [task id](#tasks) of an operation executed through the services API
83+
`taskStatus` | The status of a [task](#tasks) of an operation executed the services API
8484
<!--
8585
`metadata` | The metadata is an optionally returned field containing paging and sorting information
8686
-->

source/includes/_openstack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# OpenStack Plugin
1+
# OpenStack plugin
22

33
The CloudMC OpenStack plugin incorporates various OpenStack services such as Nova and Neutron into CloudMC's API. It also enforces CloudMC's environment-centric multi-tenancy model and RBAC over top of OpenStack.

source/includes/administration/_environments.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Environments
22

3-
Environments allow you to manage resources of a specific service and to manage your [users'](#users) access to them. With [environment roles](#roles), you have tight control of what a user is allowed to do in your environment. A general use case of environments is to split your resources into different [deployment environments](https://en.wikipedia.org/wiki/Deployment_environment) (e.g. dev, staging and production). The advantage is that resources of different deployments are isolated from each other and you can restrict user access to your most critical resources.
3+
Environments allow you to manage resources of a specific service and to manage your [users'](#administration-users) access to them. With [environment roles](#administration-roles), you have tight control of what a user is allowed to do in your environment. A general use case of environments is to split your resources into different [deployment environments](https://en.wikipedia.org/wiki/Deployment_environment) (e.g. dev, staging and production). The advantage is that resources of different deployments are isolated from each other and you can restrict user access to your most critical resources.
44

55

66
<!-------------------- LIST ENVIRONMENTS -------------------->
@@ -55,9 +55,9 @@ Attributes | &nbsp;
5555
`description`<br/>*string* | The description of the environment
5656
`membership`<br/>*string* | Type of membership of the environment. (e.g. ALL_ORG_USERS, MANY_USERS)
5757
`creationDate`<br/>*long* | The date in [unix time](https://en.wikipedia.org/wiki/Unix_time) that the environment was created
58-
`organization`<br/>*[Organization](#organizations)* | The organization of the environment<br/>*includes*: `id`, `name`, `entryPoint`
59-
`serviceConnection`<br/>*[ServiceConnection](#service-connections)* | The service connection of the environment<br/>*includes*: `id`, `name`
60-
`roles`<br/>*Array[[Role](#roles)]* | The roles of the environment with all the users assigned to them.<br/>*includes*: `id`, `name`, `isDefault`, `users.id`, `users.name`
58+
`organization`<br/>*[Organization](#administration-organizations)* | The organization of the environment<br/>*includes*: `id`, `name`, `entryPoint`
59+
`serviceConnection`<br/>*[ServiceConnection](#administration-service-connections)* | The service connection of the environment<br/>*includes*: `id`, `name`
60+
`roles`<br/>*Array[[Role](#administration-roles)]* | The roles of the environment with all the users assigned to them.<br/>*includes*: `id`, `name`, `isDefault`, `users.id`, `users.name`
6161

6262

6363

@@ -118,10 +118,10 @@ Attributes | &nbsp;
118118
`description`<br/>*string* | The description of the environment
119119
`membership`<br/>*string* | Type of membership of the environment. (e.g. ALL_ORG_USERS, MANY_USERS)
120120
`creationDate`<br/>*long* | The date in [unix time](https://en.wikipedia.org/wiki/Unix_time) that the environment was created
121-
`organization`<br/>*[Organization](#organizations)* | The organization of the environment<br/>*includes*: `id`, `name`, `entryPoint`
122-
`serviceConnection`<br/>*[ServiceConnection](#service-connections)* | The service connection of the environment<br/>*includes*: `id`, `name`
123-
`users`<br/>*Array[[User](#users)]* | The users that are members of the environment<br/>*includes*: `id`, `username`
124-
`roles`<br/>*Array[[Role](#roles)]* | The roles of the environment with all the users assigned to them.<br/>*includes*: `id`, `name`, `isDefault`, `users.id`, `users.name`
121+
`organization`<br/>*[Organization](#administration-organizations)* | The organization of the environment<br/>*includes*: `id`, `name`, `entryPoint`
122+
`serviceConnection`<br/>*[ServiceConnection](#administration-service-connections)* | The service connection of the environment<br/>*includes*: `id`, `name`
123+
`users`<br/>*Array[[User](#administration-users)]* | The users that are members of the environment<br/>*includes*: `id`, `username`
124+
`roles`<br/>*Array[[Role](#administration-roles)]* | The roles of the environment with all the users assigned to them.<br/>*includes*: `id`, `name`, `isDefault`, `users.id`, `users.name`
125125

126126
<!-------------------- CREATE ENVIRONMENT -------------------->
127127

@@ -167,18 +167,16 @@ Required | &nbsp;
167167
-------- | -----------
168168
`name`<br/>*string* | The name of the new environment. Should be unique in the environment and only contain lower case characters, numbers, dashes and underscores.
169169
`description`<br/>*string* | The description of the new environment.
170-
`serviceConnection`<br/>*[ServiceConnection](#service-connections)* | The service connection that the environment should be created in<br/>*required*: `id`
170+
`serviceConnection`<br/>*[ServiceConnection](#administration-service-connections)* | The service connection that the environment should be created in<br/>*required*: `id`
171171

172172
Optional | &nbsp;
173173
-------- | -----------
174-
`organization`<br/>*[Organization](#organizations)* | The organization that the environment should be created in. *Defaults to your organization*<br/>*required*: `id`
174+
`organization`<br/>*[Organization](#administration-organizations)* | The organization that the environment should be created in. *Defaults to your organization*<br/>*required*: `id`
175175
`membership`<br/>*string* | Type of membership of the environment. ALL_ORG_USERS will add every user in the organization to this environment with the default role. MANY_USERS will allow you to choose the users you want in the environment and assigned them specific roles. *Defaults to MANY_USERS*
176-
`roles`<br/>*Array[[Role](#roles)]* | The roles of the environment and the users assigned to them. Also, defines the default role of the environment.<br/>*required*: `name`, `users.id`<br/>*optional*: `isDefault`
176+
`roles`<br/>*Array[[Role](#administration-roles)]* | The roles of the environment and the users assigned to them. Also, defines the default role of the environment.<br/>*required*: `name`, `users.id`<br/>*optional*: `isDefault`
177177

178178

179-
##### Returns
180-
181-
The responses' `data` field contains the updated [environment](#environments).
179+
The responses' `data` field contains the updated [environment](#administration-environments).
182180

183181

184182
<!-------------------- UPDATE ENVIRONMENT -------------------->
@@ -216,7 +214,7 @@ Optional | &nbsp;
216214
`name`<br/>*string* | The updated name of the environment. Should be unique in the environment and only contain lower case characters, numbers, dashes and underscores.
217215
`description`<br/>*string* | The updated description of the environment
218216
`membership`<br/>*string* | Type of membership of the environment. ALL_ORG_USERS will add every user in the organization to this environment with the default role. MANY_USERS will allow you to choose the users you want in the environment and assigned them specific roles. *Defaults to MANY_USERS*
219-
`roles`<br/>*Array[[Role](#roles)]* | Update the users roles in the environment. Also, can also update the default role.<br/>*required*: `name`, `users.id`<br/>*optional*: `isDefault`
217+
`roles`<br/>*Array[[Role](#administration-roles)]* | Update the users roles in the environment. Also, can also update the default role.<br/>*required*: `name`, `users.id`<br/>*optional*: `isDefault`
220218

221219

222220
You will need the `Environments update` permission to execute this operation.
@@ -236,7 +234,7 @@ curl "https://cloudmc_endpoint/v1/environments/[environment-id]" \
236234

237235
```
238236

239-
Delete a specific environment. You will need a [role](#roles) with the `Delete an existing environment ` permission to execute this operation.
237+
Delete a specific environment. You will need a [role](#administration-roles) with the `Delete an existing environment ` permission to execute this operation.
240238

241239
<aside class="warning">
242240
<strong>Be careful:</strong> This will destroy all the resources in your environment.

source/includes/administration/_organizations.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Organizations
2-
Organizations are the largest logical grouping of users, environments and resources available in CloudMC. Each organization is isolated from other organizations. It has its own subdomain (`[entryPoint].CloudMC`) and is protected by its own customizable system [roles](#roles). An administrator that must manage it's sub-organizations environments or provisioned resources can do so by having the `Access other levels` permission. Additionally, provisioned resource usage is metered at the organization level facilitating cost tracking.
2+
Organizations are the largest logical grouping of users, environments and resources available in CloudMC. Each organization is isolated from other organizations. It has its own subdomain (`[entryPoint].CloudMC`) and is protected by its own customizable system [roles](#administration-roles). An administrator that must manage it's sub-organizations environments or provisioned resources can do so by having the `Access other levels` permission. Additionally, provisioned resource usage is metered at the organization level facilitating cost tracking.
33

44

55
<!-------------------- LIST ORGANIZATIONS -------------------->
@@ -59,11 +59,11 @@ Attributes | &nbsp;
5959
`id`<br/>*UUID* | ---
6060
`name`<br/>*string* | ---
6161
`entryPoint`<br/>*string* | The entry point of the organization is the subdomain of the organization in the CloudMC URL : `[entryPoint].CloudMC`
62-
`parent`<br/>*[Organization](#organizations)* | If the organization is a sub-organization, it will have it's `parent` organization. *includes*:`id`,`name`
63-
`environments`<br/>*Array[[Environment](#environments)]* | The environments belonging to the organization<br/>*includes*: `id`
64-
`roles`<br/>*Array[[Role](#roles)]* | The system and environments roles belonging to the organization<br/>*includes*: `id`
65-
`serviceConnections`<br/>*Array[[ServiceConnection](#service-connections)]* | The services for which the organization is allowed to provision resources<br/>*includes*: `id`,`serviceCode`
66-
`users`<br/>*Array[[User](#users)]* | The users of the organization<br/>*includes*: `id`
62+
`parent`<br/>*[Organization](#administration-organizations)* | If the organization is a sub-organization, it will have it's `parent` organization. *includes*:`id`,`name`
63+
`environments`<br/>*Array[[Environment](#administration-environments)]* | The environments belonging to the organization<br/>*includes*: `id`
64+
`roles`<br/>*Array[[Role](#administration-roles)]* | The system and environments roles belonging to the organization<br/>*includes*: `id`
65+
`serviceConnections`<br/>*Array[[ServiceConnection](#administration-service-connections)]* | The services for which the organization is allowed to provision resources<br/>*includes*: `id`,`serviceCode`
66+
`users`<br/>*Array[[User](#administration-users)]* | The users of the organization<br/>*includes*: `id`
6767

6868
<!-------------------- FIND ORGANIZATION -------------------->
6969
### Retrieve an organization
@@ -120,11 +120,11 @@ Attributes | &nbsp;
120120
`id`<br/>*UUID* | ---
121121
`name`<br/>*string* | ---
122122
`entryPoint`<br/>*string* | The entry point of the organization is the subdomain of the organization in the CloudMC URL :<br/>`[entryPoint].CloudMC`
123-
`parent`<br/>*[Organization](#organizations)* | If the organization is a sub-organization, it will have it's `parent` organization. *includes*:`id`,`name`
124-
`environments`<br/>*Array[[Environment](#environments)]* | The environments belonging to the organization<br/>*includes*: `id`
125-
`roles`<br/>*Array[[Role](#roles)]* | The system and environments roles belonging to the organization<br/>*includes*: `id`
126-
`serviceConnections`<br/>*Array[[ServiceConnection](#service-connections)]* | The services for which the organization is allowed to provision resources<br/>*includes*: `id`,`serviceCode`
127-
`users`<br/>*Array[[User](#users)]* | The users of the organization<br/>*includes*: `id`
123+
`parent`<br/>*[Organization](#administration-organizations)* | If the organization is a sub-organization, it will have it's `parent` organization. *includes*:`id`,`name`
124+
`environments`<br/>*Array[[Environment](#administration-environments)]* | The environments belonging to the organization<br/>*includes*: `id`
125+
`roles`<br/>*Array[[Role](#administration-roles)]* | The system and environments roles belonging to the organization<br/>*includes*: `id`
126+
`serviceConnections`<br/>*Array[[ServiceConnection](#administration-service-connections)]* | The services for which the organization is allowed to provision resources<br/>*includes*: `id`,`serviceCode`
127+
`users`<br/>*Array[[User](#administration-users)]* | The users of the organization<br/>*includes*: `id`
128128

129129
<!-------------------- CREATE ORGANIZATION -------------------->
130130
### Create organization
@@ -165,10 +165,10 @@ Required | &nbsp;
165165

166166
Optional | &nbsp;
167167
---- | ----
168-
`serviceConnections`<br/>Array[[ServiceConnection](#service-connections)] | A list of service connections for which the organization may provision resources.<br/>*required :*`id`
169-
`parent`<br/>[Organization](#organization) | The organization that will be the parent of the new organization. By default, it will default to the caller's organization.<br/>*required :*`id`
168+
`serviceConnections`<br/>Array[[ServiceConnection](#administration-service-connections)] | A list of service connections for which the organization may provision resources.<br/>*required :*`id`
169+
`parent`<br/>[Organization](#administration-organization) | The organization that will be the parent of the new organization. By default, it will default to the caller's organization.<br/>*required :*`id`
170170

171-
The responses' `data` field contains the created [organization](#organizations) with it's `id`.
171+
The responses' `data` field contains the created [organization](#administration-organizations) with it's `id`.
172172

173173
<!-------------------- UPDATE ORGANIZATION -------------------->
174174
### Update organization
@@ -204,9 +204,9 @@ Required | &nbsp;
204204

205205
Optional | &nbsp;
206206
---- | ----
207-
`serviceConnections`<br/>Array[[ServiceConnection](#service-connections)] | A list of service connections for which the organization may provision resources. The caller must have access to all connections that are provided. **NB :** Service connection access may be added but not revoked at this time.<br/>*required :* `id`
207+
`serviceConnections`<br/>Array[[ServiceConnection](#administration-service-connections)] | A list of service connections for which the organization may provision resources. The caller must have access to all connections that are provided. **NB :** Service connection access may be added but not revoked at this time.<br/>*required :* `id`
208208

209-
The responses' `data` field contains the updated [organization](#organizations).
209+
The responses' `data` field contains the updated [organization](#administration-organizations).
210210

211211
<!-------------------- DELETE ORGANIZATION -------------------->
212212
### Delete organization

source/includes/administration/_service_connections.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
## Service connections
22

3-
Service connections are the services that you can create resources for (e.g. compute, object storage). [Environments](#environments) are created for a specific service which allows you to create and manage resources within that service.
4-
5-
<!---- The service APIs are documented [here](#serviceApis) ---->
6-
3+
Service connections are the services that you can create resources for (e.g. compute, object storage). [Environments](#administration-environments) are created for a specific service which allows you to create and manage resources within that service.
74

85
<!-------------------- LIST ORGANIZATIONS -------------------->
96
### List service connections

source/includes/administration/_usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Retrieve the usage summary records for an organization and all of its sub-organi
4444

4545
Attributes | &nbsp;
4646
---- | -----------
47-
`organizationId`<br/>*UUID* | Id of the [organization](#organizations)
48-
`serviceConnectionId`<br/>*UUID* | Id of the [service connection](#service-connections)
47+
`organizationId`<br/>*UUID* | Id of the [organization](#administration-organizations)
48+
`serviceConnectionId`<br/>*UUID* | Id of the [service connection](#administration-service-connections)
4949
`serviceConnectionPricingId`<br/>*UUID* | Id of the service connection pricing
5050
`utilityCost`<br/>*string* | Utility cost of the record (aggregated per the period)
5151
`utilityUsage`<br/>*string* | Utility usage of the record

0 commit comments

Comments
 (0)