Add namespace to service monitor (#186)

* Add namespace to service monitor
* Add namespace example to service monitor
* Update README.md

Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 1.0.0
+version: 1.0.1
 appVersion: 1.14.0
 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
 keywords:

README.md

@@ -231,6 +231,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | `metrics.prometheus.enabled`            | Enable prometheus to access nifi metrics endpoint                                                                                    | `false`                                                      |
 | `metrics.prometheus.port`              | Port where Nifi server will expose Prometheus metrics                                                                                  | `9092`                                                      |
 | `metrics.prometheus.serviceMonitor.enabled`       | If `true`, creates a Prometheus Operator ServiceMonitor (also requires `metrics.prometheus.enabled` to be `true`)                       | `false`                                        |
+| `metrics.prometheus.serviceMonitor.namespace`       | In which namespace the ServiceMonitor should be created                       | 
 | `metrics.prometheus.serviceMonitor.labels`       | Additional labels for the ServiceMonitor                       | `nil`                                        |
 
 ## Troubleshooting

templates/servicemonitor.yaml

@@ -4,6 +4,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "apache-nifi.fullname" . }}
+{{- with .Values.metrics.prometheus.serviceMonitor.namespace }}
+  namespace: {{ . }}
+{{- end }}
   labels:
     app: {{ include "apache-nifi.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
@@ -34,4 +37,4 @@ spec:
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace | quote }}
-{{- end }}
+{{- end }}

values.yaml

@@ -367,5 +367,6 @@ metrics:
     serviceMonitor:
       # Enable deployment of Prometheus Operator ServiceMonitor resource
       enabled: false
+      # namespace: monitoring
       # Additional labels for the ServiceMonitor
       labels: {}