Skip to content

Commit

Permalink
Merge pull request #195 from TiTidom-RC/dev
Browse files Browse the repository at this point in the history
remove OpenElec from supported OS
  • Loading branch information
TiTidom-RC authored Nov 5, 2024
2 parents e16da15 + bb46cf0 commit b8f56a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions core/class/Monitoring.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2100,7 +2100,7 @@ public function getRemoteArchKeys($hostId, $osType = '') {
$distri_name_value = $this->execSSH($hostId, $distri_name_cmd, 'DistriName');

// Search for specific distribution in distri_name_value
$distriValues = ['OpenELEC', 'LibreELEC', 'piCorePlayer', 'FreeBSD'];
$distriValues = ['LibreELEC', 'piCorePlayer', 'FreeBSD'];
$foundDistri = false;
foreach ($distriValues as $distriValue) {
if (stripos($distri_name_value, $distriValue) !== false) {
Expand Down Expand Up @@ -2298,11 +2298,6 @@ public function getCommands($key, $subKey = '', $cartereseau = '', $confLocalorR
'distri_bits' => ['cmd', $distri_bits_command_alt],
'hdd' => sprintf($hdd_command_alt, '/storage')
],
'OpenELEC' => [
// OpenElec :: SubKey (distri_name ?)
'distri_bits' => ['cmd', $distri_bits_command_alt],
'hdd' => sprintf($hdd_command_alt, '/storage')
],
'piCorePlayer' => [ // distri_name
'ARMv' => ['cmd', "uname -m 2>/dev/null"],
'distri_bits' => ['cmd', "uname -m | grep -q '64' && echo \"64\" || echo \"32\""],
Expand Down Expand Up @@ -2385,7 +2380,7 @@ public function getCommands($key, $subKey = '', $cartereseau = '', $confLocalorR
],
];

$cmdRemoteSpecific['armv7l'] = &$cmdRemoteSpecific['aarch64']; // Included OS : OSMC, LibreELEC, OpenELEC?
$cmdRemoteSpecific['armv7l'] = &$cmdRemoteSpecific['aarch64']; // Included OS : OSMC, LibreELEC
$cmdRemoteSpecific['mips64'] = &$cmdRemoteSpecific['aarch64'];
$cmdRemoteSpecific['i686'] = &$cmdRemoteSpecific['x86_64'];
$cmdRemoteSpecific['i386'] = &$cmdRemoteSpecific['x86_64'];
Expand Down
2 changes: 1 addition & 1 deletion plugin_info/info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "Monitoring",
"name": "Monitoring",
"pluginVersion": "3.1.1",
"pluginVersion": "3.1.2",
"description": {
"fr_FR": "Plugin permettant le monitoring des équipements locaux et distants (via SSH). Le plugin affichera les informations systèmes d'équipements sous Linux ou Synology (Distribution, CPU, Mémoire, Disques, Swap).",
"en_US": "Plugin to monitor local and remote equipments (through SSH). The plugin will display system informations from Linux or Synology (Distribution, CPU, Memory, Disks, Swap).",
Expand Down

0 comments on commit b8f56a2

Please sign in to comment.