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

[Giuseppe Petralia]

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:02626ced15de24a61236b5a00e3441be4985ca5e

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/20/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/525/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/762/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/20//rebuild

review: Needs Fixing (continuous-integration)

453f34b... by Aliaksandr Vasiuk on 2023-11-10

Add cos-proxy and grafana-agent relations rules

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:453f34bf2bcaf8892dfbbcc22d8134af53fa6327

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/21/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/526/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/763/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/21//rebuild

review: Needs Fixing (continuous-integration)

e4386ca... by Aliaksandr Vasiuk on 2023-11-10

Configure cos CMRs

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:46d0e83405de0a7f0db67b332d844fe229cd3b9a

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/23/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/528/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/765/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/23//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b0172f45f9df9cb6a73207fd933e2cf051c16a95

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/529/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/766/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/24//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:4a81159796366dbf40f2fb179196051ac062d6f8

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/25/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/530/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/767/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/25//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:e4386ca4e7d9a10de4b5d7fc5cc42611c70639b5

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~valexby/juju-lint/+git/juju-lint/+merge/455428/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/531/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/768/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/26//rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

e4386ca... by Aliaksandr Vasiuk on 2023-11-10

Configure cos CMRs

453f34b... by Aliaksandr Vasiuk on 2023-11-10

Add cos-proxy and grafana-agent relations rules

0c3ab88... by Aliaksandr Vasiuk on 2023-11-09

Configure hw-observer for all metals

b4efe8c... by Aliaksandr Vasiuk on 2023-11-09

Fixed 'cos charms' to 'operations mandatory'

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

Add cos-proxy relations check

8fa0112... by Giuseppe Petralia on 2023-11-09

Initial structure for validating jammy yoga cos

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

Check relations by charm name and not application

diff --git a/contrib/fcb-yoga-jammy-cos.yaml b/contrib/fcb-yoga-jammy-cos.yaml
new file mode 100644
index 0000000..33c9f51
--- /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/operations-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..e1a1241
--- /dev/null
+++ b/contrib/includes/aggregator-openstack-cos.yaml
@@ -0,0 +1,34 @@
+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
+  - *operations-cos-mandatory-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 ]
+
+saas:
+  - *saas-base
+  - *saas-cos
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/operations-cos.yaml b/contrib/includes/operations-cos.yaml
new file mode 100644
index 0000000..e650bb8
--- /dev/null
+++ b/contrib/includes/operations-cos.yaml
@@ -0,0 +1,85 @@
+saas cos: &saas-cos
+  - cos-scrape-interval-config
+  - cos-grafana
+  - cos-prometheus-scrape
+  - cos-loki
+  - cos-prometheus
+
+operations cos mandatory: &operations-cos-mandatory-charms
+  - grafana-agent
+  - cos-proxy
+  - hardware-observer
+  - *saas-cos
+
+operations mandatory:
+  - *operations-cos-mandatory-charms
+  - *operations-mandatory-charms
+
+relations cos check: &relations-cos-check
+  - charm: grafana-agent
+    ubiquitous: true
+  - charm: cos-proxy
+    check: [
+      ["nrpe:monitors", "cos-proxy:monitors"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["ceph-mon:prometheus", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["prometheus-grok-exporter:prometheus-client", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["prometheus-openstack-exporter:prometheus-openstack-exporter-service", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["telegraf:prometheus-client", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["prometheus-libvirt-exporter:scrape", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["etcd:prometheus", "cos-proxy:prometheus-target"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["cos-proxy:downstream-grafana-dashboard", "cos-grafana:grafana-dashboard"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["cos-proxy:downstream-prometheus-scrape", "cos-prometheus-scrape:metrics-endpoint"]
+    ]
+  - charm: cos-proxy
+    check: [
+      ["cos-proxy:downstream-prometheus-scrape", "cos-scrape-interval-config:configurable-scrape-jobs"]
+    ]
+  - charm: hardware-observer
+    check: [
+      ["hardware-observer:cos-agent", "grafana-agent:cos-agent"]
+    ]
+  - charm: cos-grafana
+    check: [
+      ["grafana-agent:grafana-dashboards-provider", "cos-grafana:grafana-dashboard"]
+    ]
+  - charm: cos-loki
+    check: [
+      ["cos-loki:logging", "grafana-agent:logging-consumer"]
+    ]
+  - charm: cos-prometheus
+    check: [
+      ["cos-prometheus:receive-remote-write", "grafana-agent:send-remote-write"]
+    ]
+
+
+subordinates cos check: &subordinates-cos-check
+  grafana-agent:
+    where: container aware
+    host-suffixes: [host, physical, guest]
+    container-suffixes: [lxd, container]
+  hardware-observer:
+    where: metal only
diff --git a/contrib/includes/saas.yaml b/contrib/includes/saas.yaml
index bac2ea5..6458b67 100644
--- a/contrib/includes/saas.yaml
+++ b/contrib/includes/saas.yaml
@@ -1,4 +1,4 @@
-saas:
+saas: &saas-base
  - elasticsearch
  - grafana
  - graylog
diff --git a/jujulint/model_input.py b/jujulint/model_input.py
index 8233ebb..c5b221d 100644
--- a/jujulint/model_input.py
+++ b/jujulint/model_input.py
@@ -36,6 +36,13 @@ class BaseFile:
         """Applications present in the file."""
         return set(self.applications_data.keys())
 
+    @property
+    def charm_names(self) -> Set:
+        """Applications present in the file."""
+        return set(
+            self.applications_data[app]["charm"] for app in self.applications_data
+        )
+
     @staticmethod
     def split_relation(relation: List[List[str]]) -> Tuple[str, str]:
         """Split relations into apps and endpoints.
@@ -78,16 +85,18 @@ class BaseFile:
         # app == "*" means all apps
         # a charm from relation rule can have different app names.
         if app != "*" and app != charm:
-            if app not in self.applications:
+            if app not in self.charm_names:
                 LOGGER.warning(f"{app} not found on applications.")
                 return "", ""
 
             # NOTE(gabrielcocenza) it's not always that a bundle will contain all endpoints under "bindings".
             # See LP#1949883 and LP#1990017
             # juju-info is represented by "" on endpoint-bindings
-            if endpoint != "juju-info" and endpoint not in self.applications_data[
-                app
-            ].get(endpoints_key, {}):
+            if (
+                endpoint != "juju-info"
+                and app in self.applications_data
+                and endpoint not in self.applications_data[app].get(endpoints_key, {})
+            ):
                 LOGGER.warning(f"endpoint: {endpoint} not found on {app}")
                 return "", ""
         return app, endpoint
@@ -119,11 +128,21 @@ class BaseFile:
                 if endpoint
                 in self.applications_data.get(app, {}).get(endpoints_key, {})
             }
-        return (
-            set([app])
-            if endpoint in self.applications_data.get(app, {}).get(endpoints_key, {})
-            else set()
-        )
+
+        endpoints = {}
+        for application in self.applications_data:
+            if self.applications_data[application].get("charm") == app:
+                endpoints[application] = list(
+                    self.applications_data[application].get(endpoints_key, {}).keys()
+                )
+
+        result = set()
+
+        for charm in endpoints:
+            if endpoint in endpoints[charm]:
+                result.add(charm)
+
+        return result
 
     def filter_machines_by_charm(self, charm: str) -> Set:
         """Filter machines that has a specific charm.