Closes #37

Author: camrossi

apps/backup2graph/app/backup2graph.py

@@ -158,13 +158,13 @@ def generate_rel(key,rel_target_class):
             key += rel.Parent.ClassName + "-" + rel_target_class
 
             # Handle the contracts in a special way and override the default file name and relationship direction.
-            if rel.ClassName == 'fvRsProv':
-                key += '-fvRsProv'
-                edge_direction = '(s)-[r:{} {} ]->(t)'.format(rel.ClassName, ' {target: row[3] }')
-            elif rel.ClassName == 'fvRsCons':
-                key += '-fvRsCons'
+            if rel.ClassName == 'fvRsProv' or rel.ClassName == 'vzRsAnyToProv':
+                key += '-' + rel.ClassName
+            elif rel.ClassName == 'fvRsCons' or rel.ClassName == 'vzRsAnyToCons':
+                key += '-' + rel.ClassName
+                edge_direction = '(t)-[r:{} {} ]->(s)'.format(rel.ClassName, ' {target: row[3] }')
+            
 
-            key += rel.Parent.ClassName + "-" + rel_target_class
 
             if key not in data['non-parent-child-rel'].keys():
                 data['non-parent-child-rel'][key] = []

charts/aci-monitoring-stack/Chart.yaml

@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.4
+version: 0.2.5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.8.2"
+appVersion: "v0.8.3"
 dependencies:
 - name: prometheus
   version: "27.9.0"

charts/aci-monitoring-stack/dashboards/contracts-explorer.json

@@ -81,7 +81,7 @@
       "targets": [
         {
           "Format": "table",
-          "cypherQuery": "MATCH (provider)-[r1:fvRsProv]-(contract:vzBrCP)-[r2:fvRsCons]-(consumer)\nWHERE  contract.dn=\"uni/tn-$tenant/brc-$contract\" and contract.fabric='$fabric'\n\nRETURN provider.dn as ProviderDN, consumer.dn as ConsumerDN",
+          "cypherQuery": "MATCH (provider)-[r1:fvRsProv|vzRsAnyToProv]-(contract:vzBrCP)-[r2:fvRsCons|vzRsAnyToCons]-(consumer)\nWHERE  contract.dn=\"uni/tn-$tenant/brc-$contract\" and contract.fabric='$fabric'\n\nRETURN provider.dn as ProviderDN, consumer.dn as ConsumerDN",
           "datasource": {
             "type": "kniepdennis-neo4j-datasource",
             "uid": "memgraph"
@@ -191,7 +191,7 @@
       "targets": [
         {
           "Format": "nodegraph",
-          "cypherQuery": "MATCH (provider)-[r1:fvRsProv]-(contract:vzBrCP)-[r2:fvRsCons]-(consumer)\nWHERE  contract.dn=\"uni/tn-$tenant/brc-$contract\" and contract.fabric='$fabric'\n\nRETURN *",
+          "cypherQuery": "MATCH (provider)-[r1:fvRsProv|vzRsAnyToProv]-(contract:vzBrCP)-[r2:fvRsCons|vzRsAnyToCons]-(consumer)\nWHERE  contract.dn=\"uni/tn-$tenant/brc-$contract\" and contract.fabric='$fabric'\n\nRETURN *",
           "datasource": {
             "type": "kniepdennis-neo4j-datasource",
             "uid": "memgraph"

charts/aci-monitoring-stack/values.yaml

@@ -323,7 +323,7 @@ backup2graph:
   nodeSelector: {}
   image:
     repository: quay.io/datacenter/backup2graph
-    tag: v0.1.3
+    tag: v0.1.4
     pullPolicy: Always
 memgraph:
   enabled: true