Merge branch 'master' of https://github.com/coreos/prometheus-operator

assets/grafana/all-nodes-dashboard.json

assets/grafana/deployment-dashboard.json

assets/grafana/kubernetes-capacity-planing-dashboard.json

assets/grafana/kubernetes-cluster-health-dashboard.json

assets/grafana/kubernetes-cluster-status-dashboard.json

...ts/grafana/kubernetes-control-plane-status-dashboard.json

assets/grafana/kubernetes-pods-dashboard.json

assets/grafana/kubernetes-resource-requests-dashboard.json

assets/grafana/node-dashboard.json

assets/grafana/nodes-dashboard.json

assets/grafana/pods-dashboard.json

assets/grafana/resource-requests-dashboard.json

assets/prometheus/rules/kubelet.rules

assets/prometheus/rules/node.rules

hack/cluster-monitoring/deploy

manifests/alertmanager/alertmanager.yaml

manifests/examples/basic-auth/service-monitor.yaml

manifests/examples/example-app/prometheus-frontend.yaml

manifests/examples/example-app/servicemonitor-frontend.yaml

manifests/grafana/grafana-dashboards.yaml