Shireesh Anjal has uploaded a new change for review.
Change subject: gluster: Improved audit log messages
......................................................................
gluster: Improved audit log messages
The older messages logged by GlusterManager indicated that some action
was performed "from gluster cli". While this is true for most cases, it
can some times be misleading if some change is done implicitly by
glusterfs. Hence changing the messages to make them more generic.
Also added the cluster name to the messages.
e.g.
"Gluster Volume <volname> was created from gluster CLI.
Now added to engine DB as well."
changed to
"Detected new volume <volname> on cluster <clustername>,
and added it to engine DB"
Change-Id: I50396fb952001a65fa63e62e94b1fb8dc79b0858
Signed-off-by: Shireesh Anjal <san...@redhat.com>
---
A backend/manager/dbscripts/upgrade/03_02_0350_gluster_option_changed_event.sql
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.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
4 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/11263/1
diff --git
a/backend/manager/dbscripts/upgrade/03_02_0350_gluster_option_changed_event.sql
b/backend/manager/dbscripts/upgrade/03_02_0350_gluster_option_changed_event.sql
new file mode 100644
index 0000000..a351c23
--- /dev/null
+++
b/backend/manager/dbscripts/upgrade/03_02_0350_gluster_option_changed_event.sql
@@ -0,0 +1 @@
+insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI', 'UNASSIGNED');
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
index 668e63b..6ba46d7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java
@@ -738,7 +738,7 @@
}
} else if
(!existingOption.getValue().equals(fetchedOption.getValue())) {
logAuditMessage(existingVolume.getClusterId(), existingVolume,
null,
- AuditLogType.GLUSTER_VOLUME_OPTION_SET_FROM_CLI,
+ AuditLogType.GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI,
ENTITY_OPTION,
fetchedOption.toString());
log.infoFormat("Value of option {0} of volume {1} changed from
{2} to {3} from CLI. Updating engine DB accordingly.",
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 5effa44..01de653 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
@@ -230,6 +230,7 @@
GLUSTER_SERVER_REMOVE(4038),
GLUSTER_VOLUME_STARTED_FROM_CLI(4039),
GLUSTER_VOLUME_STOPPED_FROM_CLI(4040),
+ GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI(4041),
USER_VDS_RESTART(41),
USER_FAILED_VDS_RESTART(107),
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 5a6f884..6b4c8a6 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -570,13 +570,14 @@
GLUSTER_VOLUME_PROFILE_STOP_FAILED=Could not stop Profiling on gluster volume
${glusterVolumeName}.
GLUSTER_COMMAND_FAILED=Gluster command [${Command}] failed on server ${Server}.
GLUSTER_VOLUME_INFO_FAILED=Failed to fetch gluster volume list from server
${VdsName}.
-GLUSTER_VOLUME_CREATED_FROM_CLI=Gluster Volume ${glusterVolumeName} was
created from gluster CLI. Now added to engine DB as well.
-GLUSTER_VOLUME_DELETED_FROM_CLI=Gluster Volume ${glusterVolumeName} was
deleted from gluster CLI. Now deleted from engine DB as well.
-GLUSTER_VOLUME_OPTION_SET_FROM_CLI=Option ${option} was set on Volume
${glusterVolumeName} from gluster CLI. Now set in engine DB as well.
-GLUSTER_VOLUME_OPTION_RESET_FROM_CLI=Option ${option} was reset on Volume
${glusterVolumeName} from gluster CLI. Now reset in engine DB as well.
-GLUSTER_VOLUME_PROPERTIES_CHANGED_FROM_CLI=Gluster Volume ${glusterVolumeName}
properties were changed from CLI. Now updated in engine DB as well.
-GLUSTER_VOLUME_BRICK_ADDED_FROM_CLI=Brick ${brick} was added to Volume
${glusterVolumeName} from gluster CLI. Now added in engine DB as well.
-GLUSTER_VOLUME_BRICK_REMOVED_FROM_CLI=Brick ${brick} was removed from Volume
${glusterVolumeName} from gluster CLI. Now removed in engine DB as well.
-GLUSTER_SERVER_REMOVED_FROM_CLI=Server ${VdsName} was removed from Cluster
${VdsGroupName} from gluster CLI. Now removed in engine DB as well.
+GLUSTER_VOLUME_CREATED_FROM_CLI=Detected new volume ${glusterVolumeName} on
cluster ${VdsGroupName}, and added it to engine DB.
+GLUSTER_VOLUME_DELETED_FROM_CLI=Detected deletion of volume
${glusterVolumeName} on cluster ${VdsGroupName}, and deleted it from engine DB.
+GLUSTER_VOLUME_OPTION_SET_FROM_CLI=Detected new option ${option} on volume
${glusterVolumeName} of cluster ${VdsGroupName}, and added it to engine DB.
+GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI=Detected change in option ${option} on
volume ${glusterVolumeName} of cluster ${VdsGroupName}, and updated it to
engine DB.
+GLUSTER_VOLUME_OPTION_RESET_FROM_CLI=Detected reset option ${option} on volume
${glusterVolumeName} of cluster ${VdsGroupName}, and removed it from engine DB.
+GLUSTER_VOLUME_PROPERTIES_CHANGED_FROM_CLI=Detected changes in properties of
volume ${glusterVolumeName} of cluster ${VdsGroupName}, and updated the same in
engine DB.
+GLUSTER_VOLUME_BRICK_ADDED_FROM_CLI=Detected new brick ${brick} on volume
${glusterVolumeName} of cluster ${VdsGroupName}, and added it to engine DB.
+GLUSTER_VOLUME_BRICK_REMOVED_FROM_CLI=Detected brick ${brick} removed from
Volume ${glusterVolumeName} of cluster ${VdsGroupName}, and removed in from
engine DB.
+GLUSTER_SERVER_REMOVED_FROM_CLI=Detected server ${VdsName} removed from
Cluster ${VdsGroupName}, and removed it from engine DB.
GLUSTER_VOLUME_STARTED_FROM_CLI=Detected that Volume ${glusterVolumeName} of
Cluster ${VdsGroupName} was started, and updated engine DB with it's new status.
GLUSTER_VOLUME_STOPPED_FROM_CLI=Detected that Volume ${glusterVolumeName} of
Cluster ${VdsGroupName} was stopped, and updated engine DB with it's new status.
--
To view, visit http://gerrit.ovirt.org/11263
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50396fb952001a65fa63e62e94b1fb8dc79b0858
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <san...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
