chore(grafana): use valkey replace redis

Author: duanhongyi

README.md

@@ -38,8 +38,8 @@ We welcome your input! If you have feedback, please [submit an issue][issues]. I
 | <a name="database_password"></a> [DATABASE_PASSWORD](#database_password) | no default | Database password |
 | <a name="database_ssl_mode"></a> [DATABASE_SSL_MODE](#database_ssl_mode) | no default | For "postgres" only, either "disable", "require" or "verify-full" |
 | <a name="database_path"></a> [DATABASE_PATH](#database_path) | no default | For "sqlite3" only, path relative to data_path setting |
-| <a name="session_provider"></a> [SESSION_PROVIDER](#session_provider) | file | Either "memory", "file", "redis", "mysql", "postgres", default is "file" |
-| <a name="session_provider_config"></a> [SESSION_PROVIDER_CONFIG](#session_provider_config) | no default | Provider config options <br>`memory: not have any config yet`<br>`file: session dir path, is relative to grafana data_path`<br>`redis: addr=127.0.0.1:6379,pool_size=100,db=grafana`<br>`mysql: user:password@tcp(127.0.0.1:3306)/database_name`<br>`postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable` |
+| <a name="session_provider"></a> [SESSION_PROVIDER](#session_provider) | file | Either "memory", "file", "valkey", "mysql", "postgres", default is "file" |
+| <a name="session_provider_config"></a> [SESSION_PROVIDER_CONFIG](#session_provider_config) | no default | Provider config options <br>`memory: not have any config yet`<br>`file: session dir path, is relative to grafana data_path`<br>`mysql: user:password@tcp(127.0.0.1:3306)/database_name`<br>`postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable` |
 | <a name="session_cookie_name"></a> [SESSION_COOKIE_NAME](#session_cookie_name) | grafana_sess | Session cookie name |
 | <a name="session_life_time"></a> [SESSION_LIFE_TIME](#session_life_time) | 86400 | Session life time, default is 86400 |
 | <a name="grafana_reporting"></a> [GRAFANA_REPORTING](#grafana_reporting) | false | Server reporting, sends usage counters to stats.grafana.org every 24 hours. No ip addresses are being tracked, only simple counters to track running instances, dashboard and error counts. It is very helpful to us. Change this option to false to disable reporting. |

charts/grafana/templates/_helpers.tmpl

@@ -74,8 +74,8 @@ env:
 {{- end }}
 - name: "PROMETHEUS_LOCATION"
   value: {{ .Values.global.prometheusLocation }}
-- name: "REDIS_LOCATION"
-  value: {{ .Values.global.redisLocation }}
+- name: "VALKEY_LOCATION"
+  value: {{ .Values.global.valkeyLocation }}
 - name: "RABBITMQ_LOCATION"
   value: {{ .Values.global.rabbitmqLocation }}
 - name: "STORAGE_LOCATION"

charts/grafana/values.yaml

@@ -56,7 +56,7 @@ passportUrl: ""
 passportKey: ""
 passportSecret: ""
 
-redis:
+valkey:
   replicas: 1
   port: "6379"
 
@@ -66,7 +66,7 @@ global:
   # Valid values are:
   # - on-cluster: Run component within the Kubernetes cluster
   # - off-cluster: component is running outside of the cluster and credentials and connection information will be provided.
-  redisLocation: "on-cluster"
+  valkeyLocation: "on-cluster"
   grafanaLocation: "on-cluster"
   storageLocation: "on-cluster"
   rabbitmqLocation: "on-cluster"

rootfs/usr/share/grafana/api/dashboards/drycc_component_health.json

@@ -2944,7 +2944,7 @@
               {
                 "alias": "$tag_pod_name",
                 "editorMode": "code",
-                "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",pod!=\"\",namespace=\"drycc\",container=~\"^drycc-redis.*$\"}[1m])) by (pod) * 1000",
+                "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",pod!=\"\",namespace=\"drycc\",container=~\"^drycc-valkey.*$\"}[1m])) by (pod) * 1000",
                 "groupBy": [
                   {
                     "params": [
@@ -3052,7 +3052,7 @@
               {
                 "alias": "$tag_pod_name",
                 "editorMode": "code",
-                "expr": "sum (container_memory_working_set_bytes{image!=\"\",pod!=\"\",namespace=\"drycc\",container=~\"^drycc-redis.*$\"}) by (pod)",
+                "expr": "sum (container_memory_working_set_bytes{image!=\"\",pod!=\"\",namespace=\"drycc\",container=~\"^drycc-valkey.*$\"}) by (pod)",
                 "groupBy": [
                   {
                     "params": [
@@ -3118,7 +3118,7 @@
             "refId": "A"
           }
         ],
-        "title": "REDIS",
+        "title": "VALKEY",
         "type": "row"
       },
       {

rootfs/usr/share/grafana/grafana.ini.tpl

@@ -90,13 +90,12 @@ path = {{ .DATABASE_PATH }}
 
 #################################### Session ####################################
 [session]
-# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
+# Either "memory", "file", "mysql", "postgres", default is "file"
 provider = {{ default "file" .SESSION_PROVIDER }}
 
 # Provider config options
 # memory: not have any config yet
 # file: session dir path, is relative to grafana data_path
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
 # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
 # postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
 {{ if .SESSION_PROVIDER_CONFIG }}

rootfs/usr/share/grafana/start-grafana

@@ -98,10 +98,10 @@ sed -i 's@r\[\\"namespace\\\"\] == \\"drycc\\"@r\[\\"namespace\\"\] == \\"\'"${N
 DCD="${DASHBOARD_LOCATION}"/drycc_component_health.json
 
 # remove off-cluster component panel
-if [ "on-cluster" != "${REDIS_LOCATION}" ]; then
-  rm -rf "${DASHBOARD_LOCATION}"/redis.json
+if [ "on-cluster" != "${VALKEY_LOCATION}" ]; then
+  rm -rf "${DASHBOARD_LOCATION}"/valkey.json
   # shellcheck disable=SC2005
-  echo "$(<"${DCD}" jq 'del(.dashboard.panels[] | select(.title == "REDIS"))')" > "${DCD}"
+  echo "$(<"${DCD}" jq 'del(.dashboard.panels[] | select(.title == "VALKEY"))')" > "${DCD}"
 fi
 if [ "on-cluster" != "${RABBITMQ_LOCATION}" ]; then
   # shellcheck disable=SC2005