Revert "Implement Prometheus Collector pattern (#607)"

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
 	github.com/openshift/installer v0.9.0-master.0.20191219195746-103098955ced
 	github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
-	github.com/prometheus/client_golang v1.12.1
+	github.com/prometheus/common v0.32.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0

manifests/06-deployment.yaml

@@ -78,8 +78,8 @@ spec:
         - mountPath: /var/run/secrets/serving-cert
           name: serving-cert
         ports:
-        - containerPort: 8080
-          name: metrics
+        - containerPort: 8443
+          name: https
         resources:
           requests:
             cpu: 10m
@@ -99,24 +99,3 @@ spec:
         - start
         - -v=4
         - --config=/etc/insights-operator/server.yaml
-      - name: kube-rbac-proxy
-        image: quay.io/openshift/origin-kube-rbac-proxy:latest
-        args:
-        - --logtostderr
-        - --secure-listen-address=:8443
-        - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
-        - --upstream=http://127.0.0.1:8080/
-        - --tls-cert-file=/etc/tls/private/tls.crt
-        - --tls-private-key-file=/etc/tls/private/tls.key
-        ports:
-        - containerPort: 8443
-          name: https
-        resources:
-          requests:
-            cpu: 1m
-            memory: 20Mi
-        terminationMessagePolicy: FallbackToLogsOnError
-        volumeMounts:
-        - mountPath: /etc/tls/private
-          name: serving-cert
-          readOnly: false

pkg/cmd/start/start.go

