Eli Mesika has uploaded a new change for review.
Change subject: core: fixing missing (English) AuditLog values
......................................................................
core: fixing missing (English) AuditLog values
Fixing the reported messages in the BZ
A '+' sign marks that issue was addresses and a message was added
a '-' sign marks that issue was not addressed with the reason
UNASSIGNED +
VDS_AUTO_FENCE_STATUS +
VDS_AUTO_FENCE_STATUS_FAILED +
VDS_AUTO_FENCE_FAILED_CALL_FENCE_SPM +
VDS_HIGH_NETWORK_USE - Deprecated
USER_FAILED_REMOVE_VM - Deprecated
USER_RUN_UNLOCK_ENTITY_SCRIPT - Used only from SQL script therefor
should not have severity & message
VDS_NETWORK_MTU_DIFFER_FROM_LOGICAL_NETWORK - Deprecated
VDS_HOST_IN_CONNECTING_STATE - handled in
http://gerrit.ovirt.org/#/c/31886/
STORAGE_ACTIVATE_ASYNC - Deprecated
DWH_STOPPED +
DWH_STARTED +
DWH_ERROR +
USER_REMOVE_AUDIT_LOG +
USER_REMOVE_AUDIT_LOG_FAILED +
USER_CLEAR_ALL_DISMISSED_AUDIT_LOG +
USER_CLEAR_ALL_DISMISSED_AUDIT_LOG_FAILED +
Change-Id: I74a08a8c7d5f18707bf8cbcac5d9d169c5556def
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1119186
Signed-off-by: Eli Mesika <emes...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
3 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/32192/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java
index 3ea9061..fc8fdc1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommand.java
@@ -58,6 +58,7 @@
@Override
public AuditLogType getAuditLogTypeValue() {
+ addCustomValue("AuditLogId",
String.valueOf(getParameters().getAuditLogId()));
return getSucceeded() ? AuditLogType.USER_REMOVE_AUDIT_LOG :
AuditLogType.USER_REMOVE_AUDIT_LOG_FAILED;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 9c65292..db9bbe2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -179,6 +179,7 @@
USER_REMOVE_VM_FINISHED(113),
USER_REMOVE_VM_FINISHED_WITH_ILLEGAL_DISKS(172, AuditLogSeverity.WARNING),
USER_ADD(149),
+ @Deprecated
USER_FAILED_REMOVE_VM(59, AuditLogSeverity.ERROR),
USER_CHANGE_DISK_VM(38),
USER_FAILED_CHANGE_DISK_VM(102, AuditLogSeverity.ERROR),
@@ -664,6 +665,7 @@
NETWORK_HOST_USING_WRONG_CLUSER_VLAN(1106, AuditLogSeverity.WARNING),
@Deprecated
NETWORK_HOST_MISSING_CLUSER_VLAN(1107, AuditLogSeverity.WARNING),
+ @Deprecated
VDS_NETWORK_MTU_DIFFER_FROM_LOGICAL_NETWORK(1108,
AuditLogTimeInterval.HOUR.getValue()),
BRIDGED_NETWORK_OVER_MULTIPLE_INTERFACES(1109, AuditLogSeverity.WARNING),
VDS_NETWORKS_OUT_OF_SYNC(1110, AuditLogSeverity.WARNING),
@@ -914,6 +916,7 @@
VDS_ACTIVATE_MANUAL_HA_ASYNC(10455, AuditLogSeverity.WARNING,
AuditLogTimeInterval.HOUR.getValue() * 3), // When VDS is
reactivated by autorecovery
VDS_ACTIVATE_FAILED_ASYNC(9503, AuditLogSeverity.WARNING,
AuditLogTimeInterval.HOUR.getValue() * 3), // When VDS is reactivated
+ @Deprecated
STORAGE_ACTIVATE_ASYNC(9504, AuditLogTimeInterval.HOUR.getValue() * 3), //
When VDS is reactivated by autorecovery
USER_ACTIVATED_STORAGE_DOMAIN_ASYNC(9505,
AuditLogTimeInterval.HOUR.getValue() * 3),
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
index 93345be..a464ae1 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -1,3 +1,4 @@
+UNASSIGNED=Unrecognized audit log type has been used.
VM_CLEARED=Unused
SYSTEM_MASTER_DOMAIN_NOT_IN_SYNC=Sync Error on Master Domain between Host
${VdsName} and oVirt Engine. Domain: ${StorageDomainName} is marked as Master
in oVirt Engine database but not on the Storage side. Please consult with
Support on how to fix this issue.
IRS_DISK_SPACE_LOW=Warning, Low disk space.${StorageDomainName} domain has
${DiskSpace} GB of free space
@@ -211,6 +212,9 @@
USER_VDS_START=Host ${VdsName} was started by ${UserName}.
USER_VDS_STOP=Host ${VdsName} was stopped by ${UserName}.
VDS_ALREADY_IN_REQUESTED_STATUS=Host ${HostName} is already ${AgentStatus},
Power Management ${Operation} operation skipped.
+VDS_AUTO_FENCE_STATUS=Auto fence for host ${VdsName} was started.
+VDS_AUTO_FENCE_STATUS_FAILED=Auto fence for host ${VdsName} failed.
+VDS_AUTO_FENCE_FAILED_CALL_FENCE_SPM=Auto fence did not revoke the selected
SPM (${VdsName}) since the master storage domain\n was not active or could not
use another host for the fence operation.
VDS_MANUAL_FENCE_STATUS=Manual fence for host ${VdsName} was started.
VDS_MANUAL_FENCE_STATUS_FAILED=Manual fence for host ${VdsName} failed.
VDS_MANUAL_FENCE_FAILED_CALL_FENCE_SPM=Manual fence did not revoke the
selected SPM (${VdsName}) since the master storage domain\n was not active or
could not use another host for the fence operation.
@@ -853,3 +857,10 @@
KDUMP_FLOW_NOT_DETECTED_ON_VDS=Kdump flow is not in progress on host
'${VdsName}'.
KDUMP_FLOW_FINISHED_ON_VDS=Kdump flow finished on host '${VdsName}'.
KDUMP_DETECTION_NOT_CONFIGURED_ON_VDS=Kdump integration is enabled for host
'${VdsName}', but kdump is not configured properly on host.
+DWH_STOPPED=History Service stopped.
+DWH_STARTED=History Service started.
+DWH_ERROR=Error in History Service.
+USER_REMOVE_AUDIT_LOG=Event log message ${AuditLogId} was removed by User
${UserName}.
+USER_REMOVE_AUDIT_LOG_FAILED=User ${UserName} failed to remove event log
message ${AuditLogId}.
+USER_CLEAR_ALL_DISMISSED_AUDIT_LOG=User ${UserName} had restored all deleted
event log messages.
+USER_CLEAR_ALL_DISMISSED_AUDIT_LOG_FAILED=User ${UserName} failed to restore
all deleted audit log messages.
--
To view, visit http://gerrit.ovirt.org/32192
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74a08a8c7d5f18707bf8cbcac5d9d169c5556def
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Eli Mesika <emes...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
