The process of synchronizing Nagios and Foundation does not properly handle the adding and deleting of instanced services to service groups. This patch corrects that.

Background
The Commit process synchronizes the nagios and foundation datasets, including service groups and member services. It uses the Monarch configuration database to do this.

Problem
Instanced services were added to service groups only as base services, not their instances. Also, adding such a service to a service group resulted in all other services in the service group not being synced to foundation. Removing it from the service group restored the other services. This meant effectively that instanced services could not be added to service groups.

Solution
The code to properly add service instances (and not the base service for the instances) to service groups when the base service is added to the service group is included in this patch. Additionally, the removal of said instanced service removes all the instances from the service group.

Installation:
Copy the attached tar archive to your groundwork server.
Run the following commands as root: