Skip to content

Commit

Permalink
Add row headers to tables
Browse files Browse the repository at this point in the history
  • Loading branch information
kr8n3r committed Mar 14, 2021
1 parent 221418b commit 8678649
Show file tree
Hide file tree
Showing 13 changed files with 186 additions and 186 deletions.
6 changes: 3 additions & 3 deletions source/accounts/billing_info.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ Billing frequency is dictated by the level of usage. The table below gives a gui

| Approx. billable amount per month | Billing frequency |
| --- | --- |
| <£1000 | Yearly |
| £1000-£5000 | 6 monthly |
| > £5000 | Quarterly |
|# <£1000 | Yearly |
|# £1000-£5000 | 6 monthly |
|# > £5000 | Quarterly |

## Next steps

Expand Down
12 changes: 6 additions & 6 deletions source/accounts/closing_trial_accounts.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ A closed account:

| Sequence | Title | Description | Max time |
|:---|:---|:---|:---|
|1|New tenant|A new tenant that does not have a PaaS account yet|Indefinitely|
|2|Trial|A tenant with a 90 day trial account with the ability to deploy apps and provision small backing services|90 days|
|3|Billable|A full tenant with a billing arrangement that is being recharged for the resource consumed|Indefinitely|
|4|Suspended|The org is suspended and the tenant will not be able to perform any operations on apps or services.<br /><br />Users will be able to use the apps. Tenants will be able to log in to Cloud Foundry.|30 days|
|5|Halted|The apps are stopped and users will receive '404' error messages from the platform.<br /><br />The data is preserved and the account will still run up bills for the databases|30 days|
|6|Removed|The application instances and services are deleted by an operator.<br /><br />Users will see no difference compared to a halted/stopped app, but the tenant will have to re-push the app and re-create any backing services to restore their apps.<br /><br />At this point the account cannot incur any billable events and the bill goes to zero.<br /><br />All app, services and data are unavailable.|Indefinitely|
|# 1|New tenant|A new tenant that does not have a PaaS account yet|Indefinitely|
|# 2|Trial|A tenant with a 90 day trial account with the ability to deploy apps and provision small backing services|90 days|
|# 3 Billable|A full tenant with a billing arrangement that is being recharged for the resource consumed|Indefinitely|
|# 4|Suspended|The org is suspended and the tenant will not be able to perform any operations on apps or services.<br /><br />Users will be able to use the apps. Tenants will be able to log in to Cloud Foundry.|30 days|
|# 5|Halted|The apps are stopped and users will receive '404' error messages from the platform.<br /><br />The data is preserved and the account will still run up bills for the databases|30 days|
|# 6|Removed|The application instances and services are deleted by an operator.<br /><br />Users will see no difference compared to a halted/stopped app, but the tenant will have to re-push the app and re-create any backing services to restore their apps.<br /><br />At this point the account cannot incur any billable events and the bill goes to zero.<br /><br />All app, services and data are unavailable.|Indefinitely|

![BAU trial account expiry process](/diagrams/BAU-trial-account-expiry-process-map.svg)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,34 @@ It is important to note that live services will 'Bring Your Own' domain, apps av
### Development Domains
Purpose | URL |
------------ | -------------
Deployer Concourse | deployer.foo.dev.cloudpipeline.digital
Cloud Foundry API | api.foo.dev.cloudpipeline.digital
Cloud Foundry User Account and Authentication | uaa.foo.dev.cloudpipeline.digital
Applications | bar.foo.dev.cloudpipelineapps.digital
# Deployer Concourse | deployer.foo.dev.cloudpipeline.digital
# Cloud Foundry API | api.foo.dev.cloudpipeline.digital
# Cloud Foundry User Account and Authentication | uaa.foo.dev.cloudpipeline.digital
# Applications | bar.foo.dev.cloudpipelineapps.digital

