[bot] [main] Automated version update

2021-08-30 07:39:09 +00:00
parent 8d0aa1f3d9
commit a1c6a4e21d
22 changed files with 71 additions and 40 deletions
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
 {
-  "alertmanager": "0.22.2",
+  "alertmanager": "0.23.0",
  "blackboxExporter": "0.19.0",
  "grafana": "8.1.2",
  "kubeStateMetrics": "2.2.0",
  "nodeExporter": "1.2.2",
-  "prometheus": "2.29.1",
+  "prometheus": "2.29.2",
  "prometheusAdapter": "0.9.0",
  "prometheusOperator": "0.50.0",
  "kubeRbacProxy": "0.11.0",
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "6a32bbad756b656da23af007ac4a0256b3dab7b5",
+      "version": "ef81030105b5519b49de6d13218c32532d932db6",
      "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
    },
    {
@@ -38,7 +38,7 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "ac31371db5008f92b054751dfc4f7ece6526250f",
+      "version": "ff22d1d6698573e7cb76228198edfa2b2f632dcc",
      "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
    },
    {
@@ -88,7 +88,7 @@
          "subdir": "jsonnet/mixin"
        }
      },
-      "version": "83fe36566f4e0894eb5ffcd2638a0f039a17bdeb",
+      "version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
      "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
      "name": "prometheus-operator-mixin"
    },
@@ -99,8 +99,8 @@
          "subdir": "jsonnet/prometheus-operator"
        }
      },
-      "version": "83fe36566f4e0894eb5ffcd2638a0f039a17bdeb",
-      "sum": "J1G++A8hrtr3+OZQMmcNeb1w/C30bXqqwpwHL/Xhsd4="
+      "version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
+      "sum": "8sW09DSYBOS3RCvnBtC850sujaFNwoJoclW4AQxUw9Q="
    },
    {
      "source": {
@@ -130,8 +130,8 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "4323aa00a7019c356491c76ed00264c18b721456",
-      "sum": "AS8WYFi/z10BZSF6DFkKBscjB32XDMM7iIso7CO/FyI=",
+      "version": "a2665a9f7384cd34052ede077c036c27fa9a8ce5",
+      "sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
      "name": "prometheus"
    },
    {
@@ -141,8 +141,8 @@
          "subdir": "mixin"
        }
      },
-      "version": "8b4c3c90343541b28a6ab6686c6239f0e72ea783",
-      "sum": "4yPiwx8421KpQO0XsssDCsPx2JjlQLHkchJjXt5Ci9c=",
+      "version": "fdfc0776d0c3544a29e1bad5cc49ef971c5b73ef",
+      "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=",
      "name": "thanos-mixin"
    },
    {
--- a/manifests/alertmanager-alertmanager.yaml
+++ b/manifests/alertmanager-alertmanager.yaml
@@ -6,11 +6,11 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: main
  namespace: monitoring
 spec:
-  image: quay.io/prometheus/alertmanager:v0.22.2
+  image: quay.io/prometheus/alertmanager:v0.23.0
  nodeSelector:
    kubernetes.io/os: linux
  podMetadata:
@@ -18,7 +18,7 @@ spec:
      app.kubernetes.io/component: alert-router
      app.kubernetes.io/name: alertmanager
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 0.22.2
+      app.kubernetes.io/version: 0.23.0
  replicas: 3
  resources:
    limits:
@@ -32,4 +32,4 @@ spec:
    runAsNonRoot: true
    runAsUser: 1000
  serviceAccountName: alertmanager-main
-  version: 0.22.2
+  version: 0.23.0
--- a/manifests/alertmanager-podDisruptionBudget.yaml
+++ b/manifests/alertmanager-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: alertmanager-main
  namespace: monitoring
 spec:
--- a/manifests/alertmanager-prometheusRule.yaml
+++ b/manifests/alertmanager-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
    prometheus: k8s
    role: alert-rules
  name: alertmanager-main-rules
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -6,7 +6,7 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: alertmanager-main
  namespace: monitoring
 stringData:
--- a/manifests/alertmanager-service.yaml
+++ b/manifests/alertmanager-service.yaml
@@ -6,7 +6,7 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: alertmanager-main
  namespace: monitoring
 spec:
--- a/manifests/alertmanager-serviceAccount.yaml
+++ b/manifests/alertmanager-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: alertmanager-main
  namespace: monitoring
--- a/manifests/alertmanager-serviceMonitor.yaml
+++ b/manifests/alertmanager-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: alert-router
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.22.2
+    app.kubernetes.io/version: 0.23.0
  name: alertmanager
  namespace: monitoring
 spec:
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s
 rules:
 - apiGroups:
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s
 roleRef:
  apiGroup: rbac.authorization.k8s.io
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s
  namespace: monitoring
 spec:
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
    prometheus: k8s
  name: k8s
  namespace: monitoring
@@ -18,7 +18,7 @@ spec:
      port: web
  enableFeatures: []
  externalLabels: {}
-  image: quay.io/prometheus/prometheus:v2.29.1
+  image: quay.io/prometheus/prometheus:v2.29.2
  nodeSelector:
    kubernetes.io/os: linux
  podMetadata:
@@ -26,7 +26,7 @@ spec:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
  podMonitorNamespaceSelector: {}
  podMonitorSelector: {}
  probeNamespaceSelector: {}
@@ -44,4 +44,4 @@ spec:
  serviceAccountName: prometheus-k8s
  serviceMonitorNamespaceSelector: {}
  serviceMonitorSelector: {}
-  version: 2.29.1
+  version: 2.29.2
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
    prometheus: k8s
    role: alert-rules
  name: prometheus-k8s-prometheus-rules
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s-config
  namespace: monitoring
 roleRef:
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: default
  roleRef:
@@ -25,7 +25,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: kube-system
  roleRef:
@@ -43,7 +43,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: monitoring
  roleRef:
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s-config
  namespace: monitoring
 rules:
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: default
  rules:
@@ -44,7 +44,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: kube-system
  rules:
@@ -81,7 +81,7 @@ items:
      app.kubernetes.io/component: prometheus
      app.kubernetes.io/name: prometheus
      app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.29.1
+      app.kubernetes.io/version: 2.29.2
    name: prometheus-k8s
    namespace: monitoring
  rules:
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
    prometheus: k8s
  name: prometheus-k8s
  namespace: monitoring
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s
  namespace: monitoring
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: prometheus
    app.kubernetes.io/name: prometheus
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.29.1
+    app.kubernetes.io/version: 2.29.2
  name: prometheus-k8s
  namespace: monitoring
 spec:
--- a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
@@ -121,6 +121,37 @@ spec:
                description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
                format: int64
                type: integer
+              metricRelabelings:
+                description: MetricRelabelConfigs to apply to samples before ingestion.
+                items:
+                  description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                  properties:
+                    action:
+                      description: Action to perform based on regex matching. Default is 'replace'
+                      type: string
+                    modulus:
+                      description: Modulus to take of the hash of the source label values.
+                      format: int64
+                      type: integer
+                    regex:
+                      description: Regular expression against which the extracted value is matched. Default is '(.*)'
+                      type: string
+                    replacement:
+                      description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+                      type: string
+                    separator:
+                      description: Separator placed between concatenated source label values. default is ';'.
+                      type: string
+                    sourceLabels:
+                      description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+                      items:
+                        type: string
+                      type: array
+                    targetLabel:
+                      description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+                      type: string
+                  type: object
+                type: array
              module:
                description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
                type: string