* Use the actual server name instead of pool name where needed * Add a new attribute with nodename to avoid breaking RRD filenames * tests * tests improved * force refresh tests