Merge pull request #59 from brancz/normalization

*: normalize namings

README.md

@@ -135,4 +135,4 @@ monitoring    etcd-k8s                                       172.17.4.51:2379
 ```
 
 ## Other Documentation
-[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)
+[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)
\ No newline at end of file

hack/cluster-monitoring/deploy

@@ -27,7 +27,7 @@ kctl apply -f manifests/exporters
 kctl apply -f manifests/grafana
 
 kctl apply -f manifests/prometheus/prometheus-k8s-rules.yaml
-kctl apply -f manifests/prometheus/prometheus-k8s-svc.yaml
+kctl apply -f manifests/prometheus/prometheus-k8s-service.yaml
 
 kctl apply -f manifests/alertmanager/alertmanager-config.yaml
 kctl apply -f manifests/alertmanager/alertmanager-service.yaml
@@ -35,7 +35,7 @@ kctl apply -f manifests/alertmanager/alertmanager-service.yaml
 # `kubectl apply` is currently not working for third party resources so we are
 # using `kubectl create` here for the time being.
 # (https://github.com/kubernetes/kubernetes/issues/29542)
-kctl create -f manifests/prometheus/prometheus-k8s-servicemonitor.yaml
+kctl create -f manifests/prometheus/prometheus-k8s-servicemonitors.yaml
 kctl create -f manifests/prometheus/prometheus-k8s.yaml
 kctl create -f manifests/alertmanager/alertmanager.yaml
 

hack/scripts/generate-configmaps.sh

@@ -4,5 +4,5 @@
 kubectl create configmap --dry-run=true prometheus-k8s-rules --from-file=assets/prometheus/rules/ -oyaml > manifests/prometheus/prometheus-k8s-rules.yaml
 
 # Generate Dashboard ConfigMap
-kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-cm.yaml
+kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-dashboards.yaml
 

manifests/prometheus-operator.yaml

@@ -16,7 +16,7 @@ spec:
          image: quay.io/coreos/prometheus-operator:v0.6.0
          args:
            - "--kubelet-object=kube-system/kubelet"
-           - "--config-reloader-image=quay.io/coreos/configmap-reload:latest"
+           - "--config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1"
          resources:
            requests:
              cpu: 100m

manifests/prometheus/prometheus-k8s.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     prometheus: k8s
 spec:
+  replicas: 2
   version: v1.5.2
   serviceMonitorSelector:
     matchExpression: