From c7030fe319e0e20885c9e020ea1ebc9001e7e36b Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Fri, 21 Jul 2023 20:18:35 +0200 Subject: [PATCH 1/6] update --- vocabulary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vocabulary b/vocabulary index ae216a4..fb50d0a 160000 --- a/vocabulary +++ b/vocabulary @@ -1 +1 @@ -Subproject commit ae216a403504b058a0e00c4cfbda77120fb3a9db +Subproject commit fb50d0a3539a2ade005bd561249561f72e324cec From 2648ddf941dcf46577126d051adbc4a975615ca3 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Fri, 21 Jul 2023 20:28:27 +0200 Subject: [PATCH 2/6] update --- content/sla.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/sla.md b/content/sla.md index 20f5297..1e2eb1e 100644 --- a/content/sla.md +++ b/content/sla.md @@ -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) From 30eec416cdf380886ba5a716947a990a920f89fe Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Mon, 29 Jan 2024 10:18:59 +0100 Subject: [PATCH 3/6] update --- .github/workflows/pull_request.yaml | 8 ++++++++ .github/workflows/push.yaml | 4 ++++ .github/workflows/release.yaml | 4 ++++ .gitignore | 1 + .vale.ini | 5 +++-- content/cost.md | 2 +- content/service-composition.md | 16 ++++++++-------- content/sla.md | 2 +- mkdocs.yml | 8 +++++--- renovate.json | 17 ++++++++++++++++- vocabulary | 1 - 11 files changed, 51 insertions(+), 17 deletions(-) delete mode 160000 vocabulary diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 3d30c4f..a0d64eb 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,13 +7,21 @@ on: jobs: qa: +<<<<<<< Updated upstream uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.43 +======= + uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.64 +>>>>>>> Stashed changes with: MD_CONFIG: .github/md_config.json DOC_SRC: content MD_LINT_CONFIG: .markdownlint.yaml build: +<<<<<<< Updated upstream uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.43 +======= + uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.64 +>>>>>>> Stashed changes with: DOCKER_FILE_PATH: Dockerfile secrets: diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index ef885d3..20267ba 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -7,7 +7,11 @@ on: jobs: push: +<<<<<<< Updated upstream uses: stakater/.github/.github/workflows/push_container.yaml@v0.0.43 +======= + uses: stakater/.github/.github/workflows/push_container.yaml@v0.0.64 +>>>>>>> Stashed changes with: DOCKER_FILE_PATH: Dockerfile RELEASE_BRANCH: main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 45cd4e1..b3bf8fd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,6 +7,10 @@ on: jobs: release: +<<<<<<< Updated upstream uses: stakater/.github/.github/workflows/release_template.yaml@v0.0.43 +======= + uses: stakater/.github/.github/workflows/release_template.yaml@v0.0.64 +>>>>>>> Stashed changes secrets: SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }} diff --git a/.gitignore b/.gitignore index 8f8636f..664ff09 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ node_modules # Build files site/ +styles/ diff --git a/.vale.ini b/.vale.ini index 56d1b75..7f62d2f 100644 --- a/.vale.ini +++ b/.vale.ini @@ -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] diff --git a/content/cost.md b/content/cost.md index d78cd38..050228f 100644 --- a/content/cost.md +++ b/content/cost.md @@ -4,7 +4,7 @@ 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. diff --git a/content/service-composition.md b/content/service-composition.md index e71081c..d0466f9 100644 --- a/content/service-composition.md +++ b/content/service-composition.md @@ -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. diff --git a/content/sla.md b/content/sla.md index 1e2eb1e..6ea944b 100644 --- a/content/sla.md +++ b/content/sla.md @@ -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 diff --git a/mkdocs.yml b/mkdocs.yml index b610eb2..bf20ec4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -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/ @@ -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 @@ -57,4 +60,3 @@ nav: - Careers: https://www.stakater.com/careers plugins: - search - - mermaid2 diff --git a/renovate.json b/renovate.json index 39a2b6e..39e3895 100644 --- a/renovate.json +++ b/renovate.json @@ -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\/(?.*)\/releases\/download\/(?.*)\/.*\\.zip" + ], + "datasourceTemplate": "github-releases" + } ] } diff --git a/vocabulary b/vocabulary deleted file mode 160000 index fb50d0a..0000000 --- a/vocabulary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb50d0a3539a2ade005bd561249561f72e324cec From 000ebc0f2de9732a7d7853f5a132842a3255929a Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Mon, 29 Jan 2024 10:22:35 +0100 Subject: [PATCH 4/6] update --- custom_theme/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_theme/main.html b/custom_theme/main.html index 56b5372..7124954 100644 --- a/custom_theme/main.html +++ b/custom_theme/main.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block footer %} -

Copyright © 2023 Stakater AB – Change cookie settings

+

Copyright © 2024 Stakater AB – Change cookie settings

{% endblock %} From 38e4a64312ff3da2e33c332765d1b9b39c926617 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Mon, 29 Jan 2024 10:52:08 +0100 Subject: [PATCH 5/6] update --- .gitmodules | 3 --- content/sla.md | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a47a9fc..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vocabulary"] - path = vocabulary - url = git@github.com:stakater/vocabulary.git diff --git a/content/sla.md b/content/sla.md index 6ea944b..c9aa73a 100644 --- a/content/sla.md +++ b/content/sla.md @@ -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. From ed4b53d493034ebd3c72dc202d0101f6426ad4fb Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Mon, 29 Jan 2024 10:53:32 +0100 Subject: [PATCH 6/6] update --- content/cost.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/cost.md b/content/cost.md index 050228f..0e5819f 100644 --- a/content/cost.md +++ b/content/cost.md @@ -1,6 +1,6 @@ # 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.