Fix collectd prometheus integration by adding correct labels.
Added template helper function for helm chart.
Updated Chart appVersion, NOTES.
Initial Helm charts for CollectD, Prometheus Operator,
Kafka Strimzi operator, Rook Ceph Operator.
Change-Id: I511fc415bf2f2ab4b92d7501f3d3a1e6b6f82581
Issue-ID: ONAPARC-366
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
# limitations under the License.
apiVersion: v1
+appVersion: "0.1.0"
description: Collectd Helm Chart
name: collectd
version: 0.1.0
-1. Collect Charts
+1. Collect Charts has been installed
+2. Collectd prometheus metrics endpoint {{ .Values.collectd_prometheus.service.port}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+
+{{/* Workaround for https://github.com/helm/helm/issues/3117 */}}
+{{- define "rangeskipempty" -}}
+{{- range $key, $value := . }}
+{{- if $value }}
+{{ $key }}: {{ $value }}
+{{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
spec:
ports:
- name: collectd-prometheus
- port: {{ .Values.prometheus_port }}
- targetPort: collectd
+ port: {{ .Values.collectd_prometheus.service.port }}
+ protocol: TCP
+ targetPort: {{ .Values.collectd_prometheus.service.targetPort }}
selector:
- app: {{ template "name" . }}
- collector: collectd
- release: {{ .Release.Name }}
- type: ClusterIP
+{{ include "rangeskipempty" .Values.collectd_prometheus.service.selector | indent 4 }}
+ type: ClusterIP
\ No newline at end of file
# requests:
# cpu: 100m
# memory: 128Mi
-prometheus_port: 9103
+collectd_prometheus:
+ service:
+ port: 9103
+ targetPort: 9103
+ selector:
+ app: collectd
+ collector: collectd