Fixed fieldalias backup/restore

Author: gjanders

bin/splunkversioncontrol_backup_class.py

@@ -321,7 +321,12 @@ def runQueries(self, app, endpoint, type, fieldIgnoreList, aliasAttributes={}, v
                         elif type=="automatic lookup" and info["name"].find("LOOKUP-") == 0:
                             logger.debug("i=\"%s\" Overriding name of name=\"%s\" of type=%s in app context app=%s with owner=%s to new name of newname=\"%s\"" % (self.stanzaName, info["name"], type, app, info["owner"], info["name"][7:]))
                             info["name"] = info["name"][7:]
-                    
+                        elif type=="fieldaliases":
+                            newName = info["name"]
+                            newName = newName[newName.find("FIELDALIAS-")+11:]
+                            logger.debug("Overriding name of %s of type %s in app context %s with owner %s to new name of %s" % (info["name"], type, app, info["owner"], newName))
+                            info["name"] = newName
+
                     #Some attributes are not used to create a new version so we remove them...(they may have been used above first so we kept them until now)
                     for attribName in fieldIgnoreList:
                         if info.has_key(attribName):
@@ -564,7 +569,7 @@ def calcfields(self, app):
 
     def fieldaliases(self, app):
         ignoreList = [ "attribute", "type", "value" ]
-        return self.runQueries(app, "/data/props/fieldaliases", "fieldaliases", ignoreList)
+        return self.runQueries(app, "/data/props/fieldaliases", "fieldaliases", ignoreList, nameOverride="name")
 
     def fieldextractions(self, app):
         ignoreList = [ "attribute" ]

bin/splunkversioncontrol_restore_class.py

@@ -326,6 +326,7 @@ def runRestore(self, config, type, endpoint, app, name, user, restoreAsUser, adm
 
         #The config has an origName in it, therefore the object exists lookup may have not worked as expected
         #repeat it here for the edge cases (field extractions, field transforms and automatic lookups)
+        origName = None
         if 'origName' in config:
             origName = config['origName']
             del config['origName']
@@ -362,7 +363,11 @@ def runRestore(self, config, type, endpoint, app, name, user, restoreAsUser, adm
 
         #This is an existing object we are modifying
         if objExists == True:
-            url = url + "/" + name
+            createOrUpdate = "update"
+            if origName:
+                url = url + "/" + origName
+            else:
+                url = url + "/" + name
             del config["name"]
 
             #Cannot post type/stanza when updating field extractions or a few other object types, but require them for creation?!