diff --git a/_inventory/bbb.md b/_inventory/bbb.md
index e3397d94f966bf0dd01d2e4863a840ee4f9bcfab..27a32336a4f06b5f59ae412799f77c736082ea7f 100644
--- a/_inventory/bbb.md
+++ b/_inventory/bbb.md
@@ -11,6 +11,7 @@ uid: 685bb816-f21f-4630-8fe3-68cf3547bf8a
 parent: fd4cfe6e-2543-47a4-8eac-389379db0197
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:bbb
 calcolor: "#000000"
+out_of_service: false
 ldap: true
 infra_url: https://sediment.chaotikum.org/
 sets: 
diff --git a/_inventory/bbb_container.md b/_inventory/bbb_container.md
index 0ca6164f02a14a4821d74cb222bbc782b3129252..25f5de8b46041f1bdce16d1aaecc28d280951893 100644
--- a/_inventory/bbb_container.md
+++ b/_inventory/bbb_container.md
@@ -6,6 +6,7 @@ uid: fd4cfe6e-2543-47a4-8eac-389379db0197
 parent: 9d3a25bc-5629-4369-abb3-6a1a95598449
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:bbb
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/bbb_greenlight.md b/_inventory/bbb_greenlight.md
index adc94d41a19983b2c19c0508d5da1aa1677b187b..f1375ce03bf56c85ad467a3d364bda37c75b9b34 100644
--- a/_inventory/bbb_greenlight.md
+++ b/_inventory/bbb_greenlight.md
@@ -11,6 +11,7 @@ uid: 9da97da3-9b43-4b44-9111-4794a4da1c54
 parent: fd4cfe6e-2543-47a4-8eac-389379db0197
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:bbb
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/case.md b/_inventory/case.md
index 945b1a75a3112fab8587949233c631afaaf55677..334ce8b1091e78ceee7a9124447cbb2f01b4e79b 100644
--- a/_inventory/case.md
+++ b/_inventory/case.md
@@ -4,6 +4,7 @@ name: "Case"
 #https://www.uuidgenerator.net/
 uid: da38c6fc-69a1-490d-9b0d-473c74dd253b
 wikilink: https://wiki.chaotikum.org/infrastruktur:server:case
+out_of_service: false
 calcolor: "#000000"
 sets: 
  - server
diff --git a/_inventory/chaotikumwebsite.md b/_inventory/chaotikumwebsite.md
new file mode 100644
index 0000000000000000000000000000000000000000..af5fc2822606fcea4bc4db1fa36754591a587490
--- /dev/null
+++ b/_inventory/chaotikumwebsite.md
@@ -0,0 +1,20 @@
+---
+layout: infra
+name: "Chaotikum Website"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "chaotikum"
+cpe_product: "chaotikum-website"
+cpe_version: "2024-6"
+#https://www.uuidgenerator.net/
+uid: 4a5f732f-bba4-4240-b28e-ffb6432326bd
+parent: 25f5ff9b-015d-4a97-8ef0-35006fb9fc22
+wikilink: https://wiki.chaotikum.org/howto:chaotikumwebsite
+calcolor: "#000000"
+out_of_service: false
+infra_url: https://chaotikum.org
+sets: 
+ - software
+---
+
+Die Website des Chaotikum unter chaotikum.org, welche neben dem öffentlichen Bog eine art zentrale Informations-Drehscheibe innerhalb der Infrastruktur darstellt.
\ No newline at end of file
diff --git a/_inventory/chaotikumwebsite_container.md b/_inventory/chaotikumwebsite_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..ca8b81a097c4f76d9b32fbac5e0fe12aea39fbaa
--- /dev/null
+++ b/_inventory/chaotikumwebsite_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "chaotikum-website (Container)"
+# https://www.uuidgenerator.net/
+uid: 25f5ff9b-015d-4a97-8ef0-35006fb9fc22
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:md
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/docker01_container.md b/_inventory/docker01_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..d9f1bcc37b699e8e6e5bc8356f1189c892074937
--- /dev/null
+++ b/_inventory/docker01_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "docker01 (Container)"
+# https://www.uuidgenerator.net/
+uid: 9411847a-dcdf-4f13-b900-e18cd3102efe
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:docker01
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/dokuwiki.md b/_inventory/dokuwiki.md
index aba763d11c499bef760e6cdf7461cf6a7a6028c6..95aa40b445b6f5e6e27a82b02f6c8a5ab975b71b 100644
--- a/_inventory/dokuwiki.md
+++ b/_inventory/dokuwiki.md
@@ -12,6 +12,7 @@ parent: 39e06115-0ad2-4d72-ad96-a6f9db0bea94
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:dokuwiki
 calcolor: "#000000"
 ldap: true
