From 30d444c2a0aa4b08b89b14a43bcc2778f33d01a0 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 27 Jan 2023 13:37:33 +0100 Subject: [PATCH] Rename keywords to monitoring specific values --- src/main/cljc/dda/c4k_common/monitoring.cljc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/cljc/dda/c4k_common/monitoring.cljc b/src/main/cljc/dda/c4k_common/monitoring.cljc index 45ad865..d966d3e 100644 --- a/src/main/cljc/dda/c4k_common/monitoring.cljc +++ b/src/main/cljc/dda/c4k_common/monitoring.cljc @@ -18,10 +18,10 @@ (s/def ::node-regex string?) (s/def ::traefik-regex string?) (s/def ::kube-state-regex string?) -(s/def ::config (s/keys :req-un [::grafana-cloud-url +(s/def ::mon-cfg (s/keys :req-un [::grafana-cloud-url ::cluster-name ::cluster-stage])) -(s/def ::auth (s/keys :req-un [::grafana-cloud-user +(s/def ::mon-auth (s/keys :req-un [::grafana-cloud-user ::grafana-cloud-password])) (s/def ::storage (s/keys :opt-un [::pvc-storage-class-name])) (s/def ::filter-regex (s/keys :req-un [::node-regex @@ -79,8 +79,8 @@ (assoc-in [:spec :volumeClaimTemplates 0 :spec :storageClassName] (name pvc-storage-class-name))))) (defn-spec generate-prometheus-config cp/map-or-seq? - [config ::config - auth ::auth] + [config ::mon-cfg + auth ::mon-auth] (let [{:keys [grafana-cloud-url cluster-name cluster-stage]} config {:keys [grafana-cloud-user grafana-cloud-password]} auth] (-> @@ -98,8 +98,8 @@ (cm/replace-all-matching-values-by-new-value "FILTER_REGEX" filter-regex-string)))) (defn-spec generate-config cp/map-or-seq? - [config ::config - auth ::auth] + [config ::mon-cfg + auth ::mon-auth] (-> (yaml/load-as-edn "monitoring/prometheus/config.yaml") (assoc-in [:stringData :prometheus.yaml] @@ -107,8 +107,8 @@ (generate-prometheus-config config auth))))) (defn-spec generate cp/map-or-seq? - [config ::config - auth ::auth] + [config ::mon-cfg + auth ::mon-auth] [(yaml/load-as-edn "monitoring/namespace.yaml") (yaml/load-as-edn "monitoring/prometheus/cluster-role.yaml") (yaml/load-as-edn "monitoring/prometheus/cluster-role-binding.yaml")