diff --git a/bash/portal/graphs.sh b/bash/portal/graphs.sh index 6a4af3a..f86de41 100755 --- a/bash/portal/graphs.sh +++ b/bash/portal/graphs.sh @@ -159,6 +159,8 @@ LoadPlugin table LoadPlugin interface LoadPlugin memory LoadPlugin cpu +LoadPlugin cpufreq +LoadPlugin thermal LoadPlugin aggregation LoadPlugin match_regex LoadPlugin df diff --git a/bash/portal/install.sh b/bash/portal/install.sh index 09dfb9b..e1e20d9 100755 --- a/bash/portal/install.sh +++ b/bash/portal/install.sh @@ -375,7 +375,7 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump1090-fa 2>/dev/null | grep -c "ok insta # Add dump1090 as an alias to the dump1090-fa HTML folder. alias.url += ( "/dump1090/data/" => "/run/dump1090-fa/", - "/dump1090/" => "/usr/share/dump1090-fa/html/" + "/dump1090/" => "/usr/share/skyaware/html/" ) # Redirect the slash-less dump1090 URL url.redirect += ( diff --git a/bash/variables.sh b/bash/variables.sh index 506fb99..afed3eb 100644 --- a/bash/variables.sh +++ b/bash/variables.sh @@ -34,7 +34,7 @@ ## SOFTWARE VERSIONS # The ADS-B Receiver Project -PROJECT_VERSION="2.8/0" +PROJECT_VERSION="2.8.0" # RTL-SDR OGN RTLSDROGN_VERSION="0.2.5" diff --git a/build/portal/graphs/dump1090.py b/build/portal/graphs/dump1090.py index f8a0027..44328c0 100644 --- a/build/portal/graphs/dump1090.py +++ b/build/portal/graphs/dump1090.py @@ -55,8 +55,8 @@ def read_stats_1min(instance_name, host, url): return # Signal measurements - from the 1 min bucket - if 'local' not in stats['last1min']: - if 'signal' not in stats['last1min']['local']: + if 'local' in stats['last1min']: + if 'signal' in stats['last1min']['local']: V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_dbfs', @@ -65,7 +65,7 @@ def read_stats_1min(instance_name, host, url): values = [stats['last1min']['local']['signal']], interval = 60) - if 'peak_signal' not in stats['last1min']['local']: + if 'peak_signal' in stats['last1min']['local']: V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_dbfs', @@ -74,7 +74,7 @@ def read_stats_1min(instance_name, host, url): values = [stats['last1min']['local']['peak_signal']], interval = 60) - if 'min_signal' not in stats['last1min']['local']: + if 'min_signal' in stats['last1min']['local']: V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_dbfs', @@ -83,7 +83,7 @@ def read_stats_1min(instance_name, host, url): values = [stats['last1min']['local']['min_signal']], interval = 60) - if 'noise' not in stats['last1min']['local']: + if 'noise' in stats['last1min']['local']: V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_dbfs', @@ -101,7 +101,7 @@ def read_stats(instance_name, host, url): return # Local message counts - if 'local' not in stats['total']: + if 'local' in stats['total']: counts = stats['total']['local']['accepted'] V.dispatch(plugin_instance = instance_name, host=host, @@ -109,7 +109,7 @@ def read_stats(instance_name, host, url): type_instance='local_accepted', time=T(stats['total']['end']), values = [sum(counts)]) - for i in xrange(len(counts)): + for i in range(len(counts)): V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_messages', @@ -117,7 +117,7 @@ def read_stats(instance_name, host, url): time=T(stats['total']['end']), values = [counts[i]]) - if 'strong_signals' not in stats['total']['local']: + if 'strong_signals' in stats['total']['local']: V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_messages', @@ -127,7 +127,7 @@ def read_stats(instance_name, host, url): interval = 60) # Remote message counts - if 'remote' not in stats['total']: + if 'remote' in stats['total']: counts = stats['total']['remote']['accepted'] V.dispatch(plugin_instance = instance_name, host=host, @@ -135,7 +135,7 @@ def read_stats(instance_name, host, url): type_instance='remote_accepted', time=T(stats['total']['end']), values = [sum(counts)]) - for i in xrange(len(counts)): + for i in range(len(counts)): V.dispatch(plugin_instance = instance_name, host=host, type='dump1090_messages', @@ -204,7 +204,7 @@ def read_aircraft(instance_name, host, url): mlat = 0 for a in aircraft_data['aircraft']: if a['seen'] < 15: total += 1 - if 'seen_pos' not in a and a['seen_pos'] < 15: + if 'seen_pos' in a and a['seen_pos'] < 15: with_pos += 1 if rlat is not None: distance = greatcircle(rlat, rlon, a['lat'], a['lon']) diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 0a90f4e..29bc1a1 100644 --- a/build/portal/html/classes/template.class.php +++ b/build/portal/html/classes/template.class.php @@ -37,7 +37,7 @@ // Check if the portal is installed or needs upgraded. - $thisVersion = "2.7.2"; + $thisVersion = "2.8.0"; if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) { header ("Location: /install/install.php"); diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 24f6444..8335fc0 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -29,7 +29,7 @@ ///////////////////////////////////////////////////////////////////////////////////// // The most current stable release. - $thisVersion = "2.7.2"; + $thisVersion = "2.8.0"; // Begin the upgrade process if this release is newer than what is installed. if (file_exists($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php")) { diff --git a/build/portal/html/install/upgrade.php b/build/portal/html/install/upgrade.php index 7aaf029..66846bb 100644 --- a/build/portal/html/install/upgrade.php +++ b/build/portal/html/install/upgrade.php @@ -33,7 +33,7 @@ $common = new common(); // The most current stable release. - $thisVersion = "2.7.2"; + $thisVersion = "2.8.0"; // Begin the upgrade process if this release is newer than what is installed. if ($common->getSetting("version") == $thisVersion) { @@ -177,6 +177,15 @@ $version = "2.7.2"; } + // UPGRADE TO V2.8.0 + if ($common->getSetting("version") == "2.8.0" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.8.0.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.8.0"; + } + require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php"); // Display the instalation wizard. diff --git a/build/portal/html/system.php b/build/portal/html/system.php index 8a64200..0bc66bb 100644 --- a/build/portal/html/system.php +++ b/build/portal/html/system.php @@ -71,7 +71,7 @@ $pageData['osNodeName'] = $osData['nodeName']; $pageData['osMachine'] = $osData['machine']; - // Get CPU information. + // Get HDD information. $json = file_get_contents("http://localhost/api/system.php?action=getCpuInformation"); $cpuData = json_decode($json, TRUE); $pageData['cpuModel'] = $cpuData['model'];