Merge PR #144: New plug-in: systemmonitor

debian/control

@@ -749,6 +749,20 @@ Description: nymea.io plugin to send and receive strings over a serial port
  .
  This package will install the nymea.io plugin for serial ports
 
+Package: nymea-plugin-systemmonitor
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         nymea-plugins-translations,
+Description: nymea.io plugin to monitor the system
+ The nymea daemon is a plugin based IoT (Internet of Things) server. The
+ server works like a translator for devices, things and services and
+ allows them to interact.
+ With the powerful rule engine you are able to connect any device available
+ in the system and create individual scenes and behaviors for your environment.
+ .
+ This package will install the nymea.io plugin for system monitoring
+
 
 Package: nymea-plugins-translations
 Section: misc
@@ -818,6 +832,7 @@ Depends: nymea-plugin-boblight,
          nymea-plugin-remotessh,
          nymea-plugin-unipi,
          nymea-plugin-serialportcommander,
+         nymea-plugin-systemmonitor,
 Replaces: guh-plugins-maker
 Description: Plugins for nymea IoT server - Meta package for makers, tinkers and hackers
  The nymea daemon is a plugin based IoT (Internet of Things) server. The

debian/nymea-plugin-systemmonitor.install.in

@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_devicepluginsystemmonitor.so

nymea-plugins.pro

@@ -33,6 +33,7 @@ PLUGIN_DIRS = \
     osdomotics          \
     philipshue          \
     pushbullet          \
+    systemmonitor       \
     remotessh           \
     senic               \
     serialportcommander \

systemmonitor/README.md

@@ -0,0 +1,9 @@
+# Systemmonitor
+
+Displays the system usage of nymea, containing:
+
+* CPU usage (in percent)
+* Memory usage (in percent)
+* RSS memory usage (in KiloByte)
+* Virtual memory usage (in KiloByte)
+

systemmonitor/devicepluginsystemmonitor.cpp

@@ -0,0 +1,113 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                                         *
+ *  Copyright (C) 2018 Michael Zanetti <michael.zanetti@guh.io             *
+ *                                                                         *
+ *  This file is part of nymea.                                            *
+ *                                                                         *
+ *  This library is free software; you can redistribute it and/or          *
+ *  modify it under the terms of the GNU Lesser General Public             *
+ *  License as published by the Free Software Foundation; either           *
+ *  version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                         *
+ *  This library is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *  Lesser General Public License for more details.                        *
+ *                                                                         *
+ *  You should have received a copy of the GNU Lesser General Public       *
+ *  License along with this library; If not, see                           *
+ *  <http://www.gnu.org/licenses/>.                                        *
+ *                                                                         *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "devicepluginsystemmonitor.h"
+#include "plugininfo.h"
+
+
+DevicePluginSystemMonitor::DevicePluginSystemMonitor()
+{
+
+}
+
+DevicePluginSystemMonitor::~DevicePluginSystemMonitor()
+{
+    if (m_refreshTimer) {
+        hardwareManager()->pluginTimerManager()->unregisterTimer(m_refreshTimer);
+    }
+}
+
+Device::DeviceSetupStatus DevicePluginSystemMonitor::setupDevice(Device *device)
+{
+    Q_UNUSED(device)
+
+    if (!m_refreshTimer) {
+        m_refreshTimer = hardwareManager()->pluginTimerManager()->registerTimer(2);
+        connect(m_refreshTimer, &PluginTimer::timeout, this, &DevicePluginSystemMonitor::onRefreshTimer);
+    }
+
+
+    return Device::DeviceSetupStatusSuccess;
+}
+
+void DevicePluginSystemMonitor::deviceRemoved(Device *device)
+{
+    Q_UNUSED(device)
+
+    if (myDevices().isEmpty()) {
+        hardwareManager()->pluginTimerManager()->unregisterTimer(m_refreshTimer);
+        m_refreshTimer = nullptr;
+
+    }
+}
+
+void DevicePluginSystemMonitor::onRefreshTimer()
+{
+    QProcess *p = new QProcess(this);
+    connect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(onProcessFinished(int,QProcess::ExitStatus)));
+    p->start("ps", {"-C", "nymead", "-o", "%mem=,vsz=,rss=,pcpu="});
+}
+
+void DevicePluginSystemMonitor::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+    QProcess *p = static_cast<QProcess*>(sender());
+    p->deleteLater();
+
+    if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
+            qWarning(dcSystemMonitor) << "Error reading process memory usage:" << p->readAllStandardError();
+            return;
+    }
+    QString data = QString(p->readAllStandardOutput().trimmed()).replace(QRegExp("[ ]{2,}"), " ");
+    QStringList parts = data.split(' ');
+    if (parts.count() != 4) {
+        qCWarning(dcSystemMonitor()) << "Unexpected result from ps" << data << parts;
+        return;
+    }
+    bool ok;
+    qreal percentMem = parts.at(0).toDouble(&ok);
+    if (!ok) {
+        qWarning(dcSystemMonitor) << "Failed to parse % memory value to a number:" << parts.at(0);
+        return;
+    }
+    qint64 virtualMem = parts.at(1).toLongLong(&ok);
+    if (!ok) {
+        qWarning(dcSystemMonitor) << "Failed to parse virtual memory value to a number:" << parts.at(1);
+        return;
+    }
+    quint64 rssMem = parts.at(2).toLongLong(&ok);
+    if (!ok) {
+        qWarning(dcSystemMonitor) << "Failed to parse RSS memory value to a number:" << data;
+        return;
+    }
+    qreal cpuUsage = parts.at(3).toDouble(&ok);
+    if (!ok) {
+        qWarning(dcSystemMonitor) << "Failed to parse CPU usage value to a number:" << parts.at(3);
+        return;
+    }
+    foreach (Device *dev, myDevices()) {
+        dev->setStateValue(systemMonitorRssMemoryStateTypeId, rssMem);
+        dev->setStateValue(systemMonitorPercentMemoryStateTypeId, percentMem);
+        dev->setStateValue(systemMonitorVirtualMemoryStateTypeId, virtualMem);
+        dev->setStateValue(systemMonitorCpuUsageStateTypeId, cpuUsage);
+    }
+}
+

systemmonitor/devicepluginsystemmonitor.h

@@ -0,0 +1,56 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                                         *
+ *  Copyright (C) 2018 Michael Zanetti <michael.zanetti@guh.io             *
+ *                                                                         *
+ *  This file is part of nymea.                                            *
+ *                                                                         *
+ *  This library is free software; you can redistribute it and/or          *
+ *  modify it under the terms of the GNU Lesser General Public             *
+ *  License as published by the Free Software Foundation; either           *
+ *  version 2.1 of the License, or (at your option) any later version.     *
+ *                                                                         *
+ *  This library is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      *
+ *  Lesser General Public License for more details.                        *
+ *                                                                         *
+ *  You should have received a copy of the GNU Lesser General Public       *
+ *  License along with this library; If not, see                           *
+ *  <http://www.gnu.org/licenses/>.                                        *
+ *                                                                         *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef DEVICEPLUGINSYSTEMMONITOR_H
+#define DEVICEPLUGINSYSTEMMONITOR_H
+
+#include "devices/devicemanager.h"
+#include "devices/deviceplugin.h"
+#include "plugintimer.h"
+
+#include <QDebug>
+#include <QProcess>
+#include <QUrlQuery>
+
+
+class DevicePluginSystemMonitor: public DevicePlugin {
+	Q_OBJECT
+    Q_PLUGIN_METADATA(IID "io.nymea.DevicePlugin" FILE "devicepluginsystemmonitor.json")
+	Q_INTERFACES(DevicePlugin)
+
+public:
+    explicit DevicePluginSystemMonitor();
+    ~DevicePluginSystemMonitor() override;
+
+    Device::DeviceSetupStatus setupDevice(Device *device) override;
+    void deviceRemoved(Device *device) override;
+
+private slots:
+    void onRefreshTimer();
+    void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
+private:
+    PluginTimer *m_refreshTimer = nullptr;
+
+};
+
+#endif // DEVICEPLUGINSYSTEMMONITOR_H

systemmonitor/devicepluginsystemmonitor.json

@@ -0,0 +1,63 @@
+{
+    "name": "systemMonitor",
+    "displayName": "System Monitor",
+    "id": "908b4f18-dc0c-4940-a6f7-c0c01a2861b8",
+    "vendors": [
+        {
+            "displayName": "nymea",
+            "name": "nymea",
+            "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6",
+            "deviceClasses": [
+                {
+                    "id": "a3a15700-c251-4803-a608-0f3ddfcbd7a8",
+                    "name": "systemMonitor",
+                    "displayName": "System monitor",
+                    "interfaces": [ "system" ],
+                    "paramTypes": [ ],
+                    "stateTypes": [
+                        {
+                            "id": "56f8fac2-1021-4b96-bf15-23b21bb85b4c",
+                            "name": "cpuUsage",
+                            "displayName": "CPU usage",
+                            "displayNameEvent": "CPU usage changed",
+                            "type": "double",
+                            "unit": "Percentage",
+                            "defaultValue": 0,
+                            "minValue": 0,
+                            "maxValue": 100
+                        },
+                        {
+                            "id": "efe2d520-3b35-4668-b6f5-db3df0c8bf0d",
+                            "name": "percentMemory",
+                            "displayName": "memory usage",
+                            "displayNameEvent": "memory usage changed",
+                            "type": "double",
+                            "unit": "Percentage",
+                            "defaultValue": 0,
+                            "minValue": 0,
+                            "maxValue": 100
+                        },
+                        {
+                            "id": "d9671ee3-51be-4cf8-8601-125c0684aec9",
+                            "name": "rssMemory",
+                            "displayName": "RSS memory usage",
+                            "displayNameEvent": "RSS memory usage changed",
+                            "type": "int",
+                            "unit": "KiloByte",
+                            "defaultValue": 0
+                        },
+                        {
+                            "id": "6d71b001-c7fe-4f08-941d-47009b710d94",
+                            "name": "virtualMemory",
+                            "displayName": "virtual memory usage",
+                            "displayNameEvent": "virtual memory usage changed",
+                            "type": "int",
+                            "unit": "KiloByte",
+                            "defaultValue": 0
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

systemmonitor/systemmonitor.pro

@@ -0,0 +1,9 @@
+include(../plugins.pri)
+
+TARGET = $$qtLibraryTarget(nymea_devicepluginsystemmonitor)
+
+SOURCES += \
+    devicepluginsystemmonitor.cpp \
+
+HEADERS += \
+    devicepluginsystemmonitor.h \

systemmonitor/translations/908b4f18-dc0c-4940-a6f7-c0c01a2861b8-en_US.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>

systemmonitor/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-en_US.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>