feat(redmine): use display URL instead of API URL in notifications

Author: omertahaoztop

common/config.go

@@ -32,8 +32,9 @@ type Common struct {
 		Priority_id int
 		Interval    float64
 
-		Api_key string
-		Url     string
+		Api_key     string
+		Url         string
+		Display_url string
 	}
 }
 
@@ -113,6 +114,13 @@ func ConfInit(configName string, config interface{}) interface{} {
 	return config
 }
 
+func GetRedmineDisplayUrl() string {
+	if Config.Redmine.Display_url != "" {
+		return Config.Redmine.Display_url
+	}
+	return strings.Replace(Config.Redmine.Url, "://api.", "://", 1)
+}
+
 // expandEnvInMap recursively expands environment variables in nested map structures
 func expandEnvInMap(data map[string]interface{}) {
 	for key, value := range data {

osHealth/main.go

@@ -147,7 +147,7 @@ func collectHealthData(version string) *HealthData {
 		issues.CheckDown("zfsdataset", subject, tableOnly, false, 0)
 		id := issues.Show("zfsdataset")
 		if id != "" {
-			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.Config.Redmine.Url + "/issues/" + id
+			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.GetRedmineDisplayUrl() + "/issues/" + id
 			common.AlarmCheckUp("zfsdataset_redmineissue", "Redmine issue exists for ZFS dataset usage", false)
 		} else {
 			log.Debug().Msg("osHealth/main.go: issues.Show(\"zfsdataset\") returned empty. Proceeding without Redmine link in alarm.")
@@ -199,7 +199,7 @@ func collectDiskInfo() []DiskInfo {
 		id := issues.Show("disk")
 
 		if id != "" {
-			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.Config.Redmine.Url + "/issues/" + id
+			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.GetRedmineDisplayUrl() + "/issues/" + id
 			common.AlarmCheckUp("disk_redmineissue", "Redmine issue exists for disk usage", false)
 		} else {
 			log.Debug().Msg("osHealth/main.go: issues.Show(\"disk\") returned empty. Proceeding without Redmine link in alarm.")

osHealth/zfs.go

@@ -358,7 +358,7 @@ func ZFSHealth() []ZFSPoolInfo {
 				common.AlarmCheckDown("zfs_health", message, false, "", "")
 			} else {
 				common.AlarmCheckUp("zfs_health_redmineissue", "Redmine issue has been created for ZFS health", false)
-				message = message + "\n\n" + "Redmine Issue: " + common.Config.Redmine.Url + "/issues/" + id
+				message = message + "\n\n" + "Redmine Issue: " + common.GetRedmineDisplayUrl() + "/issues/" + id
 				common.AlarmCheckDown("zfs_health", message, false, "", "")
 			}
 		}

tmp/mono/winHealth/monokit.lock

@@ -225,7 +225,7 @@ func collectDiskInfo() []DiskInfo {
 		id := issues.Show("disk")
 
 		if id != "" {
-			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.Config.Redmine.Url + "/issues/" + id
+			fullMsg = fullMsg + "\n\n" + "Redmine Issue: " + common.GetRedmineDisplayUrl() + "/issues/" + id
 			common.AlarmCheckUp("disk_redmineissue", "Redmine issue exists for disk usage", false)
 		} else {
 			log.Debug().Msg("osHealth/main.go: issues.Show(\"disk\") returned empty. Proceeding without Redmine link in alarm.")