diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 320e8223..6f7ca1c6 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index 20aedb5c..30e7f660 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -13,7 +13,7 @@ { "source": { "git": { - "remote": "https://github.com/coreos/etcd", + "remote": "https://github.com/etcd-io/etcd", "subdir": "Documentation/etcd-mixin" } }, diff --git a/jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet b/jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet index 56406efb..1fed631d 100644 --- a/jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet +++ b/jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet index 468420fd..e6ab5548 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { prometheus+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet index 51b3c19b..59014d55 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local statefulSet = k.apps.v1.statefulSet; local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType; local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet index 6281c664..05c6a4d2 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet index 7c5b4166..bbbd7a69 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; // Custom metrics API allows the HPA v2 to scale based on arbirary metrics. // For more details on usage visit https://github.com/DirectXMan12/k8s-prometheus-adapter#quick-links diff --git a/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet index f064bda4..a3f59958 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet index 8a309d28..37760404 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet index b5cb1f84..9f9bb950 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet index 664e1912..ad13373f 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet @@ -1,4 +1,4 @@ -local kp = (import 'kube-prometheus/kube-prometheus.libsonnet'); +local kp = (import './kube-prometheus/kube-prometheus.libsonnet'); { ['0prometheus-operator-' + name]: kp.prometheusOperator[name] for name in std.objectFields(kp.prometheusOperator) } + { ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + diff --git a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet index 7a3326c2..bd7ea6ca 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet index e981a128..1481c596 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet index 9889963a..fbda4a9e 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet index b10a1bb4..13901307 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet index 63094f15..7b017e74 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet @@ -1,6 +1,6 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; -(import 'etcd-mixin/mixin.libsonnet') + { +(import 'github.com/etcd-io/etcd/Documentation/etcd-mixin/mixin.libsonnet') + { _config+:: { etcd: { ips: [], diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet index a6f54bd0..210207ba 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet index c75587ab..2a8e7980 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; @@ -183,7 +183,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; ], }, grafanaDashboards+:: { - 'weave-net.json': (import 'grafana-weave-net.json'), - 'weave-net-cluster.json': (import 'grafana-weave-net-cluster.json'), + 'weave-net.json': (import './grafana-weave-net.json'), + 'weave-net-cluster.json': (import './grafana-weave-net-cluster.json'), }, } diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index d04ec890..71369ac3 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -1,20 +1,20 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; -local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; +local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet'; local configMapList = k3.core.v1.configMapList; -(import 'grafana/grafana.libsonnet') + -(import 'kube-state-metrics/kube-state-metrics.libsonnet') + -(import 'kube-state-metrics-mixin/mixin.libsonnet') + -(import 'node-exporter/node-exporter.libsonnet') + -(import 'node-mixin/mixin.libsonnet') + -(import 'alertmanager/alertmanager.libsonnet') + -(import 'prometheus-operator/prometheus-operator.libsonnet') + -(import 'prometheus/prometheus.libsonnet') + -(import 'prometheus-adapter/prometheus-adapter.libsonnet') + -(import 'kubernetes-mixin/mixin.libsonnet') + -(import 'prometheus/mixin.libsonnet') + -(import 'alerts/alerts.libsonnet') + -(import 'rules/rules.libsonnet') + { +(import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + +(import './kube-state-metrics/kube-state-metrics.libsonnet') + +(import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-mixin/mixin.libsonnet') + +(import './node-exporter/node-exporter.libsonnet') + +(import 'github.com/prometheus/node_exporter/docs/node-mixin/mixin.libsonnet') + +(import './alertmanager/alertmanager.libsonnet') + +(import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet') + +(import './prometheus/prometheus.libsonnet') + +(import './prometheus-adapter/prometheus-adapter.libsonnet') + +(import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') + +(import 'github.com/prometheus/prometheus/documentation/prometheus-mixin/mixin.libsonnet') + +(import './alerts/alerts.libsonnet') + +(import './rules/rules.libsonnet') + { kubePrometheus+:: { namespace: k.core.v1.namespace.new($._config.namespace), }, diff --git a/jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet b/jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet index c5934732..e1d3dc0e 100644 --- a/jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet +++ b/jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local deployment = k.apps.v1.deployment; local container = deployment.mixin.spec.template.spec.containersType; local containerPort = container.portsType; diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 2c21905c..a313e7b1 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -11,7 +11,7 @@ scrapeTimeout: '30s', }, }, - kubeStateMetrics+:: (import 'kube-state-metrics/kube-state-metrics.libsonnet') + + kubeStateMetrics+:: (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet') + { local ksm = self, name:: 'kube-state-metrics', diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index a162c966..a6fb0587 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index 682f3015..ecbfb2c6 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index e4f102c7..a1a52d8f 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -1,5 +1,5 @@ -local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; +local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet'; +local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 5b25845e..6c0add96 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -14,7 +14,7 @@ { "source": { "git": { - "remote": "https://github.com/coreos/etcd.git", + "remote": "https://github.com/etcd-io/etcd.git", "subdir": "Documentation/etcd-mixin" } },