[release-0.12] Adds dependency on github.com/grafana/jsonnet-libs mixins-util (#2478 )

* Add lockfile * chore: ignore mdox errors for https://www.weave.works
[bot] [release-0.12] Automated version update (#2315 )
2024-08-07 17:10:32 +01:00 · 2024-01-03 17:32:30 +00:00 · 2023-11-27 12:07:35 +00:00 · 2023-08-16 16:55:15 +01:00 · 2023-07-28 03:24:28 -07:00 · 2023-07-27 03:20:15 -07:00
24 changed files with 563 additions and 770 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ on:
  - pull_request
 env:
  golang-version: '1.18'
-  kind-version: 'v0.14.0'
+  kind-version: 'v0.16.0'
 jobs:
  generate:
    runs-on: ${{ matrix.os }}
@@ -83,8 +83,8 @@ jobs:
    strategy:
      matrix:
        kind-image:
-          - 'kindest/node:v1.24.1'
-          - 'kindest/node:v1.23.6'
+          - 'kindest/node:v1.25.2'
+          - 'kindest/node:v1.24.6'
    steps:
    - uses: actions/checkout@v3
      with:
@@ -99,23 +99,9 @@ jobs:
        image: ${{ matrix.kind-image }}
        wait: 10s # Without default CNI, control-plane doesn't get ready until Cilium is installed
        config: .github/workflows/kind/config.yml
-    - name: Setup Helm
-      uses: azure/setup-helm@v3.5
-    - name: Install Cilium
+    - name: Install kube-router for NetworkPolicy support
      run: |
-        helm repo add cilium https://helm.cilium.io/
-        helm install cilium cilium/cilium --version 1.9.13 \
-        --namespace kube-system \
-        --set nodeinit.enabled=true \
-        --set kubeProxyReplacement=partial \
-        --set hostServices.enabled=false \
-        --set externalIPs.enabled=true \
-        --set nodePort.enabled=true \
-        --set hostPort.enabled=true \
-        --set bpf.masquerade=false \
-        --set image.pullPolicy=IfNotPresent \
-        --set ipam.mode=kubernetes \
-        --set operator.replicas=1
+        kubectl apply -f .github/workflows/kind/kube-router.yaml
    - name: Wait for cluster to finish bootstraping
      run: kubectl wait --for=condition=Ready pods --all --all-namespaces --timeout=300s
    - name: Create kube-prometheus stack
--- a/.github/workflows/kind/config.yml
+++ b/.github/workflows/kind/config.yml
@@ -1,6 +1,15 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 networking:
-  disableDefaultCNI: true
  podSubnet: "10.10.0.0/16"
  serviceSubnet: "10.11.0.0/16"
+nodes:
+  - role: control-plane
+    extraMounts:
+      - hostPath: /home/runner/work/kube-prometheus/kube-prometheus/.github/workflows/kind/patches
+        containerPath: /patches
+kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    patches:
+      directory: /patches
--- a/.github/workflows/kind/kube-router.yaml
+++ b/.github/workflows/kind/kube-router.yaml
@@ -0,0 +1,186 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kube-router-cfg
+  namespace: kube-system
+  labels:
+    tier: node
+    k8s-app: kube-router
+data:
+  cni-conf.json: |
+    {
+      "cniVersion":"0.3.0",
+      "name":"mynet",
+      "plugins":[
+        {
+          "name":"kubernetes",
+          "type":"bridge",
+          "bridge":"kube-bridge",
+          "isDefaultGateway":true,
+          "ipam":{
+            "type":"host-local"
+          }
+        }
+      ]
+    }
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  labels:
+    k8s-app: kube-router
+    tier: node
+  name: kube-router
+  namespace: kube-system
+spec:
+  selector:
+    matchLabels:
+      k8s-app: kube-router
+      tier: node
+  template:
+    metadata:
+      labels:
+        k8s-app: kube-router
+        tier: node
+    spec:
+      priorityClassName: system-node-critical
+      serviceAccountName: kube-router
+      containers:
+        - name: kube-router
+          image: docker.io/cloudnativelabs/kube-router
+          imagePullPolicy: Always
+          args:
+            - --run-router=true
+            - --run-firewall=true
+            - --run-service-proxy=false
+            - --bgp-graceful-restart=true
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: KUBE_ROUTER_CNI_CONF_FILE
+              value: /etc/cni/net.d/10-kuberouter.conflist
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 20244
+            initialDelaySeconds: 10
+            periodSeconds: 3
+          resources:
+            requests:
+              memory: 250Mi
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: lib-modules
+              mountPath: /lib/modules
+              readOnly: true
+            - name: cni-conf-dir
+              mountPath: /etc/cni/net.d
+            - name: kubeconfig
+              mountPath: /var/lib/kube-router/kubeconfig
+              readOnly: true
+            - name: xtables-lock
+              mountPath: /run/xtables.lock
+              readOnly: false
+      initContainers:
+        - name: install-cni
+          image: docker.io/cloudnativelabs/kube-router
+          imagePullPolicy: Always
+          command:
+            - /bin/sh
+            - -c
+            - set -e -x;
+              if [ ! -f /etc/cni/net.d/10-kuberouter.conflist ]; then
+              if [ -f /etc/cni/net.d/*.conf ]; then
+              rm -f /etc/cni/net.d/*.conf;
+              fi;
+              TMP=/etc/cni/net.d/.tmp-kuberouter-cfg;
+              cp /etc/kube-router/cni-conf.json ${TMP};
+              mv ${TMP} /etc/cni/net.d/10-kuberouter.conflist;
+              fi
+          volumeMounts:
+            - mountPath: /etc/cni/net.d
+              name: cni-conf-dir
+            - mountPath: /etc/kube-router
+              name: kube-router-cfg
+      hostNetwork: true
+      tolerations:
+        - effect: NoSchedule
+          operator: Exists
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - effect: NoExecute
+          operator: Exists
+      volumes:
+        - name: lib-modules
+          hostPath:
+            path: /lib/modules
+        - name: cni-conf-dir
+          hostPath:
+            path: /etc/cni/net.d
+        - name: kube-router-cfg
+          configMap:
+            name: kube-router-cfg
+        - name: kubeconfig
+          hostPath:
+            path: /var/lib/kube-router/kubeconfig
+        - name: xtables-lock
+          hostPath:
+            path: /run/xtables.lock
+            type: FileOrCreate
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kube-router
+  namespace: kube-system
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kube-router
+  namespace: kube-system
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - pods
+      - services
+      - nodes
+      - endpoints
+    verbs:
+      - list
+      - get
+      - watch
+  - apiGroups:
+      - "networking.k8s.io"
+    resources:
+      - networkpolicies
+    verbs:
+      - list
+      - get
+      - watch
+  - apiGroups:
+      - extensions
+    resources:
+      - networkpolicies
+    verbs:
+      - get
+      - list
+      - watch
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: kube-router
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-router
+subjects:
+  - kind: ServiceAccount
+    name: kube-router
+    namespace: kube-system
--- a/.github/workflows/kind/patches/kube-controller-manager.yaml
+++ b/.github/workflows/kind/patches/kube-controller-manager.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: kube-controller-manager
+  namespace: kube-system
+spec:
+  containers:
+    - name: kube-controller-manager
+      resources:
+        requests:
+          cpu: 1m
--- a/.mdox.validate.yaml
+++ b/.mdox.validate.yaml
@@ -6,4 +6,8 @@ validators:
    type: "ignore"
  # Ignore release links.
  - regex: 'https:\/\/github\.com\/prometheus-operator\/kube-prometheus\/releases'
-    type: "ignore"
+    type: "ignore"
+  # the www.weave.works domain returns 404 for many pages.
+  # Ignoring for now but we need remove the related content if it persists.
+  - regex: 'https:\/\/www.weave.works.*'
+    type: "ignore"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## release-0.12 / 2023-01-19
+
+* [CHANGE] Updates Prometheus Adapater version to 0.10.0 [#1865](https://github.com/prometheus-operator/kube-prometheus/pull/1865)
+* [FEATURE] Added a AKS platform [#1869](https://github.com/prometheus-operator/kube-prometheus/pull/1869)
+* [BUGFIX] Update Pyrra to 0.4.2 [#1800](https://github.com/prometheus-operator/kube-prometheus/pull/1800)
+* [BUGFIX] Jsonnet: enable automountServiceAccountToken for prometheus service account [#1808](https://github.com/prometheus-operator/kube-prometheus/pull/1808)
+* [BUGFIX] Fix diskDeviceSelector regex for aks and eks [#1810](https://github.com/prometheus-operator/kube-prometheus/pull/1810)
+* [BUGFIX] Set path.udev.data Argument of Node Exporter [#1913](https://github.com/prometheus-operator/kube-prometheus/pull/1913)
+* [BUGFIX] Include RAID device md.* in disk seletor [#1945](https://github.com/prometheus-operator/kube-prometheus/pull/1945)
+* [ENHANCEMENT] Prometheus-adapter: add prefix option to config for container metrics [#1844](https://github.com/prometheus-operator/kube-prometheus/pull/1844)
+* [ENHANCEMENT] Switch kube-state-metrics registry to registry.k8s.io [#1914](https://github.com/prometheus-operator/kube-prometheus/pull/1914)
+* [ENHANCEMENT] Node Exporter: add parameter for ignored network devices [#1887](https://github.com/prometheus-operator/kube-prometheus/pull/1887)
+
 ## release-0.11 / 2022-06-15

 * [CHANGE] Disable injecting unnecessary variables allowing access to k8s API [#1591](https://github.com/prometheus-operator/kube-prometheus/pull/1591)
--- a/README.md
+++ b/README.md
@@ -40,12 +40,12 @@ no effect, but is still deployed.

 The following Kubernetes versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!

-| kube-prometheus stack                                                                      | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 |
+| kube-prometheus stack                                                                      | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 |
 |--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8)   | ✔               | ✔               | ✗               | ✗               | ✗               |
-| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9)   | ✗               | ✔               | ✔               | ✗               | ✗               |
-| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗               | ✗               | ✔               | ✔               | ✗               |
-| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗               | ✗               | ✗               | ✔               | ✔               |
+| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9)   | ✔               | ✔               | ✗               | ✗               | ✗               |
+| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗               | ✔               | ✔               | ✗               | ✗               |
+| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗               | ✗               | ✔               | ✔               | ✗               |
+| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗               | ✗               | ✗               | ✔               | ✔               |
 | [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main)                 | ✗               | ✗               | ✗               | ✗               | ✔               |

 ## Quickstart
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -8,7 +8,7 @@
          "subdir": "grafana"
        }
      },
-      "version": "master"
+      "version": "d039275e4916aceae1c137120882e01d857787ac"
    },
    {
      "source": {
@@ -17,7 +17,7 @@
          "subdir": "grafana-mixin"
        }
      },
-      "version": "main",
+      "version": "release-9.3.0",
      "name": "grafana-mixin"
    },
    {
@@ -27,7 +27,7 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "main"
+      "version": "release-3.5"
    },
    {
      "source": {
@@ -36,7 +36,7 @@
          "subdir": "jsonnet/prometheus-operator"
        }
      },
-      "version": "main"
+      "version": "release-0.62"
    },
    {
      "source": {
@@ -45,7 +45,7 @@
          "subdir": "jsonnet/mixin"
        }
      },
-      "version": "main",
+      "version": "release-0.62",
      "name": "prometheus-operator-mixin"
    },
    {
@@ -55,7 +55,7 @@
          "subdir": ""
        }
      },
-      "version": "master"
+      "version": "release-0.12"
    },
    {
      "source": {
@@ -64,7 +64,7 @@
          "subdir": "jsonnet/kube-state-metrics"
        }
      },
-      "version": "main"
+      "version": "release-2.7"
    },
    {
      "source": {
@@ -73,7 +73,7 @@
          "subdir": "jsonnet/kube-state-metrics-mixin"
        }
      },
-      "version": "main"
+      "version": "release-2.7"
    },
    {
      "source": {
@@ -82,7 +82,7 @@
          "subdir": "docs/node-mixin"
        }
      },
-      "version": "master"
+      "version": "release-1.4"
    },
    {
      "source": {
@@ -91,7 +91,7 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "main",
+      "version": "release-2.41",
      "name": "prometheus"
    },
    {
@@ -101,7 +101,7 @@
          "subdir": "doc/alertmanager-mixin"
        }
      },
-      "version": "main",
+      "version": "release-0.25",
      "name": "alertmanager"
    },
    {
@@ -111,7 +111,7 @@
          "subdir": "config/crd/bases"
        }
      },
-      "version": "main"
+      "version": "release-0.5"
    },
    {
      "source": {
@@ -120,7 +120,7 @@
          "subdir": "mixin"
        }
      },
-      "version": "main",
+      "version": "release-0.30",
      "name": "thanos-mixin"
    }
  ],
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
 {
  "alertmanager": "0.25.0",
  "blackboxExporter": "0.23.0",
-  "grafana": "9.3.2",
+  "grafana": "9.3.16",
  "kubeStateMetrics": "2.7.0",
  "nodeExporter": "1.5.0",
  "prometheus": "2.41.0",
--- a/jsonnetfile.json
+++ b/jsonnetfile.json
@@ -1,6 +1,15 @@
 {
  "version": 1,
  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "master"
+    },
    {
      "source": {
        "local": {
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
          "subdir": "contrib/mixin"
        }
      },
-      "version": "7daec2928ae0528c07ca7f901e4ae07fa5d229b7",
-      "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
+      "version": "ae3b43a924c688f06560ada76a047d14b3935829",
+      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
    },
    {
      "source": {
@@ -28,7 +28,7 @@
          "subdir": "grafana-mixin"
        }
      },
-      "version": "1120f9e255760a3c104b57871fcb91801e934382",
+      "version": "e9cb2a313ecc5a8e3cfeca7d2b7df2878802096e",
      "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
    },
    {
@@ -38,7 +38,7 @@
          "subdir": "grafonnet"
        }
      },
-      "version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
+      "version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
      "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
    },
    {
@@ -48,7 +48,7 @@
          "subdir": "grafonnet-7.0"
        }
      },
-      "version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
+      "version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
      "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
    },
    {
@@ -58,8 +58,18 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "a924ab1b5fd4e6eacd7235a20978d050a27bdb65",
-      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
+      "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
+      "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+      "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
    },
    {
      "source": {
@@ -78,8 +88,8 @@
          "subdir": "jsonnet/kube-state-metrics"
        }
      },
-      "version": "63db4839e921479ebf5b8835267beaa0515d7b6e",
-      "sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
+      "version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
+      "sum": "TOS2nb0CFfVg+Bc7+AT/nPivCQO6zkefZb3wHN2E5/E="
    },
    {
      "source": {
@@ -88,7 +98,7 @@
          "subdir": "jsonnet/kube-state-metrics-mixin"
        }
      },
-      "version": "63db4839e921479ebf5b8835267beaa0515d7b6e",
+      "version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
      "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
    },
    {
@@ -98,7 +108,7 @@
          "subdir": "jsonnet/mixin"
        }
      },
-      "version": "e4e27052f57040f073c6c1e4aedaecaaec77d170",
+      "version": "21147bd93fa83f01b3fbf1542015d3508962561a",
      "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
      "name": "prometheus-operator-mixin"
    },
@@ -109,8 +119,8 @@
          "subdir": "jsonnet/prometheus-operator"
        }
      },
-      "version": "e4e27052f57040f073c6c1e4aedaecaaec77d170",
-      "sum": "82ZHr1I1pgpu4PXLfXQbVuAN2aJAtgeesE/jMEQ0U2I="
+      "version": "21147bd93fa83f01b3fbf1542015d3508962561a",
+      "sum": "mIHCeM53O4u5RBf4z2Snl+CQRDINv4J3bMygsQWauq4="
    },
    {
      "source": {
@@ -119,7 +129,7 @@
          "subdir": "doc/alertmanager-mixin"
        }
      },
-      "version": "ecb66f76b0058957e5045114ae01f8b98994451e",
+      "version": "a4e8574be7165d3c21162456f160e0faf3d05de3",
      "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
      "name": "alertmanager"
    },
@@ -130,8 +140,8 @@
          "subdir": "docs/node-mixin"
        }
      },
-      "version": "a3bd2e13052929663dbd7d680fab4a952efb1de6",
-      "sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU="
+      "version": "a954c9fea6bcccea7f68a77a002a2a878ef1d60c",
+      "sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
    },
    {
      "source": {
@@ -140,7 +150,7 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "cb2be6e62ff80ba84b639e4251044214e185886f",
+      "version": "c0d8a56c69014279464c0e15d8bfb0e153af0dab",
      "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
      "name": "prometheus"
    },
@@ -151,7 +161,7 @@
          "subdir": "config/crd/bases"
        }
      },
-      "version": "335b597f440b31d68b522d0f63b51776721b0564",
+      "version": "490bebc3ac2a93497301e76019adcb22eed6c543",
      "sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
    },
    {
@@ -161,7 +171,7 @@
          "subdir": "mixin"
        }
      },
-      "version": "e94c136a4217f196375eb967757f4d97fad1256c",
+      "version": "fe3f5d24192570038e9576307e1b31794920a1f3",
      "sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
      "name": "thanos-mixin"
    },
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana-config
  namespace: monitoring
 stringData:
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana-datasources
  namespace: monitoring
 stringData:
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana-dashboards
  namespace: monitoring
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana
  namespace: monitoring
 spec:
@@ -18,19 +18,19 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/grafana-config: adbde4cde1aa3ca57c408943af53e6f7
-        checksum/grafana-dashboardproviders: d8fb24844314114bed088b83042b1bdb
-        checksum/grafana-datasources: 0800bab7ea1e2d8ad5c09586d089e033
+        checksum/grafana-config: 8f789e9282d2c489627b7cc14331eeb5
+        checksum/grafana-dashboardproviders: c7085e546c9aa6fdaf5f4fdabcf41b7c
+        checksum/grafana-datasources: 73ffe398adc193d9836e41703c06f169
      labels:
        app.kubernetes.io/component: grafana
        app.kubernetes.io/name: grafana
        app.kubernetes.io/part-of: kube-prometheus
-        app.kubernetes.io/version: 9.3.2
+        app.kubernetes.io/version: 9.3.16
    spec:
      automountServiceAccountToken: false
      containers:
      - env: []
-        image: grafana/grafana:9.3.2
+        image: grafana/grafana:9.3.16
        name: grafana
        ports:
        - containerPort: 3000
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana
  namespace: monitoring
 spec:
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
    prometheus: k8s
    role: alert-rules
  name: grafana-rules
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana
  namespace: monitoring
 spec:
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana
  namespace: monitoring
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
    app.kubernetes.io/component: grafana
    app.kubernetes.io/name: grafana
    app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 9.3.2
+    app.kubernetes.io/version: 9.3.16
  name: grafana
  namespace: monitoring
 spec:
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -78,13 +78,6 @@ rules:
  verbs:
  - list
  - watch
- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
 - apiGroups:
  - storage.k8s.io
  resources:
--- a/manifests/nodeExporter-prometheusRule.yaml
+++ b/manifests/nodeExporter-prometheusRule.yaml
@@ -23,11 +23,11 @@ spec:
        summary: Filesystem is predicted to run out of space within the next 24 hours.
      expr: |
        (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 15
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
        and
-          predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""}[6h], 24*60*60) < 0
+          predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
@@ -41,11 +41,11 @@ spec:
        summary: Filesystem is predicted to run out of space within the next 4 hours.
      expr: |
        (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 10
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 10
        and
-          predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""}[6h], 4*60*60) < 0
+          predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
@@ -58,9 +58,9 @@ spec:
        summary: Filesystem has less than 5% space left.
      expr: |
        (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 5
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 5
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 30m
      labels:
@@ -73,9 +73,9 @@ spec:
        summary: Filesystem has less than 3% space left.
      expr: |
        (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 3
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 3
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 30m
      labels:
@@ -89,11 +89,11 @@ spec:
        summary: Filesystem is predicted to run out of inodes within the next 24 hours.
      expr: |
        (
-          node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 40
+          node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 40
        and
-          predict_linear(node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""}[6h], 24*60*60) < 0
+          predict_linear(node_filesystem_files_free{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
@@ -107,11 +107,11 @@ spec:
        summary: Filesystem is predicted to run out of inodes within the next 4 hours.
      expr: |
        (
-          node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 20
+          node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 20
        and
-          predict_linear(node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""}[6h], 4*60*60) < 0
+          predict_linear(node_filesystem_files_free{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
@@ -124,9 +124,9 @@ spec:
        summary: Filesystem has less than 5% inodes left.
      expr: |
        (
-          node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 5
+          node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 5
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
@@ -139,9 +139,9 @@ spec:
        summary: Filesystem has less than 3% inodes left.
      expr: |
        (
-          node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 3
+          node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 3
        and
-          node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
+          node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
        )
      for: 1h
      labels:
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -4524,7 +4524,6 @@ spec:
                  maxConcurrency:
                    description: Number of concurrent queries that can be run at once.
                    format: int32
-                    minimum: 1
                    type: integer
                  maxSamples:
                    description: Maximum number of samples a single query can load
@@ -8654,13 +8653,6 @@ spec:
                          a rolling update will be triggered.
                        type: boolean
                    type: object
-                  maxConnections:
-                    description: Defines the maximum number of simultaneous connections
-                      A zero value means that Prometheus doesn't accept any incoming
-                      connection.
-                    format: int32
-                    minimum: 0
-                    type: integer
                  pageTitle:
                    description: The prometheus web page title
                    type: string
Author	SHA1	Message	Date
Philip Gough	e6c581378e	[release-0.12] Adds dependency on github.com/grafana/jsonnet-libs mixins-util (#2478 ) * Add lockfile * chore: ignore mdox errors for https://www.weave.works	2024-08-07 17:10:32 +01:00
PromOperatorBot	799f6fb5d0	[bot] [release-0.12] Automated version update (#2315 ) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>	2024-01-03 17:32:30 +00:00
PromOperatorBot	6662842873	[bot] [release-0.12] Automated version update (#2289 ) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>	2023-11-27 12:07:35 +00:00
PromOperatorBot	6901a5e88d	[bot] [release-0.12] Automated version update (#2188 ) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>	2023-08-16 16:55:15 +01:00
Paul Larsen	50952c43c4	Update grafana version to 9.3.16 (#2162 ) * Update grafana version to 9.3.16 Address CVE-2023-3128 https://github.com/prometheus-operator/kube-prometheus/issues/2147 * regenerate YAML	2023-07-28 03:24:28 -07:00
Philip Gough	2343d68619	ci: Fixes CPU scheduling issues for 1.26 and 1.27 (#2172 )	2023-07-27 03:20:15 -07:00
SUN Haoyu	0198f98f68	cut release 0.12 (#1919 ) Signed-off-by: Haoyu Sun <hasun@redhat.com> Signed-off-by: Haoyu Sun <hasun@redhat.com>	2023-01-24 10:14:38 +00:00