From 1eedb90c17943566b6750076082b1e9912393f7d Mon Sep 17 00:00:00 2001
From: paulfantom <pawel@krupa.net.pl>
Date: Fri, 15 Jan 2021 14:54:19 +0100
Subject: [PATCH] jsonnet: move files around

Signed-off-by: paulfantom <pawel@krupa.net.pl>
---
 example.jsonnet                               | 16 +++++++--------
 examples/kustomize.jsonnet                    |  2 +-
 .../all-namespaces.libsonnet}                 |  0
 .../anti-affinity.libsonnet}                  |  0
 .../config-mixins.libsonnet}                  |  2 +-
 .../custom-metrics.libsonnet}                 |  0
 ...g-deprecated-metrics-relabelings.libsonnet |  0
 .../external-metrics.libsonnet}               |  0
 .../grafana-weave-net-cluster.json            |  0
 .../{ => addons}/grafana-weave-net.json       |  0
 .../{lib => addons}/image.libsonnet           |  0
 .../insecure-kubelet.libsonnet}               |  0
 .../kops-coredns.libsonnet}                   |  0
 .../managed-cluster.libsonnet}                |  2 +-
 .../node-ports.libsonnet}                     |  0
 .../static-etcd.libsonnet}                    |  0
 .../strip-limits.libsonnet}                   |  0
 .../thanos-sidecar.libsonnet}                 |  0
 .../weave-net.libsonnet}                      |  0
 .../alertmanager.libsonnet                    |  0
 .../blackbox-exporter.libsonnet               |  2 +-
 .../{grafana => components}/grafana.libsonnet |  0
 .../ksm-autoscaler.libsonnet                  |  0
 .../kube-rbac-proxy.libsonnet}                |  0
 .../kube-state-metrics.libsonnet              |  2 +-
 .../mixin/alerts/alerts.libsonnet             |  0
 .../mixin/alerts/general.libsonnet            |  0
 .../mixin/alerts/node.libsonnet               |  0
 .../{ => components}/mixin/alerts/tests.yaml  |  0
 .../{ => components}/mixin/custom.libsonnet   |  0
 .../mixin/kubernetes.libsonnet                |  0
 .../mixin/rules/general.libsonnet             |  0
 .../mixin/rules/node-rules.libsonnet          |  0
 .../mixin/rules/rules.libsonnet               |  0
 .../node-exporter.libsonnet                   |  2 +-
 .../prometheus-adapter.libsonnet              |  0
 .../prometheus-operator.libsonnet             |  2 +-
 .../prometheus.libsonnet                      |  2 +-
 .../kube-prometheus-ksonnet.libsonnet         |  8 --------
 jsonnet/kube-prometheus/lib/lib.libsonnet     |  1 -
 ...be-prometheus.libsonnet => main.libsonnet} | 20 +++++++++----------
 .../aws.libsonnet}                            |  0
 .../bootkube.libsonnet}                       |  0
 .../eks.libsonnet}                            |  0
 .../gke.libsonnet}                            |  2 +-
 .../kops.libsonnet}                           |  0
 .../kubeadm.libsonnet}                        |  0
 .../kubespray.libsonnet}                      |  0
 48 files changed, 27 insertions(+), 36 deletions(-)
 rename jsonnet/kube-prometheus/{kube-prometheus-all-namespaces.libsonnet => addons/all-namespaces.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-anti-affinity.libsonnet => addons/anti-affinity.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-config-mixins.libsonnet => addons/config-mixins.libsonnet} (94%)
 rename jsonnet/kube-prometheus/{kube-prometheus-custom-metrics.libsonnet => addons/custom-metrics.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{ => addons}/dropping-deprecated-metrics-relabelings.libsonnet (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-external-metrics.libsonnet => addons/external-metrics.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{ => addons}/grafana-weave-net-cluster.json (100%)
 rename jsonnet/kube-prometheus/{ => addons}/grafana-weave-net.json (100%)
 rename jsonnet/kube-prometheus/{lib => addons}/image.libsonnet (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-insecure-kubelet.libsonnet => addons/insecure-kubelet.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-kops-coredns.libsonnet => addons/kops-coredns.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-managed-cluster.libsonnet => addons/managed-cluster.libsonnet} (94%)
 rename jsonnet/kube-prometheus/{kube-prometheus-node-ports.libsonnet => addons/node-ports.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-static-etcd.libsonnet => addons/static-etcd.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-strip-limits.libsonnet => addons/strip-limits.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-thanos-sidecar.libsonnet => addons/thanos-sidecar.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-weave-net.libsonnet => addons/weave-net.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{alertmanager => components}/alertmanager.libsonnet (100%)
 rename jsonnet/kube-prometheus/{blackbox-exporter => components}/blackbox-exporter.libsonnet (99%)
 rename jsonnet/kube-prometheus/{grafana => components}/grafana.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ksm-autoscaler => components}/ksm-autoscaler.libsonnet (100%)
 rename jsonnet/kube-prometheus/{kube-rbac-proxy/container.libsonnet => components/kube-rbac-proxy.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-state-metrics => components}/kube-state-metrics.libsonnet (98%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/alerts/alerts.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/alerts/general.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/alerts/node.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/alerts/tests.yaml (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/custom.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/kubernetes.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/rules/general.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/rules/node-rules.libsonnet (100%)
 rename jsonnet/kube-prometheus/{ => components}/mixin/rules/rules.libsonnet (100%)
 rename jsonnet/kube-prometheus/{node-exporter => components}/node-exporter.libsonnet (99%)
 rename jsonnet/kube-prometheus/{prometheus-adapter => components}/prometheus-adapter.libsonnet (100%)
 rename jsonnet/kube-prometheus/{prometheus-operator => components}/prometheus-operator.libsonnet (98%)
 rename jsonnet/kube-prometheus/{prometheus => components}/prometheus.libsonnet (99%)
 delete mode 100644 jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet
 delete mode 100644 jsonnet/kube-prometheus/lib/lib.libsonnet
 rename jsonnet/kube-prometheus/{kube-prometheus.libsonnet => main.libsonnet} (82%)
 rename jsonnet/kube-prometheus/{kube-prometheus-kube-aws.libsonnet => platforms/aws.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-bootkube.libsonnet => platforms/bootkube.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-eks.libsonnet => platforms/eks.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-gke.libsonnet => platforms/gke.libsonnet} (73%)
 rename jsonnet/kube-prometheus/{kube-prometheus-kops.libsonnet => platforms/kops.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-kubeadm.libsonnet => platforms/kubeadm.libsonnet} (100%)
 rename jsonnet/kube-prometheus/{kube-prometheus-kubespray.libsonnet => platforms/kubespray.libsonnet} (100%)

diff --git a/example.jsonnet b/example.jsonnet
index c3c496b905..ca5028c841 100644
--- a/example.jsonnet
+++ b/example.jsonnet
@@ -1,13 +1,13 @@
 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+: {
diff --git a/examples/kustomize.jsonnet b/examples/kustomize.jsonnet
index 875d350125..ab548b05f3 100644
--- a/examples/kustomize.jsonnet
+++ b/examples/kustomize.jsonnet
@@ -1,5 +1,5 @@
 local kp =
-  (import 'kube-prometheus/kube-prometheus.libsonnet') + {
+  (import 'kube-prometheus/main.libsonnet') + {
     values+:: {
       common+: {
         namespace: 'monitoring',
diff --git a/jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet b/jsonnet/kube-prometheus/addons/all-namespaces.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet
rename to jsonnet/kube-prometheus/addons/all-namespaces.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
rename to jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
similarity index 94%
rename from jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
rename to jsonnet/kube-prometheus/addons/config-mixins.libsonnet
index ff8fd2979f..5798e71d71 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
+++ b/jsonnet/kube-prometheus/addons/config-mixins.libsonnet
@@ -1,4 +1,4 @@
-local l = import 'lib/lib.libsonnet';
+local l = import 'image.libsonnet';
 
 // withImageRepository is a mixin that replaces all images prefixes by repository. eg.
 // quay.io/coreos/addon-resizer -> $repository/addon-resizer
diff --git a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet b/jsonnet/kube-prometheus/addons/custom-metrics.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
rename to jsonnet/kube-prometheus/addons/custom-metrics.libsonnet
diff --git a/jsonnet/kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet
rename to jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-external-metrics.libsonnet b/jsonnet/kube-prometheus/addons/external-metrics.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-external-metrics.libsonnet
rename to jsonnet/kube-prometheus/addons/external-metrics.libsonnet
diff --git a/jsonnet/kube-prometheus/grafana-weave-net-cluster.json b/jsonnet/kube-prometheus/addons/grafana-weave-net-cluster.json
similarity index 100%
rename from jsonnet/kube-prometheus/grafana-weave-net-cluster.json
rename to jsonnet/kube-prometheus/addons/grafana-weave-net-cluster.json
diff --git a/jsonnet/kube-prometheus/grafana-weave-net.json b/jsonnet/kube-prometheus/addons/grafana-weave-net.json
similarity index 100%
rename from jsonnet/kube-prometheus/grafana-weave-net.json
rename to jsonnet/kube-prometheus/addons/grafana-weave-net.json
diff --git a/jsonnet/kube-prometheus/lib/image.libsonnet b/jsonnet/kube-prometheus/addons/image.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/lib/image.libsonnet
rename to jsonnet/kube-prometheus/addons/image.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet b/jsonnet/kube-prometheus/addons/insecure-kubelet.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
rename to jsonnet/kube-prometheus/addons/insecure-kubelet.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet b/jsonnet/kube-prometheus/addons/kops-coredns.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
rename to jsonnet/kube-prometheus/addons/kops-coredns.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-managed-cluster.libsonnet b/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
similarity index 94%
rename from jsonnet/kube-prometheus/kube-prometheus-managed-cluster.libsonnet
rename to jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
index 9b4e1a8cdd..8e09330c11 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-managed-cluster.libsonnet
+++ b/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
@@ -1,5 +1,5 @@
 // On managed Kubernetes clusters some of the control plane components are not exposed to customers.
-// Disable scrape jobs, service monitors, and alert groups for these components by overwriting 'kube-prometheus.libsonnet' defaults
+// Disable scrape jobs, service monitors, and alert groups for these components by overwriting 'main.libsonnet' defaults
 
 {
   _config+:: {
diff --git a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet b/jsonnet/kube-prometheus/addons/node-ports.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet
rename to jsonnet/kube-prometheus/addons/node-ports.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/addons/static-etcd.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
rename to jsonnet/kube-prometheus/addons/static-etcd.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet b/jsonnet/kube-prometheus/addons/strip-limits.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet
rename to jsonnet/kube-prometheus/addons/strip-limits.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/addons/thanos-sidecar.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
rename to jsonnet/kube-prometheus/addons/thanos-sidecar.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet b/jsonnet/kube-prometheus/addons/weave-net.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
rename to jsonnet/kube-prometheus/addons/weave-net.libsonnet
diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
rename to jsonnet/kube-prometheus/components/alertmanager.libsonnet
diff --git a/jsonnet/kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
similarity index 99%
rename from jsonnet/kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet
rename to jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
index ce421209e7..bbe03ed694 100644
--- a/jsonnet/kube-prometheus/blackbox-exporter/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -1,4 +1,4 @@
-local krp = import '../kube-rbac-proxy/container.libsonnet';
+local krp = import './kube-rbac-proxy.libsonnet';
 
 local defaults = {
   local defaults = self,
diff --git a/jsonnet/kube-prometheus/grafana/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/grafana/grafana.libsonnet
rename to jsonnet/kube-prometheus/components/grafana.libsonnet
diff --git a/jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet b/jsonnet/kube-prometheus/components/ksm-autoscaler.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet
rename to jsonnet/kube-prometheus/components/ksm-autoscaler.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet b/jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet
rename to jsonnet/kube-prometheus/components/kube-rbac-proxy.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
similarity index 98%
rename from jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
rename to jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
index fdfe3bd59e..fa1bfd596c 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
@@ -1,4 +1,4 @@
-local krp = (import '../kube-rbac-proxy/container.libsonnet');
+local krp = import './kube-rbac-proxy.libsonnet';
 
 local defaults = {
   local defaults = self,
diff --git a/jsonnet/kube-prometheus/mixin/alerts/alerts.libsonnet b/jsonnet/kube-prometheus/components/mixin/alerts/alerts.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/alerts/alerts.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/alerts/alerts.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/alerts/general.libsonnet b/jsonnet/kube-prometheus/components/mixin/alerts/general.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/alerts/general.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/alerts/general.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/alerts/node.libsonnet b/jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/alerts/node.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/alerts/node.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/alerts/tests.yaml b/jsonnet/kube-prometheus/components/mixin/alerts/tests.yaml
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/alerts/tests.yaml
rename to jsonnet/kube-prometheus/components/mixin/alerts/tests.yaml
diff --git a/jsonnet/kube-prometheus/mixin/custom.libsonnet b/jsonnet/kube-prometheus/components/mixin/custom.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/custom.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/custom.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/kubernetes.libsonnet b/jsonnet/kube-prometheus/components/mixin/kubernetes.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/kubernetes.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/kubernetes.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/rules/general.libsonnet b/jsonnet/kube-prometheus/components/mixin/rules/general.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/rules/general.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/rules/general.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/rules/node-rules.libsonnet b/jsonnet/kube-prometheus/components/mixin/rules/node-rules.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/rules/node-rules.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/rules/node-rules.libsonnet
diff --git a/jsonnet/kube-prometheus/mixin/rules/rules.libsonnet b/jsonnet/kube-prometheus/components/mixin/rules/rules.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/mixin/rules/rules.libsonnet
rename to jsonnet/kube-prometheus/components/mixin/rules/rules.libsonnet
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet
similarity index 99%
rename from jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
rename to jsonnet/kube-prometheus/components/node-exporter.libsonnet
index c5b82498f4..bd4fbfe7ab 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet
@@ -1,4 +1,4 @@
-local krp = (import '../kube-rbac-proxy/container.libsonnet');
+local krp = import './kube-rbac-proxy.libsonnet';
 
 local defaults = {
   local defaults = self,
diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
rename to jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
diff --git a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
similarity index 98%
rename from jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet
rename to jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
index 8114f91cc2..96f263d9f7 100644
--- a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
@@ -1,4 +1,4 @@
-local krp = (import '../kube-rbac-proxy/container.libsonnet');
+local krp = import './kube-rbac-proxy.libsonnet';
 local prometheusOperator = import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet';
 
 local defaults = {
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
similarity index 99%
rename from jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
rename to jsonnet/kube-prometheus/components/prometheus.libsonnet
index 76a251ff3a..e93f85376e 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -1,4 +1,4 @@
-local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet';
+local relabelings = import '../addons/dropping-deprecated-metrics-relabelings.libsonnet';
 
 local defaults = {
   local defaults = self,
diff --git a/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet
deleted file mode 100644
index ad13373fda..0000000000
--- a/jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet
+++ /dev/null
@@ -1,8 +0,0 @@
-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) } +
-{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } +
-{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } +
-{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
-{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }
diff --git a/jsonnet/kube-prometheus/lib/lib.libsonnet b/jsonnet/kube-prometheus/lib/lib.libsonnet
deleted file mode 100644
index c30f976f15..0000000000
--- a/jsonnet/kube-prometheus/lib/lib.libsonnet
+++ /dev/null
@@ -1 +0,0 @@
-(import 'image.libsonnet')
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/main.libsonnet
similarity index 82%
rename from jsonnet/kube-prometheus/kube-prometheus.libsonnet
rename to jsonnet/kube-prometheus/main.libsonnet
index d5346317aa..15f88b7d7f 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/main.libsonnet
@@ -1,13 +1,13 @@
-local alertmanager = import './alertmanager/alertmanager.libsonnet';
-local blackboxExporter = import './blackbox-exporter/blackbox-exporter.libsonnet';
-local grafana = import './grafana/grafana.libsonnet';
-local kubeStateMetrics = import './kube-state-metrics/kube-state-metrics.libsonnet';
-local customMixin = import './mixin/custom.libsonnet';
-local kubernetesMixin = import './mixin/kubernetes.libsonnet';
-local nodeExporter = import './node-exporter/node-exporter.libsonnet';
-local prometheusAdapter = import './prometheus-adapter/prometheus-adapter.libsonnet';
-local prometheusOperator = import './prometheus-operator/prometheus-operator.libsonnet';
-local prometheus = import './prometheus/prometheus.libsonnet';
+local alertmanager = import './components/alertmanager.libsonnet';
+local blackboxExporter = import './components/blackbox-exporter.libsonnet';
+local grafana = import './components/grafana.libsonnet';
+local kubeStateMetrics = import './components/kube-state-metrics.libsonnet';
+local customMixin = import './components/mixin/custom.libsonnet';
+local kubernetesMixin = import './components/mixin/kubernetes.libsonnet';
+local nodeExporter = import './components/node-exporter.libsonnet';
+local prometheusAdapter = import './components/prometheus-adapter.libsonnet';
+local prometheusOperator = import './components/prometheus-operator.libsonnet';
+local prometheus = import './components/prometheus.libsonnet';
 
 {
   // using `values` as this is similar to helm
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet b/jsonnet/kube-prometheus/platforms/aws.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
rename to jsonnet/kube-prometheus/platforms/aws.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet b/jsonnet/kube-prometheus/platforms/bootkube.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
rename to jsonnet/kube-prometheus/platforms/bootkube.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet b/jsonnet/kube-prometheus/platforms/eks.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
rename to jsonnet/kube-prometheus/platforms/eks.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-gke.libsonnet b/jsonnet/kube-prometheus/platforms/gke.libsonnet
similarity index 73%
rename from jsonnet/kube-prometheus/kube-prometheus-gke.libsonnet
rename to jsonnet/kube-prometheus/platforms/gke.libsonnet
index 3d64c01476..b8b83c28b4 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-gke.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/gke.libsonnet
@@ -1,4 +1,4 @@
-(import './kube-prometheus-managed-cluster.libsonnet') + {
+(import '../addons/managed-cluster.libsonnet') + {
   _config+:: {
     prometheusAdapter+:: {
       config+: {
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet b/jsonnet/kube-prometheus/platforms/kops.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
rename to jsonnet/kube-prometheus/platforms/kops.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
rename to jsonnet/kube-prometheus/platforms/kubeadm.libsonnet
diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
similarity index 100%
rename from jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
rename to jsonnet/kube-prometheus/platforms/kubespray.libsonnet