Skip to content

Commit 83ecb38

Browse files
markus-hentschmarkus-hentsch
authored
Merge branch 'main' into domain-manager-update
2 parents 2c3952b + c680e73 commit 83ecb38

File tree

7 files changed

+92
-114
lines changed

7 files changed

+92
-114
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/docs/04-operating-scs/components
1515
/docs/04-operating-scs/01-guides
1616
/docs/06-releases
17+
/docs/turnkey-solution
1718
/standards/*.md
1819
/standards/*/*.md
1920
/standards/*/*.mdx

‎docs.package.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
"target": "docs/04-operating-scs/components",
6060
"label": "status-page-deployment"
6161
},
62+
{
63+
"repo": "SovereignCloudStack/status-page-web",
64+
"source": "docs",
65+
"target": "docs/04-operating-scs/components",
66+
"label": "status-page-web"
67+
},
6268
{
6369
"repo": "SovereignCloudStack/k8s-observability",
6470
"source": "docs",
@@ -92,13 +98,19 @@
9298
"repo": "SovereignCloudStack/security-infra-scan-pipeline",
9399
"source": "docs/*.md",
94100
"target": "docs/04-operating-scs/components",
95-
"label": "automated-pentesting"
101+
"label": "automated-pentesting-iaas"
96102
},
97103
{
98104
"repo": "SovereignCloudStack/security-infra-scan-pipeline",
99105
"source": "docs/images/*.png",
100106
"target": "docs/04-operating-scs/components",
101-
"label": "automated-pentesting/images"
107+
"label": "automated-pentesting-iaas/images"
108+
},
109+
{
110+
"repo": "SovereignCloudStack/security-k8s-scan-pipeline",
111+
"source": "docs/*.md",
112+
"target": "docs/04-operating-scs/components",
113+
"label": "automated-pentesting-kaas"
102114
},
103115
{
104116
"repo": "SovereignCloudStack/csctl",
@@ -117,5 +129,11 @@
117129
"source": ["docs/*"],
118130
"target": "docs/03-container/components/cluster-stacks/components",
119131
"label": "cluster-stack-operator"
132+
},
133+
{
134+
"repo": "SovereignCloudStack/hardware-landscape",
135+
"source": ["documentation/overview.md"],
136+
"target": "docs/turnkey-solution",
137+
"label": ""
120138
}
121139
]

‎package-lock.json‎

Lines changed: 12 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sidebarsDocs.js‎

Lines changed: 48 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44
const sidebarsDocs = {
55
docs: [
66
'index',
7-
{
8-
type: 'category',
9-
label: 'Getting Started',
10-
link: {
11-
type: 'generated-index'
12-
},
13-
items: [
14-
// 'getting-started/overview',
15-
// 'getting-started/virtualization',
16-
// 'getting-started/containerization'
17-
]
18-
},
197
{
208
type: 'category',
219
label: 'IaaS Layer',
@@ -312,6 +300,20 @@ const sidebarsDocs = {
312300
'operating-scs/components/status-page-deployment/docs/admin-authentication',
313301
'operating-scs/components/status-page-deployment/docs/faq'
314302
]
303+
},
304+
{
305+
type: 'category',
306+
label: 'Web',
307+
link: {
308+
type: 'generated-index'
309+
},
310+
items: [
311+
'operating-scs/components/status-page-web/docs/overview',
312+
'operating-scs/components/status-page-web/docs/requirements',
313+
'operating-scs/components/status-page-web/docs/quickstart',
314+
'operating-scs/components/status-page-web/docs/configuration',
315+
'operating-scs/components/status-page-web/docs/contribute'
316+
]
315317
}
316318
]
317319
},
@@ -367,9 +369,30 @@ const sidebarsDocs = {
367369
type: 'generated-index'
368370
},
369371
items: [
370-
'operating-scs/components/automated-pentesting/overview',
371-
'operating-scs/components/automated-pentesting/quickstart',
372-
'operating-scs/components/automated-pentesting/tools'
372+
{
373+
type: 'category',
374+
label: 'Pentesting IaaS',
375+
link: {
376+
type: 'generated-index'
377+
},
378+
items: [
379+
'operating-scs/components/automated-pentesting-iaas/overview',
380+
'operating-scs/components/automated-pentesting-iaas/quickstart',
381+
'operating-scs/components/automated-pentesting-iaas/tools'
382+
]
383+
},
384+
{
385+
type: 'category',
386+
label: 'Pentesting KaaS',
387+
link: {
388+
type: 'generated-index'
389+
},
390+
items: [
391+
'operating-scs/components/automated-pentesting-kaas/overview',
392+
'operating-scs/components/automated-pentesting-kaas/quickstart',
393+
'operating-scs/components/automated-pentesting-kaas/tools'
394+
]
395+
}
373396
]
374397
}
375398
]
@@ -384,56 +407,6 @@ const sidebarsDocs = {
384407
'operating-scs/guides/openstack-health-monitor/Debian12-Install'
385408
]
386409
},
387-
// {
388-
// type: 'category',
389-
// label: 'Monitoring',
390-
// link: {
391-
// type: 'generated-index'
392-
// },
393-
// items: [
394-
// 'operating-scs/monitoring/index'
395-
// ]
396-
// },
397-
// {
398-
// type: 'category',
399-
// label: 'Incident Management',
400-
// link: {
401-
// type: 'generated-index'
402-
// },
403-
// items: [
404-
// 'operating-scs/incident-management/index'
405-
// ]
406-
// },
407-
// {
408-
// type: 'category',
409-
// label: 'Audits',
410-
// link: {
411-
// type: 'generated-index'
412-
// },
413-
// items: [
414-
// 'operating-scs/audits/index'
415-
// ]
416-
// },
417-
// {
418-
// type: 'category',
419-
// label: 'Lifecycle Management',
420-
// link: {
421-
// type: 'generated-index'
422-
// },
423-
// items: [
424-
// 'operating-scs/lifecycle-management/index'
425-
// ]
426-
// },
427-
// {
428-
// type: 'category',
429-
// label: 'Logging',
430-
// link: {
431-
// type: 'generated-index'
432-
// },
433-
// items: [
434-
// 'operating-scs/logging/index'
435-
// ]
436-
// },
437410
{
438411
type: 'category',
439412
label: 'Metering',
@@ -466,6 +439,14 @@ const sidebarsDocs = {
466439
'iam/intra-SCS-federation-setup-description-for-osism-doc-operations'
467440
]
468441
},
442+
{
443+
type: 'category',
444+
label: 'Turnkey Solution',
445+
link: {
446+
type: 'generated-index'
447+
},
448+
items: ['turnkey-solution/overview']
449+
},
469450
{
470451
type: 'category',
471452
label: 'Releases',
@@ -479,19 +460,10 @@ const sidebarsDocs = {
479460
'releases/Release3',
480461
'releases/Release4',
481462
'releases/Release5',
482-
'releases/Release6'
463+
'releases/Release6',
464+
'releases/Release7'
483465
]
484466
},
485-
// {
486-
// type: 'category',
487-
// label: 'Standards',
488-
// link: {
489-
// type: 'generated-index'
490-
// },
491-
// items: [
492-
// 'standards/index'
493-
// ]
494-
// },
495467
{
496468
type: 'doc',
497469
id: 'faq/index',

‎standards/certification/overview.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This is a list of clouds that we test on a nightly basis against the certificate
1313

1414
| Name | Description | Operator | _SCS-compatible IaaS_ Compliance | HealthMon |
1515
| -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- | ----------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------: |
16-
| [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/)--> |
16+
| [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/) |
1717
| [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) |
1818
| [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/) |
1919
| [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)--> |

‎static/data/architecturalOverviewData.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,14 @@
3131
"stable": "true"
3232
},
3333
{
34-
"title": "Automated Pentesting",
35-
"url": "/docs/operating-scs/components/automated-pentesting/overview",
34+
"title": "Automated Pentesting IaaS",
35+
"url": "/docs/operating-scs/components/automated-pentesting-iaas/overview",
36+
"mandatory": "true",
37+
"stable": "true"
38+
},
39+
{
40+
"title": "Automated Pentesting KaaS",
41+
"url": "/docs/operating-scs/components/automated-pentesting-kaas/overview",
3642
"mandatory": "true",
3743
"stable": "true"
3844
}

‎static/data/featureContentData.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
{
99
"title": "Releases",
10-
"body": "SCS is currently in Release 6. Check out the latest Release Notes.",
11-
"url": "/docs/releases/Release6",
10+
"body": "SCS is currently in Release 7. Check out the latest Release Notes.",
11+
"url": "/docs/releases/Release7",
1212
"buttonText": "Learn More"
1313
},
1414
{

0 commit comments

Comments
 (0)