Restore previous version of solr monitoring

Restore solr monitoring to pre-66109b55, since the check_solr check was
removed.

Change-Id: I51be2bbdd911faf7f8f68fa39d83b24f66b3fa8f