diff --git a/src/main/cljc/dda/c4k_common/monitoring/monitoring_internal.cljc b/src/main/cljc/dda/c4k_common/monitoring/monitoring_internal.cljc index 87c787f..651fead 100644 --- a/src/main/cljc/dda/c4k_common/monitoring/monitoring_internal.cljc +++ b/src/main/cljc/dda/c4k_common/monitoring/monitoring_internal.cljc @@ -26,7 +26,7 @@ "monitoring/node-exporter-service.yaml" (rc/inline "monitoring/node-exporter-service.yaml") "monitoring/prometheus-cluster-role-binding.yaml" (rc/inline "monitoring/prometheus-cluster-role-binding.yaml") "monitoring/prometheus-cluster-role.yaml" (rc/inline "monitoring/prometheus-cluster-role.yaml") - "monitoring/prometheus-config.yaml" (rc/inline "monitoring/prometheus-config.yaml") + "monitoring/prometheus-config-secret.yaml" (rc/inline "monitoring/prometheus-config-secret.yaml") "monitoring/prometheus-deployment.yaml" (rc/inline "monitoring/prometheus-deployment.yaml") "monitoring/prometheus-prometheus.yaml" (rc/inline "monitoring/prometheus-prometheus.yaml") "monitoring/prometheus-service-account.yaml" (rc/inline "monitoring/prometheus-service-account.yaml") diff --git a/src/test/cljc/dda/c4k_common/monitoring/monitoring_internal_test.cljc b/src/test/cljc/dda/c4k_common/monitoring/monitoring_internal_test.cljc index b763456..dbb4389 100644 --- a/src/test/cljc/dda/c4k_common/monitoring/monitoring_internal_test.cljc +++ b/src/test/cljc/dda/c4k_common/monitoring/monitoring_internal_test.cljc @@ -8,7 +8,7 @@ (st/instrument `cut/generate-stateful-set) (st/instrument `cut/generate-agent-config) -(st/instrument `cut/generate-config) +(st/instrument `cut/generate-config-secret) (def conf {:cluster-name "clustername" :cluster-stage "test" @@ -29,12 +29,12 @@ (deftest should-not-generate-config (is (thrown? #?(:clj Exception :cljs js/Error) - (cut/generate-config invalid-conf auth)))) + (cut/generate-config-secret invalid-conf auth)))) (deftest should-not-generate-auth (is (thrown? #?(:clj Exception :cljs js/Error) - (cut/generate-config conf invalid-auth)))) + (cut/generate-config-secret conf invalid-auth)))) (deftest should-generate-prometheus-remote-write-auth @@ -54,6 +54,6 @@ (deftest should-generate-config (is (str/starts-with? (get-in - (cut/generate-config conf auth) + (cut/generate-config-secret conf auth) [:stringData :prometheus.yaml]) "global:\n scrape_interval:"))) \ No newline at end of file diff --git a/src/test/cljc/dda/c4k_common/monitoring_test.cljc b/src/test/cljc/dda/c4k_common/monitoring_test.cljc index 5e5332b..6dc168c 100644 --- a/src/test/cljc/dda/c4k_common/monitoring_test.cljc +++ b/src/test/cljc/dda/c4k_common/monitoring_test.cljc @@ -5,7 +5,8 @@ [clojure.spec.test.alpha :as st] [dda.c4k-common.monitoring :as cut])) -(st/instrument `cut/generate) +(st/instrument `cut/generate-config) +(st/instrument `cut/generate-auth) (def conf {:cluster-name "clustername" :cluster-stage "test" @@ -17,5 +18,7 @@ (deftest should-generate - (is (= 17 - (count (cut/generate conf auth))))) + (is (= 16 + (count (cut/generate-config conf auth)))) + (is (= 1 + (count (cut/generate-auth conf auth)))))