Merge pull request #247 from redhat-marketplace/hotfix/2.3.2

Hotfix/2.3.2
redhat-marketplace · Sep 22, 2021 · 683ea22 · 683ea22
2 parents ed7897c + dda5bac
commit 683ea22
Show file tree

Hide file tree

Showing 11 changed files with 293 additions and 116 deletions.
diff --git a/v2/apis/marketplace/v1alpha1/meterbase_types.go b/v2/apis/marketplace/v1alpha1/meterbase_types.go
@@ -193,12 +193,16 @@ const (
 	// ConditionUserWorkloadMonitoringEnabled means UWM is actively used as the prometheus provider
 	ConditionUserWorkloadMonitoringEnabled status.ConditionType = "UserWorkloadMonitoringEnabled"
 
-	ReasonUserWorkloadMonitoringEnabled         status.ConditionReason = "UserWorkloadMonitoringEnabled"
-	ReasonUserWorkloadMonitoringSpecDisabled    status.ConditionReason = "UserWorkloadMonitoringSpecDisabled"
-	ReasonUserWorkloadMonitoringClusterDisabled status.ConditionReason = "UserWorkloadMonitoringClusterDisabled"
-	ReasonUserWorkloadMonitoringTransitioning   status.ConditionReason = "UserWorkloadMonitoringTransitioning"
-
-	MessageUserWorkloadMonitoringEnabled         string = "UserWorkloadMonitoring is enabled in the Meterbase Spec and on the Cluster"
+	ReasonUserWorkloadMonitoringEnabled                             status.ConditionReason = "UserWorkloadMonitoringEnabled"
+	ReasonUserWorkloadMonitoringSpecDisabled                        status.ConditionReason = "UserWorkloadMonitoringSpecDisabled"
+	ReasonUserWorkloadMonitoringClusterDisabled                     status.ConditionReason = "UserWorkloadMonitoringClusterDisabled"
+	ReasonUserWorkloadMonitoringInsufficientStorage                  status.ConditionReason = "UserWorkloadMonitoringInsufficientStorage"
+	ReasonUserWorkloadMonitoringRetentionTime                       status.ConditionReason = "UserWorkloadMonitoringRetentionTime"
+	ReasonUserWorkloadMonitoringParseUserWorkloadConfiguration      status.ConditionReason = "UserWorkloadMonitoringParseUserWorkloadConfiguration"
+	ReasonUserWorkloadMonitoringConfigNotFound                      status.ConditionReason = "UserWorkloadMonitoringConfigNotFound"
+	ReasonUserWorkloadMonitoringTransitioning                       status.ConditionReason = "UserWorkloadMonitoringTransitioning"
+
+	MessageUserWorkloadMonitoringEnabled         string = "UserWorkloadMonitoring is enabled in the Meterbase Spec, is enabled on the Cluster, and user-workload-monitoring configmap is configured correctly"
 	MessageUserWorkloadMonitoringSpecDisabled    string = "UserWorkloadMonitoring is disabled in the Meterbase Spec"
 	MessageUserWorkloadMonitoringClusterDisabled string = "UserWorkloadMonitoring is unavailable or disabled on the Cluster"
 	MessageUserWorkloadMonitoringTransitioning   string = "Transitioning between UserWorkloadMonitoring and RHM prometheus provider"

diff --git a/v2/assets/metric-state/meterdefinition.yaml b/v2/assets/metric-state/meterdefinition.yaml
@@ -6,15 +6,15 @@ spec:
   group: marketplace.redhat.com
   kind: Pod
   meters:
-  - aggregation: avg
-    metricId: rhm-metric-state-uptime
-    name: rhm-metric-state-uptime
-    period: 5m
-    query: avg_over_time(up{job="rhm-metric-state-service"}[5m])
-    workloadType: Pod
+    - aggregation: avg
+      metricId: rhm-metric-state-uptime
+      name: rhm-metric-state-uptime
+      period: 1h
+      query: avg_over_time(up{job="rhm-metric-state-service"}[5m])
+      workloadType: Pod
   resourceFilters:
-  - label:
-      labelSelector:
-        matchLabels:
-          app.kubernetes.io/name: rhm-metric-state
-    workloadType: Pod
+    - label:
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/name: rhm-metric-state
+      workloadType: Pod
diff --git a/v2/assets/prometheus/meterdefinition.yaml b/v2/assets/prometheus/meterdefinition.yaml
@@ -7,15 +7,15 @@ spec:
   group: marketplace.redhat.com
   kind: Pod
   meters:
-  - aggregation: avg
-    metricId: rhm-prometheus-meterbase-uptime
-    name: rhm-prometheus-meterbase-uptime
-    period: 5m
-    query: avg_over_time(up{job="rhm-prometheus-meterbase"}[5m])
-    workloadType: Pod
+    - aggregation: avg
+      metricId: rhm-prometheus-meterbase-uptime
+      name: rhm-prometheus-meterbase-uptime
+      period: 1h
+      query: avg_over_time(up{job="rhm-prometheus-meterbase"}[5m])
+      workloadType: Pod
   resourceFilters:
-  - label:
-      labelSelector:
-        matchLabels:
-          prometheus: rhm-marketplaceconfig-meterbase
-    workloadType: Pod
+    - label:
+        labelSelector:
+          matchLabels:
+            prometheus: rhm-marketplaceconfig-meterbase
+      workloadType: Pod
diff --git a/v2/assets/prometheus/user-workload-monitoring-meterdefinition.yaml b/v2/assets/prometheus/user-workload-monitoring-meterdefinition.yaml
@@ -7,16 +7,16 @@ spec:
   group: marketplace.redhat.com
   kind: Pod
   meters:
-  - aggregation: avg
-    metricId: prometheus-user-workload-uptime
-    name: prometheus-user-workload-uptime
-    period: 5m
-    query: avg_over_time(up{job="prometheus-user-workload"}[5m])
-    workloadType: Pod
+    - aggregation: avg
+      metricId: prometheus-user-workload-uptime
+      name: prometheus-user-workload-uptime
+      period: 1h
+      query: avg_over_time(up{job="prometheus-user-workload"}[5m])
+      workloadType: Pod
   resourceFilters:
-  - label:
-      labelSelector:
-        matchLabels:
-          app: prometheus
-          prometheus: user-workload
-    workloadType: Pod
+    - label:
+        labelSelector:
+          matchLabels:
+            app: prometheus
+            prometheus: user-workload
+      workloadType: Pod
diff --git a/v2/assets/reporter/meterdefinition.yaml b/v2/assets/reporter/meterdefinition.yaml
@@ -6,15 +6,15 @@ spec:
   group: marketplace.redhat.com
   kind: Service
   meters:
-  - aggregation: sum
-    metricId: rhm-meter-report-job-failed
-    name: rhm-meter-report-job-failed
-    period: 5m
-    query: 'sum(kube_job_failed{job_name=~"meter-report-.*"}) without (condition)'
-    workloadType: Service
+    - aggregation: sum
+      metricId: rhm-meter-report-job-failed
+      name: rhm-meter-report-job-failed
+      period: 1h
+      query: 'sum(kube_job_failed{job_name=~"meter-report-.*"}) without (condition)'
+      workloadType: Service
   resourceFilters:
-  - label:
-      labelSelector:
-        matchLabels:
-          app.kubernetes.io/name: kube-state-metrics
-    workloadType: Service
+    - label:
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/name: kube-state-metrics
+      workloadType: Service
diff --git a/v2/bundle/manifests/redhat-marketplace-operator.clusterserviceversion.yaml b/v2/bundle/manifests/redhat-marketplace-operator.clusterserviceversion.yaml
@@ -197,21 +197,21 @@ metadata:
     categories: Developer Tools
     certified: "true"
     description: The Red Hat Marketplace Operator provides cluster management, metering and operator installation for Red Hat Marketplace customers.
-    olm.skipRange: '>=1.0.0 <2.3.0'
+    olm.skipRange: '>=1.0.0 <2.3.2'
     operatorframework.io/suggested-namespace: openshift-redhat-marketplace
     operators.operatorframework.io/builder: operator-sdk-v1.7.1+git
     operators.operatorframework.io/internal-objects: '["razeedeployments.marketplace.redhat.com","remoteresources3s.marketplace.redhat.com"]'
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/redhat-marketplace/redhat-marketplace-operator
     support: IBM Corporation
-    containerImage: quay.io/rh-marketplace/redhat-marketplace-operator:2.3.0-361
-    createdAt: "2021-08-03T17:39:07Z"
+    containerImage: quay.io/rh-marketplace/redhat-marketplace-operator:2.3.2-515
+    createdAt: "2021-09-14T22:51:57Z"
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: redhat-marketplace-operator.v2.3.0
+  name: redhat-marketplace-operator.v2.3.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -746,11 +746,11 @@ spec:
                       - name: OPERATOR_NAME
                         value: redhat-marketplace-operator
                       - name: RELATED_IMAGE_REPORTER
-                        value: quay.io/rh-marketplace/redhat-marketplace-reporter:2.3.0-361
+                        value: quay.io/rh-marketplace/redhat-marketplace-reporter:2.3.2-515
                       - name: RELATED_IMAGE_METRIC_STATE
-                        value: quay.io/rh-marketplace/redhat-marketplace-metric-state:2.3.0-361
+                        value: quay.io/rh-marketplace/redhat-marketplace-metric-state:2.3.2-515
                       - name: RELATED_IMAGE_AUTHCHECK
-                        value: quay.io/rh-marketplace/redhat-marketplace-authcheck:2.3.0-361
+                        value: quay.io/rh-marketplace/redhat-marketplace-authcheck:2.3.2-515
                       - name: WATCH_NAMESPACE
                         valueFrom:
                           fieldRef:
@@ -779,7 +779,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.operatorGroup']
-                    image: quay.io/rh-marketplace/redhat-marketplace-operator:2.3.0-361
+                    image: quay.io/rh-marketplace/redhat-marketplace-operator:2.3.2-515
                     livenessProbe:
                       httpGet:
                         path: /healthz
@@ -982,6 +982,13 @@ spec:
                 - patch
                 - update
                 - watch
+            - apiGroups:
+                - marketplace.redhat.com
+              resources:
+                - events
+              verbs:
+                - create
+                - patch
             - apiGroups:
                 - marketplace.redhat.com
               resources:
@@ -1156,31 +1163,8 @@ spec:
       name: RHM Operator Team
   maturity: stable
   provider:
-    name: Red Hat Marketplace
-  relatedImages:
-    - image: quay.io/rh-marketplace/redhat-marketplace-metric-state:2.3.0-361
-      name: RELATED_IMAGE_METRIC_STATE
-    - image: quay.io/rh-marketplace/redhat-marketplace-reporter:2.3.0-361
-      name: RELATED_IMAGE_REPORTER
-    - image: quay.io/rh-marketplace/redhat-marketplace-authcheck:2.3.0-361
-      name: RELATED_IMAGE_AUTHCHECK
-    - image: quay.io/razee/remoteresources3:0.9.3
-      name: RELATED_IMAGE_RHM_RRS3_DEPLOYMENT
-    - image: quay.io/razee/watch-keeper:0.7.7
-      name: RELATED_IMAGE_RHM_WATCH_KEEPER_DEPLOYMENT
-    - image: registry.redhat.io/openshift4/ose-prometheus:v4.6
-      name: RELATED_IMAGE_PROMETHEUS
-    - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5
-      name: RELATED_IMAGE_OAUTH_PROXY
-    - image: registry.redhat.io/openshift4/ose-prometheus-operator:v4.5
-      name: RELATED_IMAGE_PROMETHEUS_OPERATOR
-    - image: registry.redhat.io/openshift4/ose-configmap-reloader:v4.5
-      name: RELATED_IMAGE_CONFIGMAP_RELOADER
-    - image: registry.redhat.io/openshift4/ose-prometheus-config-reloader:v4.5
-      name: RELATED_IMAGE_PROMETHEUS_CONFIGMAP_RELOADER
-    - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.5
-      name: RELATED_IMAGE_KUBE_RBAC_PROXY
-  version: 2.3.0
+    name: Red Hat Marketplace  
+  version: 2.3.2
   webhookdefinitions:
     - admissionReviewVersions:
         - v1beta1
@@ -1222,3 +1206,26 @@ spec:
       targetPort: 9443
       type: MutatingAdmissionWebhook
       webhookPath: /mutate-marketplace-redhat-com-v1beta1-meterdefinition
+  relatedImages:
+    - image: quay.io/rh-marketplace/redhat-marketplace-metric-state:2.3.2-515
+      name: RELATED_IMAGE_METRIC_STATE
+    - image: quay.io/rh-marketplace/redhat-marketplace-reporter:2.3.2-515
+      name: RELATED_IMAGE_REPORTER
+    - image: quay.io/rh-marketplace/redhat-marketplace-authcheck:2.3.2-515
+      name: RELATED_IMAGE_AUTHCHECK
+    - image: quay.io/razee/remoteresources3:0.9.3
+      name: RELATED_IMAGE_RHM_RRS3_DEPLOYMENT
+    - image: quay.io/razee/watch-keeper:0.7.7
+      name: RELATED_IMAGE_RHM_WATCH_KEEPER_DEPLOYMENT
+    - image: registry.redhat.io/openshift4/ose-prometheus:v4.6
+      name: RELATED_IMAGE_PROMETHEUS
+    - image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.5
+      name: RELATED_IMAGE_OAUTH_PROXY
+    - image: registry.redhat.io/openshift4/ose-prometheus-operator:v4.5
+      name: RELATED_IMAGE_PROMETHEUS_OPERATOR
+    - image: registry.redhat.io/openshift4/ose-configmap-reloader:v4.5
+      name: RELATED_IMAGE_CONFIGMAP_RELOADER
+    - image: registry.redhat.io/openshift4/ose-prometheus-config-reloader:v4.5
+      name: RELATED_IMAGE_PROMETHEUS_CONFIGMAP_RELOADER
+    - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.5
+      name: RELATED_IMAGE_KUBE_RBAC_PROXY    
diff --git a/...ests/redhat-marketplace-prometheus-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...ests/redhat-marketplace-prometheus-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -15,11 +15,14 @@ rules:
 - apiGroups:
   - apiextensions.k8s.io
   resourceNames:
+  - alertmanagerconfigs.monitoring.coreos.com
   - alertmanagers.monitoring.coreos.com
   - podmonitors.monitoring.coreos.com
+  - probes.monitoring.coreos.com
   - prometheuses.monitoring.coreos.com
   - prometheusrules.monitoring.coreos.com
   - servicemonitors.monitoring.coreos.com
+  - thanosrulers.monitoring.coreos.com
   resources:
   - customresourcedefinitions
   verbs: