From 3e4f0d1115cb682ca42b7fd8fc1e45dd7f99fa78 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 4 May 2017 10:49:05 +0200
Subject: [PATCH] kube-prometheus: separate exporters in their own directories
---
hack/cluster-monitoring/deploy | 3 ++-
hack/cluster-monitoring/teardown | 3 ++-
.../kube-state-metrics-cluster-role-binding.yaml | 0
.../kube-state-metrics-cluster-role.yaml | 0
.../kube-state-metrics-deployment.yaml | 0
.../kube-state-metrics-service-account.yaml | 0
.../kube-state-metrics-service.yaml | 0
.../{exporters => node-exporter}/node-exporter-daemonset.yaml | 0
.../{exporters => node-exporter}/node-exporter-service.yaml | 0
9 files changed, 4 insertions(+), 2 deletions(-)
rename manifests/{exporters => kube-state-metrics}/kube-state-metrics-cluster-role-binding.yaml (100%)
rename manifests/{exporters => kube-state-metrics}/kube-state-metrics-cluster-role.yaml (100%)
rename manifests/{exporters => kube-state-metrics}/kube-state-metrics-deployment.yaml (100%)
rename manifests/{exporters => kube-state-metrics}/kube-state-metrics-service-account.yaml (100%)
rename manifests/{exporters => kube-state-metrics}/kube-state-metrics-service.yaml (100%)
rename manifests/{exporters => node-exporter}/node-exporter-daemonset.yaml (100%)
rename manifests/{exporters => node-exporter}/node-exporter-service.yaml (100%)
diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index 2d0d50ad..c565d442 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -23,7 +23,8 @@ until kctl get prometheus > /dev/null 2>&1; do sleep 1; printf "."; done
until kctl get alertmanager > /dev/null 2>&1; do sleep 1; printf "."; done
echo "done!"
-kctl apply -f manifests/exporters
+kctl apply -f manifests/node-exporter
+kctl apply -f manifests/kube-state-metrics
kctl apply -f manifests/grafana/grafana-credentials.yaml
kctl apply -f manifests/grafana
kctl apply -f manifests/prometheus/
diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown
index e5e0d9a6..9fcc4513 100755
--- a/hack/cluster-monitoring/teardown
+++ b/hack/cluster-monitoring/teardown
@@ -12,7 +12,8 @@ kctl() {
kubectl --namespace "$NAMESPACE" "$@"
}
-kctl delete -f manifests/exporters
+kctl delete -f manifests/node-exporter
+kctl delete -f manifests/kube-state-metrics
kctl delete -f manifests/grafana
kctl delete -f manifests/prometheus
kctl delete -f manifests/alertmanager
diff --git a/manifests/exporters/kube-state-metrics-cluster-role-binding.yaml b/manifests/kube-state-metrics/kube-state-metrics-cluster-role-binding.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-cluster-role-binding.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-cluster-role-binding.yaml
diff --git a/manifests/exporters/kube-state-metrics-cluster-role.yaml b/manifests/kube-state-metrics/kube-state-metrics-cluster-role.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-cluster-role.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-cluster-role.yaml
diff --git a/manifests/exporters/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-deployment.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
diff --git a/manifests/exporters/kube-state-metrics-service-account.yaml b/manifests/kube-state-metrics/kube-state-metrics-service-account.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-service-account.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-service-account.yaml
diff --git a/manifests/exporters/kube-state-metrics-service.yaml b/manifests/kube-state-metrics/kube-state-metrics-service.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-service.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-service.yaml
diff --git a/manifests/exporters/node-exporter-daemonset.yaml b/manifests/node-exporter/node-exporter-daemonset.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-daemonset.yaml
rename to manifests/node-exporter/node-exporter-daemonset.yaml
diff --git a/manifests/exporters/node-exporter-service.yaml b/manifests/node-exporter/node-exporter-service.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-service.yaml
rename to manifests/node-exporter/node-exporter-service.yaml
--
GitLab