Skip to content

Commit

Permalink
Merge pull request #16 from stakater/sla-updates
Browse files Browse the repository at this point in the history
SLA updates
  • Loading branch information
rasheedamir authored Jan 29, 2024
2 parents a27da7f + ed4b53d commit b7646de
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ on:

jobs:
qa:
uses: stakater/.github/.github/workflows/[email protected].62
uses: stakater/.github/.github/workflows/[email protected].64
with:
MD_CONFIG: .github/md_config.json
DOC_SRC: content
MD_LINT_CONFIG: .markdownlint.yaml
build:
uses: stakater/.github/.github/workflows/[email protected].62
uses: stakater/.github/.github/workflows/[email protected].64
with:
DOCKER_FILE_PATH: Dockerfile
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
push:
uses: stakater/.github/.github/workflows/[email protected].62
uses: stakater/.github/.github/workflows/[email protected].64
with:
DOCKER_FILE_PATH: Dockerfile
RELEASE_BRANCH: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ on:

jobs:
release:
uses: stakater/.github/.github/workflows/[email protected].62
uses: stakater/.github/.github/workflows/[email protected].64
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ node_modules

# Build files
site/
styles/
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

5 changes: 3 additions & 2 deletions .vale.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
StylesPath = "vocabulary/styles"
StylesPath = styles
MinAlertLevel = warning

Vocab = "Stakater"
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.5/Stakater.zip
Vocab = Stakater

# Only check MarkDown files
[*.md]
Expand Down
4 changes: 2 additions & 2 deletions content/cost.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Cost of the Service and Settlement Procedure

`Version: 30 Jan 2023`
`Version: 29 Jan 2024`

A. The reporting period for the Service is one calendar month.

B. The cost of the Services provided in the reporting period is calculated in accordance with the rules and conditions specified in these Terms of Service, as well as in the Order, in proportion to the number of months included in the reporting period.
B. The cost of the Services provided in the reporting period is calculated in accordance with the rules and conditions specified in these [Terms of Service](./general-provisions.md), as well as in the Order, in proportion to the number of months included in the reporting period.

C. The payment of 100% of the cost of the Service provided shall be made at the end of the concerned reporting period no later than thirty (30) banking days from the end of the reporting period based on the invoice issued and sent by Stakater by email.

Expand Down
16 changes: 8 additions & 8 deletions content/service-composition.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Composition of the Service

`Version: 14 Apr 2023`
`Version: 29 Jan 2024`

The Managed OpenShift service includes, but is not limited to, the following services:
The Managed OpenShift service includes the following services:

* The post-installation technical support of the OpenShift clusters, and auxiliary software components, including regular updates using the latest versions of clusters and auxiliary components developed by Stakater along with monitoring systems and components for aggregating operating parameters of the cluster.
1. Monitoring of the health of the OpenShift clusters, responding to failures and errors in their operation in accordance with the rules defined in the Regulations.

* Consulting assistance to the Customer representatives: software developers, system administrators, engineers, and other technical specialists interacting with Stakater on behalf of the Customer (elsewhere referred to as the Contact persons), carried out as part of the post-installation technical support of the Customer to the extent and following the rules stipulated in these Terms of Service.
1. The post-installation technical support of the OpenShift clusters, and auxiliary software components, including regular updates using the latest versions of clusters and auxiliary components developed by Stakater along with monitoring systems and components for aggregating operating parameters of the cluster.

* Monitoring of the health of the OpenShift clusters, responding to failures and errors in their operation in accordance with the rules defined in the Regulations.

* Correcting errors promptly, developing, upgrading, and adapting auxiliary components of
1. Correcting errors promptly, developing, upgrading, and adapting auxiliary components of
OpenShift clusters carried out by engineers of Stakater in accordance with their own
production plans and internal technical regulations or as agreed upon by the Parties.

1. Address support tickets from Customer representatives.

The Customer agrees that the Service is carried out using Stakater's software tools that operate on an "as is" basis.

The Customer undertakes to take into account the recommendations of Stakater concerning the operation of OpenShift clusters maintained by Stakater. These recommendations are aimed at preventing possible failures of the OpenShift clusters maintained by Stakater. The Customer shall be responsible for any risks arising due to ignoring such recommendations.

