Skip to content

Commit

Permalink
jsonnet: move files around
Browse files Browse the repository at this point in the history
Signed-off-by: paulfantom <[email protected]>
  • Loading branch information
paulfantom committed Jan 15, 2021
1 parent 75f9180 commit 1eedb90
Show file tree
Hide file tree
Showing 48 changed files with 27 additions and 36 deletions.
16 changes: 8 additions & 8 deletions example.jsonnet
Original file line number Diff line number Diff line change
@@ -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+: {
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomize.jsonnet
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local kp =
(import 'kube-prometheus/kube-prometheus.libsonnet') + {
(import 'kube-prometheus/main.libsonnet') + {
values+:: {
common+: {
namespace: 'monitoring',
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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+:: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local krp = import '../kube-rbac-proxy/container.libsonnet';
local krp = import './kube-rbac-proxy.libsonnet';

local defaults = {
local defaults = self,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local krp = (import '../kube-rbac-proxy/container.libsonnet');
local krp = import './kube-rbac-proxy.libsonnet';

local defaults = {
local defaults = self,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local krp = (import '../kube-rbac-proxy/container.libsonnet');
local krp = import './kube-rbac-proxy.libsonnet';

local defaults = {
local defaults = self,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 0 additions & 8 deletions jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet

This file was deleted.

1 change: 0 additions & 1 deletion jsonnet/kube-prometheus/lib/lib.libsonnet

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(import './kube-prometheus-managed-cluster.libsonnet') + {
(import '../addons/managed-cluster.libsonnet') + {
_config+:: {
prometheusAdapter+:: {
config+: {
Expand Down

0 comments on commit 1eedb90

Please sign in to comment.