Merge branch 'slack-19.0' into bp-pr17977.slack-19.0

Author: timvaillancourt

go/vt/vtorc/logic/topology_recovery.go

@@ -796,12 +796,12 @@ func executeCheckAndRecoverFunction(analysisEntry *inst.ReplicationAnalysis) (er
 	recoveryName := getRecoverFunctionName(checkAndRecoverFunctionCode)
 	recoveriesCounter.Add(recoveryName, 1)
 	if err != nil {
-		message := fmt.Sprintf("Recovery failed on %s for problem %s. Error: %s", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis, err.Error())
+		message := fmt.Sprintf("Recovery failed on %s (%s) for problem %s. Error: %s", analysisEntry.AnalyzedInstanceAlias, analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis, err.Error())
 		vtopsExec.SendSlackMessage(message, vtopsSlackChannel)
 		logger.Errorf(message)
 		recoveriesFailureCounter.Add(recoveryName, 1)
 	} else {
-		message := fmt.Sprintf("Recovery succeeded on %s for problem %s.", analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis)
+		message := fmt.Sprintf("Recovery succeeded on %s (%s) for problem %s.", analysisEntry.AnalyzedInstanceAlias, analysisEntry.AnalyzedInstanceHostname, analysisEntry.Analysis)
 		logger.Info(message)
 		vtopsExec.SendSlackMessage(message, vtopsSlackChannel)
 		recoveriesSuccessfulCounter.Add(recoveryName, 1)