1
diff --git a/src/lib/charms/layer/grafana.py b/src/lib/charms/layer/grafana.py
2
index 009c812..d8fc7b8 100644
3
--- a/src/lib/charms/layer/grafana.py
4
+++ b/src/lib/charms/layer/grafana.py
5
@@ -43,21 +43,38 @@ def get_admin_password():
6
43
43
7
44
44
8
45
def compute_dash_title(title, remote_app=None):
45
def compute_dash_title(title, remote_app=None):
10
46
    """Compute title for dashboards."""
46
    """Compute title for dashboards.
11
47
12
48
    The returned title will typically be of the form "[<prefix>-<appname>] <title>",
13
49
    although there are some exceptions where the header portion will be shortened or
14
50
    omitted.
15
51
16
52
    """
17
47
    if remote_app is None:
53
    if remote_app is None:
18
48
        # "local" / backward compat case -- we don't have a remote app
54
        # "local" / backward compat case -- we don't have a remote app
19
49
        return title or "Untitled"
55
        return title or "Untitled"
20
50
56
21
51
    if not title:
57
    if not title:
22
52
        title = remote_app
58
        title = remote_app
23
59
24
60
    prefix = "juju"
25
61
    # For titles with an embedded prefix (e.g. of form "[prefix] title"), extract the
26
62
    # components.
27
53
    mat = TITLE_PAT.search(title)
63
    mat = TITLE_PAT.search(title)
28
54
    if mat and len(mat.groups()) == 2:
64
    if mat and len(mat.groups()) == 2:
35
55
        # If the title already is in the form "[xxx] Footitle" enrich
65
        prefix, title = mat.groups()
36
56
        # the [xxx] tag with remote_app
66
37
57
        new_title = "[{}-{}] {}".format(mat.group(1), remote_app, mat.group(2))
67
    # Header is of form "<prefix>-<app>", unless <app> is not suitable for display for
38
58
    else:
68
    # some reason, in which case we simply use the prefix.
39
59
        new_title = "[juju-{}] {}".format(remote_app, title)
69
    header_tokens = [prefix]
40
60
    return new_title
70
    # Apps seen via cross-model relationships show up with names like
41
71
    # remote-<128-bit hash>; omit the app name in this case.
42
72
    skip_app_name = remote_app.startswith("remote-")
43
73
    if not skip_app_name:
44
74
        header_tokens.append(remote_app)
45
75
    header = "-".join(header_tokens)
46
76
47
77
    return "[{}] {}".format(header, title)
48
61
78
49
62
79
50
63
def get_folders():
80
def get_folders():
51
diff --git a/src/tests/unit/test_grafana.py b/src/tests/unit/test_grafana.py
52
index 2645b53..663fa17 100644
53
--- a/src/tests/unit/test_grafana.py
54
+++ b/src/tests/unit/test_grafana.py
55
@@ -95,6 +95,9 @@ class GrafanaTestCase(unittest.TestCase):
56
95
            ((None, "app"), "[juju-app] app"),
95
            ((None, "app"), "[juju-app] app"),
57
96
            (("bar", None), "bar"),
96
            (("bar", None), "bar"),
58
97
            ((None, None), "Untitled"),
97
            ((None, None), "Untitled"),
59
98
            # Cross-model relation cases (detected via remote-<128-bit hash> names)
60
99
            (("foo", "remote-0123456789abcdef0123456789abcdef"), "[juju] foo"),
61
100
            (("[x] foo", "remote-0123456789abcdef0123456789abcdef"), "[x] foo"),
62
98
        )
101
        )
63
99
        for inputs, expect in inputs_expect:
102
        for inputs, expect in inputs_expect:
64
100
            self.assertEqual(compute_dash_title(*inputs), expect)
103
            self.assertEqual(compute_dash_title(*inputs), expect)
Status:	Merged
Approved by:	Xav Paice on 2021-07-23
Approved revision:	40b7d0e6a7a2848404775f3d88fa727a024e6d4d
Merged at revision:	40b7d0e6a7a2848404775f3d88fa727a024e6d4d
Proposed branch:	~vultaire/charm-grafana:cmr-app-dashboard-titles
Merge into:	charm-grafana:candidate/21.07
Diff against target:	64 lines (+27/-7) 2 files modified src/lib/charms/layer/grafana.py (+24/-7) src/tests/unit/test_grafana.py (+3/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Xav Paice (community)			Approve on 2021-07-23
Celia Wang		2021-07-21	Approve on 2021-07-23
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2021-07-22
Review via email: mp+406051@code.launchpad.net