easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use absolut jsonnet imports whenever possible

Browse Source 
There are still some dependencies that we need to make work to fully
deactivate the legacyImports in the future. I'll start opening PRs
against those other repositories.
This commit is contained in:
Matthias Loibl
2020-09-11 18:03:03 +02:00
parent 2212ee3db6
commit 09293866ae
28 changed files with 66 additions and 3238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
+1 -1
View File
@@ -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+:: {
jsonnet/kube-prometheus/jsonnetfile.json
+1 -1
View File
@@ -13,7 +13,7 @@
{
"source": {
"git": {
"remote": "https://github.com/coreos/etcd",
"remote": "https://github.com/etcd-io/etcd",
"subdir": "Documentation/etcd-mixin"
}
},
jsonnet/kube-prometheus/ksm-autoscaler/ksm-autoscaler.libsonnet
+1 -1
View File
@@ -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+:: {
jsonnet/kube-prometheus/kube-prometheus-all-namespaces.libsonnet
+1 -1
View File
@@ -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+:: {
jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
+1 -1
View File
@@ -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
jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-ksonnet.libsonnet
+1 -1
View File
@@ -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) } +
jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
+2 -2
View File
@@ -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: [],
jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
+3 -3
View File
@@ -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'),
},
}
jsonnet/kube-prometheus/kube-prometheus.libsonnet
+15 -15
View File
@@ -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/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics-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),
},
jsonnet/kube-prometheus/kube-rbac-proxy/container.libsonnet
+1 -1
View File
@@ -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;
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+1 -1
View File
@@ -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',
jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+1 -1
View File
@@ -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+:: {
jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
+1 -1
View File
@@ -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+:: {
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+2 -2
View File
@@ -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+:: {