+out_of_service: false
 infra_url: https://wiki.chaotikum.org/
 sets: 
  - software
diff --git a/_inventory/dokuwiki_container.md b/_inventory/dokuwiki_container.md
index f0c53b60faa0736bb035768b6be85ce08e3a8418..02c776f4805fbb29c651f644fe188cb850b7aa07 100644
--- a/_inventory/dokuwiki_container.md
+++ b/_inventory/dokuwiki_container.md
@@ -1,11 +1,12 @@
 ---
 layout: infra
-name: "Dokuwiki (Container)"
+name: "dokuwiki (Container)"
 # https://www.uuidgenerator.net/
 uid: 39e06115-0ad2-4d72-ad96-a6f9db0bea94
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:dokuwiki
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/elasticsearch_zammad.md b/_inventory/elasticsearch_zammad.md
index d96395732946af9e81ed300819234c8d8a21e615..25db3886bb9489282b3535312a861af37dc50f3e 100644
--- a/_inventory/elasticsearch_zammad.md
+++ b/_inventory/elasticsearch_zammad.md
@@ -11,6 +11,7 @@ uid: 5c69a504-ea97-4c98-b487-ef2d14064a4d
 parent: 1c666e4c-50ea-42a1-8a4c-1a5c9c6b9cbd
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:zammad
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/listmonk_container.md b/_inventory/ffhl-mcast-streamer_container.md
similarity index 50%
rename from _inventory/listmonk_container.md
rename to _inventory/ffhl-mcast-streamer_container.md
index e2d4fd1347e9d3ea8e0f944488f885037c994177..71894bacb63c467b1ae1b9435ca4d362264d4eab 100644
--- a/_inventory/listmonk_container.md
+++ b/_inventory/ffhl-mcast-streamer_container.md
@@ -1,11 +1,11 @@
 ---
 layout: infra
-name: "Listmonk (Container)"
+name: "ffhl-mcast-streamer (Container)"
 # https://www.uuidgenerator.net/
-uid: ea3d14dc-b745-4fe0-a3f8-5349c5b39016
+uid: 849d7ba8-9be3-4fe2-9e58-0278c7da9d48
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
-wikilink: https://wiki.chaotikum.org/infrastruktur:container:listmonk
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/ffhl-pim6-router_container.md b/_inventory/ffhl-pim6-router_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..5cc803e4890903cc781535c393d53c60ed095c4c
--- /dev/null
+++ b/_inventory/ffhl-pim6-router_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "ffhl-pim6-router (Container)"
+# https://www.uuidgenerator.net/
+uid: 74bc76e3-cfbd-4caa-9deb-d75ac85cc1af
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/ffhl_blackbox_container.md b/_inventory/ffhl_blackbox_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..86370689ccd4e921d9e71ebeca287dabeac28a93
--- /dev/null
+++ b/_inventory/ffhl_blackbox_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "ffhl-blackbox (Container)"
+# https://www.uuidgenerator.net/
+uid: b30f5da6-a65f-4e7b-b262-02d0c860ff10
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/ffv-pim6-router_container.md b/_inventory/ffv-pim6-router_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..9a2afb967114b99ed08826e5f0c71465d24e34ae
--- /dev/null
+++ b/_inventory/ffv-pim6-router_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "ffv-pim6-router (Container)"
+# https://www.uuidgenerator.net/
+uid: c6dfa04d-8183-4109-81df-1b80a212d233
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/gitlab.md b/_inventory/gitlab.md
index 2729c92419d2c04980ecb1d7a089aea4e4f486b4..de813c148aeb9efcac6cd47c33c9a86e3529c104 100644
--- a/_inventory/gitlab.md
+++ b/_inventory/gitlab.md
@@ -12,6 +12,7 @@ parent: 5a4cdbdf-9b58-44ba-8606-598ece73e922
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:git
 calcolor: "#000000"
 ldap: true
