Merge f66df7b599 into 822ce5384b

server/model/monitor.js

@@ -857,7 +857,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "redis") {
                     let startTime = dayjs().valueOf();
 
-                    bean.msg = await redisPingAsync(this.databaseConnectionString);
+                    bean.msg = await redisPingAsync(this.databaseConnectionString, !this.ignoreTls);
                     bean.status = UP;
                     bean.ping = dayjs().valueOf() - startTime;
 

server/util-server.js

@@ -505,12 +505,16 @@ exports.radius = function (
 /**
  * Redis server ping
  * @param {string} dsn The redis connection string
- * @returns {Promise<any>} Response from redis server
+ * @param {boolean} rejectUnauthorized If false, allows unverified server certificates.
+ * @returns {Promise<any>} Response from server
  */
-exports.redisPingAsync = function (dsn) {
+exports.redisPingAsync = function (dsn, rejectUnauthorized) {
     return new Promise((resolve, reject) => {
         const client = redis.createClient({
-            url: dsn
+            url: dsn,
+            socket: {
+                rejectUnauthorized
+            }
         });
         client.on("error", (err) => {
             if (client.isOpen) {

src/lang/en.json

@@ -77,6 +77,7 @@
     "resendDisabled": "Resend disabled",
     "retriesDescription": "Maximum retries before the service is marked as down and a notification is sent",
     "ignoreTLSError": "Ignore TLS/SSL errors for HTTPS websites",
+	  "ignoreTLSErrorGeneral": "Ignore TLS/SSL error for connection",
     "upsideDownModeDescription": "Flip the status upside down. If the service is reachable, it is DOWN.",
     "maxRedirectDescription": "Maximum number of redirects to follow. Set to 0 to disable redirects.",
     "Upside Down Mode": "Upside Down Mode",

src/pages/EditMonitor.vue

@@ -482,10 +482,10 @@
                                 </div>
                             </div>
 
-                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' " class="my-3 form-check">
+                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' || monitor.type === 'redis' " class="my-3 form-check">
                                 <input id="ignore-tls" v-model="monitor.ignoreTls" class="form-check-input" type="checkbox" value="">
                                 <label class="form-check-label" for="ignore-tls">
-                                    {{ $t("ignoreTLSError") }}
+                                    {{ monitor.type === "redis" ? $t("ignoreTLSErrorGeneral") : $t("ignoreTLSError") }}
                                 </label>
                             </div>