mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-11-02 17:11:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1243 from Kolossi/main

Browse Source 
apply make fmt fixes to migration readme extracts
This commit is contained in:
Paweł Krupa 2021-07-06 14:01:31 +02:00 committed by GitHub
commit acd7cdcde0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
docs/migration-example/readme.md
View File

@ -30,11 +30,11 @@ changes required.
local kp = local kp =
(import 'kube-prometheus/kube-prometheus.libsonnet') + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') + (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') +
(import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') + (import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') +
{ {
_config+:: { _config+:: {
# Override namespace // Override namespace
namespace: 'monitoring', namespace: 'monitoring',
@ -51,7 +51,7 @@ local kp =
```jsonnet ```jsonnet
local kp = local kp =
(import 'kube-prometheus/main.libsonnet') + (import 'kube-prometheus/main.libsonnet') +
# kubeadm now achieved by setting platform value - see 9 lines below // kubeadm now achieved by setting platform value - see 9 lines below
(import 'kube-prometheus/addons/static-etcd.libsonnet') + (import 'kube-prometheus/addons/static-etcd.libsonnet') +
(import 'kube-prometheus/addons/podsecuritypolicies.libsonnet') + (import 'kube-prometheus/addons/podsecuritypolicies.libsonnet') +
{ {
@ -60,10 +60,10 @@ local kp =
namespace: 'monitoring', namespace: 'monitoring',
}, },
# Add kubeadm platform-specific items, // Add kubeadm platform-specific items,
# including kube-contoller-manager and kube-scheduler discovery // including kube-contoller-manager and kube-scheduler discovery
kubePrometheus+: { kubePrometheus+: {
platform: 'kubeadm' platform: 'kubeadm',
}, },
``` ```
@ -79,9 +79,9 @@ local kp =
<td> <td>
```jsonnet ```jsonnet
# Add additional ingresses // Add additional ingresses
# See https://github.com/coreos/kube-prometheus/... // See https://github.com/coreos/kube-prometheus/...
# tree/master/examples/ingress.jsonnet // tree/master/examples/ingress.jsonnet
ingress+:: { ingress+:: {
alertmanager: alertmanager:
ingress.new() + ingress.new() +
@ -107,10 +107,10 @@ local kp =
ingressRuleHttpPath.mixin.backend.withServicePort(9093) ingressRuleHttpPath.mixin.backend.withServicePort(9093)
), ),
) + ) +
# Note we do not need a TLS secretName here as we are going to use the // Note we do not need a TLS secretName here as we are going to use the
# nginx-ingress default secret which is a wildcard // nginx-ingress default secret which is a wildcard
# secretName would need to be in the same namespace at this time, // secretName would need to be in the same namespace at this time,
# see https://github.com/kubernetes/ingress-nginx/issues/2371 // see https://github.com/kubernetes/ingress-nginx/issues/2371
ingress.mixin.spec.withTls( ingress.mixin.spec.withTls(
ingressTls.new() + ingressTls.new() +
ingressTls.withHosts(alert_manager_host) ingressTls.withHosts(alert_manager_host)
@ -123,11 +123,11 @@ local kp =
<td> <td>
```jsonnet ```jsonnet
# Add additional ingresses // Add additional ingresses
# See https://github.com/prometheus-operator/kube-prometheus/... // See https://github.com/prometheus-operator/kube-prometheus/...
# blob/main/examples/ingress.jsonnet // blob/main/examples/ingress.jsonnet
ingress+:: { ingress+:: {
'alertmanager': { alertmanager: {
apiVersion: 'networking.k8s.io/v1', apiVersion: 'networking.k8s.io/v1',
kind: 'Ingress', kind: 'Ingress',
metadata: { metadata: {
@ -175,13 +175,13 @@ local kp =
<td> <td>
```jsonnet ```jsonnet
# Additional prometheus rules // Additional prometheus rules
# See https://github.com/coreos/kube-prometheus/docs/... // See https://github.com/coreos/kube-prometheus/docs/...
# developing-prometheus-rules-and-grafana-dashboards.md // developing-prometheus-rules-and-grafana-dashboards.md
# //
# cat my-prometheus-rules.yaml | \ // cat my-prometheus-rules.yaml | \
# gojsontoyaml -yamltojson | \ // gojsontoyaml -yamltojson | \
# jq . > my-prometheus-rules.json // jq . > my-prometheus-rules.json
prometheusRules+:: { prometheusRules+:: {
@ -212,13 +212,13 @@ local kp =
<td> <td>
```jsonnet ```jsonnet
# Additional prometheus rules // Additional prometheus rules
# See https://github.com/prometheus-operator/kube-prometheus/blob/main/... // See https://github.com/prometheus-operator/kube-prometheus/blob/main/...
# docs/developing-prometheus-rules-and-grafana-dashboards.md... // docs/developing-prometheus-rules-and-grafana-dashboards.md...
# #pre-rendered-rules // #pre-rendered-rules
# cat my-prometheus-rules.yaml | \ // cat my-prometheus-rules.yaml | \
# gojsontoyaml -yamltojson | \ // gojsontoyaml -yamltojson | \
# jq . > my-prometheus-rules.json // jq . > my-prometheus-rules.json
prometheusMe: { prometheusMe: {
rules: { rules: {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',
@ -229,8 +229,8 @@ local kp =
labels: { labels: {
'app.kubernetes.io/name': 'kube-prometheus', 'app.kubernetes.io/name': 'kube-prometheus',
'app.kubernetes.io/part-of': 'kube-prometheus', 'app.kubernetes.io/part-of': 'kube-prometheus',
'prometheus': 'k8s', prometheus: 'k8s',
'role': 'alert-rules' role: 'alert-rules',
}, },
}, },
spec: { spec: {