Add monitoring and alerting resources

cmd/hyperconverged-cluster-operator/main.go

@@ -4,19 +4,21 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis"
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/controller"
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/controller/operands"
 	"github.com/spf13/pflag"
-	"os"
-	"runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
+	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	networkaddons "github.com/kubevirt/cluster-network-addons-operator/pkg/apis"
 	hcov1beta1 "github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis/hco/v1beta1"
 	hcoutil "github.com/kubevirt/hyperconverged-cluster-operator/pkg/util"
@@ -152,6 +154,7 @@ func main() {
 		admissionregistrationv1.AddToScheme,
 		consolev1.AddToScheme,
 		openshiftconfigv1.AddToScheme,
+		monitoringv1.AddToScheme,
 	} {
 		if err := f(mgr.GetScheme()); err != nil {
 			log.Error(err, "Failed to add to scheme")

deploy/cluster_role.yaml

@@ -300,9 +300,9 @@ rules:
   - monitoring.coreos.com
   resources:
   - servicemonitors
+  - prometheusrules
   verbs:
-  - get
-  - create
+  - '*'
 - apiGroups:
   - operators.coreos.com
   resources:

deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml

@@ -393,9 +393,9 @@ spec:
           - monitoring.coreos.com
           resources:
           - servicemonitors
+          - prometheusrules
           verbs:
-          - get
-          - create
+          - '*'
         - apiGroups:
           - operators.coreos.com
           resources:

deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml

@@ -393,9 +393,9 @@ spec:
           - monitoring.coreos.com
           resources:
           - servicemonitors
+          - prometheusrules
           verbs:
-          - get
-          - create
+          - '*'
         - apiGroups:
           - operators.coreos.com
           resources:

go.mod

@@ -4,6 +4,7 @@ go 1.15
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-kit/kit v0.10.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.0 // indirect

pkg/components/components.go

@@ -564,10 +564,10 @@ func GetClusterPermissions() []rbacv1.PolicyRule {
 			},
 			Resources: []string{
 				"servicemonitors",
+				"prometheusrules",
 			},
 			Verbs: []string{
-				"get",
-				"create",
+				"*",
 			},
 		},
 		{

pkg/controller/commonTestUtils/testUtils.go

@@ -2,6 +2,8 @@ package commonTestUtils
 
 import (
 	"context"
+
+	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	networkaddons "github.com/kubevirt/cluster-network-addons-operator/pkg/apis"
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis"
 	sspopv1 "github.com/kubevirt/kubevirt-ssp-operator/pkg/apis"
@@ -105,6 +107,7 @@ func GetScheme() *runtime.Scheme {
 		sspopv1.AddToScheme,
 		vmimportv1beta1.AddToScheme,
 		consolev1.AddToScheme,
+		monitoringv1.AddToScheme,
 	} {
 		Expect(f(s)).To(BeNil())
 	}

pkg/controller/hyperconverged/hyperconverged_controller.go

@@ -22,6 +22,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
+	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	networkaddonsv1 "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/v1"
 	hcov1beta1 "github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis/hco/v1beta1"
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/controller/common"
@@ -74,7 +75,7 @@ var JSONPatchAnnotationNames = []string{
 // Add creates a new HyperConverged Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager, ci hcoutil.ClusterInfo) error {
-	return add(mgr, newReconciler(mgr, ci))
+	return add(mgr, newReconciler(mgr, ci), ci)
 }
 
 // newReconciler returns a new reconcile.Reconciler
@@ -99,7 +100,7 @@ func newReconciler(mgr manager.Manager, ci hcoutil.ClusterInfo) reconcile.Reconc
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler
-func add(mgr manager.Manager, r reconcile.Reconciler) error {
+func add(mgr manager.Manager, r reconcile.Reconciler, ci hcoutil.ClusterInfo) error {
 	// Create a new controller
 	c, err := controller.New("hyperconverged-controller", mgr, controller.Options{Reconciler: r})
 	if err != nil {
@@ -120,8 +121,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 		return err
 	}
 
-	// Watch secondary resources
-	for _, resource := range []runtime.Object{
+	secondaryResources := []runtime.Object{
 		&kubevirtv1.KubeVirt{},
 		&cdiv1beta1.CDI{},
 		&networkaddonsv1.NetworkAddonsConfig{},
@@ -131,7 +131,17 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 		&sspv1.KubevirtMetricsAggregation{},
 		&schedulingv1.PriorityClass{},
 		&vmimportv1beta1.VMImportConfig{},
-	} {
+	}
+	if ci.IsOpenshift() {
+		secondaryResources = append(secondaryResources, []runtime.Object{
+			&corev1.Service{},
+			&monitoringv1.ServiceMonitor{},
+			&monitoringv1.PrometheusRule{},
+		}...)
+	}
+
+	// Watch secondary resources
+	for _, resource := range secondaryResources {
 		msg := fmt.Sprintf("Reconciling for %T", resource)
 		err = c.Watch(&source.Kind{Type: resource}, &handler.EnqueueRequestsFromMapFunc{
 			ToRequests: handler.ToRequestsFunc(

pkg/controller/hyperconverged/hyperconverged_controller_test.go

@@ -586,7 +586,7 @@ var _ = Describe("HyperconvergedController", func() {
 				).To(BeNil())
 
 				Expect(foundResource.Status.RelatedObjects).ToNot(BeNil())
-				Expect(len(foundResource.Status.RelatedObjects)).Should(Equal(15))
+				Expect(len(foundResource.Status.RelatedObjects)).Should(Equal(18))
 				Expect(foundResource.ObjectMeta.Finalizers).Should(Equal([]string{FinalizerName}))
 
 				// Now, delete HCO

pkg/controller/hyperconverged/testUtils_test.go

@@ -3,6 +3,9 @@ package hyperconverged
 import (
 	"context"
 	"fmt"
+	"os"
+
+	monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/go-logr/logr"
 	networkaddonsv1 "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/v1"
 	hcov1beta1 "github.com/kubevirt/hyperconverged-cluster-operator/pkg/apis/hco/v1beta1"
@@ -20,7 +23,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kubevirtv1 "kubevirt.io/client-go/api/v1"
 	cdiv1beta1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
-	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
@@ -71,6 +73,9 @@ type BasicExpected struct {
 	vmi                  *vmimportv1beta1.VMImportConfig
 	kvMtAg               *sspv1.KubevirtMetricsAggregation
 	imsConfig            *corev1.ConfigMap
+	mService             *corev1.Service
+	serviceMonitor       *monitoringv1.ServiceMonitor
+	promRule             *monitoringv1.PrometheusRule
 }
 
 func (be BasicExpected) toArray() []runtime.Object {
@@ -90,6 +95,9 @@ func (be BasicExpected) toArray() []runtime.Object {
 		be.vmi,
 		be.kvMtAg,
 		be.imsConfig,
+		be.mService,
+		be.serviceMonitor,
+		be.promRule,
 	}
 }
 
@@ -124,6 +132,9 @@ func getBasicDeployment() *BasicExpected {
 	res.hco = hco
 
 	res.pc = operands.NewKubeVirtPriorityClass(hco)
+	res.mService = operands.NewMetricsService(hco, namespace)
+	res.serviceMonitor = operands.NewServiceMonitor(hco, namespace)
+	res.promRule = operands.NewPrometheusRule(hco, namespace)
 	// These are all of the objects that we expect to "find" in the client because
 	// we already created them in a previous reconcile.
 	expectedKVConfig := operands.NewKubeVirtConfigForCR(hco, namespace)