Adapt Charts.yaml according of the requirments from k8s charts upstream (#1266)

Use an empty serviceMonitorSelector to avoid users struggling when they use operator for the first time
Sync kube-promehteus rules

helm/alertmanager/Chart.yaml

@@ -2,11 +2,16 @@ apiVersion: v1
 description: Alertmanager instance created by the CoreOS Prometheus Operator
 engine: gotpl
 maintainers:
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com
 name: alertmanager
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.15
+  - https://github.com/prometheus/alertmanager
+version: 0.1.0
+appVersion: "0.14.0"
+home: https://github.com/prometheus/alertmanager
+keywords:
+- alertmanager
+- monitoring
+- prometheus

helm/alertmanager/README.md

@@ -78,7 +78,7 @@ $ helm install coreos/alertmanager --name my-release -f values.yaml
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
-### Third-party Resource Documentation
+### CRD Resource Documentation
 - [Alertmanager](/Documentation/design.md#alertmanager)
 - [Prometheus](/Documentation/design.md#prometheus)
 - [ServiceMonitor](/Documentation/design.md#servicemonitor)

helm/exporter-kube-state/Chart.yaml

@@ -1,9 +1,7 @@
 apiVersion: v1
 description: A Helm chart singleton for kube-state-metrics
 name: exporter-kube-state
-version: 0.1.17
+version: 0.2.0
 maintainers:
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com

helm/exporter-kube-state/templates/kube-state-metrics.rules.yaml

@@ -55,7 +55,7 @@ groups:
     labels:
       severity: warning
     annotations:
-      description: Pod {{`{{$labels.namespace}}`}}/{{`{{$labels.pod}}`}} is was restarted {{`{{$value}}`}}
+      description: Pod {{`{{$labels.namespace}}`}}/{{`{{$labels.pod}}`}} was restarted {{`{{$value}}`}}
         times within the last hour
       summary: Pod is restarting frequently
 {{ end }}

helm/exporter-node/Chart.yaml

@@ -1,9 +1,15 @@
 apiVersion: v1
-description: A Helm chart for Kubernetes
+description: A Helm chart for Kubernetes node exporter
 name: exporter-node
-version: 0.2.2
+version: 0.3.0
 maintainers:
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com
+appVersion: "0.14.0"
+home: https://github.com/prometheus/node-exporter
+sources:
+  - https://github.com/prometheus/node-exporter
+keywords:
+- node-exporter
+- monitoring
+- prometheus

helm/exporter-node/templates/node.rules.yaml

@@ -46,4 +46,4 @@ groups:
       description: device {{`{{$labels.device}}`}} on node {{`{{$labels.instance}}`}} is running
         full within the next 2 hours (mounted at {{`{{$labels.mountpoint}}`}})
       summary: Node disk is running full within 2 hours
-{{ end }}
+{{ end }}

helm/kube-prometheus/requirements.yaml

@@ -1,12 +1,12 @@
 dependencies:
   - name: alertmanager
-    version: 0.0.15
+    version: 0.1.0
     #e2e-repository: file://../alertmanager
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployAlertManager
 
   - name: prometheus
-    version: 0.0.29
+    version: 0.0.31
     #e2e-repository: file://../prometheus
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
@@ -38,7 +38,7 @@ dependencies:
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-kube-state
-    version: 0.1.17
+    version: 0.2.0
     #e2e-repository: file://../exporter-kube-state
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
@@ -53,7 +53,7 @@ dependencies:
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
 
   - name: exporter-node
-    version: 0.2.2
+    version: 0.3.0
     #e2e-repository: file://../exporter-node
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployExporterNode

helm/prometheus/Chart.yaml

@@ -3,8 +3,8 @@ description: Prometheus instance created by the CoreOS Prometheus Operator
 engine: gotpl
 maintainers:
   - name: Giancarlo Rubio
-    email: mgoodness@gmail.com
+    email: gianrubio@gmail.com
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.29
+version: 0.0.31

helm/prometheus/README.md

@@ -48,7 +48,7 @@ Parameter | Description | Default
 `externalLabels` | The labels to add to any time series or alerts when communicating with external systems  | `{}`
 `externalUrl` | External URL at which Prometheus will be reachable | `""`
 `image.repository` | Image | `quay.io/prometheus/prometheus`
-`image.tag` | Image tag | `v1.5.2`
+`image.tag` | Image tag | `v2.2.1`
 `ingress.enabled` | If true, Prometheus Ingress will be created | `false`
 `ingress.annotations` | Annotations for Prometheus Ingress` | `{}`
 `ingress.fqdn` | Prometheus Ingress fully-qualified domain name | `""`
@@ -73,7 +73,7 @@ Parameter | Description | Default
 `service.loadBalancerSourceRanges` | List of client IPs allowed to access Prometheus Service | `[]`
 `service.nodePort` | Port to expose Prometheus Service on each node | `39090`
 `service.type` | Prometheus Service type | `ClusterIP`
-`serviceMonitors` | ServiceMonitor third-party resources to create & be scraped by this Prometheus instance | `[]`
+`serviceMonitors` | ServiceMonitor crd resources to create & be scraped by this Prometheus instance | `[]`
 `serviceMonitorsSelector` | ServiceMonitor ConfigMap selector | `{}`
 `storageSpec` | Prometheus StorageSpec for persistent data | `{}`
 
@@ -116,10 +116,7 @@ serviceMonitors:
       any: true
 ```
 
-Make sure that `labels` matches the `serviceMonitorSelector` on the Prometheus deployment. You can find the current `serviceMonitorSelector` for Prometheus by running `kubectl get prometheus -o yaml --all-namespaces -o jsonpath='{.items[*].spec.serviceMonitorSelector.matchLabels}'`. 
-If the `label` added to the `serviceMonitor` don't match the `serviceMonitorSelector`, the Service Monitor will not be added to Prometheus.
-
-### Third-party Resource Documentation
+### CRD Resource Documentation
 - [Alertmanager](/Documentation/design.md#alertmanager)
 - [Prometheus](/Documentation/design.md#prometheus)
 - [ServiceMonitor](/Documentation/design.md#servicemonitor)

helm/prometheus/templates/prometheus.yaml

@@ -59,10 +59,6 @@ spec:
 {{- else if .Values.serviceMonitorsSelector }}
   serviceMonitorSelector:
 {{ toYaml .Values.serviceMonitorsSelector | indent 4 }}
-{{- else }}
-  serviceMonitorSelector:
-    matchLabels:
-      prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
 {{- end }}
 {{- if .Values.remoteRead }}
   remoteRead: