jsonnet: move files around

Signed-off-by: paulfantom <pawel@krupa.net.pl>

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+: {

examples/kustomize.jsonnet

@@ -1,5 +1,5 @@
 local kp =
-  (import 'kube-prometheus/kube-prometheus.libsonnet') + {
+  (import 'kube-prometheus/main.libsonnet') + {
     values+:: {
       common+: {
         namespace: 'monitoring',

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

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+:: {

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,

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,

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,

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 = {

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,

jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet

@@ -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) }

jsonnet/kube-prometheus/lib/lib.libsonnet

@@ -1 +0,0 @@
-(import 'image.libsonnet')

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

jsonnet/kube-prometheus/platforms/gke.libsonnet

@@ -1,4 +1,4 @@
-(import './kube-prometheus-managed-cluster.libsonnet') + {
+(import '../addons/managed-cluster.libsonnet') + {
   _config+:: {
     prometheusAdapter+:: {
       config+: {