From e10e538a0c46012175b98f8fbda6910a1295a722 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 12 Oct 2017 16:14:39 +0200 Subject: [dnbd3] Show free space, fix styling, add help texts and strings (de) --- modules-available/dnbd3/inc/dnbd3rpc.inc.php | 10 +- modules-available/dnbd3/inc/dnbd3util.inc.php | 8 +- modules-available/dnbd3/lang/de/messages.json | 5 + modules-available/dnbd3/lang/de/template-tags.json | 34 ++- modules-available/dnbd3/page.inc.php | 59 +++- .../dnbd3/templates/page-server-locations.html | 2 +- .../dnbd3/templates/page-serverlist.html | 326 +++++++++++++++------ 7 files changed, 331 insertions(+), 113 deletions(-) (limited to 'modules-available/dnbd3') diff --git a/modules-available/dnbd3/inc/dnbd3rpc.inc.php b/modules-available/dnbd3/inc/dnbd3rpc.inc.php index 6134489a..27713bfb 100644 --- a/modules-available/dnbd3/inc/dnbd3rpc.inc.php +++ b/modules-available/dnbd3/inc/dnbd3rpc.inc.php @@ -5,14 +5,15 @@ class Dnbd3Rpc { /** * Query given DNBD3 server for status information. * + * @param string $server server address + * @param int $port server port * @param bool $stats include general stats * @param bool $clients include client list * @param bool $images include image list - * @param string $server server address - * @param int $port server port + * @param bool $diskSpace include disk space stats * @return false|array the queried data as an array, or false on error */ - public static function query($stats, $clients, $images, $server, $port = 5003) + public static function query($server, $port, $stats, $clients, $images, $diskSpace) { // Special case - local server if ($server === '') { @@ -28,6 +29,9 @@ class Dnbd3Rpc { if ($images) { $url .= 'q=images&'; } + if ($diskSpace) { + $url .= 'q=space&'; + } $str = Download::asString($url, 3, $code); if ($str === false || $code !== 200) return false; diff --git a/modules-available/dnbd3/inc/dnbd3util.inc.php b/modules-available/dnbd3/inc/dnbd3util.inc.php index 45ae6135..ae5e0cd7 100644 --- a/modules-available/dnbd3/inc/dnbd3util.inc.php +++ b/modules-available/dnbd3/inc/dnbd3util.inc.php @@ -49,7 +49,7 @@ class Dnbd3Util { // Now query them all $NOW = time(); foreach ($servers as $server) { - $data = Dnbd3Rpc::query(true, false, false, $server['addr']); + $data = Dnbd3Rpc::query($server['addr'], 5003, true, false, false, true); if (!is_array($data) || !isset($data['runId'])) { Database::exec('UPDATE dnbd3_server SET uptime = 0, clientcount = 0 WHERE serverid = :serverid', array('serverid' => $server['serverid'])); @@ -60,7 +60,7 @@ class Dnbd3Util { Database::exec('UPDATE dnbd3_server SET runid = :runid, lastseen = :now, uptime = :uptime, totalup = totalup + If(runid = :runid AND uptime <= :uptime, If(lastup < :up, :up - lastup, 0), If(:uptime < 1800, :up, 0)), totaldown = totaldown + If(runid = :runid AND uptime <= :uptime, If(lastdown < :down, :down - lastdown, 0), If(:uptime < 1800, :up, 0)), - lastup = :up, lastdown = :down, clientcount = :clientcount + lastup = :up, lastdown = :down, clientcount = :clientcount, disktotal = :disktotal, diskfree = :diskfree WHERE serverid = :serverid', array( 'runid' => $data['runId'], 'now' => $NOW, @@ -68,7 +68,9 @@ class Dnbd3Util { 'up' => $data['bytesSent'], 'down' => $data['bytesReceived'], 'clientcount' => $data['clientCount'], - 'serverid' => $server['serverid'] + 'serverid' => $server['serverid'], + 'disktotal' => $data['spaceTotal'], + 'diskfree' => $data['spaceFree'], )); } } diff --git a/modules-available/dnbd3/lang/de/messages.json b/modules-available/dnbd3/lang/de/messages.json index 9d7c143b..b5f455dd 100644 --- a/modules-available/dnbd3/lang/de/messages.json +++ b/modules-available/dnbd3/lang/de/messages.json @@ -1,3 +1,8 @@ { + "invalid-ipv4": "{{0}} ist keine g\u00fcltige IPv4-Adresse", + "server-added": "Server {{0}} hinzugef\u00fcgt", + "server-already-exists": "Server {{0}} existiert bereits", + "server-deleted": "Server {{0}} gel\u00f6scht", + "server-non-existent": "Server {{0}} existiert nicht", "server-unreachable": "Server nicht erreichbar" } \ No newline at end of file diff --git a/modules-available/dnbd3/lang/de/template-tags.json b/modules-available/dnbd3/lang/de/template-tags.json index 8c8f6d7a..0593950c 100644 --- a/modules-available/dnbd3/lang/de/template-tags.json +++ b/modules-available/dnbd3/lang/de/template-tags.json @@ -1,8 +1,40 @@ { + "lang_addServer": "Server hinzuf\u00fcgen", + "lang_allowedSubnets": "Zum Zugriff freigegebene Subnets", + "lang_bytesSent": "Gesendet", + "lang_changeDnbd3Status": "DNBD3 ein-\/ausschalten", + "lang_client": "Client", "lang_clientCount": "Clients", + "lang_clientList": "Liste der Clients", + "lang_clientsByLocation": "Clients nach Raum\/Ort", + "lang_count": "Anzahl", + "lang_disabled": "Deaktiviert", + "lang_diskFree": "Freier Speicher", + "lang_dnbd3IntroText": "DNBD3 ist ganz toll. Einfach einschalten und los gehts, zu beachten gibt es rein gar nichts!", + "lang_dnbd3Management": "DNBD3 Verwaltung", + "lang_dnbd3Status": "DNBD3 Status", + "lang_enableDnbd3": "DNBD3 aktivieren", + "lang_enabled": "Aktiviert", + "lang_enterIpOfServer": "Bitte geben Sie die IP-Adresse des hinzuzuf\u00fcgenden Servers ein", + "lang_externalServer": "Externer DNBD3-Server", + "lang_externalServerAdd": "Externen Server hinzuf\u00fcgen", + "lang_externalServerHelp": "Ein externer Server wird nicht \u00fcber den Satellitenserver konfiguriert und verwaltet. Das Installieren, Einrichten und ggf. Aktualisieren der DNBD3-Serversoftware muss manuell durchgef\u00fchrt werden.\r\nDies bietet mehr Flexibilit\u00e4t bei der Konfiguration und Anpassung, z.B. bei der Verwendung von RAID- oder bcache-Setups, oder wenn der DNBD3-Server auf einer Maschine laufen soll, die noch andere Services bereitstellt.\r\nWeitere Informationen dazu finden Sie im Wiki.", + "lang_global": "Global", "lang_lastSeen": "Letzte Aktivit\u00e4t", + "lang_location": "Ort", + "lang_locations": "Orte", + "lang_manageAccessTo": "Zugriff auf Server festlegen:", + "lang_managedServer": "Automatisch konfigurierter DNBD3-Proxy", + "lang_managedServerAdd": "Automatisch konfigurierten Proxy hinzuf\u00fcgen", + "lang_managedServerHelp": "Automatisch konfigurierte DNBD3-Proxies booten wie gew\u00f6hnliche bwLehrpool-Clients via PXE \u00fcber den Satelliten-Server. Sobald ein bwLehrpool-Client als DNBD3-Proxy konfiguriert wird, erh\u00e4lt er beim Booten eine gesonderte Konfiguration, sodass er fortan exklusiv als DNBD3-Proxy arbeitet, und nicht mehr als Arbeitsstation zur Verf\u00fcgung steht.\r\nDer Vorteil ist, dass die Konfiguration automatisiert erfolgt, und durch w\u00f6chentliche Reboots sichergestellt wird, dass eventuelle Updates des MiniLinux angewendet werden.\r\nIn diesem Fall legen Sie bitte eine Partition mit der ID 45 auf der Festplatte des Proxy-Servers an; diese wird persistent Behandelt und im Gegensatz zur ID44-Partition nicht beim Booten formatiert. Generell sollte diese Partition so gro\u00df wie m\u00f6glich sein, abh\u00e4ngig von der Anzahl der genutzten VMs. Bei Platzmangel l\u00f6scht der Proxy automatisch die VM, die am l\u00e4ngsten nicht verwendet wurde, um neuen VMs Platz zu machen.\r\nWeitere Informationen dazu finden Sie im Wiki.", + "lang_proxyLocationText": "Bla bla bla BLA!!!!", "lang_proxyServerTHead": "Server\/Proxy", + "lang_recursiveCount": "Rekursiv", "lang_rxTotal": "Gesamt empfangen", + "lang_serverList": "Serverliste", + "lang_storageSize": "Speichergr\u00f6\u00dfe", + "lang_test": "Testen", "lang_txTotal": "Gesamt gesendet", - "lang_uptime": "Aktuelle Laufzeit" + "lang_uptime": "Aktuelle Laufzeit", + "lang_wantToDelete": "Wollen Sie diesen Server wirklich entfernen? (Rebooten\/Ausschalten muss in diesem Fall manuell vorgenommen werden)" } \ No newline at end of file diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php index 3489cc5b..a2d47f1e 100644 --- a/modules-available/dnbd3/page.inc.php +++ b/modules-available/dnbd3/page.inc.php @@ -20,12 +20,20 @@ class Page_Dnbd3 extends Page $this->addServer(); } elseif ($action === 'savelocations') { $this->saveServerLocations(); + } elseif ($action === 'toggle-usage') { + $this->toggleUsage(); } if (Request::isPost()) { Util::redirect('?do=dnbd3'); } } + private function toggleUsage() + { + $enabled = Request::post('enabled', false, 'bool'); + Dnbd3::setEnabled($enabled); + } + private function saveServerLocations() { $server = $this->getServerById(); @@ -103,8 +111,8 @@ class Page_Dnbd3 extends Page private function showServerList() { $dynClients = RunMode::getForMode(Page::getModule(), 'proxy', true, true); - $res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastseen, - s.uptime, s.totalup, s.totaldown, s.clientcount, Count(sxl.locationid) AS locations + $res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastseen AS dnbd3lastseen, + s.uptime, s.totalup, s.totaldown, s.clientcount, s.disktotal, s.diskfree, Count(sxl.locationid) AS locations FROM dnbd3_server s LEFT JOIN dnbd3_server_x_location sxl USING (serverid) GROUP BY s.serverid'); @@ -117,33 +125,54 @@ class Page_Dnbd3 extends Page unset($dynClients[$server['machineuuid']]); } if ($server['uptime'] != 0) { - $server['uptime'] += ($NOW - $server['lastseen']); + $server['uptime'] += ($NOW - $server['dnbd3lastseen']); } - $server['lastseen_s'] = $server['lastseen'] ? date('d.m.Y H:i', $server['lastseen']) : '-'; + $server['dnbd3lastseen_s'] = $server['dnbd3lastseen'] ? date('d.m.Y H:i', $server['dnbd3lastseen']) : '-'; $server['uptime_s'] = $server['uptime'] ? floor($server['uptime'] / 86400) . 'd ' . gmdate('H:i', $server['uptime']) : '-'; $server['totalup_s'] = Util::readableFileSize($server['totalup']); $server['totaldown_s'] = Util::readableFileSize($server['totaldown']); + if ($server['disktotal'] > 0) { + $server['disktotal_s'] = Util::readableFileSize($server['disktotal']); + $server['diskfree_s'] = Util::readableFileSize($server['diskfree']); + $server['diskUsePercent'] = floor(100 - 100 * $server['diskfree'] / $server['disktotal']); + } else { + $server['disktotal_s'] = '?'; + $server['diskfree_s'] = '?'; + $server['diskUsePercent'] = 0; + } $server['self'] = ($server['fixedip'] === ''); - $servers[] = $server; + if (isset($server['clientip']) && !is_null($server['clientip'])) { + if ($NOW - $server['lastseen'] > 360) { + $server['slxDown'] = true; + } else { + $server['slxOk'] = true; + } + } if ($server['self']) { $sort[] = '---'; } else { $sort[] = $server['fixedip'] . '.' . $server['machineuuid']; } + $servers[] = $server; } foreach ($dynClients as $server) { $servers[] = $server; $sort[] = '-' . $server['machineuuid']; + Database::exec('INSERT INTO dnbd3_server (machineuuid) VALUES (:uuid)', array('uuid' => $server['machineuuid'])); } array_multisort($sort, SORT_ASC, $servers); - Render::addTemplate('page-serverlist', array('list' => $servers)); + Render::addTemplate('page-serverlist', array( + 'list' => $servers, + 'enabled' => Dnbd3::isEnabled(), + 'checked_s' => Dnbd3::isEnabled() ? 'checked' : '', + )); } private function showClientList() { $server = $this->getServerById(); Render::addTemplate('page-header-servername', $server); - $data = Dnbd3Rpc::query(false, true, false, $server['ip']); + $data = Dnbd3Rpc::query($server['ip'], 5003,false, true, false, false); if ($data === false || !isset($data['clients'])) { Message::addError('server-unreachable'); return; @@ -226,7 +255,7 @@ class Page_Dnbd3 extends Page $serverId = Request::any('server', false, 'int'); } if ($serverId === false) { - Message::addError('parameter-missing', 'server'); + Message::addError('main.parameter-missing', 'server'); Util::redirect('?do=dnbd3'); } $server = Database::queryFirst('SELECT s.serverid, s.machineuuid, s.fixedip, m.clientip, m.hostname @@ -253,7 +282,7 @@ class Page_Dnbd3 extends Page protected function doAjax() { - $action = Request::post('action', false, 'string'); + $action = Request::any('action', false, 'string'); if ($action === 'servertest') { Header('Content-Type: application/json; charset=utf-8'); $ip = Request::post('ip', false, 'string'); @@ -272,7 +301,7 @@ class Page_Dnbd3 extends Page if ($res !== false) die('{"error": "Server with this IP already exists", "fatal": true}'); // Query - $reply = Dnbd3Rpc::query(true, false, false, $ip); + $reply = Dnbd3Rpc::query($ip, 5003,true, false, false, true); if ($reply === false) die('{"error": "Could not reach server"}'); if (!is_array($reply)) @@ -280,6 +309,16 @@ class Page_Dnbd3 extends Page if (!isset($reply['uptime']) || !isset($reply['clientCount'])) die('{"error": "Reply does not suggest this is a dnbd3 server"}'); echo json_encode($reply); + } elseif ($action === 'editserver') { + $server = $this->getServerById(); + if (isset($server['machineuuid'])) { + echo 'Not automatic server.'; + } else { + //RunMode::getForModule() + echo Render::parse('fragment-server-settings', $server); + } + } else { + die($action . '???'); } } diff --git a/modules-available/dnbd3/templates/page-server-locations.html b/modules-available/dnbd3/templates/page-server-locations.html index 8e76a68d..20dddaac 100644 --- a/modules-available/dnbd3/templates/page-server-locations.html +++ b/modules-available/dnbd3/templates/page-server-locations.html @@ -7,7 +7,7 @@
- diff --git a/modules-available/dnbd3/templates/page-serverlist.html b/modules-available/dnbd3/templates/page-serverlist.html index 76f9ca35..84c587a2 100644 --- a/modules-available/dnbd3/templates/page-serverlist.html +++ b/modules-available/dnbd3/templates/page-serverlist.html @@ -1,128 +1,252 @@

{{lang_dnbd3Management}}

{{lang_dnbd3IntroText}}

-
+
+
+ {{lang_dnbd3Status}}: + + {{#enabled}}{{lang_enabled}}{{/enabled}} + {{^enabled}}{{lang_disabled}} (NFS/CIFS){{/enabled}} + + – {{lang_changeDnbd3Status}} +
+
+
+ + +
+ + +
+ + +
+
+
+ +
+

{{lang_serverList}} - +

+
- - - - - - - - - - - {{#list}} - - - - - - - - - - - {{/list}} + + + + + + + + + + + + + + + + + + {{#list}} + + + + + + + + + + + + + + {{/list}} +
{{lang_proxyServerTHead}}{{lang_clientCount}}{{lang_lastSeen}}{{lang_uptime}}{{lang_txTotal}}{{lang_rxTotal}}{{lang_locations}} 
- {{#uptime}} - - {{/uptime}} - {{^uptime}} - - {{/uptime}} - {{fixedip}} - {{#machineuuid}} - {{clientip}} -
{{hostname}}
- {{/machineuuid}} - 		- {{#uptime}} - {{clientcount}} - {{/uptime}} - {{^uptime}} - - - {{/uptime}} - - {{lastseen_s}} - - {{uptime_s}} - - {{totalup_s}} - - {{totaldown_s}} - - {{^self}} - {{^locations}} - {{lang_global}} - {{/locations}} - {{#locations}} - {{locations}} - {{/locations}} - - - - {{/self}} - - {{^self}} - - {{/self}} -
{{lang_proxyServerTHead}}{{lang_storageSize}}{{lang_clientCount}}{{lang_lastSeen}}{{lang_uptime}}{{lang_txTotal}}{{lang_rxTotal}}{{lang_locations}}
+ {{#slxOk}} + + {{/slxOk}} + {{#slxDown}} + + {{/slxDown}} + + {{#uptime}} + + {{/uptime}} + {{^uptime}} + + {{/uptime}} + + {{fixedip}} + {{#machineuuid}} + {{clientip}} +
{{hostname}}
+ {{/machineuuid}} + 		+
+ {{disktotal_s}} +
+ 		+ {{#uptime}} + {{clientcount}} + {{/uptime}} + {{^uptime}} + - + {{/uptime}} + + {{dnbd3lastseen_s}} + + {{uptime_s}} + + {{totalup_s}} + + {{totaldown_s}} + + {{^self}} + {{^locations}} + {{lang_global}} + {{/locations}} + {{#locations}} + {{locations}} + {{/locations}} + + + + {{/self}} + + {{#machineuuid}} + + {{/machineuuid}} + {{^self}} + + {{/self}} +
-
- - - - {{lang_addManagedProxy}} - +
+
+ + +
+
+ + + {{lang_managedServerAdd}} + + +
-