Add juju_charm label to logs (#111)

* add juju_charm label to logs * lint * add job labels * use python38 dict merge
canonical · May 28, 2024 · a4ba055 · a4ba055
1 parent 63b4df4
commit a4ba055
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/charm.py b/src/charm.py
@@ -416,14 +416,15 @@ def _additional_log_configs(self) -> List[Dict[str, Any]]:
                                 "targets": ["localhost"],
                                 "labels": {
                                     "__path__": "/var/log/**/*log",
+                                    "job": "varlog",
                                     **self._own_labels,
                                 },
                             }
                         ],
                     },
                     {
                         "job_name": "syslog",
-                        "journal": {"labels": self._own_labels},
+                        "journal": {"labels": {**self._own_labels, **{"job": "syslog"}}},
                         "pipeline_stages": [
                             {
                                 "drop": {

diff --git a/src/grafana_agent.py b/src/grafana_agent.py
@@ -771,6 +771,7 @@ def _instance_topology(self) -> Dict[str, str]:
             "juju_model_uuid": self.model.uuid,
             "juju_application": self.model.app.name,
             "juju_unit": self.model.unit.name,
+            "juju_charm": self.meta.name,
         }
 
     @property