Skip to content

Commit d096103

Browse files
XavierBergerXavierBerger
committed
Merge branch 'devel' for v2.12
2 parents 2acb530 + f09a861 commit d096103

26 files changed

+724
-60
lines changed

‎Makefile

+11-8
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,29 @@ all:
2222
install:
2323
@echo "Installing RPi-Monitor in ${TARGETDIR}"
2424
@mkdir -p ${TARGETDIR}var/lib/rpimonitor
25-
@cp -a src/var/lib/rpimonitor/* ${TARGETDIR}var/lib/rpimonitor/
25+
@cp -r src/var/lib/rpimonitor/* ${TARGETDIR}var/lib/rpimonitor/
2626
@mkdir -p ${TARGETDIR}etc/rpimonitor
27-
@cp -a src/etc/rpimonitor/* ${TARGETDIR}etc/rpimonitor/
27+
@cp -r src/etc/rpimonitor/* ${TARGETDIR}etc/rpimonitor/
2828
@mkdir -p ${TARGETDIR}etc/cron.d
29-
@cp -a src/etc/cron.d/* ${TARGETDIR}etc/cron.d/
29+
@cp -r src/etc/cron.d/* ${TARGETDIR}etc/cron.d/
3030
@mkdir -p ${TARGETDIR}usr/bin
31-
@cp -a src/usr/bin/* ${TARGETDIR}usr/bin/
31+
@cp -r src/usr/bin/* ${TARGETDIR}usr/bin/
3232
@mkdir -p ${TARGETDIR}usr/share/rpimonitor
33-
@cp -a src/usr/share/rpimonitor/* ${TARGETDIR}usr/share/rpimonitor/
33+
@cp -r src/usr/share/rpimonitor/* ${TARGETDIR}usr/share/rpimonitor/
3434
@echo "Startup system is ${STARTUPSYS}"
3535
ifeq (${STARTUPSYS},sysVinit)
3636
@mkdir -p ${TARGETDIR}etc/init.d
37-
@cp -a src/etc/init.d/* ${TARGETDIR}etc/init.d/
37+
@cp -r src/etc/init.d/* ${TARGETDIR}etc/init.d/
3838
endif
3939
ifeq (${STARTUPSYS},upstart)
4040
@mkdir -p ${TARGETDIR}etc/init
41-
@cp -a src/etc/init/* ${TARGETDIR}etc/init/
41+
@cp -r src/etc/init/* ${TARGETDIR}etc/init/
4242
endif
4343
ifeq (${STARTUPSYS},systemd)
4444
@mkdir -p ${TARGETDIR}usr/lib/systemd/system
45-
@cp -a usr/lib/systemd/system/* ${TARGETDIR}etc/init.d/
45+
@cp -r src/usr/lib/systemd/system/* ${TARGETDIR}etc/systemd/system/
4646
endif
4747
@echo "Installation completed"
48+
49+
clean:
50+
@echo

‎README.md

+7-9
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ to not start the embeded web server and use an external web server to deliver th
2626

2727
### Screenshot
2828

29-
You will find screenshot of [**RPi-Monitor**](http://rpi-experiences.blogspot.fr/) in [RPi-Monitor Overview]
30-
(http://rpi-experiences.blogspot.fr/p/rpi-monitor.html).
29+
You can find screenshots of [**RPi-Monitor**](http://rpi-experiences.blogspot.fr/) in [RPi-Monitor Overview](http://rpi-experiences.blogspot.fr/p/rpi-monitor.html).
3130

3231
### Installation
3332

@@ -41,20 +40,19 @@ Debian package for **Raspbian** is available in [here](https://github.com/Xavier
4140

4241
The dependencies and the detail of installation process are describe into [PACKAGING.md](PACKAGING.md)
4342

44-
For installation on other system and for advanced customization read the article [RPi-Monitor: Version 2.0 advance usage and customization] (http://rpi-experiences.blogspot.fr/2013/06/rpi-monitor-version-20-advance-usage.html).
43+
For installation on other system and for advanced customization read the article [RPi-Monitor: Version 2.0 advance usage and customization](http://rpi-experiences.blogspot.fr/2013/06/rpi-monitor-version-20-advance-usage.html).
4544

4645
Note: *"For various reasons"* **OpenElec** don't maintain a package repository. **RPi-Monitor** will then not be available on this distribution until the development team does the job.
4746

4847
### Other information
4948

50-
All articles realated to RPi-Monitor are gathered into the page [RPi-Monitor Overview]
51-
(http://rpi-experiences.blogspot.fr/p/rpi-monitor-articles.html).
49+
All articles related to RPi-Monitor are gathered into the page [RPi-Monitor Overview](http://rpi-experiences.blogspot.fr/p/rpi-monitor-articles.html).
5250

5351
Frequently Asked Question find answer into the [FAQ](http://rpi-experiences.blogspot.fr/p/rpi-monitor-faq.html) page.
5452

5553
### Development
5654

57-
Github is used to perform versionning of development and also to backup the development progress of future releases.
55+
GitHub is used to perform versioning of development and also to backup the development progress of future releases.
5856

5957
The branch **master** contains the latest stable version.
6058

@@ -68,14 +66,14 @@ You want to contribute to RPi-Monitor. I'll be happy to integrate your pull requ
6866
Please note: Pull request perfomed on **devel** branch will be integrated as soon as possible. Pull request perform on master branche may only be integrated when a new version is published (or not may not be integrated at all...)
6967

7068

71-
### **RPi-Monitor** used in other product
69+
### **RPi-Monitor** used in other projects
7270

73-
**RPi-monitor** is also used as part of other product:
71+
**RPi-monitor** is also used as part of other projects:
7472

7573
* **[Tor-Info](https://github.com/lzkill/tor-info)** Configuration file, script and documentation to extend **RPi-Monitor** for showing a Tor relay's information.
7674

7775

78-
###Author
76+
### Author
7977

8078
**Author**: Xavier Berger
8179

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.11
1+
2.12

‎src/etc/init.d/rpimonitor

+1-3
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,8 @@ install_auto_package_status_update() {
7474

7575
cat > /etc/apt/apt.conf.d/99rpimonitor << EOF
7676
# Update rpimonitor status
77-
DPkg {
78-
Post-Invoke {
77+
APT::Update::Post-Invoke {
7978
"echo 'Update rpimonitor Packages Status' && /usr/share/rpimonitor/scripts/updatePackagesStatus.pl";
80-
};
8179
};
8280
EOF
8381

‎src/etc/rpimonitor/daemon.conf

+4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
# Define the data storage directory (Default:/var/lib/rpimonitor)
5353
#daemon.datastore=/var/lib/rpimonitor
5454
#
55+
# daemon.logfile=/var/log/rpimonitor
56+
# Define directory where logs are stored (Default:/var/log/rpimonitor)
57+
# daemon.logfile=/var/log/rpimonitor
58+
#
5559
# daemon.shellinabox=https://0.0.0.0:4200/
5660
# Define shellinabox address (Default: calculated automatically based on http request)
5761
#daemon.shellinabox=https://127.0.0.1:4200/

‎src/etc/rpimonitor/template/Allwinner_H3.conf

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
########################################################################
2+
# Extract H3 information
3+
# Page: 1
4+
# Information Status Statistics
5+
# - cpu frequency - yes - yes
6+
# - cpu load 1, 5, 15 - yes - yes
7+
# - cpu scaling governor - yes - no
8+
# - cpus available - yes - yes
9+
# - dram frequency - yes - yes
10+
# - zone1/SoC temperature - yes - yes
11+
########################################################################
12+
dynamic.1.name=cpu_frequency
13+
dynamic.1.source=/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
14+
dynamic.1.regexp=(.*)
15+
dynamic.1.postprocess=sprintf("%.3f", $1/1000000)
16+
dynamic.1.rrd=GAUGE
17+
18+
dynamic.2.name=load1,load5,load15
19+
dynamic.2.source=/proc/loadavg
20+
dynamic.2.regexp=^(\S+)\s(\S+)\s(\S+)
21+
dynamic.2.postprocess=
22+
dynamic.2.rrd=GAUGE
23+
24+
dynamic.3.name=scaling_governor
25+
dynamic.3.source=/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
26+
dynamic.3.regexp=(.*)
27+
dynamic.3.postprocess=
28+
dynamic.3.rrd=
29+
30+
dynamic.4.name=cpu_count
31+
dynamic.4.source=/usr/bin/expr 1 + `/usr/bin/awk -F": " '/^processor/ {print $2}' < /proc/cpuinfo | /usr/bin/tail -n1`
32+
dynamic.4.regexp=(.*)
33+
dynamic.4.postprocess=
34+
dynamic.4.rrd=GAUGE
35+
36+
dynamic.5.name=dram_frequency
37+
dynamic.5.source=/sys/devices/platform/sunxi-ddrfreq/devfreq/sunxi-ddrfreq/cur_freq
38+
dynamic.5.regexp=(.*)
39+
dynamic.5.postprocess=sprintf("%.3f", $1/1000000)
40+
dynamic.5.rrd=GAUGE
41+
42+
dynamic.6.name=soctemp
43+
dynamic.6.source=/sys/class/thermal/thermal_zone1/temp
44+
dynamic.6.regexp=(.*)
45+
#dynamic.6.postprocess=sprintf("%.1f", $1/1000)
46+
dynamic.6.postprocess=
47+
dynamic.6.rrd=GAUGE
48+
49+
dynamic.7.name=zone0
50+
dynamic.7.source=/sys/class/thermal/thermal_zone0/temp
51+
dynamic.7.regexp=(.*)
52+
dynamic.7.postprocess=
53+
dynamic.7.rrd=GAUGE
54+
55+
web.status.1.content.1.name=CPU
56+
web.status.1.content.1.icon=cpu.png
57+
#web.status.1.content.1.line.1="Loads: <b>" + data.load1 + "</b> [1min] - <b>" + data.load5 + "</b> [5min] - <b>" + data.load15 + "</b> [15min]"
58+
web.status.1.content.1.line.1=JustGageBar("Load", "1min", 0, data.load1, 3, 100, 80)+" "+JustGageBar("Load", "5min", 0, data.load5, 3, 100, 80)+" "+JustGageBar("Load", "15min", 0, data.load15, 3, 100, 80)
59+
web.status.1.content.1.line.2="CPU frequency: <b>" + data.cpu_frequency + "GHz</b> &nbsp;DRAM frequency: <b>" + data.dram_frequency + "GHz</b>"
60+
web.status.1.content.1.line.3="Governor: <b>" + data.scaling_governor + "</b> &nbsp;Active CPU cores: <b>" + data.cpu_count + "</b>"
61+
62+
web.status.1.content.3.name=Temperature
63+
web.status.1.content.3.icon=cpu_temp.png
64+
web.status.1.content.3.line.1=JustGageBar("SoC", "°C",0, data.soctemp , 100,100,80,percentColors,50,70)
65+
66+
web.statistics.1.content.1.name=Load / Clockspeeds / Temperature
67+
web.statistics.1.content.1.graph.1=load1
68+
web.statistics.1.content.1.graph.2=load5
69+
web.statistics.1.content.1.graph.3=load15
70+
web.statistics.1.content.1.graph.4=cpu_frequency
71+
web.statistics.1.content.1.graph.5=dram_frequency
72+
web.statistics.1.content.1.graph.6=cpu_count
73+
web.statistics.1.content.1.graph.7=soctemp
74+
web.statistics.1.content.1.graph.8=zone0
75+
web.statistics.1.content.1.ds_graph_options.load1.label=Load 1 min
76+
web.statistics.1.content.1.ds_graph_options.load5.label=Load 5 min
77+
web.statistics.1.content.1.ds_graph_options.load15.label=Load 15 min
78+
web.statistics.1.content.1.ds_graph_options.cpu_frequency.label=CPU Clock speed (GHz)
79+
web.statistics.1.content.1.ds_graph_options.cpu_frequency.yaxis=2
80+
web.statistics.1.content.1.ds_graph_options.dram_frequency.label=DRAM Clock speed (GHz)
81+
web.statistics.1.content.1.ds_graph_options.dram_frequency.yaxis=2
82+
web.statistics.1.content.1.ds_graph_options.cpu_count.label=Active CPUs
83+
web.statistics.1.content.1.ds_graph_options.cpu_count.yaxis=2
84+
web.statistics.1.content.1.ds_graph_options.soctemp.label=SoC temp (°C)
85+
web.statistics.1.content.1.ds_graph_options.zone0.label=zone0 temp (°C)
86+
web.statistics.1.content.1.graph_options.y1axis={ position: "left", min: 35, max: 75 }
87+
web.statistics.1.content.1.graph_options.y2axis={ position: "right" }
88+

‎src/etc/rpimonitor/template/Allwinner_H3_Extended.conf

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
########################################################################
2+
# Extract H3 information -- extended version
3+
# Page: 1
4+
# Information Status Statistics
5+
# - cpu frequency - yes - yes
6+
# - dram frequency - yes - yes
7+
# - average load 1, 5, 15 - yes - yes
8+
# - detailed cpu load - yes - yes
9+
# - cpu scaling governor - yes - no
10+
# - cpus available - yes - yes
11+
# - zone1/SoC temperature - yes - yes
12+
# - disk temperature - yes - yes
13+
# - external temperature - yes - no
14+
# - Vcore voltage - yes - yes
15+
# - cooling state - yes - yes
16+
########################################################################
17+
dynamic.1.name=cpu_frequency
18+
dynamic.1.source=/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
19+
dynamic.1.regexp=(.*)
20+
dynamic.1.postprocess=sprintf("%.3f", $1/1000000)
21+
dynamic.1.rrd=GAUGE
22+
23+
dynamic.2.name=load1,load5,load15
24+
dynamic.2.source=/proc/loadavg
25+
dynamic.2.regexp=^(\S+)\s(\S+)\s(\S+)
26+
dynamic.2.postprocess=
27+
dynamic.2.rrd=GAUGE
28+
29+
dynamic.3.name=scaling_governor
30+
dynamic.3.source=/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
31+
dynamic.3.regexp=(.*)
32+
dynamic.3.postprocess=
33+
dynamic.3.rrd=
34+
35+
dynamic.4.name=cpu_count
36+
dynamic.4.source=/usr/bin/expr 1 + `/usr/bin/awk -F": " '/^processor/ {print $2}' < /proc/cpuinfo | /usr/bin/tail -n1`
37+
dynamic.4.regexp=(.*)
38+
dynamic.4.postprocess=
39+
dynamic.4.rrd=GAUGE
40+
41+
dynamic.5.name=dram_frequency
42+
dynamic.5.source=/sys/devices/platform/sunxi-ddrfreq/devfreq/sunxi-ddrfreq/cur_freq
43+
dynamic.5.regexp=(.*)
44+
dynamic.5.postprocess=sprintf("%.3f", $1/1000000)
45+
dynamic.5.rrd=GAUGE
46+
47+
dynamic.6.name=soctemp
48+
dynamic.6.source=/sys/class/thermal/thermal_zone1/temp
49+
dynamic.6.regexp=(.*)
50+
#dynamic.6.postprocess=sprintf("%.1f", $1/1000)
51+
dynamic.6.postprocess=
52+
dynamic.6.rrd=GAUGE
53+
54+
dynamic.7.name=externaltemp
55+
dynamic.7.source=/tmp/externaltemp
56+
dynamic.7.regexp=(.*)
57+
dynamic.7.postprocess=sprintf("%.1f", $1/1000)
58+
dynamic.7.rrd=GAUGE
59+
60+
dynamic.8.name=disktemp
61+
dynamic.8.source=/tmp/disktemp
62+
dynamic.8.regexp=(.*)
63+
dynamic.8.postprocess=sprintf("%.1f", $1/1000)
64+
dynamic.8.rrd=GAUGE
65+
66+
dynamic.9.name=vcorevoltage
67+
dynamic.9.source=/tmp/VCore
68+
dynamic.9.regexp=(.*)
69+
dynamic.9.postprocess=sprintf("%.2f", $1/1000)
70+
dynamic.9.rrd=GAUGE
71+
72+
dynamic.10.name=cpu_stat,system_stat,user_stat,nice_stat,iowait_stat,irq_stat
73+
dynamic.10.source=/tmp/cpustat
74+
dynamic.10.regexp=^(\S+)\s(\S+)\s(\S+)\s(\S+)\s(\S+)\s(\S+)
75+
dynamic.10.postprocess=
76+
dynamic.10.rrd=GAUGE
77+
78+
dynamic.11.name=coolingstate
79+
dynamic.11.source=/sys/devices/virtual/thermal/cooling_device0/cur_state
80+
dynamic.11.regexp=(.*)
81+
dynamic.11.postprocess=
82+
dynamic.11.rrd=GAUGE
83+
84+
web.status.1.content.1.name=CPU
85+
web.status.1.content.1.icon=cpu.png
86+
web.status.1.content.1.line.1=JustGageBar("Load", "1min", 0, data.load1, 3, 100, 80)+" "+JustGageBar("Load", "5min", 0, data.load5, 3, 100, 80)+" "+JustGageBar("Load", "15min", 0, data.load15, 3, 100, 80)
87+
web.status.1.content.1.line.2="CPU total: <b>" + data.cpu_stat + "%</b> (Sys: " + data.system_stat + "%, User: " + data.user_stat + "%, I/O wait: " + data.iowait_stat + "%, Nice: " + data.nice_stat + "%)"
88+
web.status.1.content.1.line.3="CPU frequency: <b>" + data.cpu_frequency + "GHz</b> &nbsp;DRAM frequency: <b>" + data.dram_frequency + "GHz</b>"
89+
web.status.1.content.1.line.4="Governor: <b>" + data.scaling_governor + "</b> &nbsp;Active CPU cores: <b>" + data.cpu_count + "</b> &nbsp;Vcore: <b>" + data.vcorevoltage + "</b>"
90+
91+
web.status.1.content.3.name=Temperature
92+
web.status.1.content.3.icon=cpu_temp.png
93+
#web.status.1.content.3.line.1=JustGageBar("SoC", "°C",0, data.soctemp , 100,100,80,percentColors,50,70)+" "+JustGageBar("Disk", "°C",0, data.disktemp , 100,100,80,percentColors,40,50)+" "+JustGageBar("München", "°C",0, data.externaltemp , 100,100,80,percentColors,30,35)
94+
web.status.1.content.3.line.1=JustGageBar("SoC", "°C",0, data.soctemp , 100,100,80,percentColors,50,70)+" "+JustGageBar("Disk", "°C",0, data.disktemp , 100,100,80,percentColors,40,50)+" "+JustGageBar("Cooling State", "",0, data.coolingstate , 5,100,80,percentColors,1,2)
95+
96+
web.statistics.1.content.1.name=Load / Clockspeeds / Temperature
97+
web.statistics.1.content.1.graph.1=load1
98+
web.statistics.1.content.1.graph.2=load5
99+
web.statistics.1.content.1.graph.3=load15
100+
web.statistics.1.content.1.graph.4=cpu_frequency
101+
web.statistics.1.content.1.graph.5=dram_frequency
102+
web.statistics.1.content.1.graph.6=cpu_count
103+
web.statistics.1.content.1.graph.7=soctemp
104+
web.statistics.1.content.1.graph.8=vcorevoltage
105+
web.statistics.1.content.1.graph.9=disktemp
106+
web.statistics.1.content.1.graph.10=cpu_stat
107+
web.statistics.1.content.1.graph.11=coolingstate
108+
web.statistics.1.content.1.ds_graph_options.load1.label=Load 1 min
109+
web.statistics.1.content.1.ds_graph_options.load5.label=Load 5 min
110+
web.statistics.1.content.1.ds_graph_options.load15.label=Load 15 min
111+
web.statistics.1.content.1.ds_graph_options.cpu_frequency.label=CPU Clock speed (GHz)
112+
web.statistics.1.content.1.ds_graph_options.cpu_frequency.yaxis=2
113+
web.statistics.1.content.1.ds_graph_options.dram_frequency.label=DRAM Clock speed (GHz)
114+
web.statistics.1.content.1.ds_graph_options.dram_frequency.yaxis=2
115+
web.statistics.1.content.1.ds_graph_options.cpu_count.label=Active CPUs
116+
web.statistics.1.content.1.ds_graph_options.cpu_count.yaxis=2
117+
web.statistics.1.content.1.ds_graph_options.soctemp.label=SoC temp (°C)
118+
web.statistics.1.content.1.ds_graph_options.disktemp.label=Disk temp (°C)
119+
web.statistics.1.content.1.ds_graph_options.vcorevoltage.label=Vcore (V)
120+
web.statistics.1.content.1.ds_graph_options.vcorevoltage.yaxis=2
121+
web.statistics.1.content.1.ds_graph_options.coolingstate.label=Cooling State
122+
web.statistics.1.content.1.ds_graph_options.coolingstate.yaxis=2
123+
web.statistics.1.content.1.ds_graph_options.cpu_stat.label=CPU total (%)
124+
web.statistics.1.content.1.graph_options.y1axis={ position: "left", min: 35, max: 75 }
125+
web.statistics.1.content.1.graph_options.y2axis={ position: "right" }
126+
127+
web.statistics.1.content.2.name=Detailed CPU Stats
128+
web.statistics.1.content.2.graph.1=cpu_stat
129+
web.statistics.1.content.2.graph.2=system_stat
130+
web.statistics.1.content.2.graph.3=user_stat
131+
web.statistics.1.content.2.graph.4=nice_stat
132+
web.statistics.1.content.2.graph.5=iowait_stat
133+
web.statistics.1.content.2.graph.6=irq_stat
134+
web.statistics.1.content.2.ds_graph_options.cpu_stat.label=CPU total (%)
135+
web.statistics.1.content.2.ds_graph_options.system_stat.label=System (%)
136+
web.statistics.1.content.2.ds_graph_options.user_stat.label=User (%)
137+
web.statistics.1.content.2.ds_graph_options.nice_stat.label=Nice (%)
138+
web.statistics.1.content.2.ds_graph_options.iowait_stat.label=I/O wait (%)
139+
web.statistics.1.content.2.ds_graph_options.irq_stat.label=IRQ/softirq (%)
140+
web.statistics.1.content.2.graph_options.y1axis={ position: "left", min: 0, max: 100 }
141+
142+

‎src/etc/rpimonitor/template/OrangePi_H3.conf

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
web.page.icon='img/logo.png'
2+
web.page.menutitle='OPi-Monitor <sub>('+data.hostname+')</sub>'
3+
web.page.pagetitle='OPi-Monitor ('+data.hostname+')'
4+
5+
web.status.1.name=Orange Pi
6+
web.statistics.1.name=Orange Pi
7+
8+
include=/etc/rpimonitor/template/version.conf
9+
include=/etc/rpimonitor/template/uptime.conf
10+
#include=/etc/rpimonitor/template/Allwinner_H3.conf
11+
include=/etc/rpimonitor/template/Allwinner_H3_Extended.conf
12+
include=/etc/rpimonitor/template/memory.conf
13+
#include=/etc/rpimonitor/template/swap.conf
14+
include=/etc/rpimonitor/template/sdcard.conf
15+
include=/etc/rpimonitor/template/network.conf
16+

‎src/etc/rpimonitor/template/dht11.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dynamic.2.rrd=GAUGE
2525
# Add a line of status in page number 2
2626
web.status.2.content.1.name=Temperature
2727
web.status.2.content.1.icon=cpu_temp.png
28-
web.status.2.content.1.line.1="Ambiant Temperature: <b>"+data.living_room_temp+"&deg;C</b>"
29-
web.status.2.content.1.line.2="Ambiant Humidity: <b>"+data.humidity+"%</b>"
28+
web.status.2.content.1.line.1="Ambient Temperature: <b>"+data.living_room_temp+"&deg;C</b>"
29+
web.status.2.content.1.line.2="Ambient Humidity: <b>"+data.humidity+"%</b>"
3030

3131
# Add a statistic graph (with 2 curves suing separate scales) in page number 2
3232
web.statistics.2.content.1.name=Temperature

‎src/etc/rpimonitor/template/memory.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ dynamic.9.postprocess=$1/1024
1818
dynamic.9.rrd=GAUGE
1919

2020
dynamic.15.name=memory_available
21-
dynamic.15.source=/usr/bin/free -mk
22-
dynamic.15.regexp=^-\/\+ buffers\/cache:\s+\d+\s+(\d+)
21+
dynamic.15.source=/proc/meminfo
22+
dynamic.15.regexp=MemAvailable:\s+(\d+)
2323
dynamic.15.postprocess=$1/1024
2424
dynamic.15.rrd=GAUGE
2525

0 commit comments

Comments
 (0)