Mojo: Continuous Delivery for Juju

Merge lp:~hloeung/mojo/mojo-specs-nrpe-nagios-master into lp:mojo/mojo-specs

  1. mojo-specs-nrpe-nagios-master
  2. Merge into mojo-specs
Proposed by Haw Loeung
Status: Merged
Approved by: Alexandre Gomes
Approved revision: 166
Merged at revision: 164
Proposed branch: lp:~hloeung/mojo/mojo-specs-nrpe-nagios-master
Merge into: lp:mojo/mojo-specs
Diff against target: 415 lines (+56/-21)
28 files modified
charm-testing/apache-openid/deploy (+2/-0)
charm-testing/apache2/deploy (+2/-1)
charm-testing/canonical-livepatch/deploy (+2/-1)
charm-testing/cassandra/deploy (+2/-1)
charm-testing/content-cache/deploy (+1/-0)
charm-testing/elasticsearch/deploy (+2/-1)
charm-testing/filebeat/deploy (+2/-1)
charm-testing/grafana/deploy (+3/-1)
charm-testing/graylog/deploy (+2/-0)
charm-testing/haproxy/deploy (+2/-1)
charm-testing/influxdb/deploy (+3/-1)
charm-testing/jenkins/deploy (+1/-0)
charm-testing/juju-introspection-proxy/deploy (+2/-1)
charm-testing/memcached/deploy (+2/-1)
charm-testing/mongodb/deploy (+2/-1)
charm-testing/nrpe/deploy (+2/-1)
charm-testing/ntp/deploy (+2/-1)
charm-testing/pgbouncer/deploy (+2/-1)
charm-testing/postgresql/deploy (+2/-1)
charm-testing/prometheus-openstack-exporter/deploy (+2/-1)
charm-testing/prometheus2/deploy (+2/-1)
charm-testing/rsyslog/deploy (+1/-0)
charm-testing/squid-reverseproxy/deploy (+2/-1)
charm-testing/telegraf/deploy (+2/-1)
charm-testing/ubuntu-repository-cache/deploy (+2/-0)
charm-testing/vault/deploy (+1/-0)
mojo-how-to/devel/services (+3/-1)
mojo-how-to/production/services (+3/-1)
To merge this branch: bzr merge lp:~hloeung/mojo/mojo-specs-nrpe-nagios-master
Reviewer Review Type Date Requested Status
Alexandre Gomes Approve
Review via email: mp+391680@code.launchpad.net

Commit message

Fixed setting nagios_master as required

Latest changes in the nrpe charm (316db7ce / LP:1887106) now requires either nagios_master set or an external monitor relation. This causes CI to fail and eventually time out as it's stuck with the nrpe unit in 'blocked' state.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

lp:~hloeung/mojo/mojo-specs-nrpe-nagios-master updated
166. By Haw Loeung

Xenial and below doesn't work with *.localhost, so let's use one that internally resolves at least