+out_of_service: false
 infra_url: https://git.chaotikum.org/
 sets: 
  - software
diff --git a/_inventory/gitlab_container.md b/_inventory/gitlab_container.md
index 10655d6d090a21032228f29ac7a614009d372255..84a5573cc1926aae513f7ca41db878054a50d1af 100644
--- a/_inventory/gitlab_container.md
+++ b/_inventory/gitlab_container.md
@@ -1,11 +1,12 @@
 ---
 layout: infra
-name: "Gitlab (Container)"
+name: "gitlab (Container)"
 # https://www.uuidgenerator.net/
 uid: 5a4cdbdf-9b58-44ba-8606-598ece73e922
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:git
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/hedgedoc.md b/_inventory/hedgedoc.md
index 6246a9e250d5466d3af21275cb1985eda277a4a6..51d8008f02eef33a7869f78e1ec2f3f636c987b7 100644
--- a/_inventory/hedgedoc.md
+++ b/_inventory/hedgedoc.md
@@ -12,6 +12,7 @@ parent: 930b4dd5-6191-45e5-9076-0aec16260237
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:git
 calcolor: "#000000"
 ldap: true
+out_of_service: false
 infra_url: https://md.chaotikum.org/
 sets: 
  - software
diff --git a/_inventory/hedgedoc_nodejs.md b/_inventory/hedgedoc_nodejs.md
index eb279f922816100a566061ed8ff1b68359522f6c..1b19cc7d51ed3195875cd2a41dc2b8f7809106f6 100644
--- a/_inventory/hedgedoc_nodejs.md
+++ b/_inventory/hedgedoc_nodejs.md
@@ -11,6 +11,7 @@ uid: 531580bc-77e7-4d9c-b888-ae0ceed9c4b4
 parent: 930b4dd5-6191-45e5-9076-0aec16260237
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:git
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/hedgedoc_psql.md b/_inventory/hedgedoc_psql.md
index e354784b212ee08709d1fefe4d1adf2a9550b2de..d485fe93908a5028784053f70336d002c1977b56 100644
--- a/_inventory/hedgedoc_psql.md
+++ b/_inventory/hedgedoc_psql.md
@@ -11,6 +11,7 @@ uid: 224f5833-8197-4278-822e-d3b6134710de
 parent: 930b4dd5-6191-45e5-9076-0aec16260237
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:git
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/keycloak02_container.md b/_inventory/keycloak02_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..5291227a387cf59e4086110029ccf38bf81b6a6d
--- /dev/null
+++ b/_inventory/keycloak02_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "keycloak02 (Container)"
+# https://www.uuidgenerator.net/
+uid: 8c0741f8-2080-47a1-af16-43f17fd759f2
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/keycloak_container.md b/_inventory/keycloak_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..dcb895acfd6e170bd4a7c7d6fd5162ea37755371
--- /dev/null
+++ b/_inventory/keycloak_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "keycloak (Container)"
+# https://www.uuidgenerator.net/
+uid: 35c55876-980d-4865-8d0e-52da63d0462c
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:keycloak
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/ldap_container.md b/_inventory/ldap_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..84c9b02d4fd2df668696f12bfcf32d7601e2cb45
--- /dev/null
+++ b/_inventory/ldap_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "ldap (Container)"
+# https://www.uuidgenerator.net/
+uid: cd815327-357a-4b65-abb3-037925b9bab1
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:ldap
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/listmonk.md b/_inventory/listmonk.md
new file mode 100644
index 0000000000000000000000000000000000000000..7c1a5bc9d63439533ea79f3d6e8863053586510b
--- /dev/null
+++ b/_inventory/listmonk.md
@@ -0,0 +1,19 @@
+---
+layout: infra
+name: "Listmonk"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "listmonk"
+cpe_product: "listmonk"
+cpe_version: "2.4.0"
+#https://www.uuidgenerator.net/
+uid: 9819f6d2-5bf9-4559-aafc-c6405ad1d48d
+parent: 205427df-8a69-4b80-bc0c-b2aba951b7f3
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:listmonk
+calcolor: "#000000"
+infra_url: https://newsletter.chaotikum.org/
+out_of_service: false
+sets: 
+ - software
+---
+
diff --git a/_inventory/magrathea.md b/_inventory/magrathea.md
index a4280f726375b7e036f4ff5c43bd0f3870b58e97..3b4f4d9741630d46ed05842fa1354ede98b9d778 100644
--- a/_inventory/magrathea.md
+++ b/_inventory/magrathea.md
@@ -5,6 +5,7 @@ name: "Magrathea"
 uid: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:server:magrathea
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - server
 ---
