Skip to content

Commit

Permalink
Merge branch 'main' into domain-manager-update
Browse files Browse the repository at this point in the history
  • Loading branch information
@markus-hentsch
markus-hentsch authored Sep 20, 2024
2 parents 2c3952b + c680e73 commit 83ecb38
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 114 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/docs/04-operating-scs/components
/docs/04-operating-scs/01-guides
/docs/06-releases
/docs/turnkey-solution
/standards/*.md
/standards/*/*.md
/standards/*/*.mdx
Expand Down
22 changes: 20 additions & 2 deletions docs.package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
"target": "docs/04-operating-scs/components",
"label": "status-page-deployment"
},
{
"repo": "SovereignCloudStack/status-page-web",
"source": "docs",
"target": "docs/04-operating-scs/components",
"label": "status-page-web"
},
{
"repo": "SovereignCloudStack/k8s-observability",
"source": "docs",
Expand Down Expand Up @@ -92,13 +98,19 @@
"repo": "SovereignCloudStack/security-infra-scan-pipeline",
"source": "docs/*.md",
"target": "docs/04-operating-scs/components",
"label": "automated-pentesting"
"label": "automated-pentesting-iaas"
},
{
"repo": "SovereignCloudStack/security-infra-scan-pipeline",
"source": "docs/images/*.png",
"target": "docs/04-operating-scs/components",
"label": "automated-pentesting/images"
"label": "automated-pentesting-iaas/images"
},
{
"repo": "SovereignCloudStack/security-k8s-scan-pipeline",
"source": "docs/*.md",
"target": "docs/04-operating-scs/components",
"label": "automated-pentesting-kaas"
},
{
"repo": "SovereignCloudStack/csctl",
Expand All @@ -117,5 +129,11 @@
"source": ["docs/*"],
"target": "docs/03-container/components/cluster-stacks/components",
"label": "cluster-stack-operator"
},
{
"repo": "SovereignCloudStack/hardware-landscape",
"source": ["documentation/overview.md"],
"target": "docs/turnkey-solution",
"label": ""
}
]
43 changes: 12 additions & 31 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 48 additions & 76 deletions sidebarsDocs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
const sidebarsDocs = {
docs: [
'index',
{
type: 'category',
label: 'Getting Started',
link: {
type: 'generated-index'
},
items: [
// 'getting-started/overview',
// 'getting-started/virtualization',
// 'getting-started/containerization'
]
},
{
type: 'category',
label: 'IaaS Layer',
Expand Down Expand Up @@ -312,6 +300,20 @@ const sidebarsDocs = {
'operating-scs/components/status-page-deployment/docs/admin-authentication',
'operating-scs/components/status-page-deployment/docs/faq'
]
},
{
type: 'category',
label: 'Web',
link: {
type: 'generated-index'
},
items: [
'operating-scs/components/status-page-web/docs/overview',
'operating-scs/components/status-page-web/docs/requirements',
'operating-scs/components/status-page-web/docs/quickstart',
'operating-scs/components/status-page-web/docs/configuration',
'operating-scs/components/status-page-web/docs/contribute'
]
}
]
},
Expand Down Expand Up @@ -367,9 +369,30 @@ const sidebarsDocs = {
type: 'generated-index'
},
items: [
'operating-scs/components/automated-pentesting/overview',
'operating-scs/components/automated-pentesting/quickstart',
'operating-scs/components/automated-pentesting/tools'
{
type: 'category',
label: 'Pentesting IaaS',
link: {
type: 'generated-index'
},
items: [
'operating-scs/components/automated-pentesting-iaas/overview',
'operating-scs/components/automated-pentesting-iaas/quickstart',
'operating-scs/components/automated-pentesting-iaas/tools'
]
},
{
type: 'category',
label: 'Pentesting KaaS',
link: {
type: 'generated-index'
},
items: [
'operating-scs/components/automated-pentesting-kaas/overview',
'operating-scs/components/automated-pentesting-kaas/quickstart',
'operating-scs/components/automated-pentesting-kaas/tools'
]
}
]
}
]
Expand All @@ -384,56 +407,6 @@ const sidebarsDocs = {
'operating-scs/guides/openstack-health-monitor/Debian12-Install'
]
},
// {
// type: 'category',
// label: 'Monitoring',
// link: {
// type: 'generated-index'
// },
// items: [
// 'operating-scs/monitoring/index'
// ]
// },
// {
// type: 'category',
// label: 'Incident Management',
// link: {
// type: 'generated-index'
// },
// items: [
// 'operating-scs/incident-management/index'
// ]
// },
// {
// type: 'category',
// label: 'Audits',
// link: {
// type: 'generated-index'
// },
// items: [
// 'operating-scs/audits/index'
// ]
// },
// {
// type: 'category',
// label: 'Lifecycle Management',
// link: {
// type: 'generated-index'
// },
// items: [
// 'operating-scs/lifecycle-management/index'
// ]
// },
// {
// type: 'category',
// label: 'Logging',
// link: {
// type: 'generated-index'
// },
// items: [
// 'operating-scs/logging/index'
// ]
// },
{
type: 'category',
label: 'Metering',
Expand Down Expand Up @@ -466,6 +439,14 @@ const sidebarsDocs = {
'iam/intra-SCS-federation-setup-description-for-osism-doc-operations'
]
},
{
type: 'category',
label: 'Turnkey Solution',
link: {
type: 'generated-index'
},
items: ['turnkey-solution/overview']
},
{
type: 'category',
label: 'Releases',
Expand All @@ -479,19 +460,10 @@ const sidebarsDocs = {
'releases/Release3',
'releases/Release4',
'releases/Release5',
'releases/Release6'
'releases/Release6',
'releases/Release7'
]
},
// {
// type: 'category',
// label: 'Standards',
// link: {
// type: 'generated-index'
// },
// items: [
// 'standards/index'
// ]
// },
{
type: 'doc',
id: 'faq/index',
Expand Down
2 changes: 1 addition & 1 deletion standards/certification/overview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This is a list of clouds that we test on a nightly basis against the certificate

| Name | Description | Operator | _SCS-compatible IaaS_ Compliance | HealthMon |
| -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- | ----------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------: |
| [gx-scs](https://github.com/SovereignCloudStack/docs/blob/main/community/cloud-resources/plusserver-gx-scs.md) | Dev environment provided for SCS & GAIA-X context | plusserver GmbH | [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-gx-scs-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-gx-scs-v4.yml) | broken <!--[HM](https://health.gx-scs.sovereignit.cloud:3000/)--> |
| [gx-scs](https://github.com/SovereignCloudStack/docs/blob/main/community/cloud-resources/plusserver-gx-scs.md) | Dev environment provided for SCS & GAIA-X context | plusserver GmbH | [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-gx-scs-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-gx-scs-v4.yml) | [HM](https://health.gx-scs.sovereignit.cloud:3000/) |
| [pluscloud open](https://www.plusserver.com/en/products/pluscloud-open)<br />- prod1<br />- prod2<br />- prod3<br />- prod4 | Public cloud for customers (4 regions) | plusserver GmbH | &nbsp;<br />- prod1 [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-pco-prod1-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-pco-prod1-v4.yml)<br />- prod2 [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-pco-prod2-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-pco-prod2-v4.yml)<br />- prod3 [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-pco-prod3-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-pco-prod3-v4.yml)<br />- prod4 [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-pco-prod4-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-pco-prod4-v4.yml) | &nbsp;<br />[HM1](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-pco)<br />[HM2](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod2)<br />[HM3](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod3)<br />[HM4](https://health.prod1.plusserver.sovereignit.cloud:3000/d/9ltTEmlnk/openstack-health-monitor2?orgId=1&var-mycloud=plus-prod4) |
| [Wavestack](https://www.noris.de/wavestack-cloud/) | Public cloud for customers | noris network AG/Wavecon GmbH | [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-wavestack-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-wavestack-v4.yml) | [HM](https://health.wavestack1.sovereignit.cloud:3000/) |
| [REGIO.cloud](https://regio.digital) | Public cloud for customers | OSISM GmbH | [![Compliance Status](https://img.shields.io/github/actions/workflow/status/SovereignCloudStack/standards/check-regio-a-v4.yml?label=v4)](https://github.com/SovereignCloudStack/standards/actions/workflows/check-regio-a-v4.yml) | broken <!--[HM](https://apimon.services.regio.digital/public-dashboards/17cf094a47404398a5b8e35a4a3968d4?orgId=1&refresh=5m)--> |
Expand Down
10 changes: 8 additions & 2 deletions static/data/architecturalOverviewData.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,14 @@
"stable": "true"
},
{
"title": "Automated Pentesting",
"url": "/docs/operating-scs/components/automated-pentesting/overview",
"title": "Automated Pentesting IaaS",
"url": "/docs/operating-scs/components/automated-pentesting-iaas/overview",
"mandatory": "true",
"stable": "true"
},
{
"title": "Automated Pentesting KaaS",
"url": "/docs/operating-scs/components/automated-pentesting-kaas/overview",
"mandatory": "true",
"stable": "true"
}
Expand Down
4 changes: 2 additions & 2 deletions static/data/featureContentData.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
{
"title": "Releases",
"body": "SCS is currently in Release 6. Check out the latest Release Notes.",
"url": "/docs/releases/Release6",
"body": "SCS is currently in Release 7. Check out the latest Release Notes.",
"url": "/docs/releases/Release7",
"buttonText": "Learn More"
},
{
Expand Down

0 comments on commit 83ecb38

Please sign in to comment.