1
diff --git a/config.yaml b/config.yaml
2
index 765d70b..0739d64 100644
3
--- a/config.yaml
4
+++ b/config.yaml
5
@@ -355,3 +355,7 @@ options:
6
355
            - name: snmp_collector
355
            - name: snmp_collector
7
356
              host: /path/to/snmp/helper ....
356
              host: /path/to/snmp/helper ....
8
357
              service: /path/to/snmp/helper ....
357
              service: /path/to/snmp/helper ....
9
358
    site_name:
10
359
        type: string
11
360
        default: ''
12
361
        description: An unique site name for Nagios deployment
13
358
\ No newline at end of file
362
\ No newline at end of file
14
diff --git a/hooks/application-dashboard-relation-changed b/hooks/application-dashboard-relation-changed
15
359
new file mode 120000
363
new file mode 120000
16
index 0000000..a13f386
17
--- /dev/null
18
+++ b/hooks/application-dashboard-relation-changed
19
@@ -0,0 +1 @@
20
1
application_dashboard_relation.py
21
0
\ No newline at end of file
2
\ No newline at end of file
22
diff --git a/hooks/application-dashboard-relation-joined b/hooks/application-dashboard-relation-joined
23
1
new file mode 120000
3
new file mode 120000
24
index 0000000..a13f386
25
--- /dev/null
26
+++ b/hooks/application-dashboard-relation-joined
27
@@ -0,0 +1 @@
28
1
application_dashboard_relation.py
29
0
\ No newline at end of file
2
\ No newline at end of file
30
diff --git a/hooks/application_dashboard_relation.py b/hooks/application_dashboard_relation.py
31
1
new file mode 100755
3
new file mode 100755
32
index 0000000..54a9596
33
--- /dev/null
34
+++ b/hooks/application_dashboard_relation.py
35
@@ -0,0 +1,75 @@
36
1
#!/usr/bin/python
37
2
# Copyright Canonical 2021 Canonical Ltd. All Rights Reserved
38
3
#
39
4
# This program is free software: you can redistribute it and/or modify
40
5
# it under the terms of the GNU General Public License as published by
41
6
# the Free Software Foundation, either version 3 of the License, or
42
7
# (at your option) any later version.
43
8
#
44
9
# This program is distributed in the hope that it will be useful,
45
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
46
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
47
12
# GNU General Public License for more details.
48
13
#
49
14
# You should have received a copy of the GNU General Public License
50
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
51
16
import os
52
17
import sys
53
18
54
19
from charmhelpers.core.hookenv import (
55
20
    Hooks,
56
21
    UnregisteredHookError,
57
22
    config,
58
23
    is_leader,
59
24
    log,
60
25
    relation_ids,
61
26
    relation_set,
62
27
    unit_public_ip,
63
28
)
64
29
65
30
hooks = Hooks()
66
31
67
32
68
33
@hooks.hook("config-changed")
69
34
@hooks.hook("application-dashboard-relation-joined")
70
35
@hooks.hook("application-dashboard-relation-changed")
71
36
def application_dashboard_relation_changed(relation_id=None, remote_unit=None):
72
37
    """Register Nagios URL in dashboard charm such as Homer."""
73
38
    if not is_leader():
74
39
        return
75
40
    relations = relation_ids("application-dashboard")
76
41
    if not relations:
77
42
        return
78
43
    tls_configured = config("ssl_key")
79
44
    scheme = "https://" if tls_configured else "http://"
80
45
    url = scheme + unit_public_ip()
81
46
    if config("site_name"):
82
47
        subtitle = "[{}] Monitoring and alerting".format(config("site_name"))
83
48
        group = "[{}] LMA".format(config("site_name"))
84
49
    else:
85
50
        subtitle = "Monitoring and alerting"
86
51
        group = "LMA"
87
52
    icon_file = os.environ.get("JUJU_CHARM_DIR", None) + "/icon.svg"
88
53
    icon_data = None
89
54
    if os.path.exists(icon_file):
90
55
        with open(icon_file) as f:
91
56
            icon_data = f.read()
92
57
    for rid in relations:
93
58
        relation_set(
94
59
            rid,
95
60
            app=True,
96
61
            relation_settings={
97
62
                "name": "Nagios",
98
63
                "url": url,
99
64
                "subtitle": subtitle,
100
65
                "icon": icon_data,
101
66
                "group": group,
102
67
            },
103
68
        )
