mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added support for newest NVidia driver 340.24 #54

This commit is contained in:
Jordi Sanfeliu 2014-07-28 12:41:52 +02:00
parent e18c4ad86b
commit 75e7b935ae
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -16,6 +16,7 @@
will put all iptables rules for network traffic accounting monitoring. will put all iptables rules for network traffic accounting monitoring.
(suggested by Russell Morris, rmorris AT rkmorris.us) (suggested by Russell Morris, rmorris AT rkmorris.us)
- Added SPF statistics in the 'mail' graph. - Added SPF statistics in the 'mail' graph.
- Added support for newest NVidia driver 340.24. [#54]
- Improved in all graphs the 'limit' and 'rigid' functionality and reduced a lot - Improved in all graphs the 'limit' and 'rigid' functionality and reduced a lot
of redundant code. of redundant code.
- Changed all DST from COUNTER to GAUGE in 'net' module to avoid unexpected huge - Changed all DST from COUNTER to GAUGE in 'net' module to avoid unexpected huge

8
lib/Monitorix.pm
View File

@ -182,8 +182,10 @@ sub get_nvidia_data {
} }
for($l = 0; $l < scalar(@data); $l++) { for($l = 0; $l < scalar(@data); $l++) {
if($data[$l] =~ /Memory Usage/) { if($data[$l] =~ /Memory Usage/) {
$check_mem = 1; if($data[$l] !~ /BAR1 Memory Usage/) {
next; $check_mem = 1;
next;
}
} }
if($check_mem) { if($check_mem) {
if($data[$l] =~ /Total/) { if($data[$l] =~ /Total/) {
@ -257,7 +259,7 @@ sub get_nvidia_data {
next; next;
} }
if($check_temp) { if($check_temp) {
if($data[$l] =~ /Gpu/) { if($data[$l] =~ /Gpu.*?(?:Current Temp)?/i) {
my (undef, $tmp) = split(':', $data[$l]); my (undef, $tmp) = split(':', $data[$l]);
if($tmp eq "\n") { if($tmp eq "\n") {
$l++; $l++;