projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1473 and add vca_model_config_* to lcm charm
[osm/devops.git]
/
installers
/
charm
/
grafana
/
src
/
charm.py
diff --git
a/installers/charm/grafana/src/charm.py
b/installers/charm/grafana/src/charm.py
index
d61873c
..
d10ccf2
100755
(executable)
--- a/
installers/charm/grafana/src/charm.py
+++ b/
installers/charm/grafana/src/charm.py
@@
-22,33
+22,25
@@
# pylint: disable=E0213
# pylint: disable=E0213
-import logging
-from typing import Optional, NoReturn
from ipaddress import ip_network
from ipaddress import ip_network
+import logging
+from pathlib import Path
+from string import Template
+from typing import NoReturn, Optional
+from urllib.parse import urlparse
from ops.main import main
from ops.main import main
-
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
from opslib.osm.charm import CharmedOsmBase, RelationsMissing
-
+from opslib.osm.interfaces.prometheus import PrometheusClient
from opslib.osm.pod import (
from opslib.osm.pod import (
- IngressResourceV3Builder,
- FilesV3Builder,
ContainerV3Builder,
ContainerV3Builder,
+ FilesV3Builder,
+ IngressResourceV3Builder,
PodSpecV3Builder,
)
PodSpecV3Builder,
)
+from opslib.osm.validator import ModelValidator, validator
-from opslib.osm.validator import (
- ModelValidator,
- validator,
-)
-
-from opslib.osm.interfaces.prometheus import PrometheusClient
-
-from urllib.parse import urlparse
-from string import Template
-from pathlib import Path
-
logger = logging.getLogger(__name__)
PORT = 3000
logger = logging.getLogger(__name__)
PORT = 3000
@@
-90,8
+82,12
@@
class GrafanaCharm(CharmedOsmBase):
super().__init__(*args, oci_image="image")
self.prometheus_client = PrometheusClient(self, "prometheus")
super().__init__(*args, oci_image="image")
self.prometheus_client = PrometheusClient(self, "prometheus")
- self.framework.observe(self.on["prometheus"].relation_changed, self.configure_pod)
- self.framework.observe(self.on["prometheus"].relation_broken, self.configure_pod)
+ self.framework.observe(
+ self.on["prometheus"].relation_changed, self.configure_pod
+ )
+ self.framework.observe(
+ self.on["prometheus"].relation_broken, self.configure_pod
+ )
def _build_dashboard_files(self, config: ConfigModel):
files_builder = FilesV3Builder()
def _build_dashboard_files(self, config: ConfigModel):
files_builder = FilesV3Builder()