diff --git a/internal/pkg/metrics/module.go b/internal/pkg/metrics/module.go deleted file mode 100644 index a743ccbb51..0000000000 --- a/internal/pkg/metrics/module.go +++ /dev/null @@ -1,51 +0,0 @@ -package metrics - -import ( - "github.com/prometheus/client_golang/prometheus" - ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" -) - -type ModuleCondition string - -const ( - MetricModuleCondition = "lifecycle_mgr_module_condition" - conditionLabel = "condition" - moduleCrWarning ModuleCondition = "ModuleCRWarning" -) - -type ModuleMetrics struct { - moduleCRConditionGauge *prometheus.GaugeVec -} - -func NewModuleMetrics() *ModuleMetrics { - metrics := &ModuleMetrics{ - moduleCRConditionGauge: prometheus.NewGaugeVec(prometheus.GaugeOpts{ - Name: MetricModuleCondition, - Help: "Manifest is in Deleting state and related ModuleCR is in Warning state, indicating that Deletion is blocked and requires user interaction.", - }, []string{KymaNameLabel, moduleNameLabel, conditionLabel}), - } - ctrlmetrics.Registry.MustRegister(metrics.moduleCRConditionGauge) - return metrics -} - -func (m *ModuleMetrics) SetModuleCRWarningCondition(kymaName, moduleName string) { - m.moduleCRConditionGauge.With(prometheus.Labels{ - KymaNameLabel: kymaName, - moduleNameLabel: moduleName, - conditionLabel: string(moduleCrWarning), - }).Set(1) -} - -func (m *ModuleMetrics) RemoveModuleCRWarningCondition(kymaName, moduleName string) { - m.moduleCRConditionGauge.DeletePartialMatch(prometheus.Labels{ - KymaNameLabel: kymaName, - moduleNameLabel: moduleName, - conditionLabel: string(moduleCrWarning), - }) -} - -func (m *ModuleMetrics) CleanupMetrics(kymaName string) { - m.moduleCRConditionGauge.DeletePartialMatch(prometheus.Labels{ - KymaNameLabel: kymaName, - }) -} diff --git a/tests/e2e/commontestutils/metrics.go b/tests/e2e/commontestutils/metrics.go index 3e32a1afc4..bab02dd0d9 100644 --- a/tests/e2e/commontestutils/metrics.go +++ b/tests/e2e/commontestutils/metrics.go @@ -153,36 +153,6 @@ func GetMandatoryModuleStateMetric(ctx context.Context, kymaName, moduleName, st return parseCount(re, bodyString) } -func GetModuleCRWarningConditionMetric(ctx context.Context, kymaName, moduleName string) (int, error) { - bodyString, err := getMetricsBody(ctx) - if err != nil { - return 0, err - } - - re := getModuleCRWarningConditionMetric(kymaName, moduleName) - return parseCount(re, bodyString) -} - -func getModuleCRWarningConditionMetric(kymaName, moduleName string) *regexp.Regexp { - return regexp.MustCompile(fmt.Sprintf(`%s{condition="ModuleCRWarning",kyma_name="%s",module_name="%s"} (\d+)`, - metrics.MetricModuleCondition, kymaName, moduleName)) -} - -func ModuleCRWarningConditionMetricNotFound(ctx context.Context, kymaName, moduleName string) error { - bodyString, err := getMetricsBody(ctx) - if err != nil { - return err - } - - re := getModuleCRWarningConditionMetric(kymaName, moduleName) - match := re.FindStringSubmatch(bodyString) - if len(match) < 1 { - return ErrMetricNotFound - } - - return nil -} - func getMetricsBody(ctx context.Context) (string, error) { clnt := &http.Client{} request, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://localhost:9081/metrics", nil) diff --git a/tests/e2e/module_status_decoupling_test.go b/tests/e2e/module_status_decoupling_test.go index b0514ff5ec..bdb4958f5c 100644 --- a/tests/e2e/module_status_decoupling_test.go +++ b/tests/e2e/module_status_decoupling_test.go @@ -93,11 +93,6 @@ func RunModuleStatusDecouplingTest(resourceKind ResourceKind) { WithContext(ctx). WithArguments(skrClient, moduleCR, shared.StateWarning). Should(BeTrue()) - By("And count of metrics lifecycle_mgr_module_condition is 1") - Eventually(GetModuleCRWarningConditionMetric). - WithContext(ctx). - WithArguments(kyma.GetName(), TestModuleName). - Should(Equal(1)) }) It("When blocking finalizers from Module CR get removed", func() { @@ -139,12 +134,6 @@ func RunModuleStatusDecouplingTest(resourceKind ResourceKind) { WithContext(ctx). WithArguments(kyma.GetName(), kyma.GetNamespace(), kcpClient, shared.StateReady). Should(Succeed()) - - By("And count of metrics lifecycle_mgr_module_condition is removed") - Eventually(ModuleCRWarningConditionMetricNotFound). - WithContext(ctx). - WithArguments(kyma.GetName(), TestModuleName). - Should(Equal(ErrMetricNotFound)) }) })