@@ -168,6 +168,7 @@ func runOperator(operator *controller.Operator, cfg *controllercmd.ControllerCom
 		builder := controllercmd.NewController("openshift-insights-operator", operator.Run).
 			WithKubeConfigFile(cmd.Flags().Lookup("kubeconfig").Value.String(), nil).
 			WithLeaderElection(operatorConfig.LeaderElection, "", "openshift-insights-operator-lock").
+			WithServer(operatorConfig.ServingInfo, operatorConfig.Authentication, operatorConfig.Authorization).
 			WithRestartOnChange(exitOnChangeReactorCh, startingFileContent, observedFiles...)
 		if err := builder.Run(ctx2, unstructured); err != nil {
 			klog.Error(err)

pkg/controller/operator.go

@@ -24,7 +24,6 @@ import (
 	"github.com/openshift/insights-operator/pkg/controller/periodic"
 	"github.com/openshift/insights-operator/pkg/controller/status"
 	"github.com/openshift/insights-operator/pkg/gather"
-	"github.com/openshift/insights-operator/pkg/insights"
 	"github.com/openshift/insights-operator/pkg/insights/insightsclient"
 	"github.com/openshift/insights-operator/pkg/insights/insightsreport"
 	"github.com/openshift/insights-operator/pkg/insights/insightsuploader"
@@ -54,9 +53,6 @@ func (s *Operator) Run(ctx context.Context, controller *controllercmd.Controller
 	}
 	s.Controller = cont
 
-	// Start the Prometheus metrics server.
-	go insights.RunMetricsServer()
-
 	// these are operator clients
 	kubeClient, err := kubernetes.NewForConfig(controller.ProtoKubeConfig)
 	if err != nil {

pkg/insights/insightsclient/insightsclient.go

@@ -20,13 +20,13 @@ import (
 	"k8s.io/client-go/pkg/version"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/transport"
+	"k8s.io/component-base/metrics"
+	"k8s.io/component-base/metrics/legacyregistry"
 
 	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
-	"github.com/openshift/insights-operator/pkg/insights"
-	"github.com/prometheus/client_golang/prometheus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryversion "k8s.io/apimachinery/pkg/version"
@@ -265,16 +265,29 @@ func (c *Client) createAndWriteMIMEHeader(source *Source, mw *multipart.Writer,
 }
 
 var (
-	counterRequestSend = prometheus.NewCounterVec(prometheus.CounterOpts{
+	counterRequestSend = metrics.NewCounterVec(&metrics.CounterOpts{
 		Name: "insightsclient_request_send_total",
 		Help: "Tracks the number of metrics sends",
 	}, []string{"client", "status_code"})
-	counterRequestRecvReport = prometheus.NewCounterVec(prometheus.CounterOpts{
+	counterRequestRecvReport = metrics.NewCounterVec(&metrics.CounterOpts{
 		Name: "insightsclient_request_recvreport_total",
 		Help: "Tracks the number of reports requested",
 	}, []string{"client", "status_code"})
 )
 
 func init() {
-	insights.MustRegisterMetricCollectors(counterRequestSend, counterRequestRecvReport)
+	err := legacyregistry.Register(
+		counterRequestSend,
+	)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	err = legacyregistry.Register(
+		counterRequestRecvReport,
+	)
+	if err != nil {
+		fmt.Println(err)
+	}
+
 }

pkg/insights/insightsreport/insightsreport.go

@@ -8,14 +8,14 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/component-base/metrics"
+	"k8s.io/component-base/metrics/legacyregistry"
 	"k8s.io/klog/v2"
 
 	"github.com/openshift/insights-operator/pkg/authorizer"
 	"github.com/openshift/insights-operator/pkg/config/configobserver"
 	"github.com/openshift/insights-operator/pkg/controllerstatus"
-	"github.com/openshift/insights-operator/pkg/insights"
 	"github.com/openshift/insights-operator/pkg/insights/insightsclient"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // Controller gathers the report from Smart Proxy
@@ -38,13 +38,10 @@ type InsightsReporter interface {
 	ArchiveUploaded() <-chan struct{}
 }
 
-const (
-	insightsLastGatherTimeName = "insightsclient_last_gather_time"
-)
-
 var (
+
 	// insightsStatus contains a metric with the latest report information
-	insightsStatus = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+	insightsStatus = metrics.NewGaugeVec(&metrics.GaugeOpts{
 		Namespace: "health",
 		Subsystem: "statuses",
 		Name:      "insights",
@@ -54,11 +51,28 @@ var (
 	retryThreshold = 2
 
 	// insightsLastGatherTime contains time of the last Insights data gathering
-	insightsLastGatherTime = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: insightsLastGatherTimeName,
+	insightsLastGatherTime = metrics.NewGauge(&metrics.GaugeOpts{
+		Name: "insightsclient_last_gather_time",
 	})
 )
 
+func init() {
+	err := legacyregistry.Register(insightsStatus)
+	if err != nil {
+		fmt.Println(err)
+	}
+	err = legacyregistry.Register(insightsLastGatherTime)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	insightsStatus.WithLabelValues("low").Set(float64(-1))
+	insightsStatus.WithLabelValues("moderate").Set(float64(-1))
+	insightsStatus.WithLabelValues("important").Set(float64(-1))
+	insightsStatus.WithLabelValues("critical").Set(float64(-1))
+	insightsStatus.WithLabelValues("total").Set(float64(-1))
+}
+
 // New initializes and returns a Gatherer
 func New(client *insightsclient.Client, configurator configobserver.Configurator, reporter InsightsReporter) *Controller {
 	return &Controller{
@@ -272,18 +286,8 @@ func updateInsightsMetrics(report SmartProxyReport) {
 
 	t, err := time.Parse(time.RFC3339, string(report.Meta.GatheredAt))
 	if err != nil {
-		klog.Errorf("Metric %s not updated. Failed to parse time: %v", insightsLastGatherTimeName, err)
+		klog.Errorf("Metric %s not updated. Failed to parse time: %v", insightsLastGatherTime.Name, err)
 		return
 	}
 	insightsLastGatherTime.Set(float64(t.Unix()))
 }
-
-func init() {
-	insights.MustRegisterMetricCollectors(insightsStatus, insightsLastGatherTime)
-
-	insightsStatus.WithLabelValues("low").Set(float64(-1))
-	insightsStatus.WithLabelValues("moderate").Set(float64(-1))
-	insightsStatus.WithLabelValues("important").Set(float64(-1))
-	insightsStatus.WithLabelValues("critical").Set(float64(-1))
-	insightsStatus.WithLabelValues("total").Set(float64(-1))
-}