From 62b2347277ff1c379d0a29c3cd457d099a54c753 Mon Sep 17 00:00:00 2001 From: Vladislav Polyakov <39828645+polRk@users.noreply.github.com> Date: Thu, 14 Apr 2022 15:01:55 +0300 Subject: [PATCH 1/3] Access requests to sidecar from thanos-query --- .../kube-prometheus/components/prometheus.libsonnet | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index 7306849f..15d16c28 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -128,6 +128,18 @@ function(params) { port: 9090, protocol: 'TCP', }], + }, { + from: [{ + podSelector: { + matchLabels: { + 'app.kubernetes.io/name': 'thanos-query', + }, + }, + }], + ports: [{ + port: 10901, + protocol: 'TCP', + }], }], }, }, From 17d2831fc510816699dd16a58bfa4e6c5b1f58b6 Mon Sep 17 00:00:00 2001 From: Vladislav Polyakov Date: Tue, 19 Apr 2022 10:27:14 +0300 Subject: [PATCH 2/3] fet: include ingress network policy for thanos --- examples/prometheus-thanos.jsonnet | 47 +++++++++++++++++++ .../components/prometheus.libsonnet | 5 +- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 examples/prometheus-thanos.jsonnet diff --git a/examples/prometheus-thanos.jsonnet b/examples/prometheus-thanos.jsonnet new file mode 100644 index 00000000..6dca5439 --- /dev/null +++ b/examples/prometheus-thanos.jsonnet @@ -0,0 +1,47 @@ +local kp = + (import 'kube-prometheus/main.libsonnet') + + // Uncomment the following imports to enable its patches + // (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/custom-metrics.libsonnet') + + // (import 'kube-prometheus/addons/external-metrics.libsonnet') + + // (import 'kube-prometheus/addons/pyrra.libsonnet') + + { + values+:: { + common+: { + namespace: 'monitoring', + }, + prometheus+: { + thanos: { + baseImage: 'quay.io/thanos/thanos', + version: 'v0.8.1', + objectStorageConfig: { + key: 'thanos.yaml', + name: 'thanos-objstore-config', + }, + }, + }, + }, + }; + +{ 'setup/0namespace-namespace': kp.kubePrometheus.namespace } + +{ + ['setup/prometheus-operator-' + name]: kp.prometheusOperator[name] + for name in std.filter((function(name) name != 'serviceMonitor' && name != 'prometheusRule'), std.objectFields(kp.prometheusOperator)) +} + +// { 'setup/pyrra-slo-CustomResourceDefinition': kp.pyrra.crd } + +// serviceMonitor and prometheusRule are separated so that they can be created after the CRDs are ready +{ 'prometheus-operator-serviceMonitor': kp.prometheusOperator.serviceMonitor } + +{ 'prometheus-operator-prometheusRule': kp.prometheusOperator.prometheusRule } + +{ 'kube-prometheus-prometheusRule': kp.kubePrometheus.prometheusRule } + +{ ['alertmanager-' + name]: kp.alertmanager[name] for name in std.objectFields(kp.alertmanager) } + +{ ['blackbox-exporter-' + name]: kp.blackboxExporter[name] for name in std.objectFields(kp.blackboxExporter) } + +{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) } + +// { ['pyrra-' + name]: kp.pyrra[name] for name in std.objectFields(kp.pyrra) if name != 'crd' } + +{ ['kube-state-metrics-' + name]: kp.kubeStateMetrics[name] for name in std.objectFields(kp.kubeStateMetrics) } + +{ ['kubernetes-' + name]: kp.kubernetesControlPlane[name] for name in std.objectFields(kp.kubernetesControlPlane) } +{ ['node-exporter-' + name]: kp.nodeExporter[name] for name in std.objectFields(kp.nodeExporter) } + +{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } + +{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index 15d16c28..35fa5808 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -128,7 +128,8 @@ function(params) { port: 9090, protocol: 'TCP', }], - }, { + }] + ( if p._config.thanos != null then + [{ from: [{ podSelector: { matchLabels: { @@ -140,7 +141,7 @@ function(params) { port: 10901, protocol: 'TCP', }], - }], + }] else []), }, }, From 76f1ba051a33bb9666f00d9e0a1c67ecd9ba1f24 Mon Sep 17 00:00:00 2001 From: Vladislav Polyakov Date: Tue, 19 Apr 2022 10:48:24 +0300 Subject: [PATCH 3/3] style: fmt code --- examples/prometheus-thanos.jsonnet | 8 +++--- .../components/prometheus.libsonnet | 28 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/prometheus-thanos.jsonnet b/examples/prometheus-thanos.jsonnet index 6dca5439..7d8f64ae 100644 --- a/examples/prometheus-thanos.jsonnet +++ b/examples/prometheus-thanos.jsonnet @@ -16,10 +16,10 @@ local kp = prometheus+: { thanos: { baseImage: 'quay.io/thanos/thanos', - version: 'v0.8.1', - objectStorageConfig: { - key: 'thanos.yaml', - name: 'thanos-objstore-config', + version: 'v0.8.1', + objectStorageConfig: { + key: 'thanos.yaml', + name: 'thanos-objstore-config', }, }, }, diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index 35fa5808..3b85906d 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -128,20 +128,20 @@ function(params) { port: 9090, protocol: 'TCP', }], - }] + ( if p._config.thanos != null then - [{ - from: [{ - podSelector: { - matchLabels: { - 'app.kubernetes.io/name': 'thanos-query', - }, - }, - }], - ports: [{ - port: 10901, - protocol: 'TCP', - }], - }] else []), + }] + (if p._config.thanos != null then + [{ + from: [{ + podSelector: { + matchLabels: { + 'app.kubernetes.io/name': 'thanos-query', + }, + }, + }], + ports: [{ + port: 10901, + protocol: 'TCP', + }], + }] else []), }, },