45 files changed, 144 insertions, 142 deletions

diff --git a/graph.php b/graph.php
index 6206d73..8eec2ec 100644
--- a/graph.php
+++ b/graph.php
@@ -83,9 +83,11 @@ if (isset($plugin_json[$type]['legend'])) {
 }
 
 if (isset($plugin_json[$type]['title'])) {
-        $obj->rrd_title = $plugin_json[$type]['title'];
-        $obj->rrd_title = str_replace('{{PI}}', GET('pi'), $obj->rrd_title);
-        $obj->rrd_title = str_replace('{{TI}}', GET('ti'), $obj->rrd_title);
+        $obj->rrd_title = str_replace(
+                array('{{PI}}', '{{TI}}', '{{HOST}}'),
+                array(GET('pi'), GET('ti'), GET('h')),
+                $plugin_json[$type]['title']
+        );
 }
 
 if (isset($plugin_json[$type]['vertical'])) {
diff --git a/plugin/apache.json b/plugin/apache.json
index 3774371..3f8b65f 100644
--- a/plugin/apache.json
+++ b/plugin/apache.json
@@ -1,6 +1,6 @@
 {
         "apache_bytes": {
-                "title": "Webserver Traffic ({{PI}})",
+                "title": "Webserver Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "{{ND}}/s",
                 "legend": {
                         "value": {
@@ -11,7 +11,7 @@
                 "legend_format": "%5.1lf"
         },
         "apache_connections": {
-                "title": "Webserver Connections ({{PI}})",
+                "title": "Webserver Connections ({{PI}}) on {{HOST}}",
                 "vertical": "Conns/s",
                 "legend": {
                         "value": {
@@ -22,7 +22,7 @@
                 "legend_format": "%5.1lf"
         },
         "apache_idle_workers": {
-                "title": "Webserver Idle Workers ({{PI}})",
+                "title": "Webserver Idle Workers ({{PI}}) on {{HOST}}",
                 "vertical": "Workers",
                 "legend": {
                         "value": {
@@ -33,7 +33,7 @@
                 "legend_format": "%5.1lf"
         },
         "apache_requests": {
-                "title": "Webserver Requests ({{PI}})",
+                "title": "Webserver Requests ({{PI}}) on {{HOST}}",
                 "vertical": "Requests/s",
                 "legend": {
                         "value": {
@@ -44,7 +44,7 @@
                 "legend_format": "%5.1lf"
         },
         "apache_scoreboard": {
-                "title": "Webserver Scoreboard ({{PI}})",
+                "title": "Webserver Scoreboard ({{PI}}) on {{HOST}}",
                 "vertical": "Slots",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/apcups.json b/plugin/apcups.json
index 87ba662..530829c 100644
--- a/plugin/apcups.json
+++ b/plugin/apcups.json
@@ -1,6 +1,6 @@
 {
         "charge": {
-                "title": "UPS Charge",
+                "title": "UPS Charge on {{HOST}}",
                 "vertical": "Ampere hours",
                 "legend": {
                         "value": {
@@ -11,7 +11,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "frequency": {
-                "title": "UPS Input Frequency",
+                "title": "UPS Input Frequency on {{HOST}}",
                 "vertical": "Hertz",
                 "legend": {
                         "value": {
@@ -22,7 +22,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "percent": {
-                "title": "UPS Load",
+                "title": "UPS Load on {{HOST}}",
                 "vertical": "Load",
                 "legend": {
                         "value": {
@@ -33,7 +33,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "temperature": {
-                "title": "UPS Temperature",
+                "title": "UPS Temperature on {{HOST}}",
                 "vertical": "Celsius",
                 "legend": {
                         "value": {
@@ -43,7 +43,7 @@
                 }
         },
         "timeleft": {
-                "title": "UPS Time Left",
+                "title": "UPS Time Left on {{HOST}}",
                 "vertical": "Seconds",
                 "legend": {
                         "value": {
@@ -54,7 +54,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "voltage": {
-                "title": "UPS Voltage {{TI}}",
+                "title": "UPS Voltage {{TI}} on {{HOST}}",
                 "vertical": "Volt",
                 "legend": {
                         "value": {
diff --git a/plugin/battery.json b/plugin/battery.json
index 625e704..95738bf 100644
--- a/plugin/battery.json
+++ b/plugin/battery.json
@@ -1,6 +1,6 @@
 {
         "charge": {
-                "title": "Charge (Battery {{PI}})",
+                "title": "Charge (Battery {{PI}}) on {{HOST}}",
                 "vertical": "Ampere hours",
                 "legend": {
                         "value": {
@@ -11,7 +11,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "current": {
-                "title": "Current (Battery {{PI}})",
+                "title": "Current (Battery {{PI}}) on {{HOST}}",
                 "vertical": "Ampere",
                 "legend": {
                         "value": {
@@ -22,7 +22,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "voltage": {
-                "title": "Voltage (Battery {{PI}})",
+                "title": "Voltage (Battery {{PI}}) on {{HOST}}",
                 "vertical": "Volt",
                 "legend": {
                         "value": {
diff --git a/plugin/conntrack.json b/plugin/conntrack.json
index d3e218e..730cc24 100644
--- a/plugin/conntrack.json
+++ b/plugin/conntrack.json
@@ -1,6 +1,6 @@
 {
         "conntrack": {
-                "title": "Conntrack entries",
+                "title": "Conntrack entries on {{HOST}}",
                 "vertical": "Entries",
                 "legend": {
                         "value": {
diff --git a/plugin/contextswitch.json b/plugin/contextswitch.json
index 65c3745..8444466 100644
--- a/plugin/contextswitch.json
+++ b/plugin/contextswitch.json
@@ -1,6 +1,6 @@
 {
         "contextswitch": {
-                "title": "Context switches",
+                "title": "Context switches on {{HOST}}",
                 "vertical": "switch per second Bits",
                 "legend": {
                         "value": {
diff --git a/plugin/cpu.json b/plugin/cpu.json
index 34e021d..6f74654 100644
--- a/plugin/cpu.json
+++ b/plugin/cpu.json
@@ -1,6 +1,6 @@
 {
         "cpu": {
-                "title": "CPU-{{PI}} usage",
+                "title": "CPU-{{PI}} usage on {{HOST}}",
                 "vertical": "Jiffies",
                 "rrdtool_opts": ["-u", "100"],
                 "type": "stacked",
diff --git a/plugin/cpufreq.json b/plugin/cpufreq.json
index c66f924..196e420 100644
--- a/plugin/cpufreq.json
+++ b/plugin/cpufreq.json
@@ -1,6 +1,6 @@
 {
         "cpufreq": {
-                "title": "CPU frequency scaling",
+                "title": "CPU frequency scaling on {{HOST}}",
                 "vertical": "Hz",
                 "legend_format": "%5.1lf%s"
         }
diff --git a/plugin/df.json b/plugin/df.json
index ad345e4..f066dcd 100644
--- a/plugin/df.json
+++ b/plugin/df.json
@@ -1,6 +1,6 @@
 {
         "df_complex": {
-                "title": "Free space ({{PI}})",
+                "title": "Free space ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -21,7 +21,7 @@
                 "base": "1024"
         },
         "df_inodes": {
-                "title": "Free inodes ({{PI}})",
+                "title": "Free inodes ({{PI}}) on {{HOST}}",
                 "vertical": "Inodes",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/disk.json b/plugin/disk.json
index 2d14715..37e7e8b 100644
--- a/plugin/disk.json
+++ b/plugin/disk.json
@@ -1,6 +1,6 @@
 {
         "disk_merged": {
-                "title": "Disk Merged Operations ({{PI}})",
+                "title": "Disk Merged Operations ({{PI}}) on {{HOST}}",
                 "vertical": "Merged operations/s",
                 "type": "io",
                 "legend": {
@@ -16,7 +16,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "disk_octets": {
-                "title": "Disk Traffic ({{PI}})",
+                "title": "Disk Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes per second",
                 "type": "io",
                 "legend": {
@@ -32,7 +32,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "disk_ops": {
-                "title": "Disk Operations ({{PI}})",
+                "title": "Disk Operations ({{PI}}) on {{HOST}}",
                 "vertical": "Ops per second",
                 "type": "io",
                 "legend": {
@@ -48,7 +48,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "disk_time": {
-                "title": "Disk time per operation ({{PI}})",
+                "title": "Disk time per operation ({{PI}}) on {{HOST}}",
                 "vertical": "Avg. Time/Op",
                 "type": "io",
                 "legend": {
diff --git a/plugin/dns.json b/plugin/dns.json
index 6f8c542..69fd1e7 100644
--- a/plugin/dns.json
+++ b/plugin/dns.json
@@ -1,6 +1,6 @@
 {
         "dns_octets": {
-                "title": "DNS traffic",
+                "title": "DNS traffic on {{HOST}}",
                 "vertical": "Bit/s",
                 "type": "stacked",
                 "legend": {
@@ -15,17 +15,17 @@
                 }
         },
         "dns_opcode": {
-                "title": "DNS Opcode Query",
+                "title": "DNS Opcode Query on {{HOST}}",
                 "vertical": "Queries/s",
                 "type": "stacked"
         },
         "dns_qtype": {
-                "title": "DNS QType",
+                "title": "DNS QType on {{HOST}}",
                 "vertical": "Queries/s",
                 "type": "stacked"
         },
         "dns_rcode": {
-                "title": "DNS Reply code",
+                "title": "DNS Reply code on {{HOST}}",
                 "vertical": "Queries/s",
                 "type": "stacked"
         }
diff --git a/plugin/entropy.json b/plugin/entropy.json
index dc0171d..7ce8108 100644
--- a/plugin/entropy.json
+++ b/plugin/entropy.json
@@ -1,6 +1,6 @@
 {
         "entropy": {
-                "title": "Available entropy",
+                "title": "Available entropy on {{HOST}}",
                 "vertical": "Bits",
                 "legend": {
                         "value": {
diff --git a/plugin/filecount.json b/plugin/filecount.json
index b32fbdd..c6c2417 100644
--- a/plugin/filecount.json
+++ b/plugin/filecount.json
@@ -1,6 +1,6 @@
 {
         "bytes": {
-                "title": "Filecount: size ({{PI}})",
+                "title": "Filecount: size ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -12,7 +12,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "files": {
-                "title": "Filecount: number of files ({{PI}})",
+                "title": "Filecount: number of files ({{PI}}) on {{HOST}}",
                 "vertical": "Files",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/hddtemp.json b/plugin/hddtemp.json
index 20b8d61..45a2e10 100644
--- a/plugin/hddtemp.json
+++ b/plugin/hddtemp.json
@@ -1,6 +1,6 @@
 {
         "temperature": {
-                "title": "HDD Temperature",
+                "title": "HDD Temperature on {{HOST}}",
                 "vertical": "°C",
                 "legend_format": "%5.1lf%s"
         }
diff --git a/plugin/interface.json b/plugin/interface.json
index 9b23049..e17ba95 100644
--- a/plugin/interface.json
+++ b/plugin/interface.json
@@ -1,6 +1,6 @@
 {
         "if_octets": {
-                "title": "Interface Traffic ({{PI}})",
+                "title": "Interface Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "{{ND}} per second",
                 "type": "io",
                 "legend": {
@@ -17,7 +17,7 @@
                 "datasize": true
         },
         "if_errors": {
-                "title": "Interface Errors ({{PI}})",
+                "title": "Interface Errors ({{PI}}) on {{HOST}}",
                 "vertical": "Errors per second",
                 "type": "io",
                 "legend": {
@@ -33,7 +33,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_packets": {
-                "title": "Interface Packets ({{PI}})",
+                "title": "Interface Packets ({{PI}}) on {{HOST}}",
                 "vertical": "Packets per second",
                 "type": "io",
                 "legend": {
diff --git a/plugin/ipmi.json b/plugin/ipmi.json
index 07caf96..1ec3cb7 100644
--- a/plugin/ipmi.json
+++ b/plugin/ipmi.json
@@ -1,16 +1,16 @@
 {
         "fanspeed": {
-                "title": "Fanspeed ({{PI}})",
+                "title": "Fanspeed ({{PI}}) on {{HOST}}",
                 "vertical": "RPM",
                 "legend_format": "%5.1lf"
         },
         "temperature": {
-                "title": "Temperature ({{PI}})",
+                "title": "Temperature ({{PI}}) on {{HOST}}",
                 "vertical": "Celsius",
                 "legend_format": "%5.1lf%s"
         },
         "voltage": {
-                "title": "Voltage ({{PI}})",
+                "title": "Voltage ({{PI}}) on {{HOST}}",
                 "vertical": "Volt",
                 "legend_format": "%5.1lf"
         }
diff --git a/plugin/iptables.json b/plugin/iptables.json
index ba2945f..5e94239 100644
--- a/plugin/iptables.json
+++ b/plugin/iptables.json
@@ -1,13 +1,13 @@
 {
         "ipt_bytes": {
-                "title": "IP-Tables Traffic",
+                "title": "IP-Tables Traffic on {{HOST}}",
                 "vertical": "{{ND}}",
                 "type": "stacked",
                 "legend_format": "%5.1lf%s",
                 "datasize": true
         },
         "ipt_packets": {
-                "title": "IP-Tables Packets",
+                "title": "IP-Tables Packets on {{HOST}}",
                 "vertical": "Packets",
                 "type": "stacked",
                 "legend_format": "%5.1lf%s"
diff --git a/plugin/irq.json b/plugin/irq.json
index b45c043..5adae3e 100644
--- a/plugin/irq.json
+++ b/plugin/irq.json
@@ -1,7 +1,7 @@
 {
         "irq": {
                 "type": "stacked",
-                "title": "Interrupts",
+                "title": "Interrupts on {{HOST}}",
                 "vertical": "IRQs/s",
                 "legend_format": "%6.1lf"
         }
diff --git a/plugin/libvirt.json b/plugin/libvirt.json
index af3c46c..9c1d1d0 100644
--- a/plugin/libvirt.json
+++ b/plugin/libvirt.json
@@ -1,6 +1,6 @@
 {
         "disk_octets": {
-                "title": "Disk Traffic ({{TI}})",
+                "title": "Disk Traffic ({{TI}}) on {{HOST}}",
                 "vertical": "Bytes per second",
                 "type": "io",
                 "legend": {
@@ -16,7 +16,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "disk_ops": {
-                "title": "Disk Operations ({{TI}})",
+                "title": "Disk Operations ({{TI}}) on {{HOST}}",
                 "vertical": "Ops per second",
                 "type": "io",
                 "legend": {
@@ -32,7 +32,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_dropped": {
-                "title": "Interface Packets Dropped ({{TI}})",
+                "title": "Interface Packets Dropped ({{TI}}) on {{HOST}}",
                 "vertical": "Packets/s",
                 "type": "io",
                 "legend": {
@@ -48,7 +48,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_errors": {
-                "title": "Interface Errors ({{TI}})",
+                "title": "Interface Errors ({{TI}}) on {{HOST}}",
                 "vertical": "Errors/s",
                 "type": "io",
                 "legend": {
@@ -64,7 +64,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_octets": {
-                "title": "Interface Traffic ({{TI}})",
+                "title": "Interface Traffic ({{TI}}) on {{HOST}}",
                 "vertical": "{{ND}} per second",
                 "type": "io",
                 "legend": {
@@ -81,7 +81,7 @@
                 "datasize": true
         },
         "if_packets": {
-                "title": "Interface Packets ({{TI}})",
+                "title": "Interface Packets ({{TI}}) on {{HOST}}",
                 "vertical": "Packets per second",
                 "type": "io",
                 "legend": {
@@ -97,7 +97,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "virt_cpu_total": {
-                "title": "CPU usage",
+                "title": "CPU usage on {{HOST}}",
                 "vertical": "Milliseconds",
                 "legend": {
                         "value": {
@@ -109,7 +109,7 @@
                 "scale": 0.000001
         },
         "virt_vcpu": {
-                "title": "vCPU usage",
+                "title": "vCPU usage on {{HOST}}",
                 "vertical": "Milliseconds",
                 "legend_format": "%5.1lf",
                 "scale": 0.000001
diff --git a/plugin/load.json b/plugin/load.json
index 4166087..f75da99 100644
--- a/plugin/load.json
+++ b/plugin/load.json
@@ -1,6 +1,6 @@
 {
         "load": {
-                "title": "System load",
+                "title": "System load on {{HOST}}",
                 "vertical": "System load",
                 "type": "default",
                 "legend": {
diff --git a/plugin/lvm.json b/plugin/lvm.json
index e19ff1c..9ec38ae 100644
--- a/plugin/lvm.json
+++ b/plugin/lvm.json
@@ -1,6 +1,6 @@
 {
         "df_complex": {
-                "title": "Logical volumes for {{PI}})",
+                "title": "Logical volumes for {{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/md.json b/plugin/md.json
index 6e0812c..1f871f0 100644
--- a/plugin/md.json
+++ b/plugin/md.json
@@ -1,6 +1,6 @@
 {
         "md_disks": {
-                "title": "MD (md-{{PI}})",
+                "title": "MD (md-{{PI}}) on {{HOST}}",
                 "vertical": "Disks",
                 "legend_format": "%2.0lf"
         }
diff --git a/plugin/memcached.json b/plugin/memcached.json
index 253a631..d30c26f 100644
--- a/plugin/memcached.json
+++ b/plugin/memcached.json
@@ -1,6 +1,6 @@
 {
         "df": {
-                "title": "Memcached Memory Usage",
+                "title": "Memcached Memory Usage on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -17,7 +17,7 @@
                 "base": "1024"
         },
         "memcached_command": {
-                "title": "Memcached Commands",
+                "title": "Memcached Commands on {{HOST}}",
                 "vertical": "Commands",
                 "type": "stacked",
                 "legend": {
@@ -37,7 +37,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "memcached_connections": {
-                "title": "Memcached Number of Connections",
+                "title": "Memcached Number of Connections on {{HOST}}",
                 "vertical": "Connections",
                 "legend": {
                         "value": {
@@ -48,7 +48,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "memcached_items": {
-                "title": "Number of Items in Memcached",
+                "title": "Number of Items in Memcached on {{HOST}}",
                 "vertical": "Items",
                 "legend": {
                         "value": {
@@ -59,7 +59,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "memcached_octets": {
-                "title": "Memcached Network Traffic",
+                "title": "Memcached Network Traffic on {{HOST}}",
                 "vertical": "{{ND}}",
                 "type": "io",
                 "legend": {
@@ -76,7 +76,7 @@
                 "datasize": true
         },
         "memcached_ops": {
-                "title": "Memcached Operations",
+                "title": "Memcached Operations on {{HOST}}",
                 "vertical": "Commands",
                 "type": "stacked",
                 "legend": {
@@ -96,7 +96,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "percent": {
-                "title": "Memcached Hit Ratio",
+                "title": "Memcached Hit Ratio on {{HOST}}",
                 "vertical": "Percent",
                 "legend": {
                         "value": {
@@ -107,7 +107,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_count": {
-                "title": "Memcached number of Threads",
+                "title": "Memcached number of Threads on {{HOST}}",
                 "vertical": "Threads",
                 "legend": {
                         "value": {
@@ -118,7 +118,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_cputime": {
-                "title": "CPU Time consumed by Memcached",
+                "title": "CPU Time consumed by Memcached on {{HOST}}",
                 "vertical": "CPU Time",
                 "legend": {
                         "user": {
diff --git a/plugin/memory.json b/plugin/memory.json
index 401768b..eb8d0e4 100644
--- a/plugin/memory.json
+++ b/plugin/memory.json
@@ -1,6 +1,6 @@
 {
         "memory": {
-                "title": "Physical memory utilization",
+                "title": "Physical memory utilization on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/mysql.json b/plugin/mysql.json
index e4dd6fc..1b7dd8c 100644
--- a/plugin/mysql.json
+++ b/plugin/mysql.json
@@ -1,6 +1,6 @@
 {
         "cache_result": {
-                "title": "MySQL query cache ({{PI}})",
+                "title": "MySQL query cache ({{PI}}) on {{HOST}}",
                 "vertical": "Queries/s",
                 "type": "stacked",
                 "legend": {
@@ -24,7 +24,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "cache_size": {
-                "title": "MySQL query cache size ({{PI}})",
+                "title": "MySQL query cache size ({{PI}}) on {{HOST}}",
                 "vertical": "Queries in cache",
                 "type": "stacked",
                 "legend": {
@@ -35,13 +35,13 @@
                 "legend_format": "%5.1lf%s"
         },
         "mysql_commands": {
-                "title": "MySQL commands ({{PI}})",
+                "title": "MySQL commands ({{PI}}) on {{HOST}}",
                 "vertical": "Issues/s",
                 "type": "stacked",
                 "legend_format": "%5.1lf%s"
         },
         "mysql_handler": {
-                "title": "MySQL handler ({{PI}})",
+                "title": "MySQL handler ({{PI}}) on {{HOST}}",
                 "vertical": "Invocations",
                 "type": "stacked",
                 "legend": {
@@ -82,7 +82,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "mysql_locks": {
-                "title": "MySQL locks ({{PI}})",
+                "title": "MySQL locks ({{PI}}) on {{HOST}}",
                 "vertical": "locks",
                 "legend": {
                         "immediate": {
@@ -95,7 +95,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "mysql_octets": {
-                "title": "MySQL Traffic ({{TI}})",
+                "title": "MySQL Traffic ({{TI}}) on {{HOST}}",
                 "vertical": "Bits per second",
                 "type": "io",
                 "legend": {
@@ -111,7 +111,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "threads": {
-                "title": "MySQL threads ({{PI}})",
+                "title": "MySQL threads ({{PI}}) on {{HOST}}",
                 "vertical": "Threads",
                 "type": "stacked",
                 "legend": {
@@ -131,7 +131,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "total_threads": {
-                "title": "MySQL created threads ({{PI}})",
+                "title": "MySQL created threads ({{PI}}) on {{HOST}}",
                 "vertical": "Created Threads",
                 "legend": {
                         "value": {
diff --git a/plugin/netlink.json b/plugin/netlink.json
index 79fbd8e..51c1d9d 100644
--- a/plugin/netlink.json
+++ b/plugin/netlink.json
@@ -1,6 +1,6 @@
 {
         "if_collisions": {
-                "title": "Collisions ({{PI}})",
+                "title": "Collisions ({{PI}}) on {{HOST}}",
                 "vertical": "Collisions/s",
                 "type": "stacked",
                 "legend": {
@@ -11,7 +11,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_dropped": {
-                "title": "Dropped Packets ({{PI}})",
+                "title": "Dropped Packets ({{PI}}) on {{HOST}}",
                 "vertical": "Packets/s",
                 "type": "io",
                 "legend": {
@@ -27,7 +27,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_errors": {
-                "title": "Interface Errors ({{PI}})",
+                "title": "Interface Errors ({{PI}}) on {{HOST}}",
                 "vertical": "Errors/s",
                 "type": "io",
                 "legend": {
@@ -43,7 +43,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_multicast": {
-                "title": "Multicast Packets ({{PI}})",
+                "title": "Multicast Packets ({{PI}}) on {{HOST}}",
                 "vertical": "Packets/s",
                 "type": "stacked",
                 "legend": {
@@ -55,7 +55,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_octets": {
-                "title": "Interface Traffic ({{PI}})",
+                "title": "Interface Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "{{ND}}/second",
                 "type": "io",
                 "legend": {
@@ -72,7 +72,7 @@
                 "datasize": true
         },
         "if_packets": {
-                "title": "Interface Packets ({{PI}})",
+                "title": "Interface Packets ({{PI}}) on {{HOST}}",
                 "vertical": "Packets/s",
                 "type": "io",
                 "legend": {
@@ -88,7 +88,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_rx_errors": {
-                "title": "Interface receive errors ({{PI}})",
+                "title": "Interface receive errors ({{PI}}) on {{HOST}}",
                 "vertical": "Errors/s",
                 "type": "stacked",
                 "legend": {
@@ -120,7 +120,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_tx_errors": {
-                "title": "Interface transmit errors ({{PI}})",
+                "title": "Interface transmit errors ({{PI}}) on {{HOST}}",
                 "vertical": "Errors/s",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/nfs.json b/plugin/nfs.json
index 372d222..d2c41eb 100644
--- a/plugin/nfs.json
+++ b/plugin/nfs.json
@@ -1,6 +1,6 @@
 {
         "nfs_procedure": {
-                "title": "NFS-{{PI}} Procedures",
+                "title": "NFS-{{PI}} Procedures on {{HOST}}",
                 "vertical": "Procedures",
                 "type": "stacked",
                 "legend_format": "%5.2lf"
diff --git a/plugin/nginx.json b/plugin/nginx.json
index 08e1d40..ac6f715 100644
--- a/plugin/nginx.json
+++ b/plugin/nginx.json
@@ -1,6 +1,6 @@
 {
         "connections": {
-                "title": "Nginx connections",
+                "title": "Nginx connections on {{HOST}}",
                 "vertical": "Connections/s",
                 "legend": {
                         "accepted": {
@@ -15,7 +15,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "nginx_connections": {
-                "title": "Nginx connection states",
+                "title": "Nginx connection states on {{HOST}}",
                 "vertical": "Connections/s",
                 "legend": {
                         "active": {
@@ -38,7 +38,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "nginx_requests": {
-                "title": "Nginx requests",
+                "title": "Nginx requests on {{HOST}}",
                 "vertical": "Requests/s",
                 "legend": {
                         "value": {
diff --git a/plugin/ntpd.json b/plugin/ntpd.json
index f7ec918..366dd58 100644
--- a/plugin/ntpd.json
+++ b/plugin/ntpd.json
@@ -1,21 +1,21 @@
 {
         "delay": {
-                "title": "Delay",
+                "title": "Delay on {{HOST}}",
                 "vertical": "Seconds",
                 "legend_format": "%5.1lf%s"
         },
         "frequency_offset": {
-                "title": "Frequency offset",
+                "title": "Frequency offset on {{HOST}}",
                 "vertical": "ppm",
                 "legend_format": "%5.1lf%s"
         },
         "time_dispersion": {
-                "title": "Time dispersion",
+                "title": "Time dispersion on {{HOST}}",
                 "vertical": "Seconds",
                 "legend_format": "%5.1lf%s"
         },
         "time_offset": {
-                "title": "Time offset",
+                "title": "Time offset on {{HOST}}",
                 "vertical": "Seconds",
                 "legend_format": "%5.1lf%s"
         }
diff --git a/plugin/nut.json b/plugin/nut.json
index c5bcbca..accbeca 100644
--- a/plugin/nut.json
+++ b/plugin/nut.json
@@ -1,31 +1,31 @@
 {
         "frequency": {
-                "title": "Frequency ({{PI}})",
+                "title": "Frequency ({{PI}}) on {{HOST}}",
                 "vertical": "Hz",
                 "legend_format": "%5.1lf%s"
         },
         "percent": {
-                "title": "Charge & load ({{PI}})",
+                "title": "Charge & load ({{PI}}) on {{HOST}}",
                 "vertical": "Percent",
                 "legend_format": "%5.1lf"
         },
         "power": {
-                "title": "Power ({{PI}})",
+                "title": "Power ({{PI}}) on {{HOST}}",
                 "vertical": "VA",
                 "legend_format": "%5.1lf%s"
         },
         "temperature": {
-                "title": "Temperature ({{PI}})",
+                "title": "Temperature ({{PI}}) on {{HOST}}",
                 "vertical": "°C",
                 "legend_format": "%5.1lf%s"
         },
         "timeleft": {
-                "title": "Time Left ({{PI}})",
+                "title": "Time Left ({{PI}}) on {{HOST}}",
                 "vertical": "Seconds",
                 "legend_format": "%5.1lf"
         },
         "voltage": {
-                "title": "Voltage {{PI}}",
+                "title": "Voltage {{PI}} on {{HOST}}",
                 "vertical": "Voltage",
                 "legend_format": "%5.1lf"
         }
diff --git a/plugin/openvpn.json b/plugin/openvpn.json
index aa731c4..0a5b26c 100644
--- a/plugin/openvpn.json
+++ b/plugin/openvpn.json
@@ -1,6 +1,6 @@
 {
         "if_octets": {
-                "title": "Traffic ({{PI}})",
+                "title": "Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "{{ND}} per second",
                 "type": "io",
                 "legend": {
@@ -17,7 +17,7 @@
                 "datasize": true
         },
         "users": {
-                "title": "Users ({{PI}})",
+                "title": "Users ({{PI}}) on {{HOST}}",
                 "vertical": "Users",
                 "legend": {
                         "value": {
diff --git a/plugin/ping.json b/plugin/ping.json
index ba6d67e..ab9dfdf 100644
--- a/plugin/ping.json
+++ b/plugin/ping.json
@@ -1,16 +1,16 @@
 {
         "ping": {
-                "title": "Ping latency",
+                "title": "Ping latency on {{HOST}}",
                 "vertical": "Milliseconds",
                 "legend_format": "%5.1lf"
         },
         "ping_stddev": {
-                "title": "Ping standard deviation",
+                "title": "Ping standard deviation on {{HOST}}",
                 "vertical": "Milliseconds",
                 "legend_format": "%5.1lf"
         },
         "ping_droprate": {
-                "title": "Ping droprate",
+                "title": "Ping droprate on {{HOST}}",
                 "legend_format": "%5.1lf"
         }
 }
diff --git a/plugin/postgresql.json b/plugin/postgresql.json
index 4e0181d..c7d55c1 100644
--- a/plugin/postgresql.json
+++ b/plugin/postgresql.json
@@ -1,6 +1,6 @@
 {
         "pg_blks": {
-                "title": "PostgreSQL Disk I/O ({{PI}})",
+                "title": "PostgreSQL Disk I/O ({{PI}}) on {{HOST}}",
                 "vertical": "Blocks",
                 "type": "stacked",
                 "legend": {
@@ -32,7 +32,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_db_size": {
-                "title": "PostgreSQL DB size ({{PI}})",
+                "title": "PostgreSQL DB size ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -44,7 +44,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_n_tup_c": {
-                "title": "PostgreSQL Row actions ({{PI}})",
+                "title": "PostgreSQL Row actions ({{PI}}) on {{HOST}}",
                 "vertical": "Rows",
                 "type": "stacked",
                 "legend": {
@@ -68,7 +68,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_n_tup_g": {
-                "title": "PostgreSQL Table states ({{PI}})",
+                "title": "PostgreSQL Table states ({{PI}}) on {{HOST}}",
                 "vertical": "Rows",
                 "type": "stacked",
                 "legend": {
@@ -84,7 +84,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_numbackends": {
-                "title": "PostgreSQL Backends ({{PI}})",
+                "title": "PostgreSQL Backends ({{PI}}) on {{HOST}}",
                 "vertical": "Backends",
                 "type": "stacked",
                 "legend": {
@@ -96,7 +96,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_scan": {
-                "title": "PostgreSQL Scans ({{PI}})",
+                "title": "PostgreSQL Scans ({{PI}}) on {{HOST}}",
                 "vertical": "Scans / Rows",
                 "type": "stacked",
                 "legend": {
@@ -116,7 +116,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "pg_xact": {
-                "title": "PostgreSQL Transactions ({{PI}})",
+                "title": "PostgreSQL Transactions ({{PI}}) on {{HOST}}",
                 "vertical": "Transactions",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/processes.json b/plugin/processes.json
index d97d6af..9e1ccd4 100644
--- a/plugin/processes.json
+++ b/plugin/processes.json
@@ -1,6 +1,6 @@
 {
         "ps_state": {
-                "title": "Processes",
+                "title": "Processes on {{HOST}}",
                 "vertical": "Processes",
                 "type": "stacked",
                 "legend": {
@@ -40,7 +40,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "fork_rate": {
-                "title": "Fork rate",
+                "title": "Fork rate on {{HOST}}",
                 "vertical": "forks/s",
                 "type": "stacked",
                 "legend": {
@@ -52,7 +52,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_code": {
-                "title": "Text Resident Set ({{PI}})",
+                "title": "Text Resident Set ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -64,7 +64,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_count": {
-                "title": "Number of Processes/Threads ({{PI}})",
+                "title": "Number of Processes/Threads ({{PI}}) on {{HOST}}",
                 "vertical": "Amount",
                 "type": "stacked",
                 "legend": {
@@ -80,7 +80,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_cputime": {
-                "title": "CPU time ({{PI}})",
+                "title": "CPU time ({{PI}}) on {{HOST}}",
                 "vertical": "CPU time [s]",
                 "type": "stacked",
                 "legend": {
@@ -96,7 +96,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_disk_octets": {
-                "title": "Disk Traffic ({{PI}})",
+                "title": "Disk Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes per second",
                 "type": "io",
                 "legend": {
@@ -112,7 +112,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_disk_ops": {
-                "title": "Disk Operations ({{PI}})",
+                "title": "Disk Operations ({{PI}}) on {{HOST}}",
                 "vertical": "Ops per second",
                 "type": "io",
                 "legend": {
@@ -128,7 +128,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_data": {
-                "title": "Data Resident Set ({{PI}})",
+                "title": "Data Resident Set ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -140,7 +140,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_pagefaults": {
-                "title": "PageFaults ({{PI}})",
+                "title": "PageFaults ({{PI}}) on {{HOST}}",
                 "vertical": "Pagefaults",
                 "type": "stacked",
                 "legend": {
@@ -156,7 +156,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_rss": {
-                "title": "Resident Segment Size ({{PI}})",
+                "title": "Resident Segment Size ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -168,7 +168,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_stacksize": {
-                "title": "Stacksize ({{PI}})",
+                "title": "Stacksize ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -180,7 +180,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "ps_vm": {
-                "title": "Virtual Memory ({{PI}})",
+                "title": "Virtual Memory ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
diff --git a/plugin/sensors.json b/plugin/sensors.json
index 07caf96..1ec3cb7 100644
--- a/plugin/sensors.json
+++ b/plugin/sensors.json
@@ -1,16 +1,16 @@
 {
         "fanspeed": {
-                "title": "Fanspeed ({{PI}})",
+                "title": "Fanspeed ({{PI}}) on {{HOST}}",
                 "vertical": "RPM",
                 "legend_format": "%5.1lf"
         },
         "temperature": {
-                "title": "Temperature ({{PI}})",
+                "title": "Temperature ({{PI}}) on {{HOST}}",
                 "vertical": "Celsius",
                 "legend_format": "%5.1lf%s"
         },
         "voltage": {
-                "title": "Voltage ({{PI}})",
+                "title": "Voltage ({{PI}}) on {{HOST}}",
                 "vertical": "Volt",
                 "legend_format": "%5.1lf"
         }
diff --git a/plugin/snmp.json b/plugin/snmp.json
index 9c6cc91..8bbe8b4 100644
--- a/plugin/snmp.json
+++ b/plugin/snmp.json
@@ -1,6 +1,6 @@
 {
         "if_octets": {
-                "title": "Interface Traffic ({{TI}})",
+                "title": "Interface Traffic ({{TI}}) on {{HOST}}",
                 "vertical": "{{ND}} per second",
                 "type": "io",
                 "legend": {
diff --git a/plugin/swap.json b/plugin/swap.json
index 7699a12..c443428 100644
--- a/plugin/swap.json
+++ b/plugin/swap.json
@@ -1,6 +1,6 @@
 {
         "swap": {
-                "title": "Swap utilization",
+                "title": "Swap utilization on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -21,7 +21,7 @@
                 "base": "1024"
         },
         "swap_io": {
-                "title": "Swapped I/O pages",
+                "title": "Swapped I/O pages on {{HOST}}",
                 "vertical": "Pages",
                 "type": "io",
                 "legend": {
diff --git a/plugin/tcpconns.json b/plugin/tcpconns.json
index 67dd762..aa8ce25 100644
--- a/plugin/tcpconns.json
+++ b/plugin/tcpconns.json
@@ -1,6 +1,6 @@
 {
         "tcp_connections": {
-                "title": "TCP Connections ({{PI}})",
+                "title": "TCP Connections ({{PI}}) on {{HOST}}",
                 "vertical": "Connections",
                 "type": "stacked",
                 "legend_format": "%5.1lf"
diff --git a/plugin/thermal.json b/plugin/thermal.json
index 6f66a85..b9bf765 100644
--- a/plugin/thermal.json
+++ b/plugin/thermal.json
@@ -1,6 +1,6 @@
 {
         "gauge": {
-                "title": "Temperature ({{PI}})",
+                "title": "Temperature ({{PI}}) on {{HOST}}",
                 "vertical": "°C",
                 "legend": {
                         "value": {
diff --git a/plugin/uptime.json b/plugin/uptime.json
index b1abe4e..42bd775 100644
--- a/plugin/uptime.json
+++ b/plugin/uptime.json
@@ -1,6 +1,6 @@
 {
         "uptime": {
-                "title": "Uptime",
+                "title": "Uptime on {{HOST}}",
                 "vertical": "Days",
                 "type": "uptime",
                 "legend": {
diff --git a/plugin/users.json b/plugin/users.json
index 8de437e..101ce34 100644
--- a/plugin/users.json
+++ b/plugin/users.json
@@ -1,6 +1,6 @@
 {
         "users": {
-                "title": "Users",
+                "title": "Users on {{HOST}}",
                 "legend": {
                         "value": {
                                 "name": "Users",
diff --git a/plugin/vmem.json b/plugin/vmem.json
index 14d214e..8374ed8 100644
--- a/plugin/vmem.json
+++ b/plugin/vmem.json
@@ -1,6 +1,6 @@
 {
         "vmpage_faults": {
-                "title": "Page faults",
+                "title": "Page faults on {{HOST}}",
                 "type": "stacked",
                 "legend": {
                         "minflt": {
@@ -15,12 +15,12 @@
                 "legend_format": "%5.1lf%s"
         },
         "vmpage_io": {
-                "title": "Page IO ({{TI}})",
+                "title": "Page IO ({{TI}}) on {{HOST}}",
                 "type": "stacked",
                 "legend_format": "%5.1lf%s"
         },
         "vmpage_number": {
-                "title": "Pages",
+                "title": "Pages on {{HOST}}",
                 "type": "stacked",
                 "legend_format": "%5.1lf%s"
         }
diff --git a/plugin/vserver.json b/plugin/vserver.json
index 7366693..503e7ca 100644
--- a/plugin/vserver.json
+++ b/plugin/vserver.json
@@ -1,6 +1,6 @@
 {
         "load": {
-                "title": "System load",
+                "title": "System load on {{HOST}}",
                 "vertical": "System load",
                 "type": "default",
                 "legend": {
@@ -20,7 +20,7 @@
                 "legend_format": "%.2lf"
         },
         "vs_memory": {
-                "title": "Memory utilization ({{PI}})",
+                "title": "Memory utilization ({{PI}}) on {{HOST}}",
                 "vertical": "Bytes",
                 "type": "stacked",
                 "legend": {
@@ -44,7 +44,7 @@
                 "legend_format": "%5.1lf%s"
         },
         "vs_threads": {
-                "title": "Threads ({{PI}})",
+                "title": "Threads ({{PI}}) on {{HOST}}",
                 "type": "stacked",
                 "legend": {
                         "running": {
@@ -67,13 +67,13 @@
                 "legend_format": "%5.1lf%s"
         },
         "if_octets": {
-                "title": "Interface Traffic ({{PI}})",
+                "title": "Interface Traffic ({{PI}}) on {{HOST}}",
                 "vertical": "{{ND}} per second",
                 "legend_format": "%5.1lf%s",
                 "datasize": true
         },
         "vs_processes": {
-                "title": "Processes ({{PI}})",
+                "title": "Processes ({{PI}}) on {{HOST}}",
                 "legend": {
                         "value": {
                                 "name": "Processes"
diff --git a/plugin/wireless.json b/plugin/wireless.json
index 1c53489..274951c 100644
--- a/plugin/wireless.json
+++ b/plugin/wireless.json
@@ -1,6 +1,6 @@
 {
         "signal_noise": {
-                "title": "Noise level ({{PI}})",
+                "title": "Noise level ({{PI}}) on {{HOST}}",
                 "vertical": "dBm",
                 "legend": {
                         "value": {
@@ -11,7 +11,7 @@
                 "legend_format": "%6.1lf"
         },
         "signal_power": {
-                "title": "Signal level ({{PI}})",
+                "title": "Signal level ({{PI}}) on {{HOST}}",
                 "vertical": "dBm",
                 "legend": {
                         "value": {
@@ -22,7 +22,7 @@
                 "legend_format": "%6.1lf"
         },
         "signal_quality": {
-                "title": "Link Quality ({{PI}})",
+                "title": "Link Quality ({{PI}}) on {{HOST}}",
                 "vertical": "quality",
                 "legend": {
                         "value": {
diff --git a/type/Base.class.php b/type/Base.class.php
index 35d6e8b..7ee547e 100644
--- a/type/Base.class.php
+++ b/type/Base.class.php
@@ -18,7 +18,7 @@ class Type_Base {
         var $rrd_vertical;
         var $rrd_format = '%5.1lf%s';
         var $scale = 1;
-        var $base; 
+        var $base;
         var $width;
         var $height;
         var $graph_type;
@@ -288,7 +288,7 @@ class Type_Base {
                         '-w', is_numeric($this->width) ? $this->width : 400,
                         '-h', is_numeric($this->height) ? $this->height : 175,
                         '-l', '0',
-                        '-t', "{$this->rrd_title} on {$this->args['host']}"
+                        '-t', $this->rrd_title
                 ));
                 if ($this->rrd_vertical) {
                         $rrdgraph[] = '-v';