v3.4.3

.github/workflows/checkPHP.yml

@@ -12,8 +12,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: PHP Syntax Checker (Lint)
-        uses: StephaneBour/actions-php-lint@8.2
+        uses: StephaneBour/actions-php-lint@8.4
         with:
           dir: '.'

.gitignore

@@ -1 +1,55 @@
+# IDE & Editors
+.vscode/*
+!.vscode/extensions.json
+!.vscode/cspell.json
+!.vscode/settings.json
 
+# OS Generated Files
+# Windows
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+
+# Editor Temporary Files
+*.swp
+*.swo
+*~
+*.bak
+*.orig
+
+# PHP Temporary Files
+*.tmp
+*.cache
+
+# Environment & Configuration
+.env
+.env.local
+.env.*.local
+
+# Logs
+logs/
+*.log
+
+# Temporary Directories
+tmp/
+temp/
+cache/
+
+# PHP Development Tools
+.php_cs.cache
+.php-cs-fixer.cache
+
+# PHPUnit
+/phpunit.xml
+/.phpunit.result.cache
+/coverage/
+
+# Build & Distribution
+/build/
+/dist/
+
+# Security & Credentials
+*.pem
+*.key
+id_rsa*

.vscode/cspell.json

@@ -0,0 +1,117 @@
+{
+    "version": "0.2",
+    "words": [
+        "addressip",
+        "ajax",
+        "armv",
+        "asus",
+        "asuswrt",
+        "boottime",
+        "buffcache",
+        "buildno",
+        "buildnumber",
+        "CACHEDEV",
+        "cartereseau",
+        "cartereseauautre",
+        "cartesreseau",
+        "clientlist",
+        "colorhigh",
+        "colorlow",
+        "commandtab",
+        "coretemp",
+        "cpufreq",
+        "Cubie",
+        "dataresult",
+        "debian",
+        "dependancy",
+        "depinstall",
+        "deporte",
+        "distri",
+        "dnsmasq",
+        "ehthumbs",
+        "ELEC",
+        "Eqlogic",
+        "eqlogictab",
+        "equipement",
+        "Equipement",
+        "esata",
+        "Etat",
+        "Eteindre",
+        "Etes",
+        "firmver",
+        "Formated",
+        "freebsd",
+        "getcfg",
+        "getconf",
+        "getconfiguration",
+        "getsysinfo",
+        "gsub",
+        "hddesata",
+        "hddusb",
+        "hddv",
+        "Historized",
+        "htmlstate",
+        "hwmon",
+        "iface",
+        "ifname",
+        "ifnames",
+        "isset",
+        "jffs",
+        "loadavg",
+        "Localor",
+        "localorremote",
+        "localoudistant",
+        "maitreesclave",
+        "medion",
+        "mips",
+        "mmcblk",
+        "Monitoringcli",
+        "Namedashboard",
+        "Namemobile",
+        "ncpu",
+        "netauto",
+        "netautre",
+        "nvram",
+        "Odroid",
+        "paramaction",
+        "PCPVERS",
+        "pcpversion",
+        "phpunit",
+        "physmem",
+        "portssh",
+        "POSTSAVE",
+        "poweroffcmd",
+        "productid",
+        "productversion",
+        "PULLCUSTOM",
+        "PULLLOCAL",
+        "Rafraichir",
+        "realip",
+        "rebootcmd",
+        "RXTX",
+        "Ryzen",
+        "smallfixnumber",
+        "SSHM",
+        "sshmanager",
+        "sunxi",
+        "swapinfo",
+        "syno",
+        "synoinfo",
+        "synologyesata",
+        "synologyusb",
+        "synologyv",
+        "temppath",
+        "tempsense",
+        "Thresholdd",
+        "timeoutsrv",
+        "timeoutssh",
+        "totalsize",
+        "txrx",
+        "unconfigured",
+        "upnpmodelname",
+        "virt",
+        "wlan",
+        "Wyse"
+    ],
+    "ignoreWords": []
+}

.vscode/settings.json

@@ -1,106 +1 @@
-{
-    "cSpell.words": [
-        "addressip",
-        "armv",
-        "asus",
-        "asuswrt",
-        "boottime",
-        "buffcache",
-        "buildno",
-        "buildnumber",
-        "CACHEDEV",
-        "cartereseau",
-        "cartereseauautre",
-        "cartesreseau",
-        "clientlist",
-        "colorhigh",
-        "colorlow",
-        "commandtab",
-        "coretemp",
-        "cpufreq",
-        "Cubie",
-        "dataresult",
-        "debian",
-        "dependancy",
-        "depinstall",
-        "deporte",
-        "distri",
-        "dnsmasq",
-        "ELEC",
-        "Eqlogic",
-        "eqlogictab",
-        "equipement",
-        "Equipement",
-        "Etat",
-        "firmver",
-        "Formated",
-        "freebsd",
-        "getcfg",
-        "getconf",
-        "getconfiguration",
-        "getsysinfo",
-        "gsub",
-        "hddesata",
-        "hddusb",
-        "hddv",
-        "Historized",
-        "hwmon",
-        "iface",
-        "ifname",
-        "ifnames",
-        "jffs",
-        "loadavg",
-        "Localor",
-        "localorremote",
-        "localoudistant",
-        "maitreesclave",
-        "medion",
-        "mips",
-        "mmcblk",
-        "Monitoringcli",
-        "Namedashboard",
-        "Namemobile",
-        "ncpu",
-        "netauto",
-        "netautre",
-        "nvram",
-        "Odroid",
-        "paramaction",
-        "PCPVERS",
-        "pcpversion",
-        "physmem",
-        "portssh",
-        "POSTSAVE",
-        "poweroffcmd",
-        "productid",
-        "productversion",
-        "PULLCUSTOM",
-        "PULLLOCAL",
-        "Rafraichir",
-        "realip",
-        "rebootcmd",
-        "RXTX",
-        "Ryzen",
-        "smallfixnumber",
-        "SSHM",
-        "sshmanager",
-        "sunxi",
-        "swapinfo",
-        "syno",
-        "synoinfo",
-        "synologyesata",
-        "synologyusb",
-        "synologyv",
-        "temppath",
-        "tempsense",
-        "Thresholdd",
-        "timeoutsrv",
-        "timeoutssh",
-        "totalsize",
-        "txrx",
-        "upnpmodelname",
-        "virt",
-        "wlan",
-        "Wyse"
-    ]
-}
+{}

core/ajax/Monitoring.ajax.php

@@ -41,6 +41,73 @@
         }
     }
 
+    if (init('action') == 'getHealthData') {
+        $eqLogics = eqLogic::byType('Monitoring');
+        $healthData = array();
+
+        foreach ($eqLogics as $eqLogic) {
+            $type = $eqLogic->getConfiguration('localoudistant', '');
+
+            // Get last refresh from uptime command collectDate
+            $uptimeCmd = $eqLogic->getCmd('info', 'uptime');
+            $lastUptime = null;
+            if (is_object($uptimeCmd)) {
+                $lastUptime = $uptimeCmd->getCollectDate();
+            }
+
+            $eqData = array(
+                'id' => $eqLogic->getId(),
+                'name' => $eqLogic->getName(),
+                'isEnable' => (int)$eqLogic->getIsEnable(),
+                'isVisible' => (int)$eqLogic->getIsVisible(),
+                'type' => $type !== '' ? $type : 'unconfigured',
+                'sshHostId' => $eqLogic->getConfiguration('SSHHostId', ''),
+                'sshHostName' => '',
+                'lastRefresh' => $lastUptime,
+                'cronCustom' => (int)$eqLogic->getConfiguration('pull_use_custom', 0),
+                'commands' => array()
+            );
+
+            // Get SSH host name if distant
+            if ($eqData['type'] === 'distant' && $eqData['sshHostId'] !== '') {
+                $sshHost = eqLogic::byId($eqData['sshHostId']);
+                if (is_object($sshHost)) {
+                    $eqData['sshHostName'] = $sshHost->getName();
+                }
+            }
+
+            // Get specific commands values by logicalId
+            $cmdLogicalIds = array(
+                'sshStatus' => 'cnx_ssh',
+                'cronStatus' => 'cron_status',
+                'uptime' => 'uptime',
+                'loadAvg1' => 'load_avg_1mn',
+                'loadAvg5' => 'load_avg_5mn',
+                'loadAvg15' => 'load_avg_15mn',
+                'ip' => 'network_ip'
+            );
+
+            foreach ($cmdLogicalIds as $key => $logicalId) {
+                $cmd = $eqLogic->getCmd('info', $logicalId);
+                if (is_object($cmd)) {
+                    $eqData['commands'][$key] = array(
+                        'id' => $cmd->getId(),
+                        'value' => $cmd->execCmd(),
+                        'unit' => $cmd->getUnite(),
+                        'collectDate' => $cmd->getCollectDate(),
+                        'valueDate' => $cmd->getValueDate()
+                    );
+                } else {
+                    $eqData['commands'][$key] = null;
+                }
+            }
+
+            $healthData[] = $eqData;
+        }
+
+        ajax::success($healthData);
+    }
+
     throw new Exception(__('Aucune méthode correspondante à : ', __FILE__) . init('action'));
     /*     * *********Catch exeption*************** */
 } catch (Exception $e) {