This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 0ba26912df3 Fix typo in alert name (#8579)
0ba26912df3 is described below
commit 0ba26912df3a8e2ed4c217c04d7422dd362cb5cc
Author: Rakesh <rakeshv....@gmail.com>
AuthorDate: Mon Feb 5 09:49:30 2024 +0100
Fix typo in alert name (#8579)
Co-authored-by: Rakesh Venkatesh <rake...@apache.org>
---
api/src/main/java/org/apache/cloudstack/alert/AlertService.java | 2 +-
server/src/main/java/com/cloud/alert/AlertManagerImpl.java | 2 +-
server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java | 4 ++--
.../main/java/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++--
usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
index 5b29426e6eb..50e48526d26 100644
--- a/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
+++ b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
@@ -52,7 +52,7 @@ public interface AlertService {
public static final AlertType ALERT_TYPE_ROUTING = new
AlertType((short)11, "ALERT.NETWORK.ROUTING", true);
public static final AlertType ALERT_TYPE_STORAGE_MISC = new
AlertType((short)12, "ALERT.STORAGE.MISC", true);
public static final AlertType ALERT_TYPE_USAGE_SERVER = new
AlertType((short)13, "ALERT.USAGE", true);
- public static final AlertType ALERT_TYPE_MANAGMENT_NODE = new
AlertType((short)14, "ALERT.MANAGEMENT", true);
+ public static final AlertType ALERT_TYPE_MANAGEMENT_NODE = new
AlertType((short)14, "ALERT.MANAGEMENT", true);
public static final AlertType ALERT_TYPE_DOMAIN_ROUTER_MIGRATE = new
AlertType((short)15, "ALERT.NETWORK.DOMAINROUTERMIGRATE", true);
public static final AlertType ALERT_TYPE_CONSOLE_PROXY_MIGRATE = new
AlertType((short)16, "ALERT.SERVICE.CONSOLEPROXYMIGRATE", true);
public static final AlertType ALERT_TYPE_USERVM_MIGRATE = new
AlertType((short)17, "ALERT.USERVM.MIGRATE", true);
diff --git a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
index ca26de5cf21..f550d80b51a 100644
--- a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java
@@ -727,7 +727,7 @@ public class AlertManagerImpl extends ManagerBase
implements AlertManager, Confi
if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) &&
(alertType != AlertManager.AlertType.ALERT_TYPE_USERVM)
&& (alertType !=
AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && (alertType !=
AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY)
&& (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) &&
(alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC)
- && (alertType !=
AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE) && (alertType !=
AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED)
+ && (alertType !=
AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE) && (alertType !=
AlertManager.AlertType.ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED)
&& (alertType !=
AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED) && (alertType !=
AlertManager.AlertType.ALERT_TYPE_OOBM_AUTH_ERROR)
&& (alertType != AlertManager.AlertType.ALERT_TYPE_HA_ACTION)
&& (alertType != AlertManager.AlertType.ALERT_TYPE_CA_CERT)) {
alert = _alertDao.getLastAlert(alertType.getType(), dataCenterId,
podId, clusterId);
diff --git a/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java
b/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java
index 16e87b40bd8..4d5246bf91b 100644
--- a/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java
+++ b/server/src/main/java/com/cloud/alert/ClusterAlertAdapter.java
@@ -70,7 +70,7 @@ public class ClusterAlertAdapter extends AdapterBase
implements AlertAdapter {
s_logger.debug("Management server node " +
mshost.getServiceIP() + " is up, send alert");
}
-
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new
Long(0), "Management server node " + mshost.getServiceIP() + " is up", "");
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new
Long(0), "Management server node " + mshost.getServiceIP() + " is up", "");
break;
}
}
@@ -90,7 +90,7 @@ public class ClusterAlertAdapter extends AdapterBase
implements AlertAdapter {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Detected management server node " +
mshost.getServiceIP() + " is down, send alert");
}
-
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new
Long(0), "Management server node " + mshost.getServiceIP() + " is down",
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new
Long(0), "Management server node " + mshost.getServiceIP() + " is down",
"");
} else {
if (s_logger.isDebugEnabled()) {
diff --git
a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 502fccfde9e..94d992f8636 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -651,12 +651,12 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
if (localCidrs != null && localCidrs.length > 0) {
s_logger.warn("Management network CIDR is not configured
originally. Set it default to " + localCidrs[0]);
-
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new
Long(0), "Management network CIDR is not configured originally. Set it default
to "
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new
Long(0), "Management network CIDR is not configured originally. Set it default
to "
+ localCidrs[0], "");
_configDao.update(Config.ManagementNetwork.key(),
Config.ManagementNetwork.getCategory(), localCidrs[0]);
} else {
s_logger.warn("Management network CIDR is not properly
configured and we are not able to find a default setting");
-
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new
Long(0),
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE, 0, new
Long(0),
"Management network CIDR is not properly configured
and we are not able to find a default setting", "");
}
}
diff --git a/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java
b/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java
index aa20f52bf1f..823d04c28c6 100644
--- a/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageAlertManagerImpl.java
@@ -83,7 +83,7 @@ public class UsageAlertManagerImpl extends ManagerBase
implements AlertManager {
if ((alertType != AlertManager.AlertType.ALERT_TYPE_HOST) &&
(alertType != AlertManager.AlertType.ALERT_TYPE_USERVM)
&& (alertType !=
AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER) && (alertType !=
AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY)
&& (alertType != AlertManager.AlertType.ALERT_TYPE_SSVM) &&
(alertType != AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC)
- && (alertType !=
AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE)) {
+ && (alertType !=
AlertManager.AlertType.ALERT_TYPE_MANAGEMENT_NODE)) {
alert = _alertDao.getLastAlert(alertType.getType(), dataCenterId,
podId);
}
if (alert == null) {
