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

cut release 0.12 (#1919)

Browse Source 
Signed-off-by: Haoyu Sun <hasun@redhat.com>

Signed-off-by: Haoyu Sun <hasun@redhat.com>
This commit is contained in:
SUN Haoyu
2023-01-24 11:14:38 +01:00
committed by GitHub
parent 67c0854519
commit 0198f98f68
9 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yaml vendored
View File

@@ -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:

13
CHANGELOG.md
View File

@@ -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)

10
README.md
View File

@@ -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

26
jsonnet/kube-prometheus/jsonnetfile.json
View File

@@ -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"
}
],

30
jsonnetfile.lock.json
View File

@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
"version": "7daec2928ae0528c07ca7f901e4ae07fa5d229b7",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
"version": "638c6f1bb16f2562d1fac840559112bf40f8a851",
"sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
},
{
"source": {
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
"version": "1120f9e255760a3c104b57871fcb91801e934382",
"version": "e9cb2a313ecc5a8e3cfeca7d2b7df2878802096e",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -78,8 +78,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "63db4839e921479ebf5b8835267beaa0515d7b6e",
"sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
"version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
"sum": "TOS2nb0CFfVg+Bc7+AT/nPivCQO6zkefZb3wHN2E5/E="
},
{
"source": {
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "63db4839e921479ebf5b8835267beaa0515d7b6e",
"version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "e4e27052f57040f073c6c1e4aedaecaaec77d170",
"version": "21147bd93fa83f01b3fbf1542015d3508962561a",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "e4e27052f57040f073c6c1e4aedaecaaec77d170",
"sum": "82ZHr1I1pgpu4PXLfXQbVuAN2aJAtgeesE/jMEQ0U2I="
"version": "21147bd93fa83f01b3fbf1542015d3508962561a",
"sum": "mIHCeM53O4u5RBf4z2Snl+CQRDINv4J3bMygsQWauq4="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "ecb66f76b0058957e5045114ae01f8b98994451e",
"version": "258fab7cdd551f2cf251ed0348f0ad7289aee789",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "a3bd2e13052929663dbd7d680fab4a952efb1de6",
"sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU="
"version": "a954c9fea6bcccea7f68a77a002a2a878ef1d60c",
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "cb2be6e62ff80ba84b639e4251044214e185886f",
"version": "c0d8a56c69014279464c0e15d8bfb0e153af0dab",
"sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
"version": "335b597f440b31d68b522d0f63b51776721b0564",
"version": "61eb388891c72da78ec3252f769d9dda4acabf1b",
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
"version": "e94c136a4217f196375eb967757f4d97fad1256c",
"version": "27e4714174e2b7d4542ce9a723716134afba1579",
"sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
"name": "thanos-mixin"
},

10
manifests/grafana-dashboardDefinitions.yaml
View File

@@ -25888,7 +25888,7 @@ items:
"steppedLine": false,
"targets": [
{
"expr": "sum without (device) (\n max without (fstype, mountpoint) ((\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"}\n ) != 0)\n)\n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"})))\n",
"expr": "sum without (device) (\n max without (fstype, mountpoint) ((\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n ) != 0)\n)\n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"})))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
@@ -27763,14 +27763,14 @@ items:
"span": 6,
"targets": [
{
"expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
"legendFormat": ""
},
{
"expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -28818,14 +28818,14 @@ items:
"span": 6,
"targets": [
{
"expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
"legendFormat": ""
},
{
"expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,

7
manifests/kubeStateMetrics-clusterRole.yaml
View File

@@ -78,13 +78,6 @@ rules:
verbs:
- list
- watch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- list
- watch
- apiGroups:
- storage.k8s.io
resources:

40
manifests/nodeExporter-prometheusRule.yaml
View File

@@ -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:

8
manifests/setup/0prometheusCustomResourceDefinition.yaml
View File

@@ -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