add ACCESSLOG node in inventory for Android

OCSInventory does not support ACCESSLOG (but fusioninventory does) We add this node in cfengine. An possible improvement is to check for the existence of this node before adding it in order to be compatible with fusioninventory
CedricCabessa · May 22, 2013 · ce3de96 · ce3de96 · CedricCabessa · May 27, 2013
1 parent f2a34d0
commit ce3de96
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/initial-promises/node-server/inventory/1.0/fusionAgent.cf b/initial-promises/node-server/inventory/1.0/fusionAgent.cf
@@ -331,6 +331,7 @@ bundle agent addInformationsToInventory {
 		"android_name" string => "Android";
 		"android_version" string => execresult("/system/bin/getprop ro.build.version.release", "noshell");
 		"android_fullname" string => "Android $(android_version)";
+		"logdate" string => execresult("/system/bin/date '+%Y-%m-%d %H:%M:%S'", "noshell");
 
   classes:
        xen::
@@ -367,6 +368,10 @@ bundle agent addInformationsToInventory {
 			edit_line => add_information_to_android_inventory($(android_fullname), $(android_kernelname), $(android_kernelversion), $(android_name), $(android_version)),
 			edit_defaults => def_no_backup;
 
+		"${g.rudder_var_tmp}/inventory/.*.ocs"
+			edit_line => add_accesslog_to_android_inventory($(logdate)),
+			edit_defaults => def_no_backup;
+
 }
 
 # Move the inventory file in the shared directory
@@ -485,6 +490,20 @@ insert_lines:
 
 }
 
+#this bundle is necessary for OCSInventory (but not for fusioninventory)
+bundle edit_line add_accesslog_to_android_inventory(logdate)
+{
+insert_lines:
+
+	android::
+
+		"<ACCESSLOG><LOGDATE>$(logdate)</LOGDATE></ACCESSLOG>"
+			location => after_location("<CONTENT>"),
+			comment => "Adding log date";
+
+}
+
+
 bundle edit_line add_users_information_to_inventory(userlist)
 {
 	insert_lines:

diff --git a/techniques/system/inventory/1.0/fusionAgent.st b/techniques/system/inventory/1.0/fusionAgent.st
@@ -345,6 +345,7 @@ bundle agent addInformationsToInventory {
 		"android_name" string => "Android";
 		"android_version" string => execresult("/system/bin/getprop ro.build.version.release", "noshell");
 		"android_fullname" string => "Android $(android_version)";
+		"logdate" string => execresult("/system/bin/date '+%Y-%m-%d %H:%M:%S'", "noshell");
 
   classes:
 
@@ -381,6 +382,9 @@ bundle agent addInformationsToInventory {
 			edit_line => add_information_to_android_inventory($(android_fullname), $(android_kernelname), $(android_kernelversion), $(android_name), $(android_version)),
 			edit_defaults => def_no_backup;
 
+		"${g.rudder_var_tmp}/inventory/.*.ocs"
+			edit_line => add_accesslog_to_android_inventory($(logdate)),
+			edit_defaults => def_no_backup;
 }
 
 
@@ -500,6 +504,19 @@ insert_lines:
 
 }
 
+#this bundle is necessary for OCSInventory (but not for fusioninventory)
+bundle edit_line add_accesslog_to_android_inventory(logdate)
+{
+insert_lines:
+
+	android::
+
+		"<ACCESSLOG><LOGDATE>$(logdate)</LOGDATE></ACCESSLOG>"
+			location => after_location("<CONTENT>"),
+			comment => "Adding log date";
+
+}
+
 bundle edit_line add_users_information_to_inventory(userlist)
 {
 	insert_lines: