support svc graph for subnet queries and chart upgrades

charts/aci-monitoring-stack/Chart.lock

@@ -1,15 +1,15 @@
 dependencies:
 - name: prometheus
   repository: https://prometheus-community.github.io/helm-charts
-  version: 25.27.0
+  version: 25.29.0
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.16.0
+  version: 6.18.0
 - name: promtail
   repository: https://grafana.github.io/helm-charts
   version: 6.16.6
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 8.5.2
-digest: sha256:04ba3c78c8200ef2345a1b3a406283f148a33fe848cd0ace4a7f5cd656329208
-generated: "2024-10-09T13:22:17.567329126+11:00"
+  version: 8.5.12
+digest: sha256:53e738d7d264d2d95eab8814d069d80a10e302e6c8a0c7725549e4555fccc4b4
+generated: "2024-11-07T13:40:04.608656295+11:00"

charts/aci-monitoring-stack/Chart.yaml

@@ -15,19 +15,19 @@ 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.1.8
+version: 0.1.9
 # 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.0"
 dependencies:
 - name: prometheus
-  version: "25.27.0"
+  version: "25.29.0"
   repository: "https://prometheus-community.github.io/helm-charts"
   condition: prometheus.enabled
 - name: loki
-  version: "6.16.0"
+  version: "6.18.0"
   repository: "https://grafana.github.io/helm-charts"
   condition: loki.enabled
 - name: "promtail"
@@ -37,4 +37,4 @@ dependencies:
 - name: "grafana"
   condition: grafana.enabled
   repository: "https://grafana.github.io/helm-charts"
-  version: "8.5.2"
+  version: "8.5.12"

charts/aci-monitoring-stack/config.d/aci-configs.yaml

@@ -32,7 +32,17 @@ class_queries:
         regex: "^uni/tn-(?P<epg_tenant>.*)/mgmtp-(?P<app>.*)/inb-(?P<epg>.*)/rsmgmtBD"
       - property_name: mgmtRsMgmtBD.attributes.tDn
         regex: "^uni/tn-(?P<bd_tenant>.*)/BD-(?P<bd_name>.*)"
-
+  svc_epg_to_bd:
+    class_name: vnsRsLIfCtxToBD
+    query_parameter: '?order-by=vnsRsLIfCtxToBD.dn'
+    metrics:
+      - name: svc_epg_to_bd
+        value_name: vnsRsLIfCtxToBD.attributes.uid
+    labels:
+      - property_name: vnsRsLIfCtxToBD.attributes.dn
+        regex: "^uni/tn-(?P<epg_tenant>.*)/ldevCtx-c-(?P<contract>.*)-g-(?P<graph>.*)-n-(?P<node>.*)/lIfCtx-c-(?P<contract_dir>.*)/rsLIfCtxToBD"
+      - property_name: vnsRsLIfCtxToBD.attributes.tDn
+        regex: "^uni/tn-(?P<bd_tenant>.*)/BD-(?P<bd_name>.*)"
   bd_to_vrf:
     class_name: fvRtCtx
     query_parameter: '?order-by=fvRtCtx.dn'

charts/aci-monitoring-stack/dashboards/epg-explore.json

@@ -86,7 +86,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "  (\n        aci_bd_to_vrf{fabric=\"$fabric\"}\n      + on (fabric, bd_name, bd_tenant) group_right (vrf_name, vrf_tenant)\n        (\n            aci_subnets{fabric=\"$fabric\",subnet=\"$subnet\"}\n          + on (fabric, bd_name, bd_tenant) group_right ()\n            (aci_inb_epg_to_bd{fabric=\"$fabric\"} or aci_epg_to_bd{fabric=\"$fabric\"})\n        )\n    >=\n      0\n  )\nor on ()\n  (\n    label_replace(\n        aci_subnets{fabric=\"$fabric\",subnet=\"$subnet\"}\n      + on (fabric, bd_name, bd_tenant) group_right ()\n        (aci_inb_epg_to_bd{fabric=\"$fabric\"} or aci_epg_to_bd{fabric=\"$fabric\"}),\n      \"vrf_name\",\n      \"NO VRF\",\n      \"vrf_name\",\n      \".*\"\n    )\n  )",
+          "expr": "  (\n        aci_bd_to_vrf{fabric=\"$fabric\"}\n      + on (fabric, bd_name, bd_tenant) group_right (vrf_name, vrf_tenant)\n        (\n            aci_subnets{fabric=\"$fabric\",subnet=\"$subnet\"}\n          + on (fabric, bd_name, bd_tenant) group_right ()\n            (aci_inb_epg_to_bd{fabric=\"$fabric\"} or aci_epg_to_bd{fabric=\"$fabric\"} or aci_svc_epg_to_bd{fabric=\"$fabric\"})\n        )\n    >=\n      0\n  )\nor on ()\n  (\n    label_replace(\n        aci_subnets{fabric=\"$fabric\",subnet=\"$subnet\"}\n      + on (fabric, bd_name, bd_tenant) group_right ()\n        (aci_inb_epg_to_bd{fabric=\"$fabric\"} or aci_epg_to_bd{fabric=\"$fabric\"} or aci_svc_epg_to_bd{fabric=\"$fabric\"} ),\n      \"vrf_name\",\n      \"NO VRF\",\n      \"vrf_name\",\n      \".*\"\n    )\n  )",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -431,7 +431,7 @@
     "list": [
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "fab2",
           "value": "fab2"
         },
@@ -587,9 +587,9 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "1.1.1.254/24",
-          "value": "1.1.1.254/24"
+          "selected": true,
+          "text": "10.36.0.1/24",
+          "value": "10.36.0.1/24"
         },
         "datasource": {
           "type": "prometheus",
@@ -624,6 +624,6 @@
   "timezone": "",
   "title": "EPG Explore",
   "uid": "a4f7ea75-6ef6-4639-809a-755684e11ac1",
-  "version": 11,
+  "version": 12,
   "weekStart": ""
 }

charts/aci-monitoring-stack/templates/prometheus/configmap-config.yaml

@@ -28,7 +28,7 @@ data:
             # List of the queries to execute on the fabric level. They need to match the aci-exporter config
             # DO NOT INSERT SPACES and use \ for next line or aci-exporter will not be able to parse the queries
           queries:
-            - "health,fabric_node_info,max_capacity,max_global_pctags,subnets,epg_to_bd,inb_epg_to_bd,bd_to_vrf,\
+            - "health,fabric_node_info,max_capacity,max_global_pctags,subnets,epg_to_bd,svc_epg_to_bd,inb_epg_to_bd,bd_to_vrf,\
               vlans,static_binding_info,node_count,object_count,fault_insts,\
               ps_power_usage,apic_hw_sensors,controller_topsystem"
         scheme: http