mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

More work on the portal in particular graphs.

pull/558/head
jprochazka 2024-06-20 00:31:56 -04:00
rodzic c4d76a8909
commit 05455798bb
8 zmienionych plików z 28 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
bash/portal/graphs.sh
Wyświetl plik

@ -159,6 +159,8 @@ LoadPlugin table
LoadPlugin interface
LoadPlugin memory
LoadPlugin cpu
LoadPlugin cpufreq
LoadPlugin thermal
LoadPlugin aggregation
LoadPlugin match_regex
LoadPlugin df

2
bash/portal/install.sh
Wyświetl plik

@ -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 += (

2
bash/variables.sh
Wyświetl plik

@ -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"

22
build/portal/graphs/dump1090.py
Wyświetl plik

@ -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'])

2
build/portal/html/classes/template.class.php
Wyświetl plik

@ -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");

2
build/portal/html/install/index.php
Wyświetl plik

@ -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")) {

11
build/portal/html/install/upgrade.php
Wyświetl plik

@ -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.

2
build/portal/html/system.php
Wyświetl plik

@ -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'];