diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ sphinxcontrib-images sphinxcontrib-programoutput sphinx-tabs -sphinx-panels +sphinx-design sphinx-reredirects sphinx_rtd_theme sphinx-click diff --git a/swh/docs/sphinx/conf.py b/swh/docs/sphinx/conf.py --- a/swh/docs/sphinx/conf.py +++ b/swh/docs/sphinx/conf.py @@ -40,7 +40,7 @@ # swh.scheduler inherits some attribute descriptions from celery that use # custom crossrefs (eg. :setting:`task_ignore_result`) "sphinx_celery.setting_crossref", - "sphinx_panels", + "sphinx_design", ] # Add any paths that contain templates here, relative to this directory. diff --git a/sysadm/mirror-operations/planning.rst b/sysadm/mirror-operations/planning.rst --- a/sysadm/mirror-operations/planning.rst +++ b/sysadm/mirror-operations/planning.rst @@ -117,65 +117,68 @@ Storage backend ^^^^^^^^^^^^^^^ -.. tabbed:: Postgresql +.. tab-set:: - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - storage postgresql 1 512GB fast+zfs (lz4) 40TB - ================ ====================== ========= ===== ============== ============== + .. tab-item:: Postgresql -.. tabbed:: Cassandra (min.)* + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + storage postgresql 1 512GB fast+zfs (lz4) 40TB + ================ ====================== ========= ===== ============== ============== - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - storage cassandra 3 32GB fast 30TB - ================ ====================== ========= ===== ============== ============== + .. tab-item:: Cassandra (min.)* -.. tabbed:: Cassandra (typ.)* + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + storage cassandra 3 32GB fast 30TB + ================ ====================== ========= ===== ============== ============== - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - storage cassandra 6+ 32GB fast 20TB - ================ ====================== ========= ===== ============== ============== + .. tab-item:: Cassandra (typ.)* + + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + storage cassandra 6+ 32GB fast 20TB + ================ ====================== ========= ===== ============== ============== Objstorage backend ^^^^^^^^^^^^^^^^^^ - -.. tabbed:: FS - - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - objstorage swh-objstorage 1 [#f1]_ 512GB zfs (with lz4) 1PB - ================ ====================== ========= ===== ============== ============== - -.. tabbed:: Winery - Ceph* - - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - objstorage swh-objstorage 2 [#f2]_ 32GB standard 100GB - winery-db postgresql 2 [#f2]_ 512GB fast 10TB - ceph-mon ceph 3 4GB fast 60GB - ceph-osd ceph 12+ 4GB mix fast+HDD 1PB (total) - ================ ====================== ========= ===== ============== ============== - -.. tabbed:: Seaweedfs* - - ================ ====================== ========= ===== ============== ============== - SWH Service Tool Instances RAM Storage Type Storage Volume - ================ ====================== ========= ===== ============== ============== - objstorage swh-objstorage 3 32GB standard 100GB - seaweed LB nginx 1 32GB fast 100GB - seaweed-master seaweedfs 3 8GB standard 10GB - seaweed-filer seaweedfs 3 32GB fast 1TB - seaweed-volume seaweedfs 3+ 32GB standard 1PB (total) - ================ ====================== ========= ===== ============== ============== +.. tab-set:: + + .. tab-item:: FS + + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + objstorage swh-objstorage 1 [#f1]_ 512GB zfs (with lz4) 1PB + ================ ====================== ========= ===== ============== ============== + + .. tab-item:: Winery - Ceph* + + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + objstorage swh-objstorage 2 [#f2]_ 32GB standard 100GB + winery-db postgresql 2 [#f2]_ 512GB fast 10TB + ceph-mon ceph 3 4GB fast 60GB + ceph-osd ceph 12+ 4GB mix fast+HDD 1PB (total) + ================ ====================== ========= ===== ============== ============== + + .. tab-item:: Seaweedfs* + + ================ ====================== ========= ===== ============== ============== + SWH Service Tool Instances RAM Storage Type Storage Volume + ================ ====================== ========= ===== ============== ============== + objstorage swh-objstorage 3 32GB standard 100GB + seaweed LB nginx 1 32GB fast 100GB + seaweed-master seaweedfs 3 8GB standard 10GB + seaweed-filer seaweedfs 3 32GB fast 1TB + seaweed-volume seaweedfs 3+ 32GB standard 1PB (total) + ================ ====================== ========= ===== ============== ============== .. rubric:: Notes