From ede5141a85677139c855771f78659d0089ca09c4 Mon Sep 17 00:00:00 2001 From: fmkiotheka <fmkiotheka@inf.ufpr.br> Date: Mon, 10 Jun 2024 01:27:45 -0300 Subject: [PATCH] feat: remove ipmiconfig --- source/_ext/ipmi.py | 125 ------------------- source/conf.py | 1 - source/config/ipmi.toml | 108 ---------------- source/pages/machines/base/azzanadra.md | 3 - source/pages/machines/base/c3sldb2.md | 3 - source/pages/machines/base/duvel.md | 3 - source/pages/machines/base/forsyn.md | 3 - source/pages/machines/base/urquell.md | 3 - source/pages/machines/cluster/c3hpc.md | 3 - source/pages/machines/cluster/node2.md | 3 - source/pages/machines/cluster/node3.md | 3 - source/pages/machines/cluster/node4.md | 3 - source/pages/machines/cluster/node5.md | 3 - source/pages/machines/cluster/node6.md | 3 - source/pages/machines/cluster/node7.md | 3 - source/pages/machines/cluster/proc1.md | 3 - source/pages/machines/cluster/proc2.md | 3 - source/pages/machines/cluster/pti.md | 3 - source/pages/machines/cluster/vti1.md | 3 - source/pages/machines/cluster/vti2.md | 3 - source/pages/machines/lab/orval.md | 3 - source/pages/machines/lab/torneira2.md | 3 - source/pages/machines/lab/torneira3.md | 3 - source/pages/machines/lab/torneira4.md | 3 - source/pages/machines/lab/torneira7.md | 3 - source/pages/machines/lab/zara.md | 4 - source/pages/machines/virtuals/abbey.md | 3 - source/pages/machines/virtuals/barril1.md | 3 - source/pages/machines/virtuals/barril2.md | 3 - source/pages/machines/virtuals/barril3.md | 3 - source/pages/machines/virtuals/barril4.md | 3 - source/pages/machines/virtuals/torneira10.md | 3 - source/pages/machines/virtuals/torneira11.md | 3 - source/pages/machines/virtuals/torneira12.md | 3 - source/pages/machines/virtuals/torneira13.md | 3 - source/pages/machines/virtuals/torneira8.md | 3 - source/pages/machines/virtuals/torneira9.md | 3 - 37 files changed, 337 deletions(-) delete mode 100644 source/_ext/ipmi.py diff --git a/source/_ext/ipmi.py b/source/_ext/ipmi.py deleted file mode 100644 index ba26578..0000000 --- a/source/_ext/ipmi.py +++ /dev/null @@ -1,125 +0,0 @@ -from sphinx.util.docutils import SphinxDirective -import docutils.nodes as nodes -from pathlib import Path -import tomllib -from ipaddress import ip_address - - -class IpmiconfigDirective(SphinxDirective): - def run(self): - page_name = Path(self.state.document["source"]).stem - with open(Path(self.env.app.srcdir) / "config/ipmi.toml", "rb") as f: - config = tomllib.load(f) - config = config[page_name] - table = nodes.table() - table["classes"] += ["colwidths-auto"] - n_cols = 2 - col_widths = [100 // n_cols] * n_cols - tgroup = nodes.tgroup(cols=len(col_widths)) - table += tgroup - for col_width in col_widths: - colspec = nodes.colspec() - colspec.attributes["colwidth"] = col_width - tgroup += colspec - rows = [] - table_data = [ - (nodes.strong(text="IP do IPMI"), nodes.paragraph(text=config["ip"])), - ( - nodes.strong(text="Acesso do IPMI"), - nodes.paragraph( - text="Padrão" if config["access_type"] == "regular" else "CrÃtico" - ), - ), - ] - if "model" in config: - table_data.append( - ( - nodes.strong(text="Modelo do IPMI"), - nodes.paragraph(text=config["model"]), - ) - ) - for row in table_data: - row_node = nodes.row() - for cell in row: - entry = nodes.entry() - entry += cell - row_node += entry - rows.append(row_node) - tbody = nodes.tbody() - tbody.extend(rows) - tgroup += tbody - - return [ - nodes.raw("", "<details open><summary>IPMI</summary>", format="html"), - table, - nodes.raw("", "</details>", format="html"), - ] - - -class IpmitableDirective(SphinxDirective): - def run(self): - with open(Path(self.env.app.srcdir) / "config/ipmi.toml", "rb") as f: - config = tomllib.load(f) - table = nodes.table() - table["classes"] += ["colwidths-auto"] - n_cols = 4 - col_widths = [100 // n_cols] * n_cols - tgroup = nodes.tgroup(cols=len(col_widths)) - table += tgroup - for col_width in col_widths: - colspec = nodes.colspec() - colspec.attributes["colwidth"] = col_width - tgroup += colspec - table_data = [] - table_data.append( - ( - nodes.strong(text="Host"), - nodes.strong(text="IP"), - nodes.strong(text="Tipo de Acesso"), - nodes.strong(text="Modelo"), - ) - ) - for machine, attributes in sorted( - config.items(), key=lambda x: ip_address(x[1]["ip"]) - ): - table_data.append( - ( - nodes.paragraph(text=machine), - nodes.paragraph(text=attributes["ip"]), - nodes.paragraph( - text="Padrão" - if attributes["access_type"] == "regular" - else "CrÃtico" - ), - nodes.paragraph(text=attributes.get("model", "?")), - ) - ) - rows = [] - for row in table_data: - row_node = nodes.row() - for cell in row: - entry = nodes.entry() - entry += cell - row_node += entry - rows.append(row_node) - thead = nodes.thead() - thead.extend(rows[:1]) - tgroup += thead - tbody = nodes.tbody() - tbody.extend(rows[1:]) - tgroup += tbody - return [table] - - -def setup(app): - app.add_directive("ipmiconfig", IpmiconfigDirective) - app.add_directive("ipmitable", IpmitableDirective) - return { - "version": "0.1", - "parallel_read_safe": True, - "parallel_write_safe": True, - } - - -# TODO: Warn when a machine config wasn't used -# TODO: Schema validation on TOML diff --git a/source/conf.py b/source/conf.py index 0d9bc7d..d4f9771 100644 --- a/source/conf.py +++ b/source/conf.py @@ -32,7 +32,6 @@ extensions = [ "sphinx_togglebutton", "myst_parser", "inline_svgbob", - "ipmi", ] myst_enable_extensions = [ diff --git a/source/config/ipmi.toml b/source/config/ipmi.toml index 467a15b..0ab3675 100644 --- a/source/config/ipmi.toml +++ b/source/config/ipmi.toml @@ -1,47 +1,7 @@ -[abbey] -ip="192.168.1.41" -access_type="critical" -model="SGI" - -[barril1] -ip="192.168.1.21" -access_type="regular" -model="supermicro" - -[barril2] -ip="192.168.1.22" -access_type="regular" -model="supermicro" - -[barril3] -ip="192.168.1.23" -access_type="regular" -model="supermicro" - -[barril4] -ip="192.168.1.24" -access_type="regular" -model="supermicro" - [c3hpc] ip="192.168.1.101" access_type="regular" -[azzanadra] -ip="192.168.1.31" -access_type="regular" -model="Intel" - -[c3sldb2] -ip="192.168.1.2" -access_type="regular" -model="Intel" - -[duvel] -ip="192.168.1.42" -access_type="critical" -model="SGI" - [node2] ip="192.168.1.102" access_type="regular" @@ -66,11 +26,6 @@ access_type="regular" ip="192.168.1.107" access_type="regular" -[orval] -ip="192.168.1.46" -access_type="regular" -model="SGI" - [proc1] ip="192.168.1.111" access_type="regular" @@ -83,61 +38,6 @@ access_type="regular" ip="192.168.1.110" access_type="regular" -[torneira2] -ip="192.168.1.45" -access_type="regular" -model="Intel" - -[torneira3] -ip="192.168.1.3" -access_type="regular" -model="Intel" - -[torneira4] -ip="192.168.1.4" -access_type="regular" -model="Intel" - -[torneira7] -ip="192.168.1.7" -access_type="regular" -model="SGI" - -[torneira8] -ip="192.168.1.8" -access_type="regular" -model="supermicro" - -[torneira9] -ip="192.168.1.9" -access_type="regular" -model="supermicro" - -[torneira10] -ip="192.168.1.10" -access_type="regular" -model="supermicro" - -[torneira11] -ip="192.168.1.11" -access_type="regular" -model="supermicro" - -[torneira12] -ip="192.168.1.12" -access_type="regular" -model="supermicro" - -[torneira13] -ip="192.168.1.13" -access_type="regular" -model="supermicro" - -[urquell] -ip="192.168.1.43" -access_type="critical" -model="supermicro" - [vti1] ip="192.168.1.108" access_type="regular" @@ -145,11 +45,3 @@ access_type="regular" [vti2] ip="192.168.1.109" access_type="regular" - -[forsyn] -ip="192.168.1.33" -access_type="regular" - -[zara] -ip="192.168.1.32" -access_type="regular" diff --git a/source/pages/machines/base/azzanadra.md b/source/pages/machines/base/azzanadra.md index 0a72dd2..8dc6bee 100644 --- a/source/pages/machines/base/azzanadra.md +++ b/source/pages/machines/base/azzanadra.md @@ -1,6 +1,3 @@ # Azzanadra -```{ipmiconfig} -``` - A Azzanadra é a máquina destinada ao backup do LAMIR. diff --git a/source/pages/machines/base/c3sldb2.md b/source/pages/machines/base/c3sldb2.md index 48336b6..7ba9288 100644 --- a/source/pages/machines/base/c3sldb2.md +++ b/source/pages/machines/base/c3sldb2.md @@ -1,6 +1,3 @@ # c3sldb2 -```{ipmiconfig} -``` - A c3sldb2 é uma máquina de banco de dados. diff --git a/source/pages/machines/base/duvel.md b/source/pages/machines/base/duvel.md index 3b477a4..5ca16d8 100644 --- a/source/pages/machines/base/duvel.md +++ b/source/pages/machines/base/duvel.md @@ -21,9 +21,6 @@ - [ZFS RAIDZ2](/pages/concepts/zfs) 67 TiB ::: -```{ipmiconfig} -``` - A duvel é a máquina fÃsica que faz backup e permite o acesso ao parque computacional. É possÃvel acessar a duvel externamente através do endereço `duvel.c3sl.ufpr.br`. Em algumas redes internas, porém, as regras de firewall barram o acesso, sendo diff --git a/source/pages/machines/base/forsyn.md b/source/pages/machines/base/forsyn.md index b87d069..8606274 100644 --- a/source/pages/machines/base/forsyn.md +++ b/source/pages/machines/base/forsyn.md @@ -42,9 +42,6 @@ - Rack 3 ::: -```{ipmiconfig} -``` - A Forsyn é a máquina fÃsica responsável pelo monitoramento do hardware e serviços. Essa tarefa compreende o monitoramento através do uso do Zabbix, armazenamento de logs e execução de scripts verificadores de segurança e de disponibilidade. diff --git a/source/pages/machines/base/urquell.md b/source/pages/machines/base/urquell.md index f1b3968..e77dc8e 100644 --- a/source/pages/machines/base/urquell.md +++ b/source/pages/machines/base/urquell.md @@ -21,9 +21,6 @@ - [](/pages/concepts/ext4) [MD RAID10](/pages/concepts/md) 22T ::: -```{ipmiconfig} -``` - A Urquell é a máquina fÃsica que gerencia o DINF que acabou recebendo a tarefa de também gerenciar o C3SL. Ela é uma parte crÃtica da infraestrutura, pois contém muitos serviços essenciais para o funcionamento do departamento e do diff --git a/source/pages/machines/cluster/c3hpc.md b/source/pages/machines/cluster/c3hpc.md index 3d41593..acaae20 100644 --- a/source/pages/machines/cluster/c3hpc.md +++ b/source/pages/machines/cluster/c3hpc.md @@ -1,6 +1,3 @@ # c3hpc -```{ipmiconfig} -``` - A c3phc é a gerenciadora do cluster do C3SL. diff --git a/source/pages/machines/cluster/node2.md b/source/pages/machines/cluster/node2.md index 840307c..487e328 100644 --- a/source/pages/machines/cluster/node2.md +++ b/source/pages/machines/cluster/node2.md @@ -1,6 +1,3 @@ # node2 -```{ipmiconfig} -``` - O node2 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/node3.md b/source/pages/machines/cluster/node3.md index 8bb2e4e..44f91ad 100644 --- a/source/pages/machines/cluster/node3.md +++ b/source/pages/machines/cluster/node3.md @@ -1,6 +1,3 @@ # node3 -```{ipmiconfig} -``` - O node3 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/node4.md b/source/pages/machines/cluster/node4.md index 672b73d..b758fe2 100644 --- a/source/pages/machines/cluster/node4.md +++ b/source/pages/machines/cluster/node4.md @@ -1,6 +1,3 @@ # node4 -```{ipmiconfig} -``` - O node4 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/node5.md b/source/pages/machines/cluster/node5.md index 3d1cae4..93d5f08 100644 --- a/source/pages/machines/cluster/node5.md +++ b/source/pages/machines/cluster/node5.md @@ -1,6 +1,3 @@ # node5 -```{ipmiconfig} -``` - O node5 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/node6.md b/source/pages/machines/cluster/node6.md index 57dcc28..b39e1d3 100644 --- a/source/pages/machines/cluster/node6.md +++ b/source/pages/machines/cluster/node6.md @@ -1,6 +1,3 @@ # node6 -```{ipmiconfig} -``` - O node6 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/node7.md b/source/pages/machines/cluster/node7.md index d301d06..9f6903e 100644 --- a/source/pages/machines/cluster/node7.md +++ b/source/pages/machines/cluster/node7.md @@ -1,6 +1,3 @@ # node7 -```{ipmiconfig} -``` - O node7 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/proc1.md b/source/pages/machines/cluster/proc1.md index f1c381d..40ce5a9 100644 --- a/source/pages/machines/cluster/proc1.md +++ b/source/pages/machines/cluster/proc1.md @@ -1,6 +1,3 @@ # proc1 -```{ipmiconfig} -``` - O proc1 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/proc2.md b/source/pages/machines/cluster/proc2.md index 5bdcc79..1af8fea 100644 --- a/source/pages/machines/cluster/proc2.md +++ b/source/pages/machines/cluster/proc2.md @@ -1,6 +1,3 @@ # proc2 -```{ipmiconfig} -``` - O proc2 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/pti.md b/source/pages/machines/cluster/pti.md index 92917e3..696a5be 100644 --- a/source/pages/machines/cluster/pti.md +++ b/source/pages/machines/cluster/pti.md @@ -1,6 +1,3 @@ # pti -```{ipmiconfig} -``` - O pti é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/vti1.md b/source/pages/machines/cluster/vti1.md index cf3f57c..4f37056 100644 --- a/source/pages/machines/cluster/vti1.md +++ b/source/pages/machines/cluster/vti1.md @@ -1,6 +1,3 @@ # vti1 -```{ipmiconfig} -``` - O vti1 é um nó de processamento do cluster. diff --git a/source/pages/machines/cluster/vti2.md b/source/pages/machines/cluster/vti2.md index 7aa443d..33445c2 100644 --- a/source/pages/machines/cluster/vti2.md +++ b/source/pages/machines/cluster/vti2.md @@ -1,6 +1,3 @@ # vti2 -```{ipmiconfig} -``` - O vti2 é um nó de processamento do cluster. diff --git a/source/pages/machines/lab/orval.md b/source/pages/machines/lab/orval.md index 0dd492e..53083d5 100644 --- a/source/pages/machines/lab/orval.md +++ b/source/pages/machines/lab/orval.md @@ -1,6 +1,3 @@ # orval -```{ipmiconfig} -``` - A orval é uma máquina de processamento que possui GPUs da Nvidia. diff --git a/source/pages/machines/lab/torneira2.md b/source/pages/machines/lab/torneira2.md index b736542..f203caa 100644 --- a/source/pages/machines/lab/torneira2.md +++ b/source/pages/machines/lab/torneira2.md @@ -1,6 +1,3 @@ # torneira2 -```{ipmiconfig} -``` - A torneira2 está atualmente reservada para experimentos. diff --git a/source/pages/machines/lab/torneira3.md b/source/pages/machines/lab/torneira3.md index 99f4bcd..7ab5962 100644 --- a/source/pages/machines/lab/torneira3.md +++ b/source/pages/machines/lab/torneira3.md @@ -1,6 +1,3 @@ # torneira3 -```{ipmiconfig} -``` - A torneira3 está atualmente reservada para experimentos. diff --git a/source/pages/machines/lab/torneira4.md b/source/pages/machines/lab/torneira4.md index 90fa830..1adca0e 100644 --- a/source/pages/machines/lab/torneira4.md +++ b/source/pages/machines/lab/torneira4.md @@ -1,6 +1,3 @@ # torneira4 -```{ipmiconfig} -``` - A torneira4 está atualmente reservada para experimentos. diff --git a/source/pages/machines/lab/torneira7.md b/source/pages/machines/lab/torneira7.md index d2e9e1f..de04a68 100644 --- a/source/pages/machines/lab/torneira7.md +++ b/source/pages/machines/lab/torneira7.md @@ -1,8 +1,5 @@ # torneira7 -```{ipmiconfig} -``` - A torneira7 hospeda máquinas virtuais perigosas e fica numa VLAN separada chamada planetlab. diff --git a/source/pages/machines/lab/zara.md b/source/pages/machines/lab/zara.md index c99784a..fde2a31 100644 --- a/source/pages/machines/lab/zara.md +++ b/source/pages/machines/lab/zara.md @@ -1,7 +1,3 @@ # zara -```{eval-rst} -.. ipmiconfig:: -``` - A orval é uma máquina de processamento. diff --git a/source/pages/machines/virtuals/abbey.md b/source/pages/machines/virtuals/abbey.md index 2d0b51f..a52154f 100644 --- a/source/pages/machines/virtuals/abbey.md +++ b/source/pages/machines/virtuals/abbey.md @@ -33,9 +33,6 @@ - [](/pages/concepts/ext4) [MD RAID6](/pages/concepts/md) 29.1T ::: -```{ipmiconfig} -``` - A Abbey é a máquina fÃsica responsável pela gerência das máquinas virtuais. ## Serviços diff --git a/source/pages/machines/virtuals/barril1.md b/source/pages/machines/virtuals/barril1.md index e40527d..94344e9 100644 --- a/source/pages/machines/virtuals/barril1.md +++ b/source/pages/machines/virtuals/barril1.md @@ -1,6 +1,3 @@ # barril1 -```{ipmiconfig} -``` - A barril1 armazena dados das máquinas virtuais. diff --git a/source/pages/machines/virtuals/barril2.md b/source/pages/machines/virtuals/barril2.md index ecb0974..98cf66c 100644 --- a/source/pages/machines/virtuals/barril2.md +++ b/source/pages/machines/virtuals/barril2.md @@ -1,6 +1,3 @@ # barril2 -```{ipmiconfig} -``` - A barril2 armazena dados das máquinas virtuais. diff --git a/source/pages/machines/virtuals/barril3.md b/source/pages/machines/virtuals/barril3.md index bd35466..ae8e1fc 100644 --- a/source/pages/machines/virtuals/barril3.md +++ b/source/pages/machines/virtuals/barril3.md @@ -1,6 +1,3 @@ # barril3 -```{ipmiconfig} -``` - A barril3 armazena dados das máquinas virtuais. diff --git a/source/pages/machines/virtuals/barril4.md b/source/pages/machines/virtuals/barril4.md index 2b57ecc..d81a351 100644 --- a/source/pages/machines/virtuals/barril4.md +++ b/source/pages/machines/virtuals/barril4.md @@ -1,6 +1,3 @@ # barril4 -```{ipmiconfig} -``` - A barril4 armazena dados das máquinas virtuais. diff --git a/source/pages/machines/virtuals/torneira10.md b/source/pages/machines/virtuals/torneira10.md index 23a85cd..d6a8ae5 100644 --- a/source/pages/machines/virtuals/torneira10.md +++ b/source/pages/machines/virtuals/torneira10.md @@ -5,8 +5,5 @@ - 512GB ``` -```{ipmiconfig} -``` - A torneira10 hospeda máquinas virtuais de serviços vitais. Ela é acessÃvel apenas através da abbey pois possui IP privado. diff --git a/source/pages/machines/virtuals/torneira11.md b/source/pages/machines/virtuals/torneira11.md index 3e03ab7..ad6798d 100644 --- a/source/pages/machines/virtuals/torneira11.md +++ b/source/pages/machines/virtuals/torneira11.md @@ -5,8 +5,5 @@ - 512GB ``` -```{ipmiconfig} -``` - A torneira11 hospeda máquinas virtuais de serviços vitais. Ela é acessÃvel apenas através da abbey pois possui IP privado. diff --git a/source/pages/machines/virtuals/torneira12.md b/source/pages/machines/virtuals/torneira12.md index 319fd72..74edbf8 100644 --- a/source/pages/machines/virtuals/torneira12.md +++ b/source/pages/machines/virtuals/torneira12.md @@ -5,9 +5,6 @@ - 1TB ``` -```{ipmiconfig} -``` - :::{todo} Essa máquina será renomeada num futuro próximo. ::: diff --git a/source/pages/machines/virtuals/torneira13.md b/source/pages/machines/virtuals/torneira13.md index 8bab9b0..dbdadd7 100644 --- a/source/pages/machines/virtuals/torneira13.md +++ b/source/pages/machines/virtuals/torneira13.md @@ -5,8 +5,5 @@ - 512GB ``` -```{ipmiconfig} -``` - A torneira13 hospeda máquinas virtuais de serviços vitais. Ela é acessÃvel apenas através da abbey pois possui IP privado. diff --git a/source/pages/machines/virtuals/torneira8.md b/source/pages/machines/virtuals/torneira8.md index 8d79945..9105111 100644 --- a/source/pages/machines/virtuals/torneira8.md +++ b/source/pages/machines/virtuals/torneira8.md @@ -5,8 +5,5 @@ - 1TB ``` -```{ipmiconfig} -``` - A torneira8 hospeda máquinas virtuais de serviços não-vitais e projetos. Ela é acessÃvel apenas através da abbey pois possui IP privado. diff --git a/source/pages/machines/virtuals/torneira9.md b/source/pages/machines/virtuals/torneira9.md index ed7278a..d5d7ddf 100644 --- a/source/pages/machines/virtuals/torneira9.md +++ b/source/pages/machines/virtuals/torneira9.md @@ -5,8 +5,5 @@ - 1TB ``` -```{ipmiconfig} -``` - A torneira9 hospeda máquinas virtuais de serviços não-vitais e projetos. Ela é acessÃvel apenas através da abbey pois possui IP privado. -- GitLab