diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page index 37f29c192..274b2fa8b 100644 --- a/plugins/dynamix.docker.manager/DockerSettings.page +++ b/plugins/dynamix.docker.manager/DockerSettings.page @@ -66,6 +66,7 @@ foreach ($custom as $network) {
+ Enable Docker: : +
Enable VMs:
diff --git a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php index 9139832d6..a7b1395ec 100644 --- a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php @@ -12,11 +12,9 @@ ?> @@ -542,6 +543,35 @@ function toggle_net(init) { $('.net_closed').show(); } } +function parseINI(data){ + var regex = { + section: /^\s*\[\s*\"*([^\]]*)\s*\"*\]\s*$/, + param: /^\s*([^=]+?)\s*=\s*\"*(.*?)\s*\"*$/, + comment: /^\s*;.*$/ + }; + var value = {}; + var lines = data.split(/[\r\n]+/); + var section = null; + lines.forEach(function(line){ + if(regex.comment.test(line)){ + return; + }else if(regex.param.test(line)){ + var match = line.match(regex.param); + if(section){ + value[section][match[1]] = match[2]; + }else{ + value[match[1]] = match[2]; + } + }else if(regex.section.test(line)){ + var match = line.match(regex.section); + value[match[1]] = {}; + section = match[1]; + }else if(line.length == 0 && section){ + section = null; + }; + }); + return value; +} $(function() { dropdown('enter_share'); dropdown('enter_view'); @@ -557,9 +587,14 @@ $(function() { cpuload_sub.on("message", function(message, message_metadata) { // message should be something like: {"cpuload": {"cpu":[0,0],"cpu0":[0,0],"cpu1":[0,0],"cpu2":[0,0],"cpu3":[0,0]}} // The array values are [,]. guest-percentage is that part of load-percentage that is being consumed by VM guests - var json = $.parseJSON(message); - $.each(json["cpuload"],function(k,v) { - $('#'+k).animate({width:v[0]+'%'},{step:function(){$('#'+k).css('overflow','visible');}}).text(v[0]+'%'); +// var json = $.parseJSON(message); +// $.each(json["cpuload"],function(k,v) { +// $('#'+k).animate({width:v[0]+'%'},{step:function(){$('#'+k).css('overflow','visible');}}).text(v[0]+'%'); +// }); + // message is the cpuload.ini file contents + var ini = parseINI(message); + $.each(ini,function(k,v) { + $('#'+k).animate({width:v['host']+'%'},{step:function(){$('#'+k).css('overflow','visible');}}).text(v['host']+'%'); }); }); cpuload_sub.start(); diff --git a/plugins/dynamix/Dashboard.page b/plugins/dynamix/Dashboard.page index 3400fe911..4433ae9d1 100644 --- a/plugins/dynamix/Dashboard.page +++ b/plugins/dynamix/Dashboard.page @@ -1,3 +1,3 @@ Menu="Tasks:1" Type="xmenu" -Tabs="false" \ No newline at end of file +Tabs="false" diff --git a/plugins/dynamix/DateTime.page b/plugins/dynamix/DateTime.page index f56452447..7d37b130d 100644 --- a/plugins/dynamix/DateTime.page +++ b/plugins/dynamix/DateTime.page @@ -18,7 +18,7 @@ Icon="date-time.png" Current date and time: -: +: Time zone: : "> +: "> > Enter the current time-of-day. Use format YYYY-MM-DD HH:MM:SS. Greyed out when using NTP. diff --git a/plugins/dynamix/Main.page b/plugins/dynamix/Main.page index 7b626ef43..7dc742b4e 100644 --- a/plugins/dynamix/Main.page +++ b/plugins/dynamix/Main.page @@ -1,2 +1,2 @@ Menu="Tasks:1" -Type="xmenu" \ No newline at end of file +Type="xmenu" diff --git a/plugins/dynamix/event/heartbeat/cpuload b/plugins/dynamix/event/heartbeat/cpuload deleted file mode 100755 index eeb7bfde9..000000000 --- a/plugins/dynamix/event/heartbeat/cpuload +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/php - diff --git a/plugins/dynamix/event/heartbeat/watchdog b/plugins/dynamix/event/heartbeat/watchdog deleted file mode 100755 index 64af22059..000000000 --- a/plugins/dynamix/event/heartbeat/watchdog +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/php -Array Stopped"; -elseif ($fsState == "Starting") - $state = "Array Starting"; -else { - $state = "Array Started"; - $mdResync = $var['mdResync']; - if ($mdResync > 0) { - $mdResyncAction = $var['mdResyncAction']; - if (strstr($mdResyncAction, "recon")) $action="Parity-Sync / Data-Rebuild"; - elseif (strstr($mdResyncAction, "clear")) $action="Clearing"; - elseif ($mdResyncAction == "check") $action="Read-Check"; - elseif (strstr($mdResyncAction, "check")) $action="Parity-Check"; - $mdResyncPos = $var['mdResyncPos']; - $progress = number_format($mdResyncPos/($mdResync/100+1),1); - $state .= "•$action $progress %"; - } -} -publish("watchdog", $state); -?> diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index 0e0695cd5..a1ef5fb0d 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -208,7 +208,7 @@ case 'parity': $mode = 'Parity-Check'; } echo "".$mode." in progress... Completed: ".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),0)." %."; - echo "
Elapsed time: ".my_clock(floor(($var['currTime']-$var['sbUpdated'])/60)).". Estimated finish: ".my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)).""; + echo "
Elapsed time: ".my_clock(floor((time()-$var['sbUpdated'])/60)).". Estimated finish: ".my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)).""; break; case 'shares': $names = explode(',',$_POST['names']); diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index aac1fbf03..8452047d4 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -338,7 +338,7 @@ case 'parity': $data = []; if ($var['mdResync']>0) { $data[] = my_scale($var['mdResync']*1024,$unit)." $unit"; - $data[] = my_clock(floor(($var['currTime']-$var['sbUpdated'])/60)); + $data[] = my_clock(floor((time()-$var['sbUpdated'])/60)); $data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResync']/100+1)),1,substr($display['number'],0,1),'')." %)"; $data[] = my_scale($var['mdResyncDb']*1024/$var['mdResyncDt'],$unit, 1)." $unit/sec"; $data[] = my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)); diff --git a/plugins/dynamix/include/NotificationAgents.xml b/plugins/dynamix/include/NotificationAgents.xml index a4a50cdc9..38dbf33f0 100644 --- a/plugins/dynamix/include/NotificationAgents.xml +++ b/plugins/dynamix/include/NotificationAgents.xml @@ -205,7 +205,8 @@ ############ TITLE=$(echo -e "$TITLE") MESSAGE=$(echo -e "$MESSAGE") - curl -X POST -d "payload={\"username\": \"$APP_NAME\", \"text\": \"*$TITLE* \n $MESSAGE\"}" $WEBH_URL 2>&1 + curl -X POST --header 'Content-Type: application/json' \ + -d "{\"username\": \"$APP_NAME\", \"text\": \"*$TITLE* \n $MESSAGE\"}" $WEBH_URL 2>&1 ]]> diff --git a/plugins/dynamix/include/publish.php b/plugins/dynamix/include/publish.php index 5ed291cd3..7b4ead5e9 100644 --- a/plugins/dynamix/include/publish.php +++ b/plugins/dynamix/include/publish.php @@ -22,10 +22,6 @@ function curl_socket($socket, $url, $postdata = NULL) curl_exec($ch); curl_close($ch); } -function refresh_emhttp_state() -{ - curl_socket("/var/run/emhttpd.socket", "http://localhost/status.htm"); -} function publish($endpoint, $message) { curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=1", $message); diff --git a/plugins/dynamix/scripts/diskload b/plugins/dynamix/scripts/diskload index 4440b9871..47161f9ca 100755 --- a/plugins/dynamix/scripts/diskload +++ b/plugins/dynamix/scripts/diskload @@ -1,5 +1,4 @@ #!/bin/bash -# todo: this should generate/publish json-encoded string ini=/var/local/emhttp/diskload.ini declare -a sector reads writes diff --git a/plugins/dynamix/scripts/emhttpd_update b/plugins/dynamix/scripts/emhttpd_update new file mode 100755 index 000000000..e626c30c1 --- /dev/null +++ b/plugins/dynamix/scripts/emhttpd_update @@ -0,0 +1,18 @@ +#!/usr/bin/php -q + + diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor index 2e0e77d6b..bd673d354 100755 --- a/plugins/dynamix/scripts/monitor +++ b/plugins/dynamix/scripts/monitor @@ -12,8 +12,6 @@ */ ?>