From f960bddd723876d11499296c81c138acc0b49ee0 Mon Sep 17 00:00:00 2001
From: Greg Smith <65406958+gsmith-sas@users.noreply.github.com>
Date: Fri, 12 Jul 2024 17:36:11 -0400
Subject: [PATCH] [CHANGE] Sample of user-values-openshift-grafana.yaml added
 to generic-base sample (#661)

---
 CHANGELOG.md                                  |  1 +
 monitoring/user-values-openshift-grafana      | 26 +++++++++++++++++++
 .../monitoring/user-values-openshift-grafana  | 26 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 monitoring/user-values-openshift-grafana
 create mode 100644 samples/generic-base/monitoring/user-values-openshift-grafana

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 944b3ef2..1e2837ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.
diff --git a/monitoring/user-values-openshift-grafana b/monitoring/user-values-openshift-grafana
new file mode 100644
index 00000000..7a6f1ec8
--- /dev/null
+++ b/monitoring/user-values-openshift-grafana
@@ -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
diff --git a/samples/generic-base/monitoring/user-values-openshift-grafana b/samples/generic-base/monitoring/user-values-openshift-grafana
new file mode 100644
index 00000000..7a6f1ec8
--- /dev/null
+++ b/samples/generic-base/monitoring/user-values-openshift-grafana
@@ -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