Resolved upstream-conflicts:

html/pages/apps.inc.php
	includes/polling/unix-agent.inc.php
This commit is contained in:
f0o
2015-01-18 06:37:22 +00:00
7 changed files with 216 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ $graphs['drbd'] = array('disk_bits', 'network_bits', 'queue', 'unsynced');
$graphs['mysql'] = array('network_traffic', 'connections', 'command_counters', 'select_types');
$graphs['memcached'] = array('bits', 'commands', 'data', 'items');
$graphs['nginx'] = array('connections', 'req');
$graphs['bind'] = array('queries');
$graphs['tinydns'] = array('queries', 'errors', 'dnssec', 'other');
print_optionbar_start();