From b95c5d6f65d49a892400df73e1ded49877372b1e Mon Sep 17 00:00:00 2001 From: Mario Fernandez Date: Thu, 28 Sep 2023 11:11:44 +0200 Subject: [PATCH 1/3] fix: add description field to CSV base Signed-off-by: Mario Fernandez --- ...bility-operator.clusterserviceversion.yaml | 54 ++++++++++++---- ...bility-operator.clusterserviceversion.yaml | 64 +++++++++++++++++++ 2 files changed, 105 insertions(+), 13 deletions(-) diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index c331034a..89b2c26d 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: categories: Monitoring certified: "false" containerImage: observability-operator:0.0.25 - createdAt: "2023-09-19T09:54:01Z" + createdAt: "2023-09-28T09:06:52Z" description: A Go based Kubernetes operator to setup and manage highly available Monitoring Stack using Prometheus, Alertmanager and Thanos Querier. operators.operatorframework.io/builder: operator-sdk-v1.31.0 @@ -59,40 +59,68 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - kind: AlertmanagerConfig + - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be + aggregated across multiple namespaces configuring one Alertmanager cluster. + displayName: AlertmanagerConfig + kind: AlertmanagerConfig name: alertmanagerconfigs.monitoring.rhobs version: v1alpha1 - - kind: Alertmanager + - description: Alertmanager describes an Alertmanager cluster + displayName: Alertmanager + kind: Alertmanager name: alertmanagers.monitoring.rhobs version: v1 - - kind: MonitoringStack + - description: MonitoringStack is the Schema for the monitoringstacks API + displayName: MonitoringStack + kind: MonitoringStack name: monitoringstacks.monitoring.rhobs version: v1alpha1 - - kind: PodMonitor + - description: PodMonitor defines monitoring for a set of pods. + displayName: PodMonitor + kind: PodMonitor name: podmonitors.monitoring.rhobs version: v1 - - kind: Probe + - description: Probe defines monitoring for a set of static targets or ingresses. + displayName: Probe + kind: Probe name: probes.monitoring.rhobs version: v1 - - kind: PrometheusAgent + - description: PrometheusAgent defines a Prometheus agent deployment. + displayName: PrometheusAgent + kind: PrometheusAgent name: prometheusagents.monitoring.rhobs version: v1alpha1 - - kind: Prometheus + - description: Prometheus defines a Prometheus deployment. + displayName: Prometheus + kind: Prometheus name: prometheuses.monitoring.rhobs version: v1 - - kind: PrometheusRule + - description: PrometheusRule defines recording and alerting rules for a Prometheus + instance. + displayName: PrometheusRule + kind: PrometheusRule name: prometheusrules.monitoring.rhobs version: v1 - - kind: ScrapeConfig + - description: ScrapeConfig defines a namespaced Prometheus scrape_config to be + aggregated across multiple namespaces into the Prometheus configuration. + displayName: ScrapeConfig + kind: ScrapeConfig name: scrapeconfigs.monitoring.rhobs version: v1alpha1 - - kind: ServiceMonitor + - description: ServiceMonitor defines monitoring for a set of services. + displayName: ServiceMonitor + kind: ServiceMonitor name: servicemonitors.monitoring.rhobs version: v1 - - kind: ThanosQuerier + - description: ThanosQuerier outlines the Thanos querier components, managed by + this stack + displayName: ThanosQuerier + kind: ThanosQuerier name: thanosqueriers.monitoring.rhobs version: v1alpha1 - - kind: ThanosRuler + - description: ThanosRuler defines a ThanosRuler deployment. + displayName: ThanosRuler + kind: ThanosRuler name: thanosrulers.monitoring.rhobs version: v1 description: |2+ diff --git a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml index fbef9a5b..bce30299 100644 --- a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml +++ b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml @@ -21,6 +21,70 @@ metadata: namespace: placeholder spec: apiservicedefinitions: {} + customresourcedefinitions: + owned: + - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to + be aggregated across multiple namespaces configuring one Alertmanager cluster. + displayName: AlertmanagerConfig + kind: AlertmanagerConfig + name: alertmanagerconfigs.monitoring.rhobs + version: v1alpha1 + - description: Alertmanager describes an Alertmanager cluster + displayName: Alertmanager + kind: Alertmanager + name: alertmanagers.monitoring.rhobs + version: v1 + - description: MonitoringStack is the Schema for the monitoringstacks API + displayName: MonitoringStack + kind: MonitoringStack + name: monitoringstacks.monitoring.rhobs + version: v1alpha1 + - description: PodMonitor defines monitoring for a set of pods. + displayName: PodMonitor + kind: PodMonitor + name: podmonitors.monitoring.rhobs + version: v1 + - description: Probe defines monitoring for a set of static targets or ingresses. + displayName: Probe + kind: Probe + name: probes.monitoring.rhobs + version: v1 + - description: PrometheusAgent defines a Prometheus agent deployment. + displayName: PrometheusAgent + kind: PrometheusAgent + name: prometheusagents.monitoring.rhobs + version: v1alpha1 + - description: Prometheus defines a Prometheus deployment. + displayName: Prometheus + kind: Prometheus + name: prometheuses.monitoring.rhobs + version: v1 + - description: PrometheusRule defines recording and alerting rules for a Prometheus instance. + displayName: PrometheusRule + kind: PrometheusRule + name: prometheusrules.monitoring.rhobs + version: v1 + - description: ScrapeConfig defines a namespaced Prometheus scrape_config to be aggregated across + multiple namespaces into the Prometheus configuration. + displayName: ScrapeConfig + kind: ScrapeConfig + name: scrapeconfigs.monitoring.rhobs + version: v1alpha1 + - description: ServiceMonitor defines monitoring for a set of services. + displayName: ServiceMonitor + kind: ServiceMonitor + name: servicemonitors.monitoring.rhobs + version: v1 + - description: ThanosQuerier outlines the Thanos querier components, managed by this stack + displayName: ThanosQuerier + kind: ThanosQuerier + name: thanosqueriers.monitoring.rhobs + version: v1alpha1 + - description: ThanosRuler defines a ThanosRuler deployment. + displayName: ThanosRuler + kind: ThanosRuler + name: thanosrulers.monitoring.rhobs + version: v1 description: >+ Observability Operator is a Go based Kubernetes operator to setup and From 447fa95cc7314cd3bd191f539cd9965511c68312 Mon Sep 17 00:00:00 2001 From: Mario Fernandez Date: Thu, 28 Sep 2023 15:04:16 +0200 Subject: [PATCH 2/3] fix: delete dots at the end of the description Signed-off-by: Mario Fernandez --- ...bility-operator.clusterserviceversion.yaml | 20 +++++++++---------- ...bility-operator.clusterserviceversion.yaml | 18 ++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index 89b2c26d..a7bb30a2 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: categories: Monitoring certified: "false" containerImage: observability-operator:0.0.25 - createdAt: "2023-09-28T09:06:52Z" + createdAt: "2023-09-28T13:10:33Z" description: A Go based Kubernetes operator to setup and manage highly available Monitoring Stack using Prometheus, Alertmanager and Thanos Querier. operators.operatorframework.io/builder: operator-sdk-v1.31.0 @@ -60,7 +60,7 @@ spec: customresourcedefinitions: owned: - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be - aggregated across multiple namespaces configuring one Alertmanager cluster. + aggregated across multiple namespaces configuring one Alertmanager cluster displayName: AlertmanagerConfig kind: AlertmanagerConfig name: alertmanagerconfigs.monitoring.rhobs @@ -75,39 +75,39 @@ spec: kind: MonitoringStack name: monitoringstacks.monitoring.rhobs version: v1alpha1 - - description: PodMonitor defines monitoring for a set of pods. + - description: PodMonitor defines monitoring for a set of pods displayName: PodMonitor kind: PodMonitor name: podmonitors.monitoring.rhobs version: v1 - - description: Probe defines monitoring for a set of static targets or ingresses. + - description: Probe defines monitoring for a set of static targets or ingresses displayName: Probe kind: Probe name: probes.monitoring.rhobs version: v1 - - description: PrometheusAgent defines a Prometheus agent deployment. + - description: PrometheusAgent defines a Prometheus agent deployment displayName: PrometheusAgent kind: PrometheusAgent name: prometheusagents.monitoring.rhobs version: v1alpha1 - - description: Prometheus defines a Prometheus deployment. + - description: Prometheus defines a Prometheus deployment displayName: Prometheus kind: Prometheus name: prometheuses.monitoring.rhobs version: v1 - description: PrometheusRule defines recording and alerting rules for a Prometheus - instance. + instance displayName: PrometheusRule kind: PrometheusRule name: prometheusrules.monitoring.rhobs version: v1 - description: ScrapeConfig defines a namespaced Prometheus scrape_config to be - aggregated across multiple namespaces into the Prometheus configuration. + aggregated across multiple namespaces into the Prometheus configuration displayName: ScrapeConfig kind: ScrapeConfig name: scrapeconfigs.monitoring.rhobs version: v1alpha1 - - description: ServiceMonitor defines monitoring for a set of services. + - description: ServiceMonitor defines monitoring for a set of services displayName: ServiceMonitor kind: ServiceMonitor name: servicemonitors.monitoring.rhobs @@ -118,7 +118,7 @@ spec: kind: ThanosQuerier name: thanosqueriers.monitoring.rhobs version: v1alpha1 - - description: ThanosRuler defines a ThanosRuler deployment. + - description: ThanosRuler defines a ThanosRuler deployment displayName: ThanosRuler kind: ThanosRuler name: thanosrulers.monitoring.rhobs diff --git a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml index bce30299..a89298a7 100644 --- a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml +++ b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml @@ -24,7 +24,7 @@ spec: customresourcedefinitions: owned: - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to - be aggregated across multiple namespaces configuring one Alertmanager cluster. + be aggregated across multiple namespaces configuring one Alertmanager cluster displayName: AlertmanagerConfig kind: AlertmanagerConfig name: alertmanagerconfigs.monitoring.rhobs @@ -39,38 +39,38 @@ spec: kind: MonitoringStack name: monitoringstacks.monitoring.rhobs version: v1alpha1 - - description: PodMonitor defines monitoring for a set of pods. + - description: PodMonitor defines monitoring for a set of pods displayName: PodMonitor kind: PodMonitor name: podmonitors.monitoring.rhobs version: v1 - - description: Probe defines monitoring for a set of static targets or ingresses. + - description: Probe defines monitoring for a set of static targets or ingresses displayName: Probe kind: Probe name: probes.monitoring.rhobs version: v1 - - description: PrometheusAgent defines a Prometheus agent deployment. + - description: PrometheusAgent defines a Prometheus agent deployment displayName: PrometheusAgent kind: PrometheusAgent name: prometheusagents.monitoring.rhobs version: v1alpha1 - - description: Prometheus defines a Prometheus deployment. + - description: Prometheus defines a Prometheus deployment displayName: Prometheus kind: Prometheus name: prometheuses.monitoring.rhobs version: v1 - - description: PrometheusRule defines recording and alerting rules for a Prometheus instance. + - description: PrometheusRule defines recording and alerting rules for a Prometheus instance displayName: PrometheusRule kind: PrometheusRule name: prometheusrules.monitoring.rhobs version: v1 - description: ScrapeConfig defines a namespaced Prometheus scrape_config to be aggregated across - multiple namespaces into the Prometheus configuration. + multiple namespaces into the Prometheus configuration displayName: ScrapeConfig kind: ScrapeConfig name: scrapeconfigs.monitoring.rhobs version: v1alpha1 - - description: ServiceMonitor defines monitoring for a set of services. + - description: ServiceMonitor defines monitoring for a set of services displayName: ServiceMonitor kind: ServiceMonitor name: servicemonitors.monitoring.rhobs @@ -80,7 +80,7 @@ spec: kind: ThanosQuerier name: thanosqueriers.monitoring.rhobs version: v1alpha1 - - description: ThanosRuler defines a ThanosRuler deployment. + - description: ThanosRuler defines a ThanosRuler deployment displayName: ThanosRuler kind: ThanosRuler name: thanosrulers.monitoring.rhobs From 3120119ead8f61a631ff42b99ae0376617e5c894 Mon Sep 17 00:00:00 2001 From: Mario Fernandez Date: Wed, 4 Oct 2023 10:54:30 +0200 Subject: [PATCH 3/3] fix: improve AlertmanagerConfig Signed-off-by: Mario Fernandez --- .../observability-operator.clusterserviceversion.yaml | 6 +++--- .../bases/observability-operator.clusterserviceversion.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index a7bb30a2..26563751 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -42,7 +42,7 @@ metadata: categories: Monitoring certified: "false" containerImage: observability-operator:0.0.25 - createdAt: "2023-09-28T13:10:33Z" + createdAt: "2023-10-04T08:52:37Z" description: A Go based Kubernetes operator to setup and manage highly available Monitoring Stack using Prometheus, Alertmanager and Thanos Querier. operators.operatorframework.io/builder: operator-sdk-v1.31.0 @@ -59,8 +59,8 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be - aggregated across multiple namespaces configuring one Alertmanager cluster + - description: AlertmanagerConfig configures the Prometheus Alertmanager, specifying + how alerts should be grouped, inhibited and notified to external systems displayName: AlertmanagerConfig kind: AlertmanagerConfig name: alertmanagerconfigs.monitoring.rhobs diff --git a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml index a89298a7..338bc17e 100644 --- a/deploy/olm/bases/observability-operator.clusterserviceversion.yaml +++ b/deploy/olm/bases/observability-operator.clusterserviceversion.yaml @@ -23,8 +23,8 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to - be aggregated across multiple namespaces configuring one Alertmanager cluster + - description: AlertmanagerConfig configures the Prometheus Alertmanager, specifying how alerts should be grouped, + inhibited and notified to external systems displayName: AlertmanagerConfig kind: AlertmanagerConfig name: alertmanagerconfigs.monitoring.rhobs