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

Merge pull request #1786 from raptorsun/release-0.11-follow-up

Browse Source 
Release 0.11 follow up
This commit is contained in:
Paweł Krupa
2022-06-20 15:28:46 +02:00
committed by GitHub
parent 17caa6f04c 395953346e
commit d8c10a1656
7 changed files with 1358 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/versions.yaml vendored
View File

@@ -12,10 +12,10 @@ jobs:
strategy:
matrix:
branch:
- 'release-0.7'
- 'release-0.8'
- 'release-0.9'
- 'release-0.10'
- 'release-0.11'
- 'main'
steps:
- uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
- [x] `NONE` (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)
## Changelog entry
```release-note
```

10
Makefile
View File

@@ -54,13 +54,13 @@ update: $(JB_BIN)
$(JB_BIN) update
.PHONY: validate
validate: validate-1.22 validate-1.23
validate-1.22:
KUBE_VERSION=1.22.4 $(MAKE) kubeconform
validate: validate-1.23 validate-1.24
validate-1.23:
KUBE_VERSION=1.23.0 $(MAKE) kubeconform
KUBE_VERSION=1.23.6 $(MAKE) kubeconform
validate-1.24:
KUBE_VERSION=1.24.1 $(MAKE) kubeconform
.PHONY: kubeconform
kubeconform: crdschemas manifests $(KUBECONFORM_BIN)

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

@@ -8,7 +8,7 @@
"subdir": "grafana"
}
},
"version": "d039275e4916aceae1c137120882e01d857787ac"
"version": "master"
},
{
"source": {
@@ -17,7 +17,7 @@
"subdir": "grafana-mixin"
}
},
"version": "release-v9.0.0",
"version": "main",
"name": "grafana-mixin"
},
{
@@ -27,7 +27,7 @@
"subdir": "contrib/mixin"
}
},
"version": "release-3.5"
"version": "main"
},
{
"source": {
@@ -36,7 +36,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "release-0.57"
"version": "main"
},
{
"source": {
@@ -45,7 +45,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "release-0.57",
"version": "main",
"name": "prometheus-operator-mixin"
},
{
@@ -55,7 +55,7 @@
"subdir": ""
}
},
"version": "release-0.11"
"version": "master"
},
{
"source": {
@@ -64,7 +64,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "release-2.5"
"version": "master"
},
{
"source": {
@@ -73,7 +73,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "release-2.5"
"version": "master"
},
{
"source": {
@@ -82,7 +82,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "release-1.3"
"version": "master"
},
{
"source": {
@@ -91,7 +91,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "release-2.36",
"version": "main",
"name": "prometheus"
},
{
@@ -101,7 +101,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "release-0.24",
"version": "main",
"name": "alertmanager"
},
{
@@ -111,7 +111,7 @@
"subdir": "config/crd/bases"
}
},
"version": "release-0.4"
"version": "main"
},
{
"source": {
@@ -120,9 +120,9 @@
"subdir": "mixin"
}
},
"version": "release-0.26",
"version": "main",
"name": "thanos-mixin"
}
],
"legacyImports": true
}
}

52
jsonnetfile.lock.json
View File

@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
"version": "4443e14dcd7e50cce71c20c5857c139d9993fa14",
"sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
"version": "0bac6096325c20b0709a3565fbf5808aa7fbf917",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
"source": {
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
"version": "3eed09056849ab873b867b561b7ce580ef2c75ba",
"version": "1120f9e255760a3c104b57871fcb91801e934382",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -41,6 +41,16 @@
"version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
"sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
},
{
"source": {
"git": {
"remote": "https://github.com/grafana/grafonnet-lib.git",
"subdir": "grafonnet-7.0"
}
},
"version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
},
{
"source": {
"git": {
@@ -61,16 +71,6 @@
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
"sum": "LCgSosxceeYuoau5fYSPtE5eXOFe46DxexfkrctUv7c="
},
{
"source": {
"git": {
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
"subdir": "lib/promgrafonnet"
}
},
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
"source": {
"git": {
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"version": "8024d3e040139b2acc6cac47907b469353114364",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"version": "8024d3e040139b2acc6cac47907b469353114364",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
"version": "973b17b54edff9419e56c238d3344fe259b33d5c",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
"sum": "pUggCYwO/3Y/p6Vgryx8Y4KO3QkJ+GqimrZtn/luzzI="
"version": "973b17b54edff9419e56c238d3344fe259b33d5c",
"sum": "sqcNWGjnMUGikgvG9aRtjHSTqc+zplp16QFTXCvl9v0="
},
{
"source": {
@@ -119,8 +119,8 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "14b01e6a34dd3155768c7e9bd5c4376055de9419",
"sum": "f3iZDUXQ/YWB5yDCY7VLD5bs442+3CdJgXJhJyWhNf8=",
"version": "805e505288ce82c3e2b625a3ca63aaf2b0aa9cea",
"sum": "EgEdKlM78IJIjmiBL7x/cIJ+wdzGwT65YHyQVo0JCNk=",
"name": "alertmanager"
},
{
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
"version": "98889b37056d02564c60d1a60ad90d53aa2a75b6",
"sum": "/ma9CIghDhPEIBZAt41Mkutb6813lMKdIX54SmNQ79g="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "9f1a3970b24e09bd65e189e39920652133a02b38",
"version": "c511d26dd013d28ab3ff3a403744e51b81247414",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
"version": "b715a9b3e1894962f910c10dc4999dda22fabc26",
"version": "bbc963f907dc258a87d2314c91801a576712e65d",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
@@ -161,8 +161,8 @@
"subdir": "mixin"
}
},
"version": "17c576472d80972bfd3705e1e0a08e6f8da8e04b",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"version": "127075bb44a25f4d3773a4a93b8f18dbd3b27ca1",
"sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw=",
"name": "thanos-mixin"
},
{

1467
manifests/grafana-dashboardDefinitions.yaml
View File

File diff suppressed because it is too large Load Diff

6
manifests/grafana-deployment.yaml
View File

@@ -113,6 +113,9 @@ spec:
- mountPath: /grafana-dashboard-definitions/0/node-rsrc-use
name: grafana-dashboard-node-rsrc-use
readOnly: false
- mountPath: /grafana-dashboard-definitions/0/nodes-darwin
name: grafana-dashboard-nodes-darwin
readOnly: false
- mountPath: /grafana-dashboard-definitions/0/nodes
name: grafana-dashboard-nodes
readOnly: false
@@ -207,6 +210,9 @@ spec:
- configMap:
name: grafana-dashboard-node-rsrc-use
name: grafana-dashboard-node-rsrc-use
- configMap:
name: grafana-dashboard-nodes-darwin
name: grafana-dashboard-nodes-darwin
- configMap:
name: grafana-dashboard-nodes
name: grafana-dashboard-nodes

5
manifests/setup/0alertmanagerCustomResourceDefinition.yaml
View File

@@ -997,12 +997,15 @@ spec:
type: string
clusterGossipInterval:
description: Interval between gossip attempts.
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
clusterPeerTimeout:
description: Timeout for cluster peering.
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
clusterPushpullInterval:
description: Interval between pushpull attempts.
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
configMaps:
description: ConfigMaps is a list of ConfigMaps in the same namespace
@@ -3630,9 +3633,11 @@ spec:
type: object
type: object
retention:
default: 120h
description: Time duration Alertmanager shall retain data for. Default
is '120h', and must match the regular expression `[0-9]+(ms|s|m|h)`
(milliseconds seconds minutes hours).
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
routePrefix:
description: The route prefix Alertmanager registers HTTP handlers