### Continuous Integration (CI) Domains
Purpose | URL |
------------ | -------------
Deployer Concourse | deployer.master.ci.cloudpipeline.digital
Cloud Foundry API | api.master.ci.cloudpipeline.digital
Cloud Foundry User Account and Authentication | uaa.master.ci.cloudpipeline.digital
Applications | bar.master.ci.cloudpipelineapps.digital
# Deployer Concourse | deployer.master.ci.cloudpipeline.digital
# Cloud Foundry API | api.master.ci.cloudpipeline.digital
# Cloud Foundry User Account and Authentication | uaa.master.ci.cloudpipeline.digital
# Applications | bar.master.ci.cloudpipelineapps.digital

### Staging Domains
Purpose | URL |
------------ | -------------
Deployer Concourse | deployer.london.staging.cloudpipeline.digital
Cloud Foundry API | api.london.staging.cloudpipeline.digital
Cloud Foundry User Account and Authentication | uaa.london.staging.cloudpipeline.digital
Applications | bar.london.staging.cloudpipelineapps.digital
# Deployer Concourse | deployer.london.staging.cloudpipeline.digital
# Cloud Foundry API | api.london.staging.cloudpipeline.digital
# Cloud Foundry User Account and Authentication | uaa.london.staging.cloudpipeline.digital
# Applications | bar.london.staging.cloudpipelineapps.digital

### Production Domains
Purpose | URL |
------------ | -------------
Deployer Concourse | deployer.cloud.service.gov.uk
Cloud Foundry API | api.cloud.service.gov.uk
Cloud Foundry User Account and Authentication | uaa.cloud.service.gov.uk
Applications | bar.cloudapps.digital
# Deployer Concourse | deployer.cloud.service.gov.uk
# Cloud Foundry API | api.cloud.service.gov.uk
# Cloud Foundry User Account and Authentication | uaa.cloud.service.gov.uk
# Applications | bar.cloudapps.digital

## Status

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ Our objectives are:

State | Expected behaviour
------|-------------------
All cells operational | Enough capacity to allow some but not all tenants to scale up to their full quota. The amount of excess capacity required should be enough to accommodate the fluctuations we can expect over a 3 day period (weekend + reaction time)
While CF being deployed | As above: enough capacity to allow some tenants to scale up to their full quota
One availability zone failed/degraded | Enough capacity to maintain steady state app usage. Not guaranteed to be able to scale apps up.
More than one AZ failed | The system is not expected to have sufficient capacity to host all running apps.
# All cells operational | Enough capacity to allow some but not all tenants to scale up to their full quota. The amount of excess capacity required should be enough to accommodate the fluctuations we can expect over a 3 day period (weekend + reaction time)
# While CF being deployed | As above: enough capacity to allow some tenants to scale up to their full quota
# One availability zone failed/degraded | Enough capacity to maintain steady state app usage. Not guaranteed to be able to scale apps up.
# More than one AZ failed | The system is not expected to have sufficient capacity to host all running apps.

To achieve this we need to start basing our capacity planning on current memory
occupied by processes on cells, rather than the sum of all quotas given to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ The domain structure for the dev and CI environments won't change. For the dev e

|Ireland|London|
|----|------|
|_api.cloud.service.gov.uk_|_api.london.cloud.service.gov.uk_|
|_sample-app.cloudapps.digital_|_sample-app.london.cloudapps.digital_|
|# _api.cloud.service.gov.uk_|_api.london.cloud.service.gov.uk_|
|# _sample-app.cloudapps.digital_|_sample-app.london.cloudapps.digital_|

#### Staging

|Ireland|London|
|----|------|
|_api.staging.cloudpipeline.digital_|_api.london.staging.cloudpipeline.digital_|
|_sample-app.staging.cloudpipelineapps.digital_|_sample-app.london.staging.cloudpipelineapps.digital_|
|# _api.staging.cloudpipeline.digital_|_api.london.staging.cloudpipeline.digital_|
|# _sample-app.staging.cloudpipelineapps.digital_|_sample-app.london.staging.cloudpipelineapps.digital_|

## Status

Expand Down
Loading

0 comments on commit 8678649

Please sign in to comment.