{t("common.bytes", {
- value: data.memory.totalMemMb * 1024 * 1024,
+ value: data.memory.total,
maximumFractionDigits: 1,
binary: true,
})}
diff --git a/src/components/widgets/resources/resources.jsx b/src/components/widgets/resources/resources.jsx
index 0524e39a..4ff0c81c 100644
--- a/src/components/widgets/resources/resources.jsx
+++ b/src/components/widgets/resources/resources.jsx
@@ -1,9 +1,11 @@
import Disk from "./disk";
import Cpu from "./cpu";
import Memory from "./memory";
+import CpuTemp from "./cputemp";
+import Uptime from "./uptime";
export default function Resources({ options }) {
- const { expanded } = options;
+ const { expanded, units } = options;
return (
@@ -12,6 +14,8 @@ export default function Resources({ options }) {
{Array.isArray(options.disk)
? options.disk.map((disk) => )
: options.disk && }
+ {options.cputemp && }
+ {options.uptime && }
{options.label && (
{options.label}
diff --git a/src/components/widgets/resources/uptime.jsx b/src/components/widgets/resources/uptime.jsx
new file mode 100644
index 00000000..2624bef1
--- /dev/null
+++ b/src/components/widgets/resources/uptime.jsx
@@ -0,0 +1,61 @@
+import useSWR from "swr";
+import { FaRegClock } from "react-icons/fa";
+import { BiError } from "react-icons/bi";
+import { useTranslation } from "next-i18next";
+
+export default function Uptime() {
+ const { t } = useTranslation();
+
+ const { data, error } = useSWR(`/api/widgets/resources?type=uptime`, {
+ refreshInterval: 1500,
+ });
+
+ if (error || data?.error) {
+ return (
+
+
+
+ {t("widget.api_error")}
+
+
+ );
+ }
+
+ if (!data) {
+ return (
+
+
+
+
+ -
+ {t("resources.temp")}
+
+
+
+ );
+ }
+
+ const mo = Math.floor(data.uptime / (3600 * 24 * 31));
+ const d = Math.floor(data.uptime % (3600 * 24 * 31) / (3600 * 24));
+ const h = Math.floor(data.uptime % (3600 * 24) / 3600);
+ const m = Math.floor(data.uptime % 3600 / 60);
+
+ let uptime;
+ if (mo > 0) uptime = `${mo}${t("resources.months")} ${d}${t("resources.days")}`;
+ else if (d > 0) uptime = `${d}${t("resources.days")} ${h}${t("resources.hours")}`;
+ else uptime = `${h}${t("resources.hours")} ${m}${t("resources.minutes")}`;
+
+ return (
+
+
+
+
+
+ {uptime}
+
+ {t("resources.uptime")}
+
+
+
+ );
+}
diff --git a/src/pages/api/widgets/glances.js b/src/pages/api/widgets/glances.js
index 5d4622b8..46be14a0 100644
--- a/src/pages/api/widgets/glances.js
+++ b/src/pages/api/widgets/glances.js
@@ -4,19 +4,16 @@ import { getPrivateWidgetOptions } from "utils/config/widget-helpers";
const logger = createLogger("glances");
-export default async function handler(req, res) {
- const { index } = req.query;
-
- const privateWidgetOptions = await getPrivateWidgetOptions("glances", index);
-
+async function retrieveFromGlancesAPI(privateWidgetOptions, endpoint) {
+ let errorMessage;
const url = privateWidgetOptions?.url;
if (!url) {
- const errorMessage = "Missing Glances URL";
+ errorMessage = "Missing Glances URL";
logger.error(errorMessage);
- return res.status(400).json({ error: errorMessage });
+ throw new Error(errorMessage);
}
- const apiUrl = `${url}/api/3/quicklook`;
+ const apiUrl = `${url}/api/3/${endpoint}`;
const headers = {
"Accept-Encoding": "application/json"
};
@@ -25,16 +22,41 @@ export default async function handler(req, res) {
}
const params = { method: "GET", headers };
- const [status, contentType, data] = await httpProxy(apiUrl, params);
+ const [status, , data] = await httpProxy(apiUrl, params);
if (status === 401) {
- logger.error("Authorization failure getting data from glances API. Data: %s", data);
+ errorMessage = `Authorization failure getting data from glances API. Data: ${data.toString()}`
+ logger.error(errorMessage);
+ throw new Error(errorMessage);
}
-
+
if (status !== 200) {
- logger.error("HTTP %d getting data from glances API. Data: %s", status, data);
+ errorMessage = `HTTP ${status} getting data from glances API. Data: ${data.toString()}`
+ logger.error(errorMessage);
+ throw new Error(errorMessage);
}
- if (contentType) res.setHeader("Content-Type", contentType);
- return res.status(status).send(data);
+ return JSON.parse(Buffer.from(data).toString());
+}
+
+export default async function handler(req, res) {
+ const { index } = req.query;
+
+ const privateWidgetOptions = await getPrivateWidgetOptions("glances", index);
+
+ try {
+ const quicklookData = await retrieveFromGlancesAPI(privateWidgetOptions, "quicklook");
+
+ const data = {
+ quicklook: quicklookData
+ }
+
+ data.uptime = await retrieveFromGlancesAPI(privateWidgetOptions, "uptime");
+
+ data.sensors = await retrieveFromGlancesAPI(privateWidgetOptions, "sensors");
+
+ return res.status(200).send(data);
+ } catch (e) {
+ return res.status(400).json({ error: e.message });
+ }
}
diff --git a/src/pages/api/widgets/resources.js b/src/pages/api/widgets/resources.js
index baa507a4..ae53bf14 100644
--- a/src/pages/api/widgets/resources.js
+++ b/src/pages/api/widgets/resources.js
@@ -1,15 +1,16 @@
import { existsSync } from "fs";
-import { cpu, drive, mem } from "node-os-utils";
+const si = require('systeminformation');
export default async function handler(req, res) {
const { type, target } = req.query;
if (type === "cpu") {
+ const load = await si.currentLoad();
return res.status(200).json({
cpu: {
- usage: await cpu.usage(1000),
- load: cpu.loadavgTime(5),
+ usage: load.currentLoad,
+ load: load.avgLoad,
},
});
}
@@ -21,14 +22,29 @@ export default async function handler(req, res) {
});
}
+ const fsSize = await si.fsSize();
+
return res.status(200).json({
- drive: await drive.info(target || "/"),
+ drive: fsSize.find(fs => fs.mount === target) ?? fsSize.find(fs => fs.mount === "/")
});
}
if (type === "memory") {
return res.status(200).json({
- memory: await mem.info(),
+ memory: await si.mem(),
+ });
+ }
+
+ if (type === "cputemp") {
+ return res.status(200).json({
+ cputemp: await si.cpuTemperature(),
+ });
+ }
+
+ if (type === "uptime") {
+ const timeData = await si.time();
+ return res.status(200).json({
+ uptime: timeData.uptime
});
}
diff --git a/src/utils/config/docker.js b/src/utils/config/docker.js
index 288e8233..8f658db2 100644
--- a/src/utils/config/docker.js
+++ b/src/utils/config/docker.js
@@ -27,10 +27,22 @@ export default function getDockerArguments(server) {
}
if (servers[server].host) {
- return {
- conn: { host: servers[server].host, port: servers[server].port || null },
+ const res ={
+ conn: { host: servers[server].host },
swarm: !!servers[server].swarm,
- };
+ }
+
+ if (servers[server].port){
+ res.conn.port = servers[server].port;
+ }
+
+ if (servers[server].tls){
+ res.conn.ca = readFileSync(path.join(process.cwd(), "config", servers[server].tls.caFile));
+ res.conn.cert = readFileSync(path.join(process.cwd(), "config", servers[server].tls.certFile));
+ res.conn.key = readFileSync(path.join(process.cwd(), "config", servers[server].tls.keyFile));
+ }
+
+ return res;
}
return servers[server];