diff --git a/README.md b/README.md index b0aab96964dc22e9d10b4e5c7112a0220002dee6..c6c71da050fa7d2bad99a00e6c6e59ec60f76636 100644 --- a/README.md +++ b/README.md @@ -207,15 +207,15 @@ Here's [example.jsonnet](example.jsonnet): [embedmd]:# (example.jsonnet) ```jsonnet local kp = - (import 'kube-prometheus/kube-prometheus.libsonnet') + + (import 'kube-prometheus/main.libsonnet') + // Uncomment the following imports to enable its patches - // (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-managed-cluster.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-custom-metrics.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-external-metrics.libsonnet') + + // (import 'kube-prometheus/addons/anti-affinity.libsonnet') + + // (import 'kube-prometheus/addons/managed-cluster.libsonnet') + + // (import 'kube-prometheus/addons/node-ports.libsonnet') + + // (import 'kube-prometheus/addons/static-etcd.libsonnet') + + // (import 'kube-prometheus/addons/thanos-sidecar.libsonnet') + + // (import 'kube-prometheus/addons/custom-metrics.libsonnet') + + // (import 'kube-prometheus/addons/external-metrics.libsonnet') + { values+:: { common+: { @@ -413,24 +413,24 @@ kubeadm: [embedmd]:# (examples/jsonnet-snippets/kubeadm.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/kubeadm.libsonnet') ``` bootkube: [embedmd]:# (examples/jsonnet-snippets/bootkube.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-bootkube.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/bootkube.libsonnet') ``` kops: [embedmd]:# (examples/jsonnet-snippets/kops.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kops.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/kops.libsonnet') ``` kops with CoreDNS: @@ -439,25 +439,25 @@ If your kops cluster is using CoreDNS, there is an additional mixin to import. [embedmd]:# (examples/jsonnet-snippets/kops-coredns.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kops.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kops-coredns.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/kops.libsonnet') + +(import 'kube-prometheus/platforms/kops-coredns.libsonnet') ``` kubespray: [embedmd]:# (examples/jsonnet-snippets/kubespray.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kubespray.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/kubespray.libsonnet') ``` -kube-aws: +aws: -[embedmd]:# (examples/jsonnet-snippets/kube-aws.jsonnet) +[embedmd]:# (examples/jsonnet-snippets/aws.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-kube-aws.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/platforms/aws.libsonnet') ``` ### Internal Registry @@ -505,8 +505,8 @@ Another mixin that may be useful for exploring the stack is to expose the UIs of [embedmd]:# (examples/jsonnet-snippets/node-ports.jsonnet) ```jsonnet -(import 'kube-prometheus/kube-prometheus.libsonnet') + -(import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') +(import 'kube-prometheus/main.libsonnet') + +(import 'kube-prometheus/addons/node-ports.libsonnet') ``` ### Prometheus Object Name diff --git a/docs/developing-prometheus-rules-and-grafana-dashboards.md b/docs/developing-prometheus-rules-and-grafana-dashboards.md index b6c9f978359b6ac9dce30de46a8bf5983a5f2d38..6ea703c64f7e73c43d0d9b446d54ac4b1b85e32e 100644 --- a/docs/developing-prometheus-rules-and-grafana-dashboards.md +++ b/docs/developing-prometheus-rules-and-grafana-dashboards.md @@ -11,15 +11,15 @@ As a basis, all examples in this guide are based on the base example of the kube [embedmd]:# (../example.jsonnet) ```jsonnet local kp = - (import 'kube-prometheus/kube-prometheus.libsonnet') + + (import 'kube-prometheus/main.libsonnet') + // Uncomment the following imports to enable its patches - // (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-managed-cluster.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-custom-metrics.libsonnet') + - // (import 'kube-prometheus/kube-prometheus-external-metrics.libsonnet') + + // (import 'kube-prometheus/addons/anti-affinity.libsonnet') + + // (import 'kube-prometheus/addons/managed-cluster.libsonnet') + + // (import 'kube-prometheus/addons/node-ports.libsonnet') + + // (import 'kube-prometheus/addons/static-etcd.libsonnet') + + // (import 'kube-prometheus/addons/thanos-sidecar.libsonnet') + + // (import 'kube-prometheus/addons/custom-metrics.libsonnet') + + // (import 'kube-prometheus/addons/external-metrics.libsonnet') + { values+:: { common+: {