diff --git a/opensearch/chart/Chart.yaml b/opensearch/chart/Chart.yaml index a54e4a42e..ce6d44c9e 100644 --- a/opensearch/chart/Chart.yaml +++ b/opensearch/chart/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: opensearch -version: 0.0.58 +version: 0.0.59 description: A Helm chart for the OpenSearch operator type: application maintainers: diff --git a/opensearch/chart/alerts/opensearch-operator.yaml b/opensearch/chart/alerts/opensearch-operator.yaml index 0f6db180a..8df812dab 100644 --- a/opensearch/chart/alerts/opensearch-operator.yaml +++ b/opensearch/chart/alerts/opensearch-operator.yaml @@ -1,17 +1,4 @@ -# Operator alerts are disabled until the operator ServiceMonitor bug is fixed. -# Uncomment the rules below once the ServiceMonitor is working again. groups: - name: opensearch-operator interval: 30s rules: [] -# - alert: OpenSearchOperatorDown -# expr: up{job=~".*opensearch-operator.*"} == 0 -# for: 10m -# labels: -# severity: info # critical -# component: opensearch-operator -# playbook: https://github.com/cloudoperators/greenhouse-extensions/tree/main/opensearch/playbooks/OpenSearchOperatorDown.md -# {{- include "opensearch-alert-labels" . | nindent 10 }} -# annotations: -# summary: "OpenSearch operator is down" -# description: "OpenSearch operator in namespace {{`{{ $labels.namespace }}`}} has been down for more than 10 minutes" diff --git a/opensearch/chart/templates/service-monitor-operator.yaml b/opensearch/chart/templates/service-monitor-operator.yaml index 4242a112b..a0c48290c 100644 --- a/opensearch/chart/templates/service-monitor-operator.yaml +++ b/opensearch/chart/templates/service-monitor-operator.yaml @@ -1,55 +1 @@ -# Operator ServiceMonitor is disabled until the operator metrics bug is fixed. -# Uncomment the template below once the operator exposes metrics correctly. -# -# {{- if .Values.cluster.cluster.general.monitoring.enable }} -# # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors -# # SPDX-License-Identifier: Apache-2.0 -# apiVersion: monitoring.coreos.com/v1 -# kind: ServiceMonitor -# metadata: -# name: {{ .Values.cluster.cluster.name | default .Release.Name }}-operator-metrics -# namespace: {{ .Release.Namespace }} -# labels: -# {{- include "opensearch.labels" . | nindent 4 }} -# {{- if .Values.cluster.cluster.general.monitoring.labels }} -# {{- toYaml .Values.cluster.cluster.general.monitoring.labels | nindent 4 }} -# {{- end }} -# spec: -# selector: -# matchLabels: -# control-plane: controller-manager -# endpoints: -# {{- if .Values.operator.kubeRbacProxy.enable }} -# - port: https -# path: /metrics -# scheme: https -# interval: {{ .Values.cluster.cluster.general.monitoring.scrapeInterval | default "30s" }} -# bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token -# tlsConfig: -# {{- if .Values.cluster.cluster.general.monitoring.tlsConfig }} -# {{- toYaml .Values.cluster.cluster.general.monitoring.tlsConfig | nindent 6 }} -# {{- else }} -# insecureSkipVerify: true -# {{- end }} -# metricRelabelings: -# - sourceLabels: [__name__] -# regex: "(.*)" -# targetLabel: __name__ -# replacement: "opensearch_operator_$1" -# action: replace -# {{- else }} -# - port: http -# path: /metrics -# scheme: http -# interval: {{ .Values.cluster.cluster.general.monitoring.scrapeInterval | default "30s" }} -# metricRelabelings: -# - sourceLabels: [__name__] -# regex: "(.*)" -# targetLabel: __name__ -# replacement: "opensearch_operator_$1" -# action: replace -# {{- end }} -# namespaceSelector: -# matchNames: -# - {{ .Release.Namespace }} -# {{- end }} +{{/* Operator ServiceMonitor is disabled until the operator metrics bug is fixed. */}} diff --git a/opensearch/plugindefinition.yaml b/opensearch/plugindefinition.yaml index b29e088d6..6b94df994 100644 --- a/opensearch/plugindefinition.yaml +++ b/opensearch/plugindefinition.yaml @@ -6,14 +6,14 @@ kind: PluginDefinition metadata: name: opensearch spec: - version: 0.0.58 + version: 0.0.59 displayName: OpenSearch description: Creates and manages an OpenSearch environment with automated deployment, provisioning, and orchestration of clusters and dashboards using the OpenSearch Operator. icon: 'https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/opensearch/logo.png' helmChart: name: opensearch repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts - version: 0.0.58 + version: 0.0.59 options: - name: cluster.cluster.general.monitoring.pluginUrl description: "Defines a custom URL for the monitoring plugin. Leave blank to use the default monitoring configuration."