logstash exporter, bug fix, etc

QingCloudAppcenter · Sep 7, 2023 · c2a59a5 · c2a59a5
1 parent 3798ba2
commit c2a59a5
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/charts/opensearch-operator/Chart.yaml b/charts/opensearch-operator/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.25-test
+version: 2.0.25
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.0.23"
+appVersion: "2.0.25"
 
 
diff --git a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
@@ -53,6 +53,10 @@ spec:
             value: {{ .Values.cluster.busybox.tag }}
           - name: LOG_FORMAT
             value: {{ .Values.logFormat | default "plaintext" }}
+          - name: LOGSTASH_EXPORTER_IMAGE
+            value: {{ .Values.logstashExporter.image }}
+          - name: LOGSTASH_EXPORTER_TAG
+            value: {{ .Values.logstashExporter.tag }}
 
         image: "{{ .Values.localRegistry | default "docker.io" }}{{"/"}}{{ .Values.namespaceOverride | default "radondb" }}{{"/"}}{{ .Values.manager.image }}:{{ .Values.manager.tag | default .Chart.AppVersion }}"
         name: operator-controller-manager

diff --git a/charts/opensearch-operator/templates/opensearch-operator-manager-role-cr.yaml b/charts/opensearch-operator/templates/opensearch-operator-manager-role-cr.yaml
@@ -102,7 +102,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - "*"
+  - ""
   - opensearch.opster.io
   resources:
   - events

diff --git a/charts/opensearch-operator/templates/servicemonitor.yaml b/charts/opensearch-operator/templates/servicemonitor.yaml
@@ -38,4 +38,23 @@ spec:
   selector:
     matchLabels:
       opster.io/exporter-monitor: "yes"
+
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: logstash-monitor
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/vendor: kubesphere
+    {{- include "opensearch-operator.labels" . | nindent 4 }}
+spec:
+  endpoints:
+  - path: /metrics
+    port: exporter
+  namespaceSelector:
+    any: true
+  selector:
+    matchLabels:
+      opster.io/logstash-exporter-monitor: "yes"
 {{ end }}
diff --git a/charts/opensearch-operator/values.yaml b/charts/opensearch-operator/values.yaml
@@ -13,7 +13,7 @@ manager:
       memory: 350Mi
   image: opensearch-operator
   ## tag default uses appVersion from Chart.yaml, to override specify tag tag: "v1.1"
-  tag: "2.0.23"
+  tag: "2.0.25"
   # If a watchNamespace is specified, the manager's cache will be restricted to
   # watch objects in the desired namespace. Defaults is to watch all namespaces.
   watchNamespace:
@@ -40,7 +40,11 @@ cluster:
 
 logstash:
   image: logstash-oss-with-opensearch-output-plugin
-  tag: 8.4.0
+  tag: 8.9.0
+
+logstashExporter:
+  image: logstash-exporter
+  tag: v1.5.0
 
 prometheus:
   secretName: "prometheus-credentials-secret"