The liability of Stakater is limited to fines and penalties imposed on Stakater under these Terms of Service. Stakater shall not be held liable for losses incurred by the Customer in connection with the provision of the Service.
The liability of Stakater is limited to fines and penalties imposed on Stakater under these [Terms of Service](./general-provisions.md). Stakater shall not be held liable for losses incurred by the Customer in connection with the provision of the Service.
14 changes: 7 additions & 7 deletions content/sla.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Service Level Agreement (SLA)

`Version: 30 Jan 2023`
`Version: 29 Jan 2024`

This SLA establishes conditions and a method for measuring the level of service at a given time, defines the guaranteed level of service, and sets out penalties for violating the guaranteed level of service.

Expand All @@ -10,7 +10,7 @@ Specifications and operating conditions of components running in the High Availa

* The component is run in two or more instances to preserve availability in the case of a failure of a single instance
* Enabling this mode requires additional computing resources
* If there is more than one master node in the cluster, the High Availability mode is activated for all components by default
* If there is more than one control plane node in the cluster, the High Availability mode is activated for all components by default
* The HA mode can be turned off for individual components, such as authentication and monitoring, to reduce the cost of computing resources. However, we cannot guarantee the Service Level (SL) for such subsystems.
* Control Plane — the cluster core — is considered running in the HA mode if it has at least three instances

Expand Down Expand Up @@ -126,9 +126,9 @@ If the SLA is violated for multiple availability types for the same cluster simu

## Additional Sections

The following sections from the `SAAP` SLA also applies to the `Managed OpenShift Service` SLA:
The following sections also applies to this SLA:

* [Excused Downtime](https://docs.stakater.com/content/saap-sla/saap-sla.html#6-excused-downtime)
* [Monthly Uptime Percentage](https://docs.stakater.com/content/saap-sla/saap-sla.html#7-monthly-uptime-percentage)
* [Limitations](https://docs.stakater.com/content/saap-sla/saap-sla.html#10-limitations)
* [SLA Exclusions](https://docs.stakater.com/content/saap-sla/saap-sla.html#13-sla-exclusions)
* [Excused Downtime](https://docs.stakater.com/saap/legal-documents/sla.html#6-excused-downtime)
* [Monthly Uptime Percentage](https://docs.stakater.com/saap/legal-documents/sla.html#7-monthly-uptime-percentage)
* [Limitations](https://docs.stakater.com/saap/legal-documents/sla.html#10-limitations)
* [SLA Exclusions](https://docs.stakater.com/saap/legal-documents/sla.html#13-sla-exclusions)
2 changes: 1 addition & 1 deletion custom_theme/main.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}

{% block footer %}
<p>Copyright &copy; 2023 Stakater AB – <a href="#__consent">Change cookie settings</a></p>
<p>Copyright &copy; 2024 Stakater AB – <a href="#__consent">Change cookie settings</a></p>
{% endblock %}
8 changes: 5 additions & 3 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ edit_uri: blob/main/content/
use_directory_urls: false
theme:
name: material
prev_next_buttons_location: none
logo: assets/images/favicon.svg
favicon: assets/images/favicon.svg
custom_dir: custom_theme/
Expand All @@ -18,7 +17,11 @@ theme:
markdown_extensions:
- admonition
- pymdownx.details
- pymdownx.superfences
- pymdownx.superfences:
custom_fences:
- name: mermaid
class: mermaid
format: !!python/name:pymdownx.superfences.fence_code_format
- attr_list
- pymdownx.emoji:
emoji_index: !!python/name:materialx.emoji.twemoji
Expand Down Expand Up @@ -57,4 +60,3 @@ nav:
- Careers: https://www.stakater.com/careers
plugins:
- search
- mermaid2
17 changes: 16 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
"config:recommended"
],
"labels": [
"dependencies"
],
"customManagers": [
{
"customType": "regex",
"fileMatch": [
".vale.ini"
],
"matchStrings": [
"https:\/\/github\\.com\/(?<depName>.*)\/releases\/download\/(?<currentValue>.*)\/.*\\.zip"
],
"datasourceTemplate": "github-releases"
}
]
}
1 change: 0 additions & 1 deletion vocabulary
Submodule vocabulary deleted from ae216a

0 comments on commit b7646de

Please sign in to comment.