Updating generate-monitoring to use TrackIPEntries

bin/kapisi_lib.py

@@ -10,11 +10,12 @@ from yamlpath.exceptions import YAMLPathException
 def TrackIPEntries(yaml_file,searchstring='all.children.**.ip'):
     ### Try to parse an Ansible inventory for hosts with the 'ip' attribute.
     # param file: the file to parse
-    # return: a populated entry set in form [{Host,[ip,mac]},...]
+    # return: a populated entry set in form [{Host,[ip,mac,fqdn]},...]
 
     # Borrowing from upstream author's example at https://pypi.org/project/yamlpath/
 
     entryset = {}
+    replicadomain = GetReplicaDomain(yaml_file)
 
     # The various classes of this library must be able to write messages somewhere
     # when things go bad.
@@ -32,7 +33,7 @@ def TrackIPEntries(yaml_file,searchstring='all.children.**.ip'):
     yaml_path = YAMLPath(searchstring)
 
     # Create a regex pattern to remove the end of the path
-    ippattern = re.compile('\.ip$')
+    ippattern = re.compile('\\.ip$')
     try:
         for node_coordinate in processor.get_nodes(yaml_path, mustexist=True):
             # Strip the path to the host entry.
@@ -54,10 +55,18 @@ def TrackIPEntries(yaml_file,searchstring='all.children.**.ip'):
                 log.error(ex)
 
             # Add the host to the entryset.
-            entryset.update({ hostname : [ip,mac] })
+            entryset.update({ hostname : [ip,mac,hostname+'.'+replicadomain] })
 
     except YAMLPathException as ex:
         log.error(ex)
 
     finally:
         return entryset
+
+def GetReplicaDomain(file):
+    '''
+    Return the defined replica domain
+    '''
+    with open(file, 'r') as stream:
+        content = yaml.safe_load(stream)
+        return content['all']['vars']['replica_domain']