diff --git a/_inventory/mail_container.md b/_inventory/mail_container.md
index 07965d4ed54d2570780766b4f566bb7f1a5611fe..8f382c4de7ee15d17ba54d8f7f510f6894b0c4e1 100644
--- a/_inventory/mail_container.md
+++ b/_inventory/mail_container.md
@@ -6,6 +6,7 @@ uid: c501dd0b-119c-4991-aa60-7091e72e6388
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:mail
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/matrix-welcome-bot.md b/_inventory/matrix-welcome-bot.md
new file mode 100644
index 0000000000000000000000000000000000000000..2e7f8279e4e3bd5e72e239a30c84ca29bc04ea86
--- /dev/null
+++ b/_inventory/matrix-welcome-bot.md
@@ -0,0 +1,19 @@
+---
+layout: infra
+name: "Matrix Welcome Bot"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "tvluke"
+cpe_product: "matrix-welcome-bot"
+cpe_version: "1.0"
+#https://www.uuidgenerator.net/
+uid: 9819f6d2-5bf9-4559-aafc-c6405ad1d48d
+parent: 205427df-8a69-4b80-bc0c-b2aba951b7f3
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:matrix-welcome-bot
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - software
+ - exfrastruktur
+---
+
diff --git a/_inventory/md_container.md b/_inventory/md_container.md
index 857460c35c27b9b943db3c69c2db3299948b2691..4ce6055409f7a83fd1950fc5d73b981827788250 100644
--- a/_inventory/md_container.md
+++ b/_inventory/md_container.md
@@ -6,6 +6,7 @@ uid: 930b4dd5-6191-45e5-9076-0aec16260237
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:md
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/monitoring_container.md b/_inventory/monitoring_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..3ff953eb31092de489563b8dbc28df5287b47edc
--- /dev/null
+++ b/_inventory/monitoring_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "monitoring (Container)"
+# https://www.uuidgenerator.net/
+uid: 587a2f9f-97a3-4c5c-8015-7065f7aef373
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:monitoring
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/nextcloud.md b/_inventory/nextcloud.md
index e3c8f650dc4a273a9c5e6f689a12009ca8817e80..6e772431ddddb18d935c35d1ee5e7c2b2a442b1e 100644
--- a/_inventory/nextcloud.md
+++ b/_inventory/nextcloud.md
@@ -13,6 +13,7 @@ wikilink: https://wiki.chaotikum.org/infrastruktur:container:nextcloud
 calcolor: "#000000"
 ldap: true
 onlymember: true
+out_of_service: false
 infra_url: https://cloud.chaotikum.org/
 sets: 
  - software
diff --git a/_inventory/nextcloud_container.md b/_inventory/nextcloud_container.md
index 7449b3aa1794b66a80036ff282e197820d4a4cee..ba25445a64c4bc3a6bab6a63b58e16fd6dfd3a02 100644
--- a/_inventory/nextcloud_container.md
+++ b/_inventory/nextcloud_container.md
@@ -1,11 +1,12 @@
 ---
 layout: infra
