update Readme

Talk about the UPnP status setting

.gitignore

@@ -0,0 +1,61 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+

CONTRIBUTORS.md

@@ -0,0 +1,4 @@
+## fritzbox-munin contributors
+
+ - Bob van de Vijver ([bobvandevijver](https://github.com/bobvandevijver))
+ - Framps ([framps](https://github.com/framps))

Changelog.md

@@ -1,6 +1,18 @@
 # Changelog
 
+## 6.83.2
+*2017-09-05*
+
+- Support for German and English user interface (by: [@bobvandevijver](https://github.com/bobvandevijver))
+- Support for running Fritzbox as separate host (by: [@bobvandevijver](https://github.com/bobvandevijver))
+- Make maximum download and upload optional by config (by: [@bobvandevijver](https://github.com/bobvandevijver))
+
+## 6.83.1
+*2017-06-11*
+
+- Support for FRITZ!OS 6.83. This version is not compatible with the old FRITZ!OS 6.30.
+
 ## 6.30.1
 *2017-06-11*
 
-- Initial version supporting FRITZ!OS 6.30
+- Initial version supporting FRITZ!OS 6.30

README.md

@@ -1,6 +1,25 @@
 # fritzbox-munin
-A collection of munin plugins to monitor your AVM FRITZ!Box router. The scripts have been developed using a [FRITZ!Box 7362 SL](http://geni.us/fTyoY)(Amazon link) running FRITZ!OS 06.30.
- 
+
+A collection of munin plugins to monitor your AVM FRITZ!Box router. The scripts have been developed using a [FRITZ!Box 7590](http://geni.us/OO2c7S)(Amazon link) running FRITZ!OS 7.00.
+
+If you are using the scripts on a different Fritz!Box model please let me know by
+
+ - opening an issue
+ - submitting a pull request
+
+ So far the following models (running FRITZ!OS 06.83) have been confirmed working:
+
+ - [FRITZ!Box 3370](http://geni.us/zh3U)
+ - [FRITZ!Box 5490](http://geni.us/ACtUyFt) 
+ - [FRITZ!Box 7362 SL](http://geni.us/fTyoY)
+ - [FRITZ!Box 7390](http://geni.us/BlAP)
+ - [FRITZ!Box 7430](http://geni.us/BlAP)
+ - [FRITZ!Box 7490](http://geni.us/fTyoY)
+ - [FRITZ!Box 7580](http://geni.us/yUYyQTE)
+ - [FRITZ!Box 7590](http://geni.us/OO2c7S)
+
+ If you are still running Fritz!OS 6.30 check out the [releases section](https://github.com/Tafkas/fritzbox-munin/releases/tag/6.30.1).
+
 ## Introduction
 
    These python scripts are [Munin](http://munin-monitoring.org) plugins for monitoring the [Fritz!Box](http://avm.de/produkte/fritzbox/) router by AVM.
@@ -9,6 +28,10 @@ A collection of munin plugins to monitor your AVM FRITZ!Box router. The scripts
 
   fritzbox\_traffic shows you the traffic of the WAN interface (requires fritzconnection)  
   ![http://i.imgur.com/8BwNMOL.png](http://i.imgur.com/8BwNMOL.png)
+
+  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
 
@@ -37,34 +60,70 @@ A collection of munin plugins to monitor your AVM FRITZ!Box router. The scripts
 
 ## fritzbox\_uptime
 
-  fritzbox\_uptime shows you the uptime in days (requires password)  
+  fritzbox\_uptime shows you the uptime in days (requires password) (language dependant, see below).
   ![http://i.imgur.com/Jr8OibH.png](http://i.imgur.com/Jr8OibH.png)
 
 ## fritzbox\_wifi\_devices
 
-  fritzbox\_wifi\_devices shows you the number of connected wifi clients (requires password)
+  fritzbox\_wifi\_devices shows you the number of connected wifi clients (requires password) (language dependant, see below).
   ![http://i.imgur.com/lqvK1b2.png](http://i.imgur.com/lqvK1b2.png)
   
 
 ## Installation & Configuration 
 
-0. Pre-requesites for the fritzbox\_traffic and fritzbox\_uptime plugins is the [fritzconnection](https://pypi.python.org/pypi/fritzconnection) package. To install it  
+0. Pre-requesites for the fritzbox\_traffic and fritzbox\_uptime plugins are the [fritzconnection](https://pypi.python.org/pypi/fritzconnection) and [requests](https://pypi.python.org/pypi/requests) package. To install it  
     
         pip install fritzconnection
+        pip install requests
 
-1. Copy all the scripts to =/usr/share/munin/plugins
+1. Make sure the FritzBox has UPnP status information enabled. (German interface: Heimnetz > Heimnetzübersicht > Netzwerkeinstellungen > Statusinformationen über UPnP übertragen)
+
+2. Copy all the scripts to `/usr/share/munin/plugins`
    
-2. Create entry in /etc/munin/plugin-conf.d/munin-node:  
+3. Create entry in `/etc/munin/plugin-conf.d/munin-node`:  
     
         [fritzbox_*]  
         env.fritzbox_ip <ip_address_to_your_fritzbox>  
         env.fritzbox_password <fritzbox_password>  
 
-3. Create symbolic links to /etc/munin/plugins.
+4. Create symbolic links to `/etc/munin/plugins`.
 
-4. Restart the munin-node daemon: /etc/init.d/munin-node restart.
+5. Restart the munin-node daemon: `/etc/init.d/munin-node restart`.
 
-5. Done. You should now start to see the charts on the Munin pages.
+6. Done. You should now start to see the charts on the Munin pages.
+
+## Localization
+
+Two scripts depend on the language selected in your fritzbox: the uptime and wifi\_devices. Currently, two locales are
+supported:
+
+1. German: `de` (default)
+2. English: `en`
+
+You can change the used locale by setting an environment variable in your plugin configuration:
+
+    env.locale en
+
+## Different hosts for the fritzbox and your system
+
+You can split the graphs of your fritzbox from the localhost graphs by following the next steps:
+
+1. Use the following as your host configuration in `/etc/munin/munin.conf`
+
+        [home.yourhost.net;server]
+            address 127.0.0.1
+            use_node_name yes
+
+        
+        [home.yourhost.net;fritzbox]
+            address 127.0.0.1
+            use_node_name no
+
+2. Add the following to your munin-node configuration
+
+    env.host_name fritzbox
+
+3. Restart your munin-node: `systemctl restart munin-node`
 
 ## Environment Settings
   

fritzbox_connection_uptime.py

@@ -14,6 +14,7 @@
   #%# capabilities=autoconf
 """
 
+import os
 import sys
 
 from fritzconnection import FritzConnection
@@ -21,29 +22,31 @@ from fritzconnection import FritzConnection
 
 def print_values():
     try:
-        conn = FritzConnection()
+        conn = FritzConnection(address=os.environ['fritzbox_ip'])
     except Exception as e:
         sys.exit("Couldn't get connection uptime")
 
     uptime = conn.call_action('WANIPConnection', 'GetStatusInfo')['NewUptime']
-    print ('uptime.value %.2f' % (int(uptime) / 86400.0))
+    print('uptime.value %.2f' % (int(uptime) / 86400.0))
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box Connection Uptime"
-    print "graph_args --base 1000 -l 0"
-    print 'graph_vlabel uptime in days'
-    print "graph_scale no'"
-    print "graph_category network"
-    print "uptime.label uptime"
-    print "uptime.draw AREA"
+    print("graph_title AVM Fritz!Box Connection Uptime")
+    print("graph_args --base 1000 -l 0")
+    print('graph_vlabel uptime in days')
+    print("graph_scale no'")
+    print("graph_category network")
+    print("uptime.label uptime")
+    print("uptime.draw AREA")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print "yes"  # Some docs say it'll be called with fetch, some say no arg at all
+        print("yes")  # Some docs say it'll be called with fetch, some say no arg at all
     elif len(sys.argv) == 1 or (len(sys.argv) == 2 and sys.argv[1] == 'fetch'):
         try:
             print_values()

fritzbox_cpu_temperature.py

@@ -22,7 +22,7 @@ import sys
 import fritzbox_helper as fh
 
 PAGE = '/system/ecostat.lua'
-pattern = re.compile(".*/(StatTemperature)\".*=.*\"(.*?)\"")
+pattern = re.compile('Query\s=\s"(\d{1,3})')
 
 
 def get_cpu_temperature():
@@ -31,32 +31,34 @@ def get_cpu_temperature():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
 
     m = re.search(pattern, data)
     if m:
-        print 'temp.value %d' % (int(m.group(2).split(',')[0]))
+        print('temp.value %d' % (int(m.group(1))))
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box CPU temperature"
-    print "graph_vlabel degrees Celsius"
-    print "graph_category sensors"
-    print "graph_order tmp"
-    print "graph_scale no"
-    print "temp.label CPU temperature"
-    print "temp.type GAUGE"
-    print "temp.graph LINE1"
-    print "temp.min 0"
-    print "temp.info Fritzbox CPU temperature"
+    print("graph_title AVM Fritz!Box CPU temperature")
+    print("graph_vlabel degrees Celsius")
+    print("graph_category sensors")
+    print("graph_order tmp")
+    print("graph_scale no")
+    print("temp.label CPU temperature")
+    print("temp.type GAUGE")
+    print("temp.graph LINE1")
+    print("temp.min 0")
+    print("temp.info Fritzbox CPU temperature")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try:

fritzbox_cpu_usage.py

@@ -22,7 +22,7 @@ import sys
 import fritzbox_helper as fh
 
 PAGE = '/system/ecostat.lua'
-pattern = re.compile(".*/(StatCPU)\".*=.*\"(.*?)\"")
+pattern = re.compile('Query1\s=\s"(\d{1,3})')
 
 
 def get_cpu_usage():
@@ -31,32 +31,34 @@ def get_cpu_usage():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
 
     m = re.search(pattern, data)
     if m:
-        print 'cpu.value %d' % (int(m.group(2).split(',')[0]))
+        print('cpu.value %d' % (int(m.group(1))))
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box CPU usage"
-    print "graph_vlabel %"
-    print "graph_category system"
-    print "graph_order cpu"
-    print "graph_scale no"
-    print "cpu.label system"
-    print "cpu.type GAUGE"
-    print "cpu.graph AREA"
-    print "cpu.min 0"
-    print "cpu.info Fritzbox CPU usage"
+    print("graph_title AVM Fritz!Box CPU usage")
+    print("graph_vlabel %")
+    print("graph_category system")
+    print("graph_order cpu")
+    print("graph_scale no")
+    print("cpu.label system")
+    print("cpu.type GAUGE")
+    print("cpu.graph AREA")
+    print("cpu.min 0")
+    print("cpu.info Fritzbox CPU usage")
+    if os.environ.get('host_name'):
+        print "host_name " + os.environ['host_name']
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try:

fritzbox_helper.py

@@ -14,80 +14,94 @@
   This plugin supports the following munin configuration parameters:
   #%# family=auto contrib
   #%# capabilities=autoconf
+
+  The initial script was inspired by
+  https://www.linux-tips-and-tricks.de/en/programming/389-read-data-from-a-fritzbox-7390-with-python-and-bash
+  framp at linux-tips-and-tricks dot de
 """
 
 import hashlib
-import httplib
-import re
 import sys
-from xml.dom import minidom
 
-USER_AGENT = "Mozilla/5.0 (U; Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0"
+import requests
+from lxml import etree
+
+USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:10.0) Gecko/20100101 Firefox/10.0"
 
 
-def get_sid(server, password, port=80):
-    """Obtains the sid after login into the fritzbox"""
-    conn = httplib.HTTPConnection(server + ':' + str(port))
+def get_session_id(server, password, port=80):
+    """Obtains the session id after login into the Fritzbox.
+    See https://avm.de/fileadmin/user_upload/Global/Service/Schnittstellen/AVM_Technical_Note_-_Session_ID.pdf
+    for deteils (in German).
+
+    :param server: the ip address of the Fritzbox
+    :param password: the password to log into the Fritzbox webinterface
+    :param port: the port the Fritzbox webserver runs on
+    :return: the session id
+    """
 
     headers = {"Accept": "application/xml",
                "Content-Type": "text/plain",
                "User-Agent": USER_AGENT}
 
-    initial_page = '/login_sid.lua'
-    conn.request("GET", initial_page, '', headers)
-    response = conn.getresponse()
-    data = response.read()
-    if response.status != 200:
-        print "%s %s" % (response.status, response.reason)
-        sys.exit(0)
+    url = 'http://{}:{}/login_sid.lua'.format(server, port)
+    try:
+        r = requests.get(url, headers=headers)
+        r.raise_for_status()
+    except requests.exceptions.HTTPError as err:
+        print(err)
+        sys.exit(1)
+
+    root = etree.fromstring(r.content)
+    session_id = root.xpath('//SessionInfo/SID/text()')[0]
+    if session_id == "0000000000000000":
+        challenge = root.xpath('//SessionInfo/Challenge/text()')[0]
+        challenge_bf = ('{}-{}'.format(challenge, password)).decode('iso-8859-1').encode('utf-16le')
+        m = hashlib.md5()
+        m.update(challenge_bf)
+        response_bf = '{}-{}'.format(challenge, m.hexdigest().lower())
     else:
-        xml_data = minidom.parseString(data)
-        sid_info = xml_data.getElementsByTagName('SID')
-        sid = sid_info[0].firstChild.data
-        if sid == "0000000000000000":
-            challenge_info = xml_data.getElementsByTagName('Challenge')
-            challenge = challenge_info[0].firstChild.data
-            challenge_bf = (challenge + '-' + password).decode('iso-8859-1').encode('utf-16le')
-            m = hashlib.md5()
-            m.update(challenge_bf)
-            response_bf = challenge + '-' + m.hexdigest().lower()
-        else:
-            return sid
+        return session_id
 
     headers = {"Accept": "text/html,application/xhtml+xml,application/xml",
                "Content-Type": "application/x-www-form-urlencoded",
                "User-Agent": USER_AGENT}
 
-    login_page = "/login_sid.lua?&response=" + response_bf
-    conn.request("GET", login_page, '', headers)
-    response = conn.getresponse()
-    data = response.read()
-    if response.status != 200:
-        print "%s %s" % (response.status, response.reason)
+    url = 'http://{}:{}/login_sid.lua?&response={}'.format(server, port, response_bf)
+    try:
+        r = requests.get(url, headers=headers)
+        r.raise_for_status()
+    except requests.exceptions.HTTPError as err:
+        print(err)
+        sys.exit(1)
+
+    root = etree.fromstring(r.content)
+    session_id = root.xpath('//SessionInfo/SID/text()')[0]
+    if session_id == "0000000000000000":
+        print("ERROR - No SID received because of invalid password")
         sys.exit(0)
-    else:
-        sid = re.search("<SID>(.*?)</SID>", data).group(1)
-        if sid == "0000000000000000":
-            print "ERROR - No SID received because of invalid password"
-            sys.exit(0)
-        return sid
+    return session_id
 
 
-def get_page(server, sid, page, port=80):
-    """Fetches a page from the Fritzbox and returns its content"""
-    conn = httplib.HTTPConnection(server + ':' + str(port))
+def get_page_content(server, session_id, page, port=80):
+    """Fetches a page from the Fritzbox and returns its content
+
+    :param server: the ip address of the Fritzbox
+    :param session_id: a valid session id
+    :param page: the page you are regquesting
+    :param port: the port the Fritzbox webserver runs on
+    :return: the content of the page
+    """
 
     headers = {"Accept": "application/xml",
                "Content-Type": "text/plain",
                "User-Agent": USER_AGENT}
 
-    page_with_sid = page + "?sid=" + sid
-    conn.request("GET", page_with_sid, '', headers)
-    response = conn.getresponse()
-    data = response.read()
-    if response.status != 200:
-        print "%s %s" % (response.status, response.reason)
-        print data
-        sys.exit(0)
-    else:
-        return data
+    url = 'http://{}:{}/{}?sid={}'.format(server, port, page, session_id)
+    try:
+        r = requests.get(url, headers=headers)
+        r.raise_for_status()
+    except requests.exceptions.HTTPError as err:
+        print(err)
+        sys.exit(1)
+    return r.content

fritzbox_memory_usage.py

@@ -22,8 +22,8 @@ import sys
 import fritzbox_helper as fh
 
 PAGE = '/system/ecostat.lua'
-pattern = re.compile(".*/(StatRAM.*?)\".*=.*\"(.*?)\"")
-USAGE_MAPPING = {'StatRAMCacheUsed': 'cache', 'StatRAMPhysFree': 'free', 'StatRAMStrictlyUsed': 'strict'}
+pattern = re.compile('Query[1-3]\s="(\d{1,3})')
+USAGE = ['free', 'cache', 'strict']
 
 
 def get_memory_usage():
@@ -32,38 +32,41 @@ def get_memory_usage():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
     matches = re.finditer(pattern, data)
     if matches:
-        for m in matches:
-            print'%s.value %d' % (USAGE_MAPPING[m.group(1)], int(m.group(2).split(',')[0]))
+        data = zip(USAGE, [m.group(1) for m in matches])
+        for d in data:
+            print('%s.value %s' % (d[0], d[1]))
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box Memory"
-    print "graph_vlabel %"
-    print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100"
-    print "graph_category system"
-    print "graph_order strict cache free"
-    print "graph_info This graph shows what the Fritzbox uses memory for."
-    print "graph_scale no"
-    print "strict.label strict"
-    print "strict.type GAUGE"
-    print "strict.draw AREA"
-    print "cache.label cache"
-    print "cache.type GAUGE"
-    print "cache.draw STACK"
-    print "free.label free"
-    print "free.type GAUGE"
-    print "free.draw STACK"
+    print("graph_title AVM Fritz!Box Memory")
+    print("graph_vlabel %")
+    print("graph_args --base 1000 -r --lower-limit 0 --upper-limit 100")
+    print("graph_category system")
+    print("graph_order strict cache free")
+    print("graph_info This graph shows what the Fritzbox uses memory for.")
+    print("graph_scale no")
+    print("strict.label strict")
+    print("strict.type GAUGE")
+    print("strict.draw AREA")
+    print("cache.label cache")
+    print("cache.type GAUGE")
+    print("cache.draw STACK")
+    print("free.label free")
+    print("free.type GAUGE")
+    print("free.draw STACK")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try:

fritzbox_power_consumption.py

@@ -22,9 +22,8 @@ import sys
 import fritzbox_helper as fh
 
 PAGE = '/system/energy.lua'
-pattern = re.compile(".*/(.*act?)\".*=.*\"(.*?)\"")
-DEVICE_MAPPING = {'rate_abact': 'ab', 'rate_dspact': 'dsl', 'rate_sumact': 'system',
-                  'rate_systemact': 'cpu', 'rate_usbhostact': 'usb', 'rate_wlanact': 'wifi'}
+pattern = re.compile('<td>(.+?)"bar\s(act|fillonly)"(.+?)\s(\d{1,3})\s%')
+DEVICES = ['system', 'cpu', 'wifi', 'dsl', 'ab', 'usb']
 
 
 def get_power_consumption():
@@ -33,62 +32,65 @@ def get_power_consumption():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
     matches = re.finditer(pattern, data)
     if matches:
-        for m in matches:
-            print'%s.value %d' % (DEVICE_MAPPING[m.group(1)], int(m.group(2)))
+        data = zip(DEVICES, [m.group(4) for m in matches])
+        for d in data:
+            print('%s.value %s' % (d[0], d[1]))
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box Power Consumption"
-    print "graph_vlabel %"
-    print "graph_category network"
-    print "graph_order system cpu wifi dsl ab usb"
-    print "system.label system"
-    print "system.type GAUGE"
-    print "system.graph LINE12"
-    print "system.min 0"
-    print "system.max 100"
-    print "system.info Fritzbox overall power consumption"
-    print "cpu.label cpu"
-    print "cpu.type GAUGE"
-    print "cpu.graph LINE1"
-    print "cpu.min 0"
-    print "cpu.max 100"
-    print "cpu.info Fritzbox central processor power consumption"
-    print "wifi.label wifi"
-    print "wifi.type GAUGE"
-    print "wifi.graph LINE1"
-    print "wifi.min 0"
-    print "wifi.max 100"
-    print "wifi.info Fritzbox wifi power consumption"
-    print "dsl.label dsl"
-    print "dsl.type GAUGE"
-    print "dsl.graph LINE1"
-    print "dsl.min 0"
-    print "dsl.max 100"
-    print "dsl.info Fritzbox dsl power consumption"
-    print "ab.label ab"
-    print "ab.type GAUGE"
-    print "ab.graph LINE1"
-    print "ab.min 0"
-    print "ab.max 100"
-    print "ab.info Fritzbox analog phone ports power consumption"
-    print "usb.label usb"
-    print "usb.type GAUGE"
-    print "usb.graph LINE1"
-    print "usb.min 0"
-    print "usb.max 100"
-    print "usb.info Fritzbox usb devices power consumption"
+    print("graph_title AVM Fritz!Box Power Consumption")
+    print("graph_vlabel %")
+    print("graph_category system")
+    print("graph_order system cpu wifi dsl ab usb")
+    print("system.label system")
+    print("system.type GAUGE")
+    print("system.graph LINE12")
+    print("system.min 0")
+    print("system.max 100")
+    print("system.info Fritzbox overall power consumption")
+    print("cpu.label cpu")
+    print("cpu.type GAUGE")
+    print("cpu.graph LINE1")
+    print("cpu.min 0")
+    print("cpu.max 100")
+    print("cpu.info Fritzbox central processor power consumption")
+    print("wifi.label wifi")
+    print("wifi.type GAUGE")
+    print("wifi.graph LINE1")
+    print("wifi.min 0")
+    print("wifi.max 100")
+    print("wifi.info Fritzbox wifi power consumption")
+    print("dsl.label dsl")
+    print("dsl.type GAUGE")
+    print("dsl.graph LINE1")
+    print("dsl.min 0")
+    print("dsl.max 100")
+    print("dsl.info Fritzbox dsl power consumption")
+    print("ab.label ab")
+    print("ab.type GAUGE")
+    print("ab.graph LINE1")
+    print("ab.min 0")
+    print("ab.max 100")
+    print("ab.info Fritzbox analog phone ports power consumption")
+    print("usb.label usb")
+    print("usb.type GAUGE")
+    print("usb.graph LINE1")
+    print("usb.min 0")
+    print("usb.max 100")
+    print("usb.info Fritzbox usb devices power consumption")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try:

fritzbox_traffic.py

@@ -14,6 +14,7 @@
   #%# capabilities=autoconf
 """
 
+import os
 import sys
 
 from fritzconnection import FritzConnection
@@ -21,60 +22,64 @@ from fritzconnection import FritzConnection
 
 def print_values():
     try:
-        conn = FritzConnection()
+        conn = FritzConnection(address=os.environ['fritzbox_ip'])
     except Exception as e:
         sys.exit("Couldn't get WAN traffic")
 
     down_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetTotalBytesReceived')['NewTotalBytesReceived']
-    print ('down.value %d' % down_traffic)
+    print('down.value %d' % down_traffic)
 
     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')[
-        'NewLayer1DownstreamMaxBitRate']
-    print ('maxdown.value %d' % max_down_traffic)
+    if not os.environ.get('traffic_remove_max'):
+        max_down_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
+            'NewLayer1DownstreamMaxBitRate']
+        print('maxdown.value %d' % max_down_traffic)
 
-    max_up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
-        'NewLayer1UpstreamMaxBitRate']
-    print ('maxup.value %d' % max_up_traffic)
+        max_up_traffic = conn.call_action('WANCommonInterfaceConfig', 'GetCommonLinkProperties')[
+            'NewLayer1UpstreamMaxBitRate']
+        print('maxup.value %d' % max_up_traffic)
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box WAN traffic"
-    print "graph_args --base 1000"
-    print "graph_vlabel bits in (-) / out (+) per \${graph_period}"
-    print "graph_category network"
-    print "graph_order down up maxdown maxup"
-    print "down.label received"
-    print "down.type DERIVE"
-    print "down.graph no"
-    print "down.cdef down,8,*"
-    print "down.min 0"
-    print "down.max 1000000000"
-    print "up.label bps"
-    print "up.type DERIVE"
-    print "up.draw AREA"
-    print "up.cdef up,8,*"
-    print "up.min 0"
-    print "up.max 1000000000"
-    print "up.negative down"
-    print "up.info Traffic of the WAN interface."
-    print "maxdown.label received"
-    print "maxdown.type GAUGE"
-    print "maxdown.graph no"
-    print "maxup.label MAX"
-    print "maxup.type GAUGE"
-    print "maxup.negative maxdown"
-    print "maxup.draw LINE1"
-    print "maxup.info Maximum speed of the WAN interface."
+    print("graph_title AVM Fritz!Box WAN traffic")
+    print("graph_args --base 1000")
+    print("graph_vlabel bits in (-) / out (+) per \${graph_period}")
+    print("graph_category network")
+    print("graph_order down up maxdown maxup")
+    print("down.label received")
+    print("down.type DERIVE")
+    print("down.graph no")
+    print("down.cdef down,8,*")
+    print("down.min 0")
+    print("down.max 1000000000")
+    print("up.label bps")
+    print("up.type DERIVE")
+    print("up.draw AREA")
+    print("up.cdef up,8,*")
+    print("up.min 0")
+    print("up.max 1000000000")
+    print("up.negative down")
+    print("up.info Traffic of the WAN interface.")
+    if not os.environ.get('traffic_remove_max'):
+        print("maxdown.label received")
+        print("maxdown.type GAUGE")
+        print("maxdown.graph no")
+        print("maxup.label MAX")
+        print("maxup.type GAUGE")
+        print("maxup.negative maxdown")
+        print("maxup.draw LINE1")
+        print("maxup.info Maximum speed of the WAN interface.")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == "__main__":
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print "yes"  # Some docs say it'll be called with fetch, some say no arg at all
+        print("yes")  # Some docs say it'll be called with fetch, some say no arg at all
     elif len(sys.argv) == 1 or (len(sys.argv) == 2 and sys.argv[1] == 'fetch'):
         try:
             print_values()

fritzbox_uptime.py

@@ -19,10 +19,18 @@
 import os
 import re
 import sys
+
 import fritzbox_helper as fh
 
+locale = os.environ.get('locale', 'de')
+patternLoc = {"de": "(\d+)\s(Tag|Stunden|Minuten)",
+              "en": "(\d+)\s(days|hours|minutes)"}
+dayLoc = {"de": "Tag", "en": "days"}
+hourLoc = {"de": "Stunden", "en": "hours"}
+minutesLoc = {"de": "Minuten", "en": "minutes"}
+
 PAGE = '/system/energy.lua'
-pattern = re.compile(".*/(.*uptime_\w+?)\".*=.*\"(.*?)\"")
+pattern = re.compile(patternLoc[locale])
 
 
 def get_uptime():
@@ -31,35 +39,39 @@ def get_uptime():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
     matches = re.finditer(pattern, data)
     if matches:
         hours = 0.0
         for m in matches:
-            if m.group(1) == "uptime_hours":
-                hours += int(m.group(2))
-            if m.group(1) == "uptime_minutes":
-                hours += int(m.group(2)) / 60.0
+            if m.group(2) == dayLoc[locale]:
+                hours += 24 * int(m.group(1))
+            if m.group(2) == hourLoc[locale]:
+                hours += int(m.group(1))
+            if m.group(2) == minutesLoc[locale]:
+                hours += int(m.group(1)) / 60.0
         uptime = hours / 24
         print "uptime.value %.2f" % uptime
 
 
 def print_config():
-    print "graph_title AVM Fritz!Box Uptime"
-    print "graph_args --base 1000 -l 0"
-    print 'graph_vlabel uptime in days'
-    print "graph_scale no'"
-    print "graph_category system"
-    print "uptime.label uptime"
-    print "uptime.draw AREA"
+    print("graph_title AVM Fritz!Box Uptime")
+    print("graph_args --base 1000 -l 0")
+    print('graph_vlabel uptime in days')
+    print("graph_scale no'")
+    print("graph_category system")
+    print("uptime.label uptime")
+    print("uptime.draw AREA")
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try:

fritzbox_wifi_devices.py

@@ -19,10 +19,14 @@
 import os
 import re
 import sys
+
 import fritzbox_helper as fh
 
+locale = os.environ.get('locale', 'de')
+patternLoc = {"de": "(\d+) WLAN", "en": "(\d+) wireless LAN"}
+
 PAGE = '/system/energy.lua'
-pattern = re.compile("(\d+) WLAN")
+pattern = re.compile(patternLoc[locale])
 
 
 def get_connected_wifi_devices():
@@ -31,31 +35,33 @@ def get_connected_wifi_devices():
     server = os.environ['fritzbox_ip']
     password = os.environ['fritzbox_password']
 
-    sid = fh.get_sid(server, password)
-    data = fh.get_page(server, sid, PAGE)
+    session_id = fh.get_session_id(server, password)
+    data = fh.get_page_content(server, session_id, PAGE)
     m = re.search(pattern, data)
     if m:
         connected_devices = int(m.group(1))
-        print 'wifi.value %d' % connected_devices
+        print('wifi.value %d' % connected_devices)
 
 
 def print_config():
-    print 'graph_title AVM Fritz!Box Connected Wifi Devices'
-    print 'graph_vlabel Number of devices'
-    print 'graph_args --base 1000'
-    print 'graph_category network'
-    print 'graph_order wifi'
-    print 'wifi.label Wifi Connections on 2.4 & 5 Ghz'
-    print 'wifi.type GAUGE'
-    print 'wifi.graph LINE1'
-    print 'wifi.info Wifi Connections on 2.4 & 5 Ghz'
+    print('graph_title AVM Fritz!Box Connected Wifi Devices')
+    print('graph_vlabel Number of devices')
+    print('graph_args --base 1000')
+    print('graph_category network')
+    print('graph_order wifi')
+    print('wifi.label Wifi Connections on 2.4 & 5 Ghz')
+    print('wifi.type GAUGE')
+    print('wifi.graph LINE1')
+    print('wifi.info Wifi Connections on 2.4 & 5 Ghz')
+    if os.environ.get('host_name'):
+        print("host_name " + os.environ['host_name'])
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 2 and sys.argv[1] == 'config':
         print_config()
     elif len(sys.argv) == 2 and sys.argv[1] == 'autoconf':
-        print 'yes'
+        print('yes')
     elif len(sys.argv) == 1 or len(sys.argv) == 2 and sys.argv[1] == 'fetch':
         # Some docs say it'll be called with fetch, some say no arg at all
         try: