Merge e354853 into 3bd8186

sapcc · Jul 28, 2021 · d26ab48 · d26ab48
2 parents 3bd8186 + e354853
commit d26ab48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/InventoryBuilder.py b/InventoryBuilder.py
@@ -296,8 +296,9 @@ def create_nsxt_objects(self, vrops, target: str, token: str):
                     logger.debug(f'Collecting NSX-T management cluster: {mgmt_cluster.name}')
             for mgmt_cluster_object in nsxt_adapter_object.management_cluster:
                 for mgmt_node in nsxt_mgmt_nodes:
-                    mgmt_cluster_object.add_mgmt_node(mgmt_node)
-                    logger.debug(f'Collecting NSX-T management node: {mgmt_node.name}')
+                    if mgmt_node.parent == mgmt_cluster_object.uuid:
+                        mgmt_cluster_object.add_mgmt_node(mgmt_node)
+                        logger.debug(f'Collecting NSX-T management node: {mgmt_node.name}')
                 for nsxt_mgmt_node in mgmt_cluster_object.management_nodes:
                     for mgmt_service_instance in nsxt_mgmt_service:
                         if mgmt_service_instance.parent == nsxt_mgmt_node.uuid:

diff --git a/tests/metrics.yaml b/tests/metrics.yaml
@@ -253,13 +253,14 @@ NSXTMgmtClusterPropertiesCollector:
 NSXTMgmtNodeStatsCollector:
   - 'vrops_api_response{class="nsxtmgmtnodestatscollector",target="testhost.test"}'
   - 'vrops_api_response_time_seconds{class="nsxtmgmtnodestatscollector",target="testhost.test"}'
-  - 'vrops_nsxt_mgmt_node_memory_total{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2"}'
-  - 'vrops_nsxt_mgmt_node_memory_used{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+  - 'vrops_nsxt_mgmt_node_memory_used{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+  - 'vrops_nsxt_mgmt_node_memory_total{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2"}'
 
 NSXTMgmtNodePropertiesCollector:
   - 'vrops_api_response{class="nsxtmgmtnodepropertiescollector",target="testhost.test"}'
-  - 'vrops_nsxt_mgmt_node_version{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2",version="test"}'
   - 'vrops_api_response_time_seconds{class="nsxtmgmtnodepropertiescollector",target="testhost.test"}'
-  - 'vrops_nsxt_mgmt_node_connectivity_status{connectivity_status="test",nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2"}'
-  - 'vrops_nsxt_mgmt_node_version{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2"}'
-  - 'vrops_nsxt_mgmt_node_connectivity_status{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster3",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+  - 'vrops_nsxt_mgmt_node_version{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2",version="test"}'
+  - 'vrops_nsxt_mgmt_node_connectivity_status{connectivity_status="test",nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+  - 'vrops_nsxt_mgmt_node_connectivity_status{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+  - 'vrops_nsxt_mgmt_node_version{nsxt_adapter="nsxt_adapter2",nsxt_mgmt_cluster="nsxt_mgmt_cluster2",nsxt_mgmt_node="nsxt_mgmt_node2"}'
+