104
69
105
70
106
71
if __name__ == "__main__":
107
72
    try:
108
73
        hooks.execute(sys.argv)
109
74
    except UnregisteredHookError as e:
110
75
        log("Unknown hook {} - skipping.".format(e))
111
diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
112
index 32f6613..816d41d 100755
113
--- a/hooks/upgrade_charm.py
114
+++ b/hooks/upgrade_charm.py
115
@@ -20,6 +20,8 @@ except ImportError:
116
20
        "DEBIAN_FRONTEND=noninteractive apt-get -qy install python-enum34", shell=True
20
        "DEBIAN_FRONTEND=noninteractive apt-get -qy install python-enum34", shell=True
117
21
    )
21
    )
118
22
22
119
23
from application_dashboard_relation import application_dashboard_relation_changed
120
24
121
23
from charmhelpers import fetch
25
from charmhelpers import fetch
122
24
from charmhelpers.contrib import ssl
26
from charmhelpers.contrib import ssl
123
25
from charmhelpers.core import hookenv, host
27
from charmhelpers.core import hookenv, host
124
@@ -678,6 +680,7 @@ update_cgi_config()
125
678
update_contacts()
680
update_contacts()
126
679
update_password("nagiosro", ro_password)
681
update_password("nagiosro", ro_password)
127
680
configure_livestatus_xinetd()
682
configure_livestatus_xinetd()
128
683
application_dashboard_relation_changed()
129
681
684
130
682
if password:
685
if password:
131
683
    update_password(nagiosadmin, password)
686
    update_password(nagiosadmin, password)
132
diff --git a/metadata.yaml b/metadata.yaml
133
index 21ceda1..e89c497 100644
134
--- a/metadata.yaml
135
+++ b/metadata.yaml
136
@@ -16,5 +16,7 @@ requires:
137
16
    interface: juju-info
16
    interface: juju-info
138
17
  monitors:
17
  monitors:
139
18
    interface: monitors
18
    interface: monitors
140
19
  application-dashboard:
141
20
    interface: register-application
142
19
extra-bindings:
21
extra-bindings:
143
20
  public:
22
  public:
144
diff --git a/tests/unit/test_registration_relation_joined.py b/tests/unit/test_registration_relation_joined.py
145
21
new file mode 100644
23
new file mode 100644
146
index 0000000..0161f47
147
--- /dev/null
148
+++ b/tests/unit/test_registration_relation_joined.py
149
@@ -0,0 +1,39 @@
150
1
import application_dashboard_relation
151
2
152
3
import mock
153
4
154
5
155
6
@mock.patch("application_dashboard_relation.relation_set")
156
7
@mock.patch("application_dashboard_relation.unit_public_ip")
157
8
@mock.patch("application_dashboard_relation.is_leader")
158
9
@mock.patch("application_dashboard_relation.relation_ids")
159
10
@mock.patch("application_dashboard_relation.config")
160
11
@mock.patch("os.environ.get")
161
12
def test_main(
162
13
    environ_get, config, relation_ids, is_leader, unit_public_ip, relation_set
163
14
):
164
15
    hostname = "nagios.com"
165
16
    unit_public_ip.return_value = hostname
166
17
    relation_id = "application-dashboard:0"
167
18
    environ_get.return_value = ""
168
19
    relation_ids.return_value = relation_id
169
20
    site_name = "test"
170
21
    config.return_value = site_name
171
22
    application_dashboard_relation.application_dashboard_relation_changed()
172
23
    subtitle = "[{}] Monitoring and alerting".format(site_name)
173
24
    group = "[{}] LMA".format(site_name)
174
25
    name = "Nagios"
175
26
    tls_configured = config("ssl_key")
176
27
    scheme = "https" if tls_configured else "http"
177
28
178
29
    relation_set.assert_called_with(
179
30
        "0",
180
31
        app=True,
181
32
        relation_settings={
182
33
            "name": name,
183
34
            "url": "{}://{}".format(scheme, hostname),
184
35
            "subtitle": subtitle,
185
36
            "icon": None,
186
37
            "group": group,
187
38
        },
188
39
    )
Reviewer	Review Type	Date Requested	Status
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2021-10-07
James Troup (community)		2021-10-01	Needs Fixing on 2021-10-05
BootStack Reviewers		2021-10-01	Pending
Review via email: mp+409472@code.launchpad.net