-name: "Nextcloud (Container)"
+name: "nextcloud (Container)"
 # https://www.uuidgenerator.net/
 uid: 5048e1f6-6a56-4bf3-92b3-decbc2f1af09
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:website
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/pad_container.md b/_inventory/pad_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..02f2f6b6caf2a0309e7530f298972ea4ab0bd48b
--- /dev/null
+++ b/_inventory/pad_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "pad (Container)"
+# https://www.uuidgenerator.net/
+uid: 1d93ceb0-14cb-4712-aa27-557907ad93b2
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:etherpad
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/padlock.md b/_inventory/padlock.md
index 5163d330a70b2dc8b37287820a366be139015643..4c41511f0ab573731efb08c495fcdee84d6d259a 100644
--- a/_inventory/padlock.md
+++ b/_inventory/padlock.md
@@ -11,6 +11,7 @@ uid: 465eea94-c330-40b8-b9b1-f1ae8f52e71b
 parent: 18b7635c-ea8c-460f-a63f-8d9c6fd04663
 wikilink: https://wiki.chaotikum.org/infrastruktur:host:padlock
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/padlock_vm.md b/_inventory/padlock_vm.md
index c58490bd3ca4a4c182c443728500bd56d8dd40ef..8811400ab56852fda15e78ea7da2a963ad3d1d43 100644
--- a/_inventory/padlock_vm.md
+++ b/_inventory/padlock_vm.md
@@ -6,6 +6,7 @@ uid: 18b7635c-ea8c-460f-a63f-8d9c6fd04663
 parent: da38c6fc-69a1-490d-9b0d-473c74dd253b
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:dokuwiki
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/portainer.md b/_inventory/portainer.md
new file mode 100644
index 0000000000000000000000000000000000000000..82d8f5c43c21c2278b8eb20eebbab9996b19330e
--- /dev/null
+++ b/_inventory/portainer.md
@@ -0,0 +1,19 @@
+---
+layout: infra
+name: "Portainer"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "portainer"
+cpe_product: "portainer"
+cpe_version: "2.19.4"
+#https://www.uuidgenerator.net/
+uid: 205427df-8a69-4b80-bc0c-b2aba951b7f3
+parent: 9411847a-dcdf-4f13-b900-e18cd3102efe
+calcolor: "#000000"
+ldap: true
+out_of_service: false
+infra_url: https://docker.chaotikum.org/
+sets: 
+ - software
+---
+
diff --git a/_inventory/presence.md b/_inventory/presence.md
new file mode 100644
index 0000000000000000000000000000000000000000..f689165b63e3dc7cb8870819c2da46357ba30b95
--- /dev/null
+++ b/_inventory/presence.md
@@ -0,0 +1,21 @@
+---
+layout: infra
+name: "Presence Service"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "tvluke"
+cpe_product: "presence"
+cpe_version: "1.0"
+#https://www.uuidgenerator.net/
+uid: 036f7894-16fd-4ef2-a3e0-4c4b8e0d6d64
+parent: 205427df-8a69-4b80-bc0c-b2aba951b7f3
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:presence
+calcolor: "#000000"
+ldap: true
+out_of_service: false
+infra_url: https://presence.chaotikum.org/
+sets: 
+ - software
+ - exfrastruktur
+---
+
diff --git a/_inventory/pretix_container.md b/_inventory/pretix_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..63918df70ac1fd87d42daf39781f5e3c2e389ce1
--- /dev/null
+++ b/_inventory/pretix_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "pretix (Container)"
+# https://www.uuidgenerator.net/
+uid: 5e56ea8b-f69b-4f07-9ce6-3e6e2539a8cc
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:pretix
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/roundcube_container.md b/_inventory/roundcube_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..5ae17bc005b07c4171e01c6c05367abf011c1874
--- /dev/null
+++ b/_inventory/roundcube_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "roundcube (Container)"
+# https://www.uuidgenerator.net/
+uid: d4cc16c7-27e2-48e1-b6b8-d5f569274867
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:roundcube
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/runner02.md b/_inventory/runner02.md
new file mode 100644
index 0000000000000000000000000000000000000000..5192fbdaae97494261bbd3ffa2c2147d31f3dfd0
--- /dev/null
+++ b/_inventory/runner02.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "runner02 (Container)"
+# https://www.uuidgenerator.net/
+uid: c88aceb7-5674-4202-83ca-97dacd1a2b29
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:ldap
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/scaro.md b/_inventory/scaro.md
index 03ca1b6c3b73bdddbf3cdacfbf8cef6f752cadf0..b29209295415ae360054bb9a128cc2fcb8a0c457 100644
--- a/_inventory/scaro.md
+++ b/_inventory/scaro.md
@@ -5,6 +5,7 @@ name: "Scaro"
 uid: 9d3a25bc-5629-4369-abb3-6a1a95598449
 wikilink: https://wiki.chaotikum.org/infrastruktur:server:skaro
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - server
 ---