Revision history for this message
Alexandre Gomes (alejdg) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 164

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/apache-openid/deploy'
2--- charm-testing/apache-openid/deploy 2018-07-23 16:29:22 +0000
3+++ charm-testing/apache-openid/deploy 2020-10-01 23:10:22 +0000
4@@ -20,6 +20,8 @@
5 authorized_teams: "apache-openid-charmers"
6 nrpe:
7 charm: nrpe
8+ options:
9+ nagios_master: nagios1.internal
10 relations:
11 - ["apache2", "apache-openid"]
12 - ["nrpe:local-monitors", "apache2:local-monitors"]
13
14=== modified file 'charm-testing/apache2/deploy'
15--- charm-testing/apache2/deploy 2018-07-09 04:24:22 +0000
16+++ charm-testing/apache2/deploy 2020-10-01 23:10:22 +0000
17@@ -17,8 +17,9 @@
18 ssl_certlocation: ssl-cert-snakeoil.crt
19 nrpe:
20 charm: nrpe
21+ options:
22+ nagios_master: nagios1.internal
23 {%- if series != "trusty" %}
24- options:
25 procs: '-w 200 -c 250 -k'
26 swap: '-w 90% -c 75% -n ok'
27 {%- endif %}
28
29=== modified file 'charm-testing/canonical-livepatch/deploy'
30--- charm-testing/canonical-livepatch/deploy 2020-02-21 16:48:43 +0000
31+++ charm-testing/canonical-livepatch/deploy 2020-10-01 23:10:22 +0000
32@@ -9,8 +9,9 @@
33 livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
34 nrpe:
35 charm: nrpe
36+ options:
37+ nagios_master: nagios1.internal
38 {%- if series != "trusty" %}
39- options:
40 procs: '-w 200 -c 250 -k'
41 swap: '-w 90% -c 75% -n ok'
42 {%- endif %}
43
44=== modified file 'charm-testing/cassandra/deploy'
45--- charm-testing/cassandra/deploy 2018-07-09 04:24:22 +0000
46+++ charm-testing/cassandra/deploy 2020-10-01 23:10:22 +0000
47@@ -6,8 +6,9 @@
48 num_units: 3
49 nrpe:
50 charm: nrpe
51+ options:
52+ nagios_master: nagios1.internal
53 {%- if series != "trusty" %}
54- options:
55 procs: '-w 200 -c 250 -k'
56 swap: '-w 90% -c 75% -n ok'
57 {%- endif %}
58
59=== modified file 'charm-testing/content-cache/deploy'
60--- charm-testing/content-cache/deploy 2020-03-25 02:38:02 +0000
61+++ charm-testing/content-cache/deploy 2020-10-01 23:10:22 +0000
62@@ -25,6 +25,7 @@
63 nrpe:
64 charm: nrpe
65 options:
66+ nagios_master: nagios1.internal
67 export_nagios_definitions: true
68 sub_postfix: ""
69 swap: "-w 90% -c 75% -n ok"
70
71=== modified file 'charm-testing/elasticsearch/deploy'
72--- charm-testing/elasticsearch/deploy 2018-07-09 04:24:22 +0000
73+++ charm-testing/elasticsearch/deploy 2020-10-01 23:10:22 +0000
74@@ -6,8 +6,9 @@
75 num_units: 3
76 nrpe:
77 charm: nrpe
78+ options:
79+ nagios_master: nagios1.internal
80 {%- if series != "trusty" %}
81- options:
82 procs: '-w 200 -c 250 -k'
83 swap: '-w 90% -c 75% -n ok'
84 {%- endif %}
85
86=== modified file 'charm-testing/filebeat/deploy'
87--- charm-testing/filebeat/deploy 2020-02-21 08:48:20 +0000
88+++ charm-testing/filebeat/deploy 2020-10-01 23:10:22 +0000
89@@ -15,8 +15,9 @@
90 apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
91 nrpe:
92 charm: nrpe
93+ options:
94+ nagios_master: nagios1.internal
95 {%- if series != "trusty" %}
96- options:
97 procs: '-w 200 -c 250 -k'
98 swap: '-w 90% -c 75% -n ok'
99 {%- endif %}
100
101=== modified file 'charm-testing/grafana/deploy'
102--- charm-testing/grafana/deploy 2018-07-09 04:24:22 +0000
103+++ charm-testing/grafana/deploy 2020-10-01 23:10:22 +0000
104@@ -18,6 +18,7 @@
105 apache2-nrpe:
106 charm: nrpe
107 options:
108+ nagios_master: nagios1.internal
109 swap: '-w 90% -c 75% -n OK'
110 load: '-w 10,10,10 -c 20,20,20'
111 prometheus:
112@@ -60,8 +61,9 @@
113 skip_serial_number: true
114 nrpe:
115 charm: nrpe
116+ options:
117+ nagios_master: nagios1.internal
118 {%- if series != "trusty" %}
119- options:
120 procs: '-w 200 -c 250 -k'
121 swap: '-w 90% -c 75% -n ok'
122 {%- endif %}
123
124=== modified file 'charm-testing/graylog/deploy'
125--- charm-testing/graylog/deploy 2020-02-21 10:06:37 +0000
126+++ charm-testing/graylog/deploy 2020-10-01 23:10:22 +0000
127@@ -27,6 +27,7 @@
128 elasticsearch-nrpe:
129 charm: nrpe
130 options:
131+ nagios_master: nagios1.internal
132 export_nagios_definitions: true
133 load: "-w 10,10,10 -c 25,25,25"
134 sub_postfix: ""
135@@ -36,6 +37,7 @@
136 nrpe:
137 charm: nrpe
138 options:
139+ nagios_master: nagios1.internal
140 export_nagios_definitions: true
141 load: "-w 10,10,6 -c 25,25,20"
142 sub_postfix: ""
143
144=== modified file 'charm-testing/haproxy/deploy'
145--- charm-testing/haproxy/deploy 2018-07-09 04:24:22 +0000
146+++ charm-testing/haproxy/deploy 2020-10-01 23:10:22 +0000
147@@ -15,8 +15,9 @@
148 services: "include-file://{{spec_dir}}/{{stage}}/haproxy.yaml"
149 nrpe:
150 charm: nrpe
151+ options:
152+ nagios_master: nagios1.internal
153 {%- if series != "trusty" %}
154- options:
155 procs: '-w 200 -c 250 -k'
156 swap: '-w 90% -c 75% -n ok'
157 {%- endif %}
158
159=== modified file 'charm-testing/influxdb/deploy'
160--- charm-testing/influxdb/deploy 2018-07-11 09:12:30 +0000
161+++ charm-testing/influxdb/deploy 2020-10-01 23:10:22 +0000
162@@ -7,7 +7,9 @@
163 install_sources: ppa:canonical-is-sa/influxdb
164 nrpe:
165 charm: nrpe
166- {% if series == "bionic" or series == "xenial" %}options:
167+ options:
168+ nagios_master: nagios1.internal
169+ {% if series == "bionic" or series == "xenial" %}
170 procs: '-w 200 -c 250'
171 swap: '-w 90% -c 75% -n ok'{% endif %}
172 relations:
173
174=== modified file 'charm-testing/jenkins/deploy'
175--- charm-testing/jenkins/deploy 2020-01-30 21:53:26 +0000
176+++ charm-testing/jenkins/deploy 2020-10-01 23:10:22 +0000
177@@ -163,6 +163,7 @@
178 nrpe:
179 charm: nrpe
180 options:
181+ nagios_master: nagios1.internal
182 # We think Jenkins is a bit more intensive at idle than most.
183 load: "-w 8,4,2 -c 15,10,5"
184 procs: "300"
185
186=== modified file 'charm-testing/juju-introspection-proxy/deploy'
187--- charm-testing/juju-introspection-proxy/deploy 2018-07-19 16:43:27 +0000
188+++ charm-testing/juju-introspection-proxy/deploy 2020-10-01 23:10:22 +0000
189@@ -10,8 +10,9 @@
190 port: 19091
191 nrpe:
192 charm: nrpe
193+ options:
194+ nagios_master: nagios1.internal
195 {%- if series != "trusty" %}
196- options:
197 procs: '-w 200 -c 250 -k'
198 swap: '-w 90% -c 75% -n ok'
199 {%- endif %}
200
201=== modified file 'charm-testing/memcached/deploy'
202--- charm-testing/memcached/deploy 2018-07-16 12:27:28 +0000
203+++ charm-testing/memcached/deploy 2020-10-01 23:10:22 +0000
204@@ -6,8 +6,9 @@
205 num_units: 3
206 nrpe:
207 charm: nrpe
208+ options:
209+ nagios_master: nagios1.internal
210 {%- if series != "trusty" %}
211- options:
212 procs: '-w 200 -c 250 -k'
213 swap: '-w 90% -c 75% -n ok'
214 {%- endif %}
215
216=== modified file 'charm-testing/mongodb/deploy'
217--- charm-testing/mongodb/deploy 2018-07-09 04:24:22 +0000
218+++ charm-testing/mongodb/deploy 2020-10-01 23:10:22 +0000
219@@ -6,8 +6,9 @@
220 num_units: 3
221 nrpe:
222 charm: nrpe
223+ options:
224+ nagios_master: nagios1.internal
225 {%- if series != "trusty" %}
226- options:
227 procs: '-w 200 -c 250 -k'
228 swap: '-w 90% -c 75% -n ok'
229 {%- endif %}
230
231=== modified file 'charm-testing/nrpe/deploy'
232--- charm-testing/nrpe/deploy 2018-07-09 04:24:22 +0000
233+++ charm-testing/nrpe/deploy 2020-10-01 23:10:22 +0000
234@@ -5,8 +5,9 @@
235 charm: ubuntu
236 nrpe:
237 charm: nrpe
238+ options:
239+ nagios_master: nagios1.internal
240 {%- if series != "trusty" %}
241- options:
242 procs: '-w 200 -c 250 -k'
243 swap: '-w 90% -c 75% -n ok'
244 {%- endif %}
245
246=== modified file 'charm-testing/ntp/deploy'
247--- charm-testing/ntp/deploy 2019-03-15 04:14:14 +0000
248+++ charm-testing/ntp/deploy 2020-10-01 23:10:22 +0000
249@@ -6,8 +6,9 @@
250 num_units: 3
251 nrpe:
252 charm: nrpe
253+ options:
254+ nagios_master: nagios1.internal
255 {%- if series != "trusty" %}
256- options:
257 procs: '-w 200 -c 250 -k'
258 swap: '-w 90% -c 75% -n ok'
259 {%- endif %}
260
261=== modified file 'charm-testing/pgbouncer/deploy'
262--- charm-testing/pgbouncer/deploy 2018-07-09 04:24:22 +0000
263+++ charm-testing/pgbouncer/deploy 2020-10-01 23:10:22 +0000
264@@ -11,8 +11,9 @@
265 charm: pgbouncer
266 nrpe:
267 charm: nrpe
268+ options:
269+ nagios_master: nagios1.internal
270 {%- if series != "trusty" %}
271- options:
272 procs: '-w 200 -c 250 -k'
273 swap: '-w 90% -c 75% -n ok'
274 {%- endif %}
275
276=== modified file 'charm-testing/postgresql/deploy'
277--- charm-testing/postgresql/deploy 2018-07-16 12:27:28 +0000
278+++ charm-testing/postgresql/deploy 2020-10-01 23:10:22 +0000
279@@ -5,8 +5,9 @@
280 charm: postgresql
281 nrpe:
282 charm: nrpe
283+ options:
284+ nagios_master: nagios1.internal
285 {%- if series != "trusty" %}
286- options:
287 procs: '-w 200 -c 250 -k'
288 swap: '-w 90% -c 75% -n ok'
289 {%- endif %}
290
291=== modified file 'charm-testing/prometheus-openstack-exporter/deploy'
292--- charm-testing/prometheus-openstack-exporter/deploy 2018-07-19 11:40:59 +0000
293+++ charm-testing/prometheus-openstack-exporter/deploy 2020-10-01 23:10:22 +0000
294@@ -12,8 +12,9 @@
295 auth_url: "http://localhost" }
296 nrpe:
297 charm: nrpe
298+ options:
299+ nagios_master: nagios1.internal
300 {%- if series != "trusty" %}
301- options:
302 procs: '-w 200 -c 250 -k'
303 swap: '-w 90% -c 75% -n ok'
304 {%- endif %}
305
306=== modified file 'charm-testing/prometheus2/deploy'
307--- charm-testing/prometheus2/deploy 2018-07-16 12:27:28 +0000
308+++ charm-testing/prometheus2/deploy 2020-10-01 23:10:22 +0000
309@@ -63,8 +63,9 @@
310 skip_serial_number: true
311 nrpe:
312 charm: nrpe
313+ options:
314+ nagios_master: nagios1.internal
315 {%- if series != "trusty" %}
316- options:
317 procs: '-w 200 -c 250 -k'
318 swap: '-w 90% -c 75% -n ok'
319 {%- endif %}
320
321=== modified file 'charm-testing/rsyslog/deploy'
322--- charm-testing/rsyslog/deploy 2019-03-06 05:58:33 +0000
323+++ charm-testing/rsyslog/deploy 2020-10-01 23:10:22 +0000
324@@ -11,6 +11,7 @@
325 nrpe:
326 charm: nrpe
327 options:
328+ nagios_master: nagios1.internal
329 export_nagios_definitions: true
330 sub_postfix: ""
331 hostgroups: ci-rsyslog-testing
332
333=== modified file 'charm-testing/squid-reverseproxy/deploy'
334--- charm-testing/squid-reverseproxy/deploy 2018-08-09 14:16:48 +0000
335+++ charm-testing/squid-reverseproxy/deploy 2020-10-01 23:10:22 +0000
336@@ -12,8 +12,9 @@
337 vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"
338 nrpe:
339 charm: nrpe
340+ options:
341+ nagios_master: nagios1.internal
342 {%- if series != "trusty" %}
343- options:
344 procs: '-w 200 -c 250 -k'
345 swap: '-w 90% -c 75% -n ok'
346 {%- endif %}
347
348=== modified file 'charm-testing/telegraf/deploy'
349--- charm-testing/telegraf/deploy 2018-07-16 12:27:28 +0000
350+++ charm-testing/telegraf/deploy 2020-10-01 23:10:22 +0000
351@@ -8,8 +8,9 @@
352 expose: true
353 nrpe:
354 charm: nrpe
355+ options:
356+ nagios_master: nagios1.internal
357 {%- if series != "trusty" %}
358- options:
359 procs: '-w 200 -c 250 -k'
360 swap: '-w 90% -c 75% -n ok'
361 {%- endif %}
362
363=== modified file 'charm-testing/ubuntu-repository-cache/deploy'
364--- charm-testing/ubuntu-repository-cache/deploy 2020-04-15 01:43:18 +0000
365+++ charm-testing/ubuntu-repository-cache/deploy 2020-10-01 23:10:22 +0000
366@@ -13,6 +13,8 @@
367 sync-on-start: True
368 nrpe:
369 charm: nrpe
370+ options:
371+ nagios_master: nagios1.internal
372 haproxy:
373 charm: haproxy
374 num_units: 1
375
376=== modified file 'charm-testing/vault/deploy'
377--- charm-testing/vault/deploy 2018-02-16 16:26:32 +0000
378+++ charm-testing/vault/deploy 2020-10-01 23:10:22 +0000
379@@ -19,6 +19,7 @@
380 nrpe:
381 charm: nrpe
382 options:
383+ nagios_master: nagios1.internal
384 export_nagios_definitions: true
385 sub_postfix: ""
386 hostgroups: nagios-vault
387
388=== modified file 'mojo-how-to/devel/services'
389--- mojo-how-to/devel/services 2016-03-30 10:00:49 +0000
390+++ mojo-how-to/devel/services 2020-10-01 23:10:22 +0000
391@@ -18,6 +18,8 @@
392 dest_dir: /srv/mojo
393 nrpe:
394 charm: nrpe
395- {% if series == "xenial" %}options:
396+ options:
397+ nagios_master: nagios1.internal
398+ {% if series == "xenial" %}
399 procs: '-w 150 -c 200'
400 swap: '-w 90% -c 75% -n ok'{% endif %}
401
402=== modified file 'mojo-how-to/production/services'
403--- mojo-how-to/production/services 2019-02-04 04:28:17 +0000
404+++ mojo-how-to/production/services 2020-10-01 23:10:22 +0000
405@@ -25,7 +25,9 @@
406 charm: landscape-client
407 nrpe:
408 charm: nrpe
409- {% if series == "xenial" %}options:
410+ options:
411+ nagios_master: nagios1.internal
412+ {% if series == "xenial" %}
413 procs: '-w 200 -c 250'
414 swap: '-w 90% -c 75% -n ok'{% endif %}
415 ksplice:

Subscribers

People subscribed via source and target branches

to all changes: