Diff of Infrastructure And Operations/Inventory at 61a3ed0

diff --git a/infrastructure_and_operations/inventory.myco b/infrastructure_and_operations/inventory.myco
index 705e5a7..6e5f280 100644
--- a/infrastructure_and_operations/inventory.myco
+++ b/infrastructure_and_operations/inventory.myco
@@ -15,3 +15,3 @@ img {
 This diagram was created with https://app.diagrams.net/.
-To edit it, download the [[infrastructure_and_operations/inventory/overview.drawio | diagram file]] and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
+To edit it, download the [[infrastructure_and_operations/inventory/overview.drawio | diagram file]] and edit it with the https://app.diagrams.net/ web application, or you may run the application from [[https://github.com/jgraph/drawio | source]] if you wish.
 
@@ -22,3 +22,3 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
    - cyberia's first rack server, installed in  CyberWurx datacenter in Atlanta Georgia
-   - j3s is the only authorized support contact right now and the only one who can log into the CyberWurx portal
+   - j3s and forest are the only authorized support contacts on the CyberWurx portal right now
 
@@ -29,6 +29,6 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
 
- - magnataur
-   - dynamic(ish) ip address
-   - NOTE: magnataur uses port 3216 for ssh. connect with `ssh -p 3216 magnataur.cyberia.club`
-   - olde desktop located in j3s's house
+ - ~~magnataur~~
+   - ~~dynamic(ish) ip address~~
+   - ~~NOTE: magnataur uses port 3216 for ssh. connect with `ssh -p 3216 magnataur.cyberia.club`~~
+   - ~~olde desktop located in j3s's house~~
 
@@ -36,3 +36,3 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
 
-  - namecheap
+  - namecheap.com
     - fack's namecheap account is currently being used to manage DNS entires for:
@@ -41,3 +41,3 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
       - capsul.org
-    - all DNS updates are being done manually by j3s.
+    - all DNS updates are being done manually by j3s/forest.
     - conventions:
@@ -49,3 +49,6 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
     - View metrics, get datacenter information, support tickets, etc
-    - Right now j3s is the only one who can log in / be authorized for support. Can add others though!
+    - Right now j3s/forest are the only one who can log in / be authorized for support. Can add others though!
+
+  - Capsul.org
+    - Cyberia has an internal capsul account that we use. If you want access to this account, talk to j3s, vvesley, or forest.
 
@@ -53,3 +56,3 @@ To edit it, download the [[infrastructure_and_operations/inventory/overview.draw
 
-Most of cyberia's services run on [Capsul](https://capsul.org), our Virtual Machine Management tool & service.
+Most of cyberia's services run on [[https://capsul.org | Capsul]], our Virtual Machine Management tool & service.
 
@@ -60,4 +63,4 @@ capsul-c04bbf593b  f1-s   69.61.2.246  alpine311  Jun 01 2020 raaz.cyberia.club
 capsul-pfgy2tthx9  f1-xs  69.61.2.167  alpine311  May 10 2020 legion.cyberia.club     (postgres for forge & others in the future)
-capsul-id502edkg0  f1-xs  69.61.2.170  alpine311  Apr 01 2020 rosewater.cyberia.club  (cyberia forge)
-capsul-t6tfb2dh5p  f1-m   69.61.2.183  alpine311  May 10 2020 mothership.cyberia.club (prometheus & grafana & future logg agg)
+capsul-id502edkg0  f1-xs  69.61.2.170  alpine311  Apr 01 2020 rosewater.cyberia.club  (cyberia forge, concourse server)
+capsul-t6tfb2dh5p  f1-m   69.61.2.183  alpine311  May 10 2020 mothership.cyberia.club (prometheus & grafana & future log agg)
 capsul-w6hsx09r7v  f1-xs  69.61.2.213  alpine311  Aug 20 2020 leckie.cyberia.club     (ansible bastion + build submitter)
@@ -69,3 +72,4 @@ capsul-yi9ffqbjly  f1-x   69.61.2.188  debian10   Apr 15 2020 btcpay.cyberia.clu
 cvm-lqj2x9nxic	   f1-l   69.61.2.190  debian10   Mar 07 2020 matrix.cyberia.club     (cyberia matrix) 
-cvm-m1tjv0lljd	   f1-xs  69.61.2.178  debian10   Mar 10 2020 elliot.cyberia.club     (websites & git.cyberia.club, nullhex.com)
+cvm-m1tjv0lljd	   f1-xs  69.61.2.178  debian10   Mar 10 2020 elliot.cyberia.club     (websites, this wiki, nullhex.com)
+capsul-sbsmrkpgx7  f1-xs  69.61.38.199 debian10   Aug 01 2021 paimon.cyberia.club     (git.cyberia.club)
 ```
@@ -74,4 +78,2 @@ The Ansible Managed servers should have a user account for each user. The Legacy
 
-Contact j3s, forest, or vvesley for more information on cyberia's capsul account.
-
 #### Host Key Fingerprints
@@ -129,6 +131,2 @@ elliot.cyberia.club
 
-btcpay.cyberia.club
-  ECDSA    SHA256:CdqdUvG0Obfdq9kkeQSETVhSJO2oCAdEAjDCydQWcDI
-  ED25519  SHA256:WcjrJtvev3+rAu98TFGJoxx/CytLCg+GfEXBMVOl5Hw
-
 comet.cyberia.club
@@ -140,2 +138,6 @@ kindred.cyberia.club
   ED25519  SHA256:wCyMJYgoPAwlFKTXw41v/q8kypuand4fmhY4zsWdGlc
+
+paimon.cyberia.club
+  ECDSA    SHA256:IILubNkDwqzi1/6l5UCm24MvoxyxB6Y/m0BGWSmePZ0
+  ED25519  SHA256:UsYrMq7nqxAND81Qzpgpzqz5ZxC/or6T0KIikM0tY9Q
 ```
@@ -149,2 +151,3 @@ Ansible bastion host/automation is on leckie.cyberia.club
 
+
 ## Service Inventory
@@ -153,25 +156,40 @@ Ansible bastion host/automation is on leckie.cyberia.club
 |-----------------------|-------------------------|-------------------------|-----------------------|--------------------|-------------------|
-|cyberia's matrix server|https://matrix.cyberia.club/|         synapse         |  matrix.cyberia.club  | [ansible/roles/synapse](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/synapse) | [matrix-org/synapse](https://github.com/matrix-org/synapse) |
-|cyberia's matrix server|https://riot.cyberia.club/| element (used to be called riot) |  matrix.cyberia.club  | [ansible/roles/riot](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/riot) | [vector-im/element-web](https://github.com/vector-im/element-web) |
-|cyberia's matrix server| N/A                       |  postgres |  matrix.cyberia.club  | [ansible/roles/postgresql](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/postgresql) |  [git.postgresql.org](https://git.postgresql.org/git/postgresql.git) |
-|cyberia's matrix server| N/A                       |  irc bridge to freenode    |  matrix.cyberia.club  |     TBD    | [matrix-org/matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc) |
-|cyberia's matrix server| https://matrix.cyberia.club/_synapse/metrics | matrix prometheus exporter |  matrix.cyberia.club  |     TBD    | [matrix-org/synapse/metrics](https://github.com/matrix-org/synapse/tree/develop/synapse/metrics) |
-|nullhex email          | https://nullhex.com/      | alps |  elliot.cyberia.club  |     TBD    | [~emersion/alps/](https://sr.ht/~emersion/alps/) |
-|nullhex email          | nullhex.com ports 25 & 587 (STARTTLS) | opensmtpd |  domechild.cyberia.club  |     [ansible/roles/opensmtpd](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/opensmtpd)    | [OpenSMTPD/OpenSMTPD](https://github.com/OpenSMTPD/OpenSMTPD/) |
-|nullhex email          | nullhex.com:993 (imap)   | dovecot |  domechild.cyberia.club  |     [ansible/roles/dovecot](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/dovecot)    | [dovecot/core](https://github.com/dovecot/core) |
-|nullhex email          | N/A                       | rspamd  |  domechild.cyberia.club  |     TBD    | [rspamd/rspamd](https://github.com/rspamd/rspamd) |
-| capsul                | https://capsul.org       | capsul | baikal.cyberia.club | TBD       | [~forest/capsul-flask/](https://giit.cyberia.club/~forest/capsul-flask/) |
-| forge (cyberia's git server) |https://forge.cyberia.club/ | sourcehut | rosewater.cyberia.club |      [see the ops-handbook](https://git.cyberia.club/services/ops-handbook/tree/docs/forge.md)       | [~sircmpwn/sourcehut](https://sr.ht/~sircmpwn/sourcehut/) |
-| forge (cyberia's git server) |N/A                | postgres | legion.cyberia.club |     TBD    | [git.postgresql.org](https://git.postgresql.org/git/postgresql.git) |
-| concourse (the new build server) | https://concourse.cyberia.club/ | concourse | rosewater.cyberia.club | TBD | [concourse/concourse](https://github.com/concourse/concourse) |
-| vault (build secrets manager) | N/A | vault | rosewater.cyberia.club | [ansible/roles/concourse-vault](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/concourse-vault/files) | [hashicorp/vault](https://github.com/hashicorp/vault) |
-| cyberia's website     | https://cyberia.club/    | nginx static site   | elliot.cyberia.club |     TBD    | [services/website](https://git.cyberia.club/services/website/) |
-| the old git server    | https://git.cyberia.club/ | cgit   | elliot.cyberia.club |     TBD    | [git.zx2c4.com/cgit](https://git.zx2c4.com/cgit/) |
-| prometheus   | https://prometheus.cyberia.club/ | prometheus   | mothership.cyberia.club | [rules](https://git.cyberia.club/services/ops-handbook/tree/rules) & [ansible/roles/prometheus](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/prometheus) | [prometheus/prometheus](https://github.com/prometheus/prometheus) |
-| alertmanager   | N/A                            | alertmanager   | mothership.cyberia.club | same as prometheus | [prometheus/alertmanager](https://github.com/prometheus/alertmanager) |
-| grafana          | https://grafana.cyberia.club/ | grafana   | mothership.cyberia.club | [ansible/roles/grafana](https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/grafana) | [grafana/grafana](https://github.com/grafana/grafana) |
-| Jackal           | https://bot.j3s.sh            |   go-neb (matrix bot)  | mothership.cyberia.club | TBD | [matrix-org/go-neb (forest's fork)](https://giit.cyberia.club/~forest/go-neb/log/forest-feature-rebase-2) |
-| Stream           | https://stream.cyberia.club            | owncast   | comet.cyberia.club | TBD | [owncast/owncast](https://github.com/owncast/owncast) |
-| Mastodon           | https://social.cyberia.club            | hometown   | kindred.cyberia.club | TBD | [hometown-fork/hometown](https://github.com/hometown-fork/hometown) |
-
+|cyberia's matrix server|https://matrix.cyberia.club/|         synapse         |  matrix.cyberia.club  | [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/synapse | ansible/roles/synapse ]] | [[ https://github.com/matrix-org/synapse | matrix-org/synapse ]] |
+|cyberia's matrix server|https://riot.cyberia.club/| element (used to be called riot) |  matrix.cyberia.club  | [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/riot | ansible/roles/riot ]] | [[ https://github.com/vector-im/element-web | vector-im/element-web ]] |
+|cyberia's matrix server| N/A                       |  postgres |  matrix.cyberia.club  | [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/postgresql | ansible/roles/postgresql ]] |  [[ https://git.postgresql.org/git/postgresql.git | git.postgresql.org ]] |
+|cyberia's matrix server| N/A                       |  irc bridge to freenode    |  matrix.cyberia.club  |     TBD    | [[ https://github.com/matrix-org/matrix-appservice-irc | matrix-org/matrix-appservice-irc ]] |
+|cyberia's matrix server| https://matrix.cyberia.club/_synapse/metrics | matrix prometheus exporter |  matrix.cyberia.club  |     TBD    | [[ https://github.com/matrix-org/synapse/tree/develop/synapse/metrics | matrix-org/synapse/metrics ]] |
+|nullhex email          | https://nullhex.com/      | alps |  elliot.cyberia.club  |     TBD    | [[ https://sr.ht/~emersion/alps/ | ~emersion/alps/ ]] |
+|nullhex email          | nullhex.com ports 25 & 587 (STARTTLS) | opensmtpd |  domechild.cyberia.club  |     [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/opensmtpd | ansible/roles/opensmtpd ]]    | [[ https://github.com/OpenSMTPD/OpenSMTPD/ | OpenSMTPD/OpenSMTPD ]] |
+|nullhex email          | nullhex.com:993 (imap)   | dovecot |  domechild.cyberia.club  |     [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/dovecot | ansible/roles/dovecot ]]    | [[ https://github.com/dovecot/core | dovecot/core ]] |
+|nullhex email          | N/A                       | rspamd  |  domechild.cyberia.club  |     TBD    | [[ https://github.com/rspamd/rspamd | rspamd/rspamd ]] |
+| capsul                | https://capsul.org       | capsul | baikal.cyberia.club | TBD       | [[ https://giit.cyberia.club/~forest/capsul-flask/ | ~forest/capsul-flask/ ]] |
+| cyberia's git server | https://git.cyberia.club/ | gitea ( | paimon.cyberia.club |   TBD       | [[ https://gitea.com/ | gitea ]] |
+| cyberias mailing lists | https://lists.cyberia.club/ | postgres | legion.cyberia.club |     TBD    | [[ https://git.postgresql.org/git/postgresql.git | git.postgresql.org ]] |
+| concourse (the new build server) | https://concourse.cyberia.club/ | concourse | rosewater.cyberia.club | TBD | [[ https://github.com/concourse/concourse | concourse/concourse ]] |
+| vault (build secrets manager) | N/A | vault | rosewater.cyberia.club | [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/concourse-vault/files | ansible/roles/concourse-vault ]] | [[ https://github.com/hashicorp/vault | hashicorp/vault ]] |
+| cyberia's website     | https://cyberia.club/    | nginx static site   | elliot.cyberia.club |     TBD    | [[ https://git.cyberia.club/services/website/ | services/website ]] |
+| prometheus   | https://prometheus.cyberia.club/ | prometheus   | mothership.cyberia.club | [[ https://git.cyberia.club/services/ops-handbook/tree/rules | rules ]] & [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/prometheus | ansible/roles/prometheus ]] | [[ https://github.com/prometheus/prometheus | prometheus/prometheus ]] |
+| alertmanager   | N/A                            | alertmanager   | mothership.cyberia.club | same as prometheus | [[ https://github.com/prometheus/alertmanager | prometheus/alertmanager ]] |
+| grafana          | https://grafana.cyberia.club/ | grafana   | mothership.cyberia.club | [[ https://git.cyberia.club/services/ops-handbook/tree/ansible/roles/grafana | ansible/roles/grafana ]] | [[ https://github.com/grafana/grafana | grafana/grafana ]] |
+| Jackal           | https://bot.j3s.sh            |   go-neb (matrix bot)  | mothership.cyberia.club | TBD | [[ https://giit.cyberia.club/~forest/go-neb/log/forest-feature-rebase-2 | matrix-org/go-neb (forest's fork) ]] |
+| Stream           | https://stream.cyberia.club            | owncast   | comet.cyberia.club | TBD | [[ https://github.com/owncast/owncast | owncast/owncast ]] |
+| Mastodon           | https://social.cyberia.club            | hometown   | kindred.cyberia.club | TBD | [[https://github.com/hometown-fork/hometown | hometown-fork/hometown]] |
+| wiki / cyberdex   | https://wiki.cyberia.club            | Mycorrhiza   | elliot.cyberia.club | TBD | [[ https://github.com/bouncepaw/mycorrhiza | bouncepaw/mycorrhiza]] |
+
+
+## Metrics Inventory
+
+We use Prometheus and Grafana to capture, store, and display metrics related to our services.
+
+There are four main dashboards in grafana:
+
+  - [[ Node Exporter | https://grafana.cyberia.club/d/rYdddlPWk/node-exporter-full?orgId=1 ]]
+    - The prometheus node exporter runs on all of our servers and is [[ https://git.cyberia.club/cyberia/ops-handbook/src/branch/master/ansible/roles/common/tasks/main.yml#L66 | managed by ansible ]]. 
+  - [[ Postgres Overview | https://grafana.cyberia.club/d/wGgaPlciz/postgres-overview?orgId=1 ]]
+    - These metrics are reported by a postgres exporter which was installed manually on matrix.cyberia.club and legion.cyberia.club
+  - [[ Cyberia Synapse | https://grafana.cyberia.club/d/000000026/cyberia-synapse?orgId=1 ]]
+    - These metrics are reported by synapse itself. If they are not working, it may be an issue with the reverse proxy in front of synapse. 
+  - [[ Capsul Stats | https://grafana.cyberia.club/d/jMw9xSRMz/capsul-stats?orgId=1 ]]
+    - these metrics are reported by https://git.cyberia.club/cyberia/libvirt_exporter (running on baikal). They are used to generate the graphs in the capsul.org web interface
 
@@ -206,2 +224,7 @@ The following are managed by Caddy on the router which sits in front of magnatau
   - mumble.cyberia.club
+
+paimon.cyberia.club
+The following are managed by something that sanine set up. Ask sanine about this.
+  - git.cyberia.club
+
 ```