diff --git a/_inventory/sediment.md b/_inventory/sediment.md
index 5e7be382c3c21c3bd6e05a5bb064033ff868d6e1..dff81a760e7c4cf6a8ba810a223e214057637c82 100644
--- a/_inventory/sediment.md
+++ b/_inventory/sediment.md
@@ -12,6 +12,7 @@ parent: 803d6706-96fa-4eb3-a503-93e2e218b263
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:sediment
 calcolor: "#000000"
 ldap: true
+out_of_service: false
 infra_url: https://sediment.chaotikum.org/
 sets: 
  - software
diff --git a/_inventory/sediment_container.md b/_inventory/sediment_container.md
index 0d3b0701cf43da1e638b0a99f0ef91e7644630dd..a339f95464d1a171bcad74533713438f1296c50a 100644
--- a/_inventory/sediment_container.md
+++ b/_inventory/sediment_container.md
@@ -1,11 +1,12 @@
 ---
 layout: infra
-name: "Sediment (Container)"
+name: "sediment (Container)"
 # https://www.uuidgenerator.net/
 uid: 803d6706-96fa-4eb3-a503-93e2e218b263
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:sediment
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/social_container.md b/_inventory/social_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..8ed9a29574595af20857bd0b5ca742d505416625
--- /dev/null
+++ b/_inventory/social_container.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "social (Container)"
+# https://www.uuidgenerator.net/
+uid: 43824272-8a5d-40bf-8494-a864e4265def
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:social
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/syncthing-server_container.md b/_inventory/syncthing-server_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..8ea36e90192f4ccee4963f6bf2cef391f3e2ece3
--- /dev/null
+++ b/_inventory/syncthing-server_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "syncthing-server (Container)"
+# https://www.uuidgenerator.net/
+uid: d0e23976-22b7-4603-b47c-b74bfca9c21b
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/torproxy_container.md b/_inventory/torproxy_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..6d49b944ee60309fd7025bafe0442f159dbe93af
--- /dev/null
+++ b/_inventory/torproxy_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "torproxy (Container)"
+# https://www.uuidgenerator.net/
+uid: 551c60e0-e9aa-4911-899f-3f3ea6e67f24
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/uptimekuma.md b/_inventory/uptimekuma.md
new file mode 100644
index 0000000000000000000000000000000000000000..15228d29a01b896fc65fe97ffa33829ee2c52cd3
--- /dev/null
+++ b/_inventory/uptimekuma.md
@@ -0,0 +1,18 @@
+---
+layout: infra
+name: "Uptime Kuma"
+# For Software plz define https://de.wikipedia.org/wiki/Common_Platform_Enumeration https://nvd.nist.gov/products/cpe
+cpe_part: "a"
+cpe_vendor: "uptime.kuma"
+cpe_product: "uptime-kuma"
+cpe_version: "*"
+#https://www.uuidgenerator.net/
+uid: 27a1c4ba-72cd-43f0-8a67-f08c85c3e212
+parent: 205427df-8a69-4b80-bc0c-b2aba951b7f3
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - software
+ - exfrastruktur
+---
+
diff --git a/_inventory/videostorage_container.md b/_inventory/videostorage_container.md
new file mode 100644
index 0000000000000000000000000000000000000000..16adf3d996d0e6e8b72ad57039729944f9198ee5
--- /dev/null
+++ b/_inventory/videostorage_container.md
@@ -0,0 +1,11 @@
+---
+layout: infra
+name: "videostorage (Container)"
+# https://www.uuidgenerator.net/
+uid: 2ec8adc3-aa93-46ca-b36f-c162d86bd5f1
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:container:video
+calcolor: "#000000"
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/web_container.md b/_inventory/web_container.md
index bcb8eb1c8bae6c7a1f5df5eed3467e877bfce9f5..92454b07fd424f91c6b7c3681adb44e18aea29b2 100644
--- a/_inventory/web_container.md
+++ b/_inventory/web_container.md
@@ -6,6 +6,7 @@ uid: 88d085c2-0aab-4496-8e96-b0b69a1a009f
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:website
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/willi_vm.md b/_inventory/willi_vm.md
new file mode 100644
index 0000000000000000000000000000000000000000..c2e25e42f1eed2d34bb9d955a7ee96953e921416
--- /dev/null
+++ b/_inventory/willi_vm.md
@@ -0,0 +1,12 @@
+---
+layout: infra
+name: "Willi (VM)"
+# https://www.uuidgenerator.net/
+uid: 5e38392e-72ab-4c73-b3db-35a84d966460
+parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
+wikilink: https://wiki.chaotikum.org/infrastruktur:host:willi
+calcolor: "#000000"
+out_of_service: false
+sets: 
+ - environment
+---
\ No newline at end of file
diff --git a/_inventory/wupo_container.md b/_inventory/wupo_container.md
index 4370118ca51fd07c8780c124f3f365c9116ae807..6184a5558a616224b0bc667d16a2ceaf620d6d8f 100644
--- a/_inventory/wupo_container.md
+++ b/_inventory/wupo_container.md
@@ -6,6 +6,7 @@ uid: 1e40836e-1c0b-4c40-85ed-5f2ebc9c5164
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:wupo
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_inventory/zammad.md b/_inventory/zammad.md
index 3dfc05bce9acaa0f67b074d0ad9c2716f7924949..2bfbe9a7cff1b6456364456504a5bc56f9f1093e 100644
--- a/_inventory/zammad.md
+++ b/_inventory/zammad.md
@@ -11,6 +11,7 @@ uid: 0a41935d-3965-46db-805c-0717a8f621f5
 parent: 1c666e4c-50ea-42a1-8a4c-1a5c9c6b9cbd
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:zammad
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - software
 ---
