diff --git a/docs/configs/kubernetes.md b/docs/configs/kubernetes.md index c76813f4..06685f3a 100644 --- a/docs/configs/kubernetes.md +++ b/docs/configs/kubernetes.md @@ -36,7 +36,7 @@ Inside of the service you'd like to connect to a pod: The `app` field is used to create a label selector, in this example case it would match pods with the label: `app.kubernetes.io/name=emby`. -Sometimes this is insufficient for complex or atypical application deployments. In these cases, the `pod-selector` field can be used. Any field selector can be used with it, so it allows for some very powerful selection capabilities. +Sometimes this is insufficient for complex or atypical application deployments. In these cases, the `podSelector` field can be used. Any field selector can be used with it, so it allows for some very powerful selection capabilities. For instance, it can be utilized to roll multiple underlying deployments under one application to see a high-level aggregate: @@ -47,7 +47,7 @@ For instance, it can be utilized to roll multiple underlying deployments under o description: Matrix Synapse Powered Chat app: matrix-element namespace: comms - pod-selector: >- + podSelector: >- app.kubernetes.io/instance in ( matrix-element, matrix-media-repo, @@ -58,7 +58,7 @@ For instance, it can be utilized to roll multiple underlying deployments under o !!! note - A blank string as a pod-selector does not deactivate it, but will actually select all pods in the namespace. This is a useful way to capture the resource usage of a complex application siloed to a single namespace, like Longhorn. + A blank string as a podSelector does not deactivate it, but will actually select all pods in the namespace. This is a useful way to capture the resource usage of a complex application siloed to a single namespace, like Longhorn. ## Automatic Service Discovery diff --git a/docs/widgets/services/pfsense.md b/docs/widgets/services/pfsense.md index 8f32a718..a7d7a923 100644 --- a/docs/widgets/services/pfsense.md +++ b/docs/widgets/services/pfsense.md @@ -26,5 +26,6 @@ widget: headers: # optional, or username/password Authorization: client_id client_token wan: igb0 + version: 2 # optional, defaults to 1 for api v1 fields: ["load", "memory", "temp", "wanStatus"] # optional ``` diff --git a/public/locales/af/common.json b/public/locales/af/common.json index 7b8b1ee3..fe23c022 100644 --- a/public/locales/af/common.json +++ b/public/locales/af/common.json @@ -893,5 +893,12 @@ "ping": "Pieng", "download": "Aflaai", "upload": "Laai Op" + }, + "stocks": { + "stocks": "Aandele", + "loading": "Laai", + "open": "Oop - VS Mark", + "closed": "Toe - VS Mark", + "invalidConfiguration": "Ongeldige opstelling" } } diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index 9df6e2c0..60035f59 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -893,5 +893,12 @@ "ping": "بينغ", "download": "التنزيل", "upload": "التحميل" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 6d570371..af5b9015 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index 582fa813..19b21474 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -893,5 +893,12 @@ "ping": "Latència", "download": "Descarregar", "upload": "Pujada" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 23977042..a2218b4a 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -893,5 +893,12 @@ "ping": "Odezva", "download": "Stahování", "upload": "Nahrávání" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/da/common.json b/public/locales/da/common.json index f9652fd0..779f885e 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/de/common.json b/public/locales/de/common.json index d50ca2f8..c452ba6f 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Aktien", + "loading": "Wird geladen", + "open": "Offen - US-Markt", + "closed": "Geschlossen - US-Markt", + "invalidConfiguration": "Ungültige Konfiguration" } } diff --git a/public/locales/el/common.json b/public/locales/el/common.json index 0569b1d8..e6cbcfc1 100644 --- a/public/locales/el/common.json +++ b/public/locales/el/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Λήξη", "upload": "Μεταφόρτωση" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index 930796d6..02358fab 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -893,5 +893,12 @@ "ping": "Sondaĵo", "download": "Elŝuti", "upload": "Alŝuti" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 9bae44fd..d412ce85 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Descarga", "upload": "Subida" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/eu/common.json b/public/locales/eu/common.json index 8d56d7d6..2cbda3b1 100644 --- a/public/locales/eu/common.json +++ b/public/locales/eu/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index 539a7388..4b54f8e0 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index 8409c0b7..d769cd0f 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Récep.", "upload": "Envoi" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 25d528d6..279c2701 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 81441dff..fc76c9dc 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index 3b68d083..1404cac0 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Preuzimanje", "upload": "Prijenos" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index fd5968fe..160a277b 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Letöltés", "upload": "Feltöltés" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/id/common.json b/public/locales/id/common.json index 314d0b7c..1635d966 100644 --- a/public/locales/id/common.json +++ b/public/locales/id/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Unduh", "upload": "Unggah" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 16d7a537..7256c1e8 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index b6a89799..d276e8ab 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "ダウンロード", "upload": "アップロード" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json index 376ca7e3..59bc528c 100644 --- a/public/locales/ko/common.json +++ b/public/locales/ko/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "다운로드", "upload": "업로드" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 9b3d1bd2..594d958e 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Lejupielāde", "upload": "Augšupielāde" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index a73fbf11..bf43076c 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Muat turun", "upload": "Muat naik" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 967d203a..429eabf4 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/no/common.json b/public/locales/no/common.json index a246208c..39e4ad79 100644 --- a/public/locales/no/common.json +++ b/public/locales/no/common.json @@ -893,5 +893,12 @@ "ping": "Responstid", "download": "Last ned", "upload": "Opplastning" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index c3729d1b..4611c90a 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Pobieranie", "upload": "Wysyłanie" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 5a96a3a6..e4772dec 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -893,5 +893,12 @@ "ping": "Tempo de resposta", "download": "Descarregar", "upload": "Carregar" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/pt_BR/common.json b/public/locales/pt_BR/common.json index 836200fe..95ede1c0 100644 --- a/public/locales/pt_BR/common.json +++ b/public/locales/pt_BR/common.json @@ -317,7 +317,7 @@ "hours": "{{number}}h", "minutes": "{{number}}m", "seconds": "{{number}}s", - "ago": "{{value}} Ago" + "ago": "{{value}} Atrás" }, "tdarr": { "queue": "Fila", @@ -328,7 +328,7 @@ "traefik": { "routers": "Roteadores", "services": "Serviços", - "middleware": "Middleware" + "middleware": "" }, "navidrome": { "nothing_streaming": "Sem Streams Ativos", @@ -884,14 +884,21 @@ "total": "Total" }, "swagdashboard": { - "proxied": "Proxied", - "auth": "With Auth", - "outdated": "Outdated", - "banned": "Banned" + "proxied": "Com proxy", + "auth": "Com Autenticação", + "outdated": "Desatualizado", + "banned": "Banido" }, "myspeed": { "ping": "Tempo de resposta", "download": "Descarregar", "upload": "Carregar" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Abrir - Mercado Americano", + "closed": "Fechado - Mercado americano", + "invalidConfiguration": "Configuração Inválida" } } diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index a3411f8e..38189210 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Descarcă", "upload": "Încarcă" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index d57d911b..fc1fdbae 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -893,5 +893,12 @@ "ping": "Пинг", "download": "Скачивание", "upload": "Загрузка" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json index 256475c7..d967ad97 100644 --- a/public/locales/sk/common.json +++ b/public/locales/sk/common.json @@ -893,5 +893,12 @@ "ping": "Odozva", "download": "Sťahovanie", "upload": "Nahrávanie" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json index 6eebfaeb..7bbc04d1 100644 --- a/public/locales/sl/common.json +++ b/public/locales/sl/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Prenos", "upload": "Nalaganje" + }, + "stocks": { + "stocks": "Delnice", + "loading": "Nalaganje", + "open": "Odprto - US trg", + "closed": "Zaprto - US trg", + "invalidConfiguration": "Neveljavna konfiguracija" } } diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index 4311bf87..c3f4a546 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index d6974546..cb75e4c8 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/te/common.json b/public/locales/te/common.json index 2b4a34d7..446b290a 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/th/common.json b/public/locales/th/common.json index 711f7df7..335b7d10 100644 --- a/public/locales/th/common.json +++ b/public/locales/th/common.json @@ -893,5 +893,12 @@ "ping": "ปิง", "download": "ดาวน์โหลด", "upload": "อัพโหลด" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index d6a6e508..67904795 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -884,14 +884,21 @@ "total": "Toplam" }, "swagdashboard": { - "proxied": "Proxied", - "auth": "With Auth", - "outdated": "Outdated", - "banned": "Banned" + "proxied": "Proxy Üzerinden", + "auth": "Kimlik Doğrulamalı", + "outdated": "Eskimiş", + "banned": "Yasaklı" }, "myspeed": { "ping": "Gecikme", "download": "İndirme", "upload": "Yükleme" + }, + "stocks": { + "stocks": "Hisse Senetleri", + "loading": "Yükleniyor", + "open": "Açık - ABD Pazarı", + "closed": "Kapalı - ABD Pazarı", + "invalidConfiguration": "Geçersiz Yapılandırma" } } diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 1626ccde..425c9920 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -893,5 +893,12 @@ "ping": "Пінг", "download": "Завантаження", "upload": "Відправлення" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 2720cba7..338ea8fb 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "Download", "upload": "Upload" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index 186c8a16..2de99504 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -893,5 +893,12 @@ "ping": "延遲", "download": "下載速率", "upload": "上傳速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/zh-Hans/common.json b/public/locales/zh-Hans/common.json index 6a8534fc..9334cea4 100644 --- a/public/locales/zh-Hans/common.json +++ b/public/locales/zh-Hans/common.json @@ -893,5 +893,12 @@ "ping": "Ping", "download": "下载速率", "upload": "上传速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index a67f0d45..570de17f 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -893,5 +893,12 @@ "ping": "延遲", "download": "下載速率", "upload": "上傳速率" + }, + "stocks": { + "stocks": "Stocks", + "loading": "Loading", + "open": "Open - US Market", + "closed": "Closed - US Market", + "invalidConfiguration": "Invalid Configuration" } } diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 93b5b1b6..75d31add 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -399,7 +399,7 @@ export function cleanServiceGroups(groups) { expandOneStreamToTwoRows, showEpisodeNumber, - // glances, pihole + // glances, pihole, pfsense version, // glances @@ -509,6 +509,9 @@ export function cleanServiceGroups(groups) { if (type === "unifi") { if (site) cleanedService.widget.site = site; } + if (type === "pfsense") { + if (version) cleanedService.widget.version = version; + } if (type === "proxmox") { if (node) cleanedService.widget.node = node; } diff --git a/src/widgets/pfsense/component.jsx b/src/widgets/pfsense/component.jsx index 0e961dbc..8e02c590 100644 --- a/src/widgets/pfsense/component.jsx +++ b/src/widgets/pfsense/component.jsx @@ -9,8 +9,12 @@ export default function Component({ service }) { const { widget } = service; - const { data: systemData, error: systemError } = useWidgetAPI(widget, "system"); - const { data: interfaceData, error: interfaceError } = useWidgetAPI(widget, "interface"); + const version = widget.version ?? 1; + const { data: systemData, error: systemError } = useWidgetAPI(widget, version === 1 ? "system" : "systemv2"); + const { data: interfaceData, error: interfaceError } = useWidgetAPI( + widget, + version === 1 ? "interface" : "interfacev2", + ); const showWanIP = widget.fields?.filter((f) => f !== "wanIP").length <= 4 && widget.fields?.includes("wanIP"); const showDiskUsage = widget.fields?.filter((f) => f !== "disk").length <= 4 && widget.fields?.includes("disk"); @@ -34,14 +38,20 @@ export default function Component({ service }) { } const wan = interfaceData.data.filter((l) => l.hwif === widget.wan)[0]; + let memUsage = systemData?.data.mem_usage; + let diskUsage = systemData.data.disk_usage; + if (version === 1) { + memUsage *= 100; + diskUsage *= 100; + } return ( - + {showWanIP && } - {showDiskUsage && ( - - )} + {showDiskUsage && } ); } diff --git a/src/widgets/pfsense/widget.js b/src/widgets/pfsense/widget.js index a8e38950..feaafeb8 100644 --- a/src/widgets/pfsense/widget.js +++ b/src/widgets/pfsense/widget.js @@ -1,16 +1,24 @@ import genericProxyHandler from "utils/proxy/handlers/generic"; const widget = { - api: "{url}/api/v1/{endpoint}", + api: "{url}/api/{endpoint}", proxyHandler: genericProxyHandler, mappings: { system: { - endpoint: "status/system", + endpoint: "v1/status/system", validate: ["data"], }, interface: { - endpoint: "status/interface", + endpoint: "v1/status/interface", + validate: ["data"], + }, + systemv2: { + endpoint: "v2/status/system", + validate: ["data"], + }, + interfacev2: { + endpoint: "v2/status/interfaces?limit=0&offset=0", validate: ["data"], }, },