From 9e11e17a710bc006cdc04cc35d9ca7f36babfa79 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Fri, 3 Mar 2017 16:43:52 +0100
Subject: [PATCH] *: normalize namings
---
README.md | 2 +-
hack/cluster-monitoring/deploy | 4 ++--
hack/scripts/generate-configmaps.sh | 2 +-
...e-metrics-depl.yaml => kube-state-metrics-deployment.yaml} | 0
...state-metrics-svc.yaml => kube-state-metrics-service.yaml} | 0
.../{node-exporter-ds.yaml => node-exporter-daemonset.yaml} | 0
.../{node-exporter-svc.yaml => node-exporter-service.yaml} | 0
.../grafana/{grafana-cm.yaml => grafana-dashboards.yaml} | 0
.../grafana/{grafana-depl.yaml => grafana-deployment.yaml} | 0
manifests/grafana/{grafana-svc.yaml => grafana-service.yaml} | 0
manifests/prometheus-operator.yaml | 2 +-
.../{prometheus-k8s-svc.yaml => prometheus-k8s-service.yaml} | 0
...ervicemonitor.yaml => prometheus-k8s-servicemonitors.yaml} | 0
manifests/prometheus/prometheus-k8s.yaml | 1 +
14 files changed, 6 insertions(+), 5 deletions(-)
rename manifests/exporters/{kube-state-metrics-depl.yaml => kube-state-metrics-deployment.yaml} (100%)
rename manifests/exporters/{kube-state-metrics-svc.yaml => kube-state-metrics-service.yaml} (100%)
rename manifests/exporters/{node-exporter-ds.yaml => node-exporter-daemonset.yaml} (100%)
rename manifests/exporters/{node-exporter-svc.yaml => node-exporter-service.yaml} (100%)
rename manifests/grafana/{grafana-cm.yaml => grafana-dashboards.yaml} (100%)
rename manifests/grafana/{grafana-depl.yaml => grafana-deployment.yaml} (100%)
rename manifests/grafana/{grafana-svc.yaml => grafana-service.yaml} (100%)
rename manifests/prometheus/{prometheus-k8s-svc.yaml => prometheus-k8s-service.yaml} (100%)
rename manifests/prometheus/{prometheus-k8s-servicemonitor.yaml => prometheus-k8s-servicemonitors.yaml} (100%)
diff --git a/README.md b/README.md
index 820bbb85..db4f554d 100644
--- a/README.md
+++ b/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)
\ No newline at end of file
+[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)
diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index c3e2667f..9ad91eb0 100755
--- a/hack/cluster-monitoring/deploy
+++ b/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
diff --git a/hack/scripts/generate-configmaps.sh b/hack/scripts/generate-configmaps.sh
index aa38878b..02ba18e9 100755
--- a/hack/scripts/generate-configmaps.sh
+++ b/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
diff --git a/manifests/exporters/kube-state-metrics-depl.yaml b/manifests/exporters/kube-state-metrics-deployment.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-depl.yaml
rename to manifests/exporters/kube-state-metrics-deployment.yaml
diff --git a/manifests/exporters/kube-state-metrics-svc.yaml b/manifests/exporters/kube-state-metrics-service.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-svc.yaml
rename to manifests/exporters/kube-state-metrics-service.yaml
diff --git a/manifests/exporters/node-exporter-ds.yaml b/manifests/exporters/node-exporter-daemonset.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-ds.yaml
rename to manifests/exporters/node-exporter-daemonset.yaml
diff --git a/manifests/exporters/node-exporter-svc.yaml b/manifests/exporters/node-exporter-service.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-svc.yaml
rename to manifests/exporters/node-exporter-service.yaml
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-dashboards.yaml
similarity index 100%
rename from manifests/grafana/grafana-cm.yaml
rename to manifests/grafana/grafana-dashboards.yaml
diff --git a/manifests/grafana/grafana-depl.yaml b/manifests/grafana/grafana-deployment.yaml
similarity index 100%
rename from manifests/grafana/grafana-depl.yaml
rename to manifests/grafana/grafana-deployment.yaml
diff --git a/manifests/grafana/grafana-svc.yaml b/manifests/grafana/grafana-service.yaml
similarity index 100%
rename from manifests/grafana/grafana-svc.yaml
rename to manifests/grafana/grafana-service.yaml
diff --git a/manifests/prometheus-operator.yaml b/manifests/prometheus-operator.yaml
index 78bc11d7..6c8030eb 100644
--- a/manifests/prometheus-operator.yaml
+++ b/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
diff --git a/manifests/prometheus/prometheus-k8s-svc.yaml b/manifests/prometheus/prometheus-k8s-service.yaml
similarity index 100%
rename from manifests/prometheus/prometheus-k8s-svc.yaml
rename to manifests/prometheus/prometheus-k8s-service.yaml
diff --git a/manifests/prometheus/prometheus-k8s-servicemonitor.yaml b/manifests/prometheus/prometheus-k8s-servicemonitors.yaml
similarity index 100%
rename from manifests/prometheus/prometheus-k8s-servicemonitor.yaml
rename to manifests/prometheus/prometheus-k8s-servicemonitors.yaml
diff --git a/manifests/prometheus/prometheus-k8s.yaml b/manifests/prometheus/prometheus-k8s.yaml
index a593f041..9054ea58 100644
--- a/manifests/prometheus/prometheus-k8s.yaml
+++ b/manifests/prometheus/prometheus-k8s.yaml
@@ -5,6 +5,7 @@ metadata:
labels:
prometheus: k8s
spec:
+ replicas: 2
version: v1.5.2
serviceMonitorSelector:
matchExpression:
--
GitLab