Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade kube-prometheus-stack #1764

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions charts/kube-prometheus-stack/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[files/dashboards/*.json]
indent_size = 2
indent_style = space
9 changes: 9 additions & 0 deletions charts/kube-prometheus-stack/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# Python development for hack
venv
pyvenv.cfg
!**
charts/*
!charts/crds/
!charts/crds/**
Chart.lock
hack/*.git
hack/tmp/
hack/venv/
hack/pyvenv.cfg
1 change: 1 addition & 0 deletions charts/kube-prometheus-stack/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ ci/
kube-prometheus-*.tgz

unittests/
files/dashboards/
17 changes: 11 additions & 6 deletions charts/kube-prometheus-stack/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
dependencies:
- name: crds
repository: ""
version: 0.0.0
- name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 5.6.4
version: 5.26.0
- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.16.0
version: 4.39.0
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 6.56.6
digest: sha256:1536941208f949782278c15de52be433d529588c2c99e3e2f630442bcd568e3f
generated: "2023-06-26T14:49:51.130328+02:00"

version: 8.5.5
- name: prometheus-windows-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 0.7.0
digest: sha256:f4113006cd1c16fa72c34e2527d029bf158518162e6fcbdc44a30e788e3dd251
generated: "2024-10-16T13:42:02.706796+02:00"
14 changes: 8 additions & 6 deletions charts/kube-prometheus-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ maintainers:
email: github.gkarthiks@gmail.com
- name: GMartinez-Sisti
email: kube-prometheus-stack@sisti.pt
- name: jkroepke
email: github@jkroepke.de
- name: scottrigby
email: scott@r6by.com
- name: Xtigyro
Expand All @@ -21,9 +23,9 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 46.4.1
appVersion: v0.65.1
kubeVersion: ">=1.16.0-0"
version: 65.2.0
appVersion: v0.77.1
kubeVersion: ">=1.19.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
keywords:
- operator
Expand All @@ -40,14 +42,14 @@ annotations:

dependencies:
- name: kube-state-metrics
version: "5.6.*"
version: "5.26.0"
repository: https://prometheus-community.github.io/helm-charts
condition: kubeStateMetrics.enabled
- name: prometheus-node-exporter
version: "4.16.*"
version: "4.39.0"
repository: https://prometheus-community.github.io/helm-charts
condition: nodeExporter.enabled
- name: grafana
version: "6.56.*"
version: "8.5.5"
repository: https://grafana.github.io/helm-charts
condition: grafana.enabled
361 changes: 360 additions & 1 deletion charts/kube-prometheus-stack/README.md

Large diffs are not rendered by default.

50 changes: 28 additions & 22 deletions charts/kube-prometheus-stack/charts/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
apiVersion: v2
name: grafana
version: 8.5.5
appVersion: 11.2.2
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
home: https://grafana.com
icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
sources:
- https://github.com/grafana/grafana
- https://github.com/grafana/helm-charts
annotations:
artifacthub.io/links: |
"artifacthub.io/license": Apache-2.0
"artifacthub.io/links": |
- name: Chart Source
url: https://github.com/grafana/helm-charts
- name: Upstream Project
url: https://github.com/grafana/grafana
apiVersion: v2
appVersion: 9.5.2
description: The leading tool for querying and visualizing time series and metrics.
home: https://grafana.net
icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
kubeVersion: ^1.8.0-0
maintainers:
- email: zanhsieh@gmail.com
name: zanhsieh
- email: rluckie@cisco.com
name: rtluckie
- email: maor.friedman@redhat.com
name: maorfr
- email: miroslav.hadzhiev@gmail.com
name: Xtigyro
- email: mail@torstenwalter.de
name: torstenwalter
name: grafana
sources:
- https://github.com/grafana/grafana
- https://github.com/grafana/helm-charts
- name: zanhsieh
email: zanhsieh@gmail.com
- name: rtluckie
email: rluckie@cisco.com
- name: maorfr
email: maor.friedman@redhat.com
- name: Xtigyro
email: miroslav.hadzhiev@gmail.com
- name: torstenwalter
email: mail@torstenwalter.de
- name: jkroepke
email: github@jkroepke.de
type: application
version: 6.56.6
keywords:
- monitoring
- metric
146 changes: 122 additions & 24 deletions charts/kube-prometheus-stack/charts/grafana/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,91 @@ imageRenderer:
requests:
cpu: 500m
memory: 50Mi
extraVolumes:
- name: empty-renderer-volume
emtpyDir: {}
extraVolumeMounts:
- mountPath: /tmp/renderer
name: empty-renderer-volume
extraConfigmapMounts:
- name: renderer-config
mountPath: /usr/src/app/config.json
subPath: renderer-config.json
configMap: image-renderer-config
extraSecretMounts:
- name: renderer-certificate
mountPath: /usr/src/app/certs/
secretName: image-renderer-certificate
readOnly: true

extraObjects:
- apiVersion: v1
kind: ConfigMap
metadata:
name: image-renderer-config
data:
renderer-config.json: |
{
"service": {
"host": null,
"port": 8081,
"protocol": "http",
"certFile": "",
"certKey": "",

"metrics": {
"enabled": true,
"collectDefaultMetrics": true,
"requestDurationBuckets": [1, 5, 7, 9, 11, 13, 15, 20, 30]
},

"logging": {
"level": "info",
"console": {
"json": true,
"colorize": false
}
},

"security": {
"authToken": "-"
}
},
"rendering": {
"chromeBin": null,
"args": ["--no-sandbox", "--disable-gpu"],
"ignoresHttpsErrors": false,

"timezone": null,
"acceptLanguage": null,
"width": 1000,
"height": 500,
"deviceScaleFactor": 1,
"maxWidth": 3080,
"maxHeight": 3000,
"maxDeviceScaleFactor": 4,
"pageZoomLevel": 1,
"headed": false,

"mode": "default",
"emulateNetworkConditions": false,
"clustering": {
"monitor": false,
"mode": "browser",
"maxConcurrency": 5,
"timeout": 30
},

"verboseLogging": false,
"dumpio": false,
"timingMetrics": false
}
}
- apiVersion: v1
kind: Secret
metadata:
name: image-renderer-certificate
type: Opaque
data:
# Decodes to 'PLACEHOLDER CERTIFICATE'
not-a-real-certificate: UExBQ0VIT0xERVIgQ0VSVElGSUNBVEU=
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

3. Login with the password from step 1 and the username: {{ .Values.adminUser }}

{{- if not .Values.persistence.enabled }}
{{- if and (not .Values.persistence.enabled) (not .Values.persistence.disableWarning) }}
#################################################################################
###### WARNING: Persistence is disabled!!! You will lose your data when #####
###### the Grafana pod is terminated. #####
Expand Down
Loading