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

[CHANGE] Add user-values-openshift-grafana.yaml added to generic-base sample #661

Merged
merged 1 commit into from
Jul 12, 2024
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* [CHANGE] Some Grafana dashboards inherited from the Kube-Prometheus Stack Helm chart do not
work with Grafana 11.x due to Angular migration or other issues. As a **temporary** fix, we have
removed these dashboards and replaced them with our versions of them. **This fix will be removed when these issues have been resolved.**
* [CHANGE] Sample of user-values-openshift-grafana.yaml added to generic-base sample
* [UPGRADE] Kube-Prometheus Stack Helm chart has been upgraded from 56.6.2 to 61.1.1.
* [UPGRADE] Grafana Helm Chart (for OpenShift deployments) has been upgraded from 7.3.0 to 8.2.1.
* [UPGRADE] Prometheus Pushgateway Helm chart has been upgraded from 2.6.0 to 2.13.0.
Expand Down
26 changes: 26 additions & 0 deletions monitoring/user-values-openshift-grafana
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## NOTE: This file is *only* approprite for deployments on OpenShift clusters.
## On other cloud-providers, Grafana-related customizations should be
## specified within the grafana stanza (section) of the the file
## user-values-prom-operator.yaml within your USER_DIR directory.


## Chart: https://github.com/grafana/helm-charts/tree/main/charts/grafana
## Default values: https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
##
## NOTE: Refer to the ARTIFACT_INVENTORY.md file in the project repo for
## information on the specific version of Grafana being deployed


#image:
# registry: docker.io
# repository: grafana/grafana
# tag: 11.1.0
# pullPolicy: IfNotPresent
#resources:
# requests:
# cpu: "250m"
# memory: "150Mi"
#persistence:
# enabled: true
# storageClassName: myStorageClass
# size: 5Gi
26 changes: 26 additions & 0 deletions samples/generic-base/monitoring/user-values-openshift-grafana
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## NOTE: This file is *only* approprite for deployments on OpenShift clusters.
## On other cloud-providers, Grafana-related customizations should be
## specified within the grafana stanza (section) of the the file
## user-values-prom-operator.yaml within your USER_DIR directory.


## Chart: https://github.com/grafana/helm-charts/tree/main/charts/grafana
## Default values: https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
##
## NOTE: Refer to the ARTIFACT_INVENTORY.md file in the project repo for
## information on the specific version of Grafana being deployed


#image:
# registry: docker.io
# repository: grafana/grafana
# tag: 11.1.0
# pullPolicy: IfNotPresent
#resources:
# requests:
# cpu: "250m"
# memory: "150Mi"
#persistence:
# enabled: true
# storageClassName: myStorageClass
# size: 5Gi
Loading