feature: airlifting Dhruv's zabbix optimizations

Change-Id: I4cf86186be0db6db75cff09d8ab4ac849f0c686f
Merge "feature: airlifting Dhruv's zabbix optimizations"