kopia lustrzana https://github.com/jprochazka/adsb-receiver
Missed merge conflict tags.
Joe Prochazka
rodzic
d5a476b8aa
commit
aff126bea9
|
|
@ -81,8 +81,7 @@ cpu_graph_dump1090() {
|
|||
"CDEF:backgroundp=background,10,/" \
|
||||
"AREA:readerp#008000:USB" \
|
||||
"AREA:backgroundp#00C000:other:STACK" \
|
||||
"AREA:demodp#00FF00:demodulator\c:STACK" \
|
||||
"COMMENT: \n" \
|
||||
"AREA:demodp#00FF00:demodulator:STACK" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -94,26 +93,16 @@ tracks_graph() {
|
|||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "$3 Tracks Seen" \
|
||||
--vertical-label "tracks/hour" \
|
||||
--vertical-label "Tracks/Hour" \
|
||||
--lower-limit 0 \
|
||||
--units-exponent 0 \
|
||||
"DEF:all=$2/dump1090_tracks-all.rrd:value:AVERAGE" \
|
||||
"DEF:single=$2/dump1090_tracks-single_message.rrd:value:AVERAGE" \
|
||||
"CDEF:hall=all,3600,*" \
|
||||
"CDEF:hsingle=single,3600,*" \
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"AREA:hsingle#FF0000:Tracks with single message" \
|
||||
"AREA:hall#00FF00:Unique tracks\c:STACK" \
|
||||
=======
|
||||
"AREA:hsingle#FF0000:tracks with single message" \
|
||||
"AREA:hall#00FF00:unique tracks\c:STACK" \
|
||||
>>>>>>> 82576755a77e5581c4fedd3e1ee0bad45cadc064
|
||||
"COMMENT: \n" \
|
||||
=======
|
||||
"AREA:hsingle#FF0000:tracks with single message" \
|
||||
"AREA:hall#00FF00:unique tracks:STACK" \
|
||||
>>>>>>> 0825d25e6c782511daa9f29c5d51136ea2666882
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -123,7 +112,7 @@ cpu_graph() {
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 1010 \
|
||||
--width 1110 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "Overall CPU Utilization" \
|
||||
|
|
@ -154,7 +143,7 @@ cpu_graph() {
|
|||
"AREA:pwait#C00000:io:STACK" \
|
||||
"AREA:psystem#FF0000:sys:STACK" \
|
||||
"AREA:puser#40FF40:user:STACK" \
|
||||
"AREA:pnice#008000:nice\c:STACK" \
|
||||
"AREA:pnice#008000:nice:STACK" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -162,7 +151,7 @@ df_root_graph() {
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 496 \
|
||||
--width 480 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "Disk Usage (/)" \
|
||||
|
|
@ -174,8 +163,7 @@ df_root_graph() {
|
|||
"DEF:free=$2/df_complex-free.rrd:value:AVERAGE" \
|
||||
"CDEF:totalused=used,reserved,+" \
|
||||
"AREA:totalused#4169E1:used:STACK" \
|
||||
"AREA:free#32C734:free\c:STACK" \
|
||||
"COMMENT: \n" \
|
||||
"AREA:free#32C734:free:STACK" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -203,6 +191,7 @@ disk_io_iops_graph() {
|
|||
"GPRINT:write:MAX:Max\:%4.1lf iops" \
|
||||
"GPRINT:write:AVERAGE:Avg\:%4.1lf iops" \
|
||||
"GPRINT:write:LAST:Current\:%4.1lf iops\c" \
|
||||
"HRULE:0#000000" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -230,6 +219,7 @@ disk_io_octets_graph() {
|
|||
"GPRINT:write:MAX:Max\: %4.1lf %sB/sec" \
|
||||
"GPRINT:write:AVERAGE:Avg\: %4.1lf %SB/sec" \
|
||||
"GPRINT:write:LAST:Current\: %4.1lf %SB/sec\c" \
|
||||
"HRULE:0#000000" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -250,12 +240,13 @@ eth0_graph() {
|
|||
"LINE1:rx#336600" \
|
||||
"GPRINT:rx:MAX:Max\:%8.1lf %s" \
|
||||
"GPRINT:rx:AVERAGE:Avg\:%8.1lf %S" \
|
||||
"GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
|
||||
"GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
|
||||
"AREA:tx_neg#4169E1:Outgoing" \
|
||||
"LINE1:tx_neg#0033CC" \
|
||||
"GPRINT:tx:MAX:Max\:%8.1lf %S" \
|
||||
"GPRINT:tx:AVERAGE:Avg\:%8.1lf %S" \
|
||||
"GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
|
||||
"GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
|
||||
"HRULE:0#000000" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -263,7 +254,7 @@ memory_graph() {
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 496 \
|
||||
--width 480 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "Memory Utilization" \
|
||||
|
|
@ -276,8 +267,7 @@ memory_graph() {
|
|||
"AREA:used#4169E1:used:STACK" \
|
||||
"AREA:buffered#32C734:buffered:STACK" \
|
||||
"AREA:cached#00FF00:cached:STACK" \
|
||||
"AREA:free#FFFFFF:free\c:STACK" \
|
||||
"COMMENT: \n" \
|
||||
"AREA:free#FFFFFF:free:STACK" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -299,8 +289,6 @@ temp_graph_imperial() {
|
|||
"CDEF:ttb=tta,1.8,*" \
|
||||
"CDEF:ttc=ttb,32,+" \
|
||||
"AREA:ttc#ffcc00" \
|
||||
"COMMENT: \n" \
|
||||
"COMMENT: \n" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -320,8 +308,6 @@ temp_graph_metric() {
|
|||
"DEF:traw=$2/gauge-cpu_temp.rrd:value:MAX" \
|
||||
"CDEF:tfin=traw,1000,/" \
|
||||
"AREA:tfin#ffcc00" \
|
||||
"COMMENT: \n" \
|
||||
"COMMENT: \n" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -342,12 +328,13 @@ wlan0_graph() {
|
|||
"LINE1:rx#336600" \
|
||||
"GPRINT:rx:MAX:Max\:%8.1lf %s" \
|
||||
"GPRINT:rx:AVERAGE:Avg\:%8.1lf %S" \
|
||||
"GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
|
||||
"GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
|
||||
"AREA:tx_neg#4169E1:Outgoing" \
|
||||
"LINE1:tx_neg#0033CC" \
|
||||
"GPRINT:tx:MAX:Max\:%8.1lf %S" \
|
||||
"GPRINT:tx:AVERAGE:Avg\:%8.1lf %S" \
|
||||
"GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
|
||||
"GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
|
||||
"HRULE:0#000000" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -357,7 +344,7 @@ local_rate_graph() {
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 429 \
|
||||
--width 480 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "$3 Message Rate" \
|
||||
|
|
@ -372,8 +359,7 @@ local_rate_graph() {
|
|||
"CDEF:y2positions=positions,10,*" \
|
||||
"LINE1:messages#0000FF:messages received" \
|
||||
"AREA:y2strong#FF0000:messages >-3dBFS / hr (RHS)" \
|
||||
"LINE1:y2positions#00c0FF:positions / hr (RHS)\c" \
|
||||
"COMMENT: \n" \
|
||||
"LINE1:y2positions#00c0FF:positions / hr (RHS)" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -473,31 +459,12 @@ local_trailing_rate_graph() {
|
|||
"CDEF:max5=max3,gmax1,MAX" \
|
||||
"CDEF:max=max4,max5,MAX" \
|
||||
"CDEF:maxarea=max,min,-" \
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"LINE1:messages#0000FF:Messages Received" \
|
||||
"LINE1:min#FFFF99" \
|
||||
"AREA:maxarea#FFFF99:Min/Max:STACK" \
|
||||
"LINE1:7dayaverage#00FF00:7 Day Average" \
|
||||
"LINE1:messages#0000FF" \
|
||||
"AREA:y2strong#FF0000:Messages > -3dBFS/Hr (RHS)" \
|
||||
"LINE1:y2positions#00c0FF:Positions/Hr (RHS)\c" \
|
||||
=======
|
||||
"LINE1:min#FFFF99:mins" \
|
||||
"AREA:maxarea#FFFF99:max:STACK" \
|
||||
"LINE1:7dayaverage#00FF00:7 Day Average" \
|
||||
"AREA:y2strong#FF0000:messages >-3dBFS/Hr (RHS)" \
|
||||
"LINE1:y2positions#00c0FF:Positions/Hr (RHS)" \
|
||||
"LINE1:messages#0000FF:Messages Received\c" \
|
||||
>>>>>>> 82576755a77e5581c4fedd3e1ee0bad45cadc064
|
||||
=======
|
||||
"LINE1:min#FFFF99:mins" \
|
||||
"AREA:maxarea#FFFF99:max:STACK" \
|
||||
"LINE1:7dayaverage#00FF00:7 Day Average" \
|
||||
"AREA:y2strong#FF0000:messages >-3dBFS/Hr (RHS)" \
|
||||
"LINE1:y2positions#00c0FF:Positions/Hr (RHS)" \
|
||||
"LINE1:messages#0000FF:Messages Received" \
|
||||
>>>>>>> 0825d25e6c782511daa9f29c5d51136ea2666882
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -505,7 +472,7 @@ range_graph_imperial(){
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 428 \
|
||||
--width 480 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "$3 Max Range" \
|
||||
|
|
@ -522,8 +489,7 @@ range_graph_imperial(){
|
|||
"VDEF:peakrange=rangenm,MAXIMUM" \
|
||||
"GPRINT:avgrange:%1.1lf NM" \
|
||||
"LINE1:peakrange#FF0000:Peak Range\\:" \
|
||||
"GPRINT:peakrange:%1.1lf NM\c" \
|
||||
"COMMENT: \n" \
|
||||
"GPRINT:peakrange:%1.1lf NM" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -531,7 +497,7 @@ range_graph_metric() {
|
|||
rrdtool graph \
|
||||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 428 \
|
||||
--width 480 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "$3 Max Range" \
|
||||
|
|
@ -548,8 +514,7 @@ range_graph_metric() {
|
|||
"GPRINT:avgrange:%1.1lf km" \
|
||||
"LINE1:peakrange#FF0000:Peak Range\\:" \
|
||||
"GPRINT:peakrange:%1.1lf km" \
|
||||
"LINE1:463#000000:250 NM\c" \
|
||||
"COMMENT: \n" \
|
||||
"LINE1:463#000000:250 NM" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
@ -558,7 +523,7 @@ signal_graph() {
|
|||
"$1" \
|
||||
--start end-$4 \
|
||||
--width 480 \
|
||||
--height 186 \
|
||||
--height 200 \
|
||||
--step "$5" \
|
||||
--title "$3 Signal Level" \
|
||||
--vertical-label "dBFS" \
|
||||
|
|
@ -575,13 +540,13 @@ signal_graph() {
|
|||
"AREA:us#FFFFFF" \
|
||||
"GPRINT:signal:AVERAGE:%4.1lf" \
|
||||
"LINE1:peak#0000FF:Peak Level\:" \
|
||||
"GPRINT:peak:MAX:%4.1lf\c" \
|
||||
"GPRINT:peak:MAX:%4.1lf\n" \
|
||||
"LINE:noise#7F00FF:Noise" \
|
||||
"GPRINT:noise:MAX:Max\: %4.1lf" \
|
||||
"GPRINT:noise:MIN:Min\: %4.1lf" \
|
||||
"GPRINT:noise:AVERAGE:Avg\: %4.1lf\c" \
|
||||
"GPRINT:noise:AVERAGE:Avg\: %4.1lf\n" \
|
||||
"LINE1:0#000000:Zero dBFS" \
|
||||
"LINE1:-3#FF0000:-3 dBFS\c" \
|
||||
"LINE1:-3#FF0000:-3 dBFS\n" \
|
||||
--watermark "Drawn: $nowlit";
|
||||
}
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue