Adding service monitor additionalEndpoints (fluent#311)

* [FEAT] adding vpa support Signed-off-by: Nicolas Takashi <nicolas.takashi@coralogix.com> * [FEAT] adding additionalEndpoints support Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> * Update charts/fluent-bit/values.yaml Co-authored-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> --------- Signed-off-by: Nicolas Takashi <nicolas.takashi@coralogix.com> Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> Co-authored-by: Steve Hipwell <steve.hipwell@gmail.com>
moonape1226 · Feb 1, 2023 · 96ad033 · 96ad033
1 parent c1f74d1
commit 96ad033
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.22.0
+version: 0.23.0
 appVersion: 2.0.8
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
 home: https://fluentbit.io/
@@ -23,4 +23,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: "Added support for using the Vertical Pod Autoscaler (VPA) to recommend or modify pod resources."
+      description: "Service monitor additional endpoints support"
diff --git a/charts/fluent-bit/templates/servicemonitor.yaml b/charts/fluent-bit/templates/servicemonitor.yaml
@@ -43,6 +43,9 @@ spec:
       tlsConfig:
         {{- toYaml .Values.serviceMonitor.tlsConfig | nindent 8 }}
       {{- end }}
+    {{- with .Values.serviceMonitor.additionalEndpoints }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -121,6 +121,33 @@ serviceMonitor:
 #  scheme: ""
 #  tlsConfig: {}
 
+  ## Beare in mind if youn want to collec metrics from a different port
+  ## you will need to configure the new ports on the extraPorts property.
+  additionalEndpoints: []
+  # - port: metrics
+  #   path: /metrics
+  #   interval: 10s
+  #   scrapeTimeout: 10s
+  #   scheme: ""
+  #   tlsConfig: {}
+  #   # metric relabel configs to apply to samples before ingestion.
+  #   #
+  #   metricRelabelings:
+  #     - sourceLabels: [__meta_kubernetes_service_label_cluster]
+  #       targetLabel: cluster
+  #       regex: (.*)
+  #       replacement: ${1}
+  #       action: replace
+  #   # relabel configs to apply to samples after ingestion.
+  #   #
+  #   relabelings:
+  #     - sourceLabels: [__meta_kubernetes_pod_node_name]
+  #       separator: ;
+  #       regex: ^(.*)$
+  #       targetLabel: nodename
+  #       replacement: $1
+  #       action: replace
+
 prometheusRule:
   enabled: false
 #   namespace: ""