Improving JSON representation of OnmsEvent and OnmsMonitoredService