Merge pull request #1 from kaovilai/status_descriptors

Edited oadp_types.go, moved `PrometheusRule` to `config/..`, ran `mak…

Author: eemcmullan

api/v1alpha1/oadp_types.go

@@ -178,7 +178,7 @@ type DataProtectionApplicationSpec struct {
 	Configuration *ApplicationConfig `json:"configuration"`
 }
 
-// DataProtectionApplicationStatus defines the observed state of Velero
+// DataProtectionApplicationStatus defines the observed state of DataProtectionApplication
 type DataProtectionApplicationStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }

bundle/manifests/oadp-operator.clusterserviceversion.yaml

@@ -222,7 +222,7 @@ spec:
             displayName: Errors
             path: errors
         version: v1
-      - description: BackupStorageLocation represents an object storage location (Such as Amazon S3 Bucket) where Velero stores backup objects.
+      - description: BackupStorageLocation represents an object storage location (such as Amazon S3 Bucket) where Velero stores backup objects.
         displayName: BackupStorageLocation
         kind: BackupStorageLocation
         name: backupstoragelocations.velero.io
@@ -245,7 +245,7 @@ spec:
         kind: DataProtectionApplication
         name: dataprotectionapplications.oadp.openshift.io
         statusDescriptors:
-          - description: Conditions defines the observed state of Velero
+          - description: Conditions defines the observed state of DataProtectionApplication
             displayName: Conditions
             path: conditions
         version: v1alpha1

bundle/manifests/oadp-operator_monitoring.coreos.com_v1_prometheusrule.yaml

@@ -0,0 +1,12 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: oadp-operator
+spec:
+  groups:
+  - name: oadp-operator.rules
+    rules:
+    - expr: max without(instance) (velero_restore_total)
+      record: cluster:velero_restore_total:max
+    - expr: max without(instance) (velero_backup_total)
+      record: cluster:velero_backup_total:max

bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml

@@ -488,7 +488,7 @@ spec:
             type: object
           status:
             description: DataProtectionApplicationStatus defines the observed state
-              of Velero
+              of DataProtectionApplication
             properties:
               conditions:
                 items:

bundle/manifests/openshift-adp-controller-manager_v1_serviceaccount.yaml

@@ -12,38 +12,59 @@ stages:
     labels:
       suite: basic
       test: basic-check-spec-test
+    storage:
+      spec:
+        mountPath: {}
   - entrypoint:
     - scorecard-test
     - olm-bundle-validation
     image: quay.io/operator-framework/scorecard-test:v1.10.0
     labels:
       suite: olm
       test: olm-bundle-validation-test
+    storage:
+      spec:
+        mountPath: {}
   - entrypoint:
     - scorecard-test
     - olm-crds-have-validation
     image: quay.io/operator-framework/scorecard-test:v1.10.0
     labels:
       suite: olm
       test: olm-crds-have-validation-test
+    storage:
+      spec:
+        mountPath: {}
   - entrypoint:
     - scorecard-test
     - olm-crds-have-resources
     image: quay.io/operator-framework/scorecard-test:v1.10.0
     labels:
       suite: olm
       test: olm-crds-have-resources-test
+    storage:
+      spec:
+        mountPath: {}
   - entrypoint:
     - scorecard-test
     - olm-spec-descriptors
     image: quay.io/operator-framework/scorecard-test:v1.10.0
     labels:
       suite: olm
       test: olm-spec-descriptors-test
+    storage:
+      spec:
+        mountPath: {}
   - entrypoint:
     - scorecard-test
     - olm-status-descriptors
     image: quay.io/operator-framework/scorecard-test:v1.10.0
     labels:
       suite: olm
       test: olm-status-descriptors-test
+    storage:
+      spec:
+        mountPath: {}
+storage:
+  spec:
+    mountPath: {}

bundle/manifests/velero_v1_serviceaccount.yaml

@@ -490,7 +490,7 @@ spec:
             type: object
           status:
             description: DataProtectionApplicationStatus defines the observed state
-              of Velero
+              of DataProtectionApplication
             properties:
               conditions:
                 items:

bundle/tests/scorecard/config.yaml

@@ -6,6 +6,7 @@ resources:
 - ../samples
 - ../scorecard
 - ../velero
+- ../prometheus
 
 # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
 # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.

config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml

@@ -1,2 +1,3 @@
 resources:
-- monitor.yaml
+# - monitor.yaml
+- oadp-metrics-recording-rule.yaml