\ No newline at end of file
diff --git a/_inventory/zammad_container.md b/_inventory/zammad_container.md
index e50c4c355919f7a1ba70a0269b2478b1da7ae90c..6a736de18263132bd0dd896fc1f8ce43afeffce8 100644
--- a/_inventory/zammad_container.md
+++ b/_inventory/zammad_container.md
@@ -6,6 +6,7 @@ uid: 1c666e4c-50ea-42a1-8a4c-1a5c9c6b9cbd
 parent: 77fa25b8-f44f-4d98-9253-c1150fb472e6
 wikilink: https://wiki.chaotikum.org/infrastruktur:container:zammad
 calcolor: "#000000"
+out_of_service: false
 sets: 
  - environment
 ---
\ No newline at end of file
diff --git a/_layouts/wartung.html b/_layouts/wartung.html
index eadbeb1f713acdc4fc4c59c5ad3be09c80538f32..d060132d19f1738edbfc1ba6e8a9e56942e2038d 100644
--- a/_layouts/wartung.html
+++ b/_layouts/wartung.html
@@ -14,19 +14,33 @@ layout: default
 			{% for component in site.inventory -%}
 			{% if component.layout == 'infra' -%}
 			{% if component.parent == nil -%}
+      {% if component.out_of_service == false or component.out_of_service == '' -%}
 			<li> <b>{{component.name }}</b>
 			{% assign children = site.inventory | where_exp: "c", "c.parent == component.uid" -%}
 			<ul>
 			{% for child in children -%}
+      {% if child.out_of_service == false or child.out_of_service == '' -%}
 			<li style="margin-left:50px;"><b>{{child.name }}
 			{% assign grandchildren = site.inventory | where_exp: "g", "g.parent == child.uid" -%}
 			<ul>
 			{% for gc in grandchildren -%}
+      {% if gc.out_of_service == false or gc.out_of_service == '' -%}
 			<li style="margin-left:80px;"><b>{{gc.name }}
+       {% assign ggc = site.inventory | where_exp: "gg", "gg.parent == gc.uid" -%} 
+       <ul>
+        {% for ggcx in ggc -%}
+        {% if ggcx.out_of_service == false or ggcx.out_of_service == '' -%}
+        <li style="margin-left:80px;"><b>{{ggcx.name }}
+          {% endif -%}
+        {% endfor -%}
+       </ul>
+       {% endif -%}
 			{% endfor -%}
 			</ul>
+      {% endif -%}
 			{% endfor -%}
 			</ul>
+      {% endif -%}
 			{% endif -%}
 			{% endif -%}
 			{% endfor -%}