Merge pull request #1613 from konsotirop/installplan

add InstallplanApproval (automatic/manual) to OLM metrics

Author: openshift-merge-robot

pkg/metrics/metrics.go

@@ -23,6 +23,7 @@ const (
 	Outcome         = "outcome"
 	Succeeded       = "succeeded"
 	Failed          = "failed"
+	APPROVAL_LABEL  = "approval"
 )
 
 type MetricsProvider interface {
@@ -153,7 +154,7 @@ var (
 			Name: "subscription_sync_total",
 			Help: "Monotonic count of subscription syncs",
 		},
-		[]string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL, PACKAGE_LABEL},
+		[]string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL, PACKAGE_LABEL, APPROVAL_LABEL},
 	)
 
 	csvSucceeded = prometheus.NewGaugeVec(
@@ -188,9 +189,10 @@ var (
 )
 
 type subscriptionSyncLabelValues struct {
-	installedCSV string
-	pkg          string
-	channel      string
+	installedCSV     string
+	pkg              string
+	channel          string
+	approvalStrategy string
 }
 
 func RegisterOLM() {
@@ -208,8 +210,8 @@ func RegisterCatalog() {
 	prometheus.MustRegister(dependencyResolutionSummary)
 }
 
-func CounterForSubscription(name, installedCSV, channelName, packageName string) prometheus.Counter {
-	return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName, packageName)
+func CounterForSubscription(name, installedCSV, channelName, packageName, planApprovalStrategy string) prometheus.Counter {
+	return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName, packageName, planApprovalStrategy)
 }
 
 func DeleteCSVMetric(oldCSV *olmv1alpha1.ClusterServiceVersion) {
@@ -246,12 +248,13 @@ func EmitSubMetric(sub *olmv1alpha1.Subscription) {
 	if sub.Spec == nil {
 		return
 	}
-	SubscriptionSyncCount.WithLabelValues(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package).Inc()
+	SubscriptionSyncCount.WithLabelValues(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package, string(sub.Spec.InstallPlanApproval)).Inc()
 	if _, present := subscriptionSyncCounters[sub.GetName()]; !present {
 		subscriptionSyncCounters[sub.GetName()] = subscriptionSyncLabelValues{
-			installedCSV: sub.Status.InstalledCSV,
-			pkg:          sub.Spec.Package,
-			channel:      sub.Spec.Channel,
+			installedCSV:     sub.Status.InstalledCSV,
+			pkg:              sub.Spec.Package,
+			channel:          sub.Spec.Channel,
+			approvalStrategy: string(sub.Spec.InstallPlanApproval),
 		}
 	}
 }
@@ -260,25 +263,28 @@ func DeleteSubsMetric(sub *olmv1alpha1.Subscription) {
 	if sub.Spec == nil {
 		return
 	}
-	SubscriptionSyncCount.DeleteLabelValues(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package)
+	SubscriptionSyncCount.DeleteLabelValues(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package, string(sub.Spec.InstallPlanApproval))
 }
 
 func UpdateSubsSyncCounterStorage(sub *olmv1alpha1.Subscription) {
 	if sub.Spec == nil {
 		return
 	}
 	counterValues := subscriptionSyncCounters[sub.GetName()]
+	approvalStrategy := string(sub.Spec.InstallPlanApproval)
 
 	if sub.Spec.Channel != counterValues.channel ||
 		sub.Spec.Package != counterValues.pkg ||
-		sub.Status.InstalledCSV != counterValues.installedCSV {
+		sub.Status.InstalledCSV != counterValues.installedCSV ||
+		approvalStrategy != counterValues.approvalStrategy {
 
 		// Delete metric will label values of old Subscription first
-		SubscriptionSyncCount.DeleteLabelValues(sub.GetName(), counterValues.installedCSV, counterValues.channel, counterValues.pkg)
+		SubscriptionSyncCount.DeleteLabelValues(sub.GetName(), counterValues.installedCSV, counterValues.channel, counterValues.pkg, counterValues.approvalStrategy)
 
 		counterValues.installedCSV = sub.Status.InstalledCSV
 		counterValues.pkg = sub.Spec.Package
 		counterValues.channel = sub.Spec.Channel
+		counterValues.approvalStrategy = approvalStrategy
 
 		subscriptionSyncCounters[sub.GetName()] = counterValues
 	}

test/e2e/like_metric_matcher_test.go

@@ -67,6 +67,10 @@ func WithReason(reason string) MetricPredicate {
 	return WithLabel("reason", reason)
 }
 
+func WithApproval(approvalStrategy string) MetricPredicate {
+	return WithLabel("approval", approvalStrategy)
+}
+
 func WithVersion(version string) MetricPredicate {
 	return WithLabel("version", version)
 }

test/e2e/metrics_e2e_test.go

@@ -136,6 +136,7 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
 					WithName("metric-subscription-for-create"),
 					WithChannel(stableChannel),
 					WithPackage(testPackageName),
+					WithApproval(string(v1alpha1.ApprovalManual)),
 				)))
 			})
 
@@ -187,12 +188,14 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
 						WithName("metric-subscription-for-update"),
 						WithChannel(stableChannel),
 						WithPackage(testPackageName),
+						WithApproval(string(v1alpha1.ApprovalManual)),
 					))),
 					ContainElement(LikeMetric(
 						WithFamily("subscription_sync_total"),
 						WithName("metric-subscription-for-update"),
 						WithChannel(betaChannel),
 						WithPackage(testPackageName),
+						WithApproval(string(v1alpha1.ApprovalManual)),
 					)),
 				))
 			})
@@ -224,12 +227,14 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
 							WithName("metric-subscription-for-update"),
 							WithChannel(betaChannel),
 							WithPackage(testPackageName),
+							WithApproval(string(v1alpha1.ApprovalManual)),
 						))),
 						ContainElement(LikeMetric(
 							WithFamily("subscription_sync_total"),
 							WithName("metric-subscription-for-update"),
 							WithChannel(alphaChannel),
 							WithPackage(testPackageName),
+							WithApproval(string(v1alpha1.ApprovalManual)),
 						))))
 				})
 			})