Merge ~peppepetra/juju-lint:jammy-yoga-cos into juju-lint:master

[Giuseppe Petralia]

97db16c... by Giuseppe Petralia on 2023-11-09

Add cos-proxy relations check

Unmerged commits

97db16c... by Giuseppe Petralia on 2023-11-09

Add cos-proxy relations check

1229092... by Giuseppe Petralia on 2023-11-09

Initial structure for validating jammy yoga cos

diff --git a/contrib/fcb-yoga-jammy-cos.yaml b/contrib/fcb-yoga-jammy-cos.yaml
new file mode 100644
index 0000000..855109f
--- /dev/null
+++ b/contrib/fcb-yoga-jammy-cos.yaml
@@ -0,0 +1,10 @@
+!include includes/base.yaml
+!include includes/networking/ovn.yaml
+!include includes/database/mysql.yaml
+!include includes/release/yoga.yaml
+!include includes/series/jammy.yaml
+!include includes/openstack.yaml
+!include includes/operations.yaml
+!include includes/saas.yaml
+!include includes/openstack-cos.yaml
+!include includes/aggregator-openstack-cos.yaml
diff --git a/contrib/fcb-yoga-jammy.yaml b/contrib/fcb-yoga-jammy.yaml
index bedfc36..80e7a89 100644
--- a/contrib/fcb-yoga-jammy.yaml
+++ b/contrib/fcb-yoga-jammy.yaml
@@ -6,4 +6,5 @@
 !include includes/openstack.yaml
 !include includes/operations.yaml
 !include includes/saas.yaml
+!include includes/openstack-cos.yaml
 !include includes/aggregator-openstack.yaml
diff --git a/contrib/includes/aggregator-openstack-cos.yaml b/contrib/includes/aggregator-openstack-cos.yaml
new file mode 100644
index 0000000..6ec6d0a
--- /dev/null
+++ b/contrib/includes/aggregator-openstack-cos.yaml
@@ -0,0 +1,30 @@
+operations charms: &operations-charms
+  - *operations-mandatory-charms
+  - *operations-mandatory-deps
+  - *operations-mandatory-subs
+  - *operations-optional-charms
+  - *operations-optional-subs
+  - *operations-openstack-mandatory-charms
+  - *operations-openstack-mandatory-release
+  - *cos-charms
+
+openstack charms: &openstack-charms
+  - *openstack-mandatory-charms
+  - *openstack-mandatory-deps
+  - *openstack-mandatory-subs
+  - *openstack-optional-charms
+  - *openstack-loadbalancer
+  - *cisco-aci-charms
+  - *trilio-charms
+
+known charms:
+  - ubuntu
+  - *openstack-charms
+  - *operations-charms
+
+relations:
+  - *relations-base-check
+  - *relations-cos-check
+
+subordinates:
+  << : [ *subordinates-base-check, *subordinates-cos-check ]
diff --git a/contrib/includes/aggregator-openstack.yaml b/contrib/includes/aggregator-openstack.yaml
index d8c1305..591bc99 100644
--- a/contrib/includes/aggregator-openstack.yaml
+++ b/contrib/includes/aggregator-openstack.yaml
@@ -23,3 +23,6 @@ known charms:
 
 relations:
   - *relations-base-check
+
+subordinates:
+  << : [ *subordinates-base-check ]
diff --git a/contrib/includes/base.yaml b/contrib/includes/base.yaml
index fc095c4..b8482af 100644
--- a/contrib/includes/base.yaml
+++ b/contrib/includes/base.yaml
@@ -18,7 +18,7 @@ config:
   disable-unattended-upgrades:
    eq: true
 
-subordinates:
+subordinates base check: &subordinates-base-check
  telegraf:
   where: all except prometheus
   # and prometheus-ceph-exporter and prometheus-openstack-exporter
diff --git a/contrib/includes/openstack-cos.yaml b/contrib/includes/openstack-cos.yaml
new file mode 100644
index 0000000..196109f
--- /dev/null
+++ b/contrib/includes/openstack-cos.yaml
@@ -0,0 +1,20 @@
+cos charms: &cos-charms
+  - grafana-agent
+  - cos-proxy
+  - hardware-observer
+
+relations cos check: &relations-cos-check
+  - charm: grafana-agent
+    ubiquitous: true
+  - charm: cos-proxy
+    check: [
+      ["nrpe:monitors", "cos-proxy:monitors"],
+      ["cos-proxy:downstream-prometheus-scrape", "scrape-interval-config:configurable-scrape-jobs"]
+    ]
+
+
+subordinates cos check: &subordinates-cos-check
+  grafana-agent:
+    where: container aware
+    host-suffixes: [host, physical, guest]
+    container-suffixes: [lxd, container]
\ No newline at end of file