kube-prometheus/jsonnet: Use jsonnet-bundler

hack/cluster-monitoring/deploy

@@ -8,11 +8,11 @@ set -u
 # print each command before executing it
 set -x
 
-manifest_prefix=${1-.}
+manifest_prefix=${1-./manifests}
 
 kubectl create namespace monitoring
 
-find ${manifest_prefix}/manifests/prometheus-operator/ -type f ! -name prometheus-operator-service-monitor.yaml -exec kubectl apply -f {} \;
+find ${manifest_prefix}/prometheus-operator/ -type f ! -name service-monitor.yaml -exec kubectl apply -f {} \;
 
 # Wait for CRDs to be ready.
 printf "Waiting for Operator to register custom resource definitions..."
@@ -25,14 +25,14 @@ until kubectl get alertmanagers.monitoring.coreos.com > /dev/null 2>&1; do sleep
 echo "done!"
 
 # need to ensure that ServiceMonitors are registered before we can create the prometheus-operator ServiceMonitor
-kubectl apply -f ${manifest_prefix}/manifests/prometheus-operator/prometheus-operator-service-monitor.yaml
+kubectl apply -f ${manifest_prefix}/prometheus-operator/service-monitor.yaml
 
-kubectl apply -f ${manifest_prefix}/manifests/node-exporter/
-kubectl apply -f ${manifest_prefix}/manifests/kube-state-metrics/
-find ${manifest_prefix}/manifests/grafana/ -type f ! -name grafana-dashboard-definitions.yaml -exec kubectl apply -f {} \;
+kubectl apply -f ${manifest_prefix}/node-exporter/
+kubectl apply -f ${manifest_prefix}/kube-state-metrics/
+find ${manifest_prefix}/grafana/ -type f ! -name dashboard-definitions.yaml -exec kubectl apply -f {} \;
 
 # kubectl apply wants to put the previous version in an annotation, which is too large, therefore create instead of apply
-kubectl create -f ${manifest_prefix}/manifests/grafana/grafana-dashboard-definitions.yaml
-kubectl apply -f ${manifest_prefix}/manifests/prometheus-k8s/
-kubectl apply -f ${manifest_prefix}/manifests/alertmanager-main/
+kubectl create -f ${manifest_prefix}/grafana/dashboard-definitions.yaml
+kubectl apply -f ${manifest_prefix}/prometheus/
+kubectl apply -f ${manifest_prefix}/alertmanager/
 

hack/scripts/build-jsonnet.sh

@@ -8,12 +8,7 @@ json="tmp/manifests.json"
 
 rm -rf ${prefix}
 mkdir -p $(dirname "${json}")
-jsonnet \
-    -J $GOPATH/src/github.com/ksonnet/ksonnet-lib \
-    -J $GOPATH/src/github.com/grafana/grafonnet-lib \
-    -J $GOPATH/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus/jsonnet \
-    -J $GOPATH/src/github.com/brancz/kubernetes-grafana/src/kubernetes-jsonnet \
-    ${jsonnet} > ${json}
+jsonnet -J jsonnet/kube-prometheus/vendor -J jsonnet ${jsonnet} > ${json}
 
 files=$(jq -r 'keys[]' ${json})
 
@@ -21,5 +16,6 @@ for file in ${files}; do
     dir=$(dirname "${file}")
     path="${prefix}/${dir}"
     mkdir -p ${path}
-    jq -r ".[\"${file}\"]" ${json} | gojsontoyaml -yamltojson | gojsontoyaml > "${prefix}/${file}"
+    fullfile=$(echo ${file} | sed -r 's/([a-z0-9])([A-Z])/\1-\L\2/g' | tr '[:upper:]' '[:lower:]')
+    jq -r ".[\"${file}\"]" ${json} | gojsontoyaml -yamltojson | gojsontoyaml > "${prefix}/${fullfile}"
 done

hack/scripts/kube-prometheus-base.jsonnet

@@ -0,0 +1,12 @@
+local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
+  _config+:: {
+    namespace: 'monitoring',
+  },
+};
+
+{ ['0prometheus-operator-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheusOperator[name]) for name in std.objectFields(kp.prometheusOperator) } +
+{ ['node-exporter-' + name + '.yaml']: std.manifestYamlDoc(kp.nodeExporter[name]) for name in std.objectFields(kp.nodeExporter) } +
+{ ['kube-state-metrics-' + name + '.yaml']: std.manifestYamlDoc(kp.kubeStateMetrics[name]) for name in std.objectFields(kp.kubeStateMetrics) } +
+{ ['alertmanager-' + name + '.yaml']: std.manifestYamlDoc(kp.alertmanager[name]) for name in std.objectFields(kp.alertmanager) } +
+{ ['prometheus-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheus[name]) for name in std.objectFields(kp.prometheus) } +
+{ ['grafana-' + name + '.yaml']: std.manifestYamlDoc(kp.grafana[name]) for name in std.objectFields(kp.grafana) }

hack/scripts/kube-prometheus-minikube.jsonnet

@@ -0,0 +1,16 @@
+local kp =
+  (import 'kube-prometheus/kube-prometheus.libsonnet') +
+  (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') +
+  (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') +
+  {
+    _config+:: {
+      namespace: 'monitoring',
+    },
+  };
+
+{ ['0prometheus-operator-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheusOperator[name]) for name in std.objectFields(kp.prometheusOperator) } +
+{ ['node-exporter-' + name + '.yaml']: std.manifestYamlDoc(kp.nodeExporter[name]) for name in std.objectFields(kp.nodeExporter) } +
+{ ['kube-state-metrics-' + name + '.yaml']: std.manifestYamlDoc(kp.kubeStateMetrics[name]) for name in std.objectFields(kp.kubeStateMetrics) } +
+{ ['alertmanager-' + name + '.yaml']: std.manifestYamlDoc(kp.alertmanager[name]) for name in std.objectFields(kp.alertmanager) } +
+{ ['prometheus-' + name + '.yaml']: std.manifestYamlDoc(kp.prometheus[name]) for name in std.objectFields(kp.prometheus) } +
+{ ['grafana-' + name + '.yaml']: std.manifestYamlDoc(kp.grafana[name]) for name in std.objectFields(kp.grafana) }