add operator_bad_objects_count metric for vmauth and vmagent, additionally unified it

Author: AndrewChubatiuk

api/operator/v1beta1/vmnodescrape_types.go

@@ -87,6 +87,10 @@ func (cr *VMNodeScrape) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata
 }
 
+func (cr *VMNodeScrape) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 func init() {
 	SchemeBuilder.Register(&VMNodeScrape{}, &VMNodeScrapeList{})
 }

api/operator/v1beta1/vmpodscrape_types.go

@@ -142,6 +142,10 @@ func (cr *VMPodScrape) Validate() error {
 	return nil
 }
 
+func (cr *VMPodScrape) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 // GetStatusMetadata implements reconcile.objectWithStatus interface
 func (cr *VMPodScrape) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata

api/operator/v1beta1/vmprobe_types.go

@@ -141,6 +141,10 @@ func (cr *VMProbe) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata
 }
 
+func (cr *VMProbe) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 // Validate returns error if CR is invalid
 func (cr *VMProbe) Validate() error {
 	if MustSkipCRValidation(cr) {

api/operator/v1beta1/vmrule_types.go

@@ -144,6 +144,10 @@ func (cr *VMRule) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata
 }
 
+func (cr *VMRule) AsKey() string {
+	return fmt.Sprintf("%s-%s.yaml", cr.Namespace, cr.Name)
+}
+
 // Validate performs semantic validation of object
 func (cr *VMRule) Validate() error {
 	if MustSkipCRValidation(cr) {

api/operator/v1beta1/vmscrapeconfig_types.go

@@ -530,6 +530,10 @@ func (cr *VMScrapeConfig) Validate() error {
 	return cr.Spec.validate()
 }
 
+func (cr *VMScrapeConfig) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 // GetStatusMetadata implements reconcile.objectWithStatus interface
 func (cr *VMScrapeConfig) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata

api/operator/v1beta1/vmservicescrape_types.go

@@ -164,6 +164,10 @@ func (cr *VMServiceScrape) Validate() error {
 	return nil
 }
 
+func (cr *VMServiceScrape) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 // GetStatusMetadata implements reconcile.objectWithStatus interface
 func (cr *VMServiceScrape) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata

api/operator/v1beta1/vmstaticscrape_types.go

@@ -93,6 +93,10 @@ func (cr *VMStaticScrape) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata
 }
 
+func (cr *VMStaticScrape) AsKey() string {
+	return cr.Namespace + "/" + cr.Name
+}
+
 func init() {
 	SchemeBuilder.Register(&VMStaticScrape{}, &VMStaticScrapeList{})
 }

api/operator/v1beta1/vmuser_types.go

@@ -15,10 +15,10 @@ type VMUserSpec struct {
 	// Name of the VMUser object.
 	// +optional
 	Name *string `json:"name,omitempty"`
-	// UserName basic auth user name for accessing protected endpoint,
+	// Username basic auth user name for accessing protected endpoint,
 	// will be replaced with metadata.name of VMUser if omitted.
 	// +optional
-	UserName *string `json:"username,omitempty"`
+	Username *string `json:"username,omitempty"`
 	// Password basic auth password for accessing protected endpoint.
 	// +optional
 	Password *string `json:"password,omitempty"`
@@ -232,11 +232,25 @@ func (cr *VMUser) GetStatusMetadata() *StatusMetadata {
 	return &cr.Status.StatusMetadata
 }
 
+func (cr *VMUser) AsKey() string {
+	var id string
+	if cr.Spec.Username != nil {
+		id = "basicAuth:" + *cr.Spec.Username
+	}
+	if cr.Spec.Password != nil {
+		return id + ":" + *cr.Spec.Password
+	}
+	if cr.Spec.BearerToken != nil {
+		return "bearerToken:" + *cr.Spec.BearerToken
+	}
+	return id
+}
+
 func (cr *VMUser) Validate() error {
 	if MustSkipCRValidation(cr) {
 		return nil
 	}
-	if cr.Spec.UserName != nil && cr.Spec.BearerToken != nil {
+	if cr.Spec.Username != nil && cr.Spec.BearerToken != nil {
 		return fmt.Errorf("one of spec.username and spec.bearerToken must be defined for user, got both")
 	}
 	if cr.Spec.PasswordRef != nil && cr.Spec.Password != nil {

api/operator/v1beta1/vmuser_types_test.go

@@ -18,15 +18,15 @@ func TestVMUser_Validate(t *testing.T) {
 	// invalid auths
 	f(&VMUser{
 		Spec: VMUserSpec{
-			UserName:    ptr.To("user"),
+			Username:    ptr.To("user"),
 			BearerToken: ptr.To("bearer"),
 		},
 	}, true)
 
 	// invalid ref
 	f(&VMUser{
 		Spec: VMUserSpec{
-			UserName: ptr.To("some-user"),
+			Username: ptr.To("some-user"),
 			TargetRefs: []TargetRef{
 				{
 					CRD:    &CRDRef{Name: "sm"},
@@ -39,7 +39,7 @@ func TestVMUser_Validate(t *testing.T) {
 	// invalid ref wo targets
 	f(&VMUser{
 		Spec: VMUserSpec{
-			UserName: ptr.To("some-user"),
+			Username: ptr.To("some-user"),
 			TargetRefs: []TargetRef{
 				{
 					Paths: []string{"/some-path"},
@@ -51,7 +51,7 @@ func TestVMUser_Validate(t *testing.T) {
 	// invalid ref crd, bad empty ns
 	f(&VMUser{
 		Spec: VMUserSpec{
-			UserName: ptr.To("some-user"),
+			Username: ptr.To("some-user"),
 			TargetRefs: []TargetRef{
 				{
 					CRD: &CRDRef{
@@ -68,7 +68,7 @@ func TestVMUser_Validate(t *testing.T) {
 	// incorrect password
 	f(&VMUser{
 		Spec: VMUserSpec{
-			UserName: ptr.To("some-user"),
+			Username: ptr.To("some-user"),
 			Password: ptr.To("some-password"),
 			PasswordRef: &corev1.SecretKeySelector{
 				Key: "some-key",