fix prometheus error

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

janitor/janitor.go

@@ -397,7 +397,7 @@ func (j *Janitor) checkAzureResourceExpiry(logger *log.Entry, resourceType, reso
 			resourceTagRewriteNeeded = true
 			resourceExpireTime = val
 		} else {
-			logger.Errorf("ERROR %s", timeParseErr.Error())
+			logger.Errorf("unable to parse time: %v", timeParseErr.Error())
 		}
 	}
 

janitor/resourcegroups.go

@@ -54,10 +54,11 @@ func (j *Janitor) runResourceGroups(ctx context.Context, logger *log.Entry, subs
 					resourceLogger.Infof("successfully updated")
 				} else {
 					// failed delete
-					resourceLogger.Errorf("ERROR %s", err.Error())
+					resourceLogger.Error(err.Error())
 
 					j.Prometheus.MetricErrors.With(prometheus.Labels{
-						"resourceType": stringToStringLower(resourceType),
+						"subscriptionID": stringPtrToStringLower(subscription.SubscriptionID),
+						"resourceType":   stringToStringLower(resourceType),
 					}).Inc()
 				}
 			}