mirror of
				https://github.com/Tafkas/fritzbox-munin.git
				synced 2023-10-10 11:36:55 +00:00 
			
		
		
		
	Merge pull request #18 from bobvandevijver/remove-traffic-max
Fixes #13. Configurable traffic maximum
This commit is contained in:
		@@ -26,6 +26,10 @@ If you are using the scripts on a different Fritz!Box model please let me know b
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  fritzbox\_traffic shows you the traffic of the WAN interface (requires fritzconnection)  
 | 
					  fritzbox\_traffic shows you the traffic of the WAN interface (requires fritzconnection)  
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  If you do not want to show the interface maximum values, add the following to your plugin-configuration:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    env.traffic_remove_max true
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
## fritzbox\_connection\_uptime
 | 
					## fritzbox\_connection\_uptime
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,13 +32,14 @@ def print_values():
 | 
				
			|||||||
    up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetTotalBytesSent')['NewTotalBytesSent']
 | 
					    up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetTotalBytesSent')['NewTotalBytesSent']
 | 
				
			||||||
    print ('up.value %d' % up_traffic)
 | 
					    print ('up.value %d' % up_traffic)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    max_down_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
 | 
					    if not os.environ.get('traffic_remove_max'):
 | 
				
			||||||
        'NewLayer1DownstreamMaxBitRate']
 | 
					        max_down_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
 | 
				
			||||||
    print ('maxdown.value %d' % max_down_traffic)
 | 
					            'NewLayer1DownstreamMaxBitRate']
 | 
				
			||||||
 | 
					        print ('maxdown.value %d' % max_down_traffic)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    max_up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
 | 
					        max_up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
 | 
				
			||||||
        'NewLayer1UpstreamMaxBitRate']
 | 
					            'NewLayer1UpstreamMaxBitRate']
 | 
				
			||||||
    print ('maxup.value %d' % max_up_traffic)
 | 
					        print ('maxup.value %d' % max_up_traffic)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def print_config():
 | 
					def print_config():
 | 
				
			||||||
@@ -61,14 +62,15 @@ def print_config():
 | 
				
			|||||||
    print "up.max 1000000000"
 | 
					    print "up.max 1000000000"
 | 
				
			||||||
    print "up.negative down"
 | 
					    print "up.negative down"
 | 
				
			||||||
    print "up.info Traffic of the WAN interface."
 | 
					    print "up.info Traffic of the WAN interface."
 | 
				
			||||||
    print "maxdown.label received"
 | 
					    if not os.environ.get('traffic_remove_max'):
 | 
				
			||||||
    print "maxdown.type GAUGE"
 | 
					        print "maxdown.label received"
 | 
				
			||||||
    print "maxdown.graph no"
 | 
					        print "maxdown.type GAUGE"
 | 
				
			||||||
    print "maxup.label MAX"
 | 
					        print "maxdown.graph no"
 | 
				
			||||||
    print "maxup.type GAUGE"
 | 
					        print "maxup.label MAX"
 | 
				
			||||||
    print "maxup.negative maxdown"
 | 
					        print "maxup.type GAUGE"
 | 
				
			||||||
    print "maxup.draw LINE1"
 | 
					        print "maxup.negative maxdown"
 | 
				
			||||||
    print "maxup.info Maximum speed of the WAN interface."
 | 
					        print "maxup.draw LINE1"
 | 
				
			||||||
 | 
					        print "maxup.info Maximum speed of the WAN interface."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if __name__ == "__main__":
 | 
					if __name__ == "__main__":
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user