Mojo: Continuous Delivery for Juju

Merge ~mthaddon/mojo/+git/mojo-specs:nagios_master into ~mojo-maintainers/mojo/+git/mojo-specs:master

  1. Git
  2. lp:~mthaddon/mojo/+git/mojo-specs
  3. nagios_master
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Nick Moffitt
Approved revision: eeba6719aef67be3d5efd04df02bbe1edc1e0764
Merged at revision: fd64314864940098936d665746f13edb711dcd48
Proposed branch: ~mthaddon/mojo/+git/mojo-specs:nagios_master
Merge into: ~mojo-maintainers/mojo/+git/mojo-specs:master
Diff against target: 477 lines (+65/-27)
31 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/manifest-initial (+3/-3)
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/prometheus/deploy (+3/-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/collect (+2/-2)
charm-testing/ubuntu-repository-cache/deploy (+3/-0)
charm-testing/vault/deploy (+1/-0)
mojo-how-to/devel/services (+3/-1)
mojo-how-to/production/services (+3/-1)
Reviewer Review Type Date Requested Status
Mojo Maintainers Pending
Review via email: mp+397965@code.launchpad.net

Commit message

Pull in nagios_master config changes from bzr spec

Description of the change

Pull in nagios_master config changes from bzr spec.

I've done a manual diff of the bzr version of this spec to the git version of this spec. This pulls in all the changes. My plan from here is to update all our charm testing jobs to use the git repo, and then to land an update to the bzr spec saying it's obsolete.

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.

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

Change successfully merged at revision fd64314864940098936d665746f13edb711dcd48

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm-testing/apache-openid/deploy b/charm-testing/apache-openid/deploy
2index f62674d..7c74a5d 100644
3--- a/charm-testing/apache-openid/deploy
4+++ b/charm-testing/apache-openid/deploy
5@@ -20,6 +20,8 @@ apache-openid:
6 authorized_teams: "apache-openid-charmers"
7 nrpe:
8 charm: nrpe
9+ options:
10+ nagios_master: nagios1.internal
11 relations:
12 - ["apache2", "apache-openid"]
13 - ["nrpe:local-monitors", "apache2:local-monitors"]
14diff --git a/charm-testing/apache2/deploy b/charm-testing/apache2/deploy
15index c0e546a..a9bd9b5 100644
16--- a/charm-testing/apache2/deploy
17+++ b/charm-testing/apache2/deploy
18@@ -17,8 +17,9 @@ apache2:
19 ssl_certlocation: ssl-cert-snakeoil.crt
20 nrpe:
21 charm: nrpe
22-{%- if series != "trusty" %}
23 options:
24+ nagios_master: nagios1.internal
25+{%- if series != "trusty" %}
26 procs: '-w 200 -c 250 -k'
27 swap: '-w 90% -c 75% -n ok'
28 {%- endif %}
29diff --git a/charm-testing/canonical-livepatch/deploy b/charm-testing/canonical-livepatch/deploy
30index e176b5b..e278477 100644
31--- a/charm-testing/canonical-livepatch/deploy
32+++ b/charm-testing/canonical-livepatch/deploy
33@@ -9,8 +9,9 @@ ubuntu:
34 livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
35 nrpe:
36 charm: nrpe
37-{%- if series != "trusty" %}
38 options:
39+ nagios_master: nagios1.internal
40+{%- if series != "trusty" %}
41 procs: '-w 200 -c 250 -k'
42 swap: '-w 90% -c 75% -n ok'
43 {%- endif %}
44diff --git a/charm-testing/cassandra/deploy b/charm-testing/cassandra/deploy
45index 7dba164..7248e96 100644
46--- a/charm-testing/cassandra/deploy
47+++ b/charm-testing/cassandra/deploy
48@@ -6,8 +6,9 @@ cassandra:
49 num_units: 3
50 nrpe:
51 charm: nrpe
52-{%- if series != "trusty" %}
53 options:
54+ nagios_master: nagios1.internal
55+{%- if series != "trusty" %}
56 procs: '-w 200 -c 250 -k'
57 swap: '-w 90% -c 75% -n ok'
58 {%- endif %}
59diff --git a/charm-testing/content-cache/deploy b/charm-testing/content-cache/deploy
60index 53312bf..be8ef7a 100644
61--- a/charm-testing/content-cache/deploy
62+++ b/charm-testing/content-cache/deploy
63@@ -25,6 +25,7 @@ content-cache:
64 nrpe:
65 charm: nrpe
66 options:
67+ nagios_master: nagios1.internal
68 export_nagios_definitions: true
69 sub_postfix: ""
70 swap: "-w 90% -c 75% -n ok"
71diff --git a/charm-testing/elasticsearch/deploy b/charm-testing/elasticsearch/deploy
72index 47da8a2..970ee05 100644
73--- a/charm-testing/elasticsearch/deploy
74+++ b/charm-testing/elasticsearch/deploy
75@@ -6,8 +6,9 @@ elasticsearch:
76 num_units: 3
77 nrpe:
78 charm: nrpe
79-{%- if series != "trusty" %}
80 options:
81+ nagios_master: nagios1.internal
82+{%- if series != "trusty" %}
83 procs: '-w 200 -c 250 -k'
84 swap: '-w 90% -c 75% -n ok'
85 {%- endif %}
86diff --git a/charm-testing/filebeat/deploy b/charm-testing/filebeat/deploy
87index 643b21c..60742fd 100644
88--- a/charm-testing/filebeat/deploy
89+++ b/charm-testing/filebeat/deploy
90@@ -15,8 +15,9 @@ ubuntu:
91 apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
92 nrpe:
93 charm: nrpe
94-{%- if series != "trusty" %}
95 options:
96+ nagios_master: nagios1.internal
97+{%- if series != "trusty" %}
98 procs: '-w 200 -c 250 -k'
99 swap: '-w 90% -c 75% -n ok'
100 {%- endif %}
101diff --git a/charm-testing/grafana/deploy b/charm-testing/grafana/deploy
102index 7c1b893..37bfbaf 100644
103--- a/charm-testing/grafana/deploy
104+++ b/charm-testing/grafana/deploy
105@@ -18,6 +18,7 @@ grafana:
106 apache2-nrpe:
107 charm: nrpe
108 options:
109+ nagios_master: nagios1.internal
110 swap: '-w 90% -c 75% -n OK'
111 load: '-w 10,10,10 -c 20,20,20'
112 prometheus:
113@@ -60,8 +61,9 @@ grafana:
114 skip_serial_number: true
115 nrpe:
116 charm: nrpe
117-{%- if series != "trusty" %}
118 options:
119+ nagios_master: nagios1.internal
120+{%- if series != "trusty" %}
121 procs: '-w 200 -c 250 -k'
122 swap: '-w 90% -c 75% -n ok'
123 {%- endif %}
124diff --git a/charm-testing/graylog/deploy b/charm-testing/graylog/deploy
125index 1dde9b5..f54f0e9 100644
126--- a/charm-testing/graylog/deploy
127+++ b/charm-testing/graylog/deploy
128@@ -27,6 +27,7 @@ centralized-logging:
129 elasticsearch-nrpe:
130 charm: nrpe
131 options:
132+ nagios_master: nagios1.internal
133 export_nagios_definitions: true
134 load: "-w 10,10,10 -c 25,25,25"
135 sub_postfix: ""
136@@ -36,6 +37,7 @@ centralized-logging:
137 nrpe:
138 charm: nrpe
139 options:
140+ nagios_master: nagios1.internal
141 export_nagios_definitions: true
142 load: "-w 10,10,6 -c 25,25,20"
143 sub_postfix: ""
144diff --git a/charm-testing/haproxy/deploy b/charm-testing/haproxy/deploy
145index 62e2657..bf62e82 100644
146--- a/charm-testing/haproxy/deploy
147+++ b/charm-testing/haproxy/deploy
148@@ -15,8 +15,9 @@ haproxy:
149 services: "include-file://{{spec_dir}}/{{stage}}/haproxy.yaml"
150 nrpe:
151 charm: nrpe
152-{%- if series != "trusty" %}
153 options:
154+ nagios_master: nagios1.internal
155+{%- if series != "trusty" %}
156 procs: '-w 200 -c 250 -k'
157 swap: '-w 90% -c 75% -n ok'
158 {%- endif %}
159diff --git a/charm-testing/influxdb/deploy b/charm-testing/influxdb/deploy
160index a50847a..d77360d 100644
161--- a/charm-testing/influxdb/deploy
162+++ b/charm-testing/influxdb/deploy
163@@ -7,7 +7,9 @@ influxdb:
164 install_sources: ppa:canonical-is-sa/influxdb
165 nrpe:
166 charm: nrpe
167- {% if series == "bionic" or series == "xenial" %}options:
168+ options:
169+ nagios_master: nagios1.internal
170+ {% if series == "bionic" or series == "xenial" %}
171 procs: '-w 200 -c 250'
172 swap: '-w 90% -c 75% -n ok'{% endif %}
173 relations:
174diff --git a/charm-testing/jenkins/deploy b/charm-testing/jenkins/deploy
175index 9b2a2b2..bbd6a40 100644
176--- a/charm-testing/jenkins/deploy
177+++ b/charm-testing/jenkins/deploy
178@@ -163,6 +163,7 @@ jenkaas:
179 nrpe:
180 charm: nrpe
181 options:
182+ nagios_master: nagios1.internal
183 # We think Jenkins is a bit more intensive at idle than most.
184 load: "-w 8,4,2 -c 15,10,5"
185 procs: "300"
186diff --git a/charm-testing/juju-introspection-proxy/deploy b/charm-testing/juju-introspection-proxy/deploy
187index 3fbeb4e..4069329 100644
188--- a/charm-testing/juju-introspection-proxy/deploy
189+++ b/charm-testing/juju-introspection-proxy/deploy
190@@ -10,8 +10,9 @@ juju-introspection-proxy:
191 port: 19091
192 nrpe:
193 charm: nrpe
194-{%- if series != "trusty" %}
195 options:
196+ nagios_master: nagios1.internal
197+{%- if series != "trusty" %}
198 procs: '-w 200 -c 250 -k'
199 swap: '-w 90% -c 75% -n ok'
200 {%- endif %}
201diff --git a/charm-testing/manifest-initial b/charm-testing/manifest-initial
202index 284bfc9..23d31e0 100644
203--- a/charm-testing/manifest-initial
204+++ b/charm-testing/manifest-initial
205@@ -10,7 +10,7 @@ script config=create-initial-collect INITIAL_CHARM=${INITIAL_CHARM}
206 collect config=collect-initial
207 script config=pre-deploy
208 deploy config=deploy wait=true
209-nagios-check retry=3 sleep=60
210+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
211 verify config=post-deploy retry=3 sleep=60
212 # Now test an upgrade to the new charm if UPGRADE_CHARM is set
213 stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
214@@ -18,11 +18,11 @@ script config=create-upgrade-collect UPGRADE_CHARM=${UPGRADE_CHARM}
215 collect config=collect-upgrade
216 script config=upgrade-charm
217 juju-check-wait
218-nagios-check retry=3 sleep=60
219+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
220 verify config=post-deploy retry=3 sleep=60
221 # Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
222 script config=redeploy-model
223 script config=pre-deploy
224 deploy config=deploy wait=true
225-nagios-check retry=3 sleep=60
226+nagios-check skip-checks='check_load,check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
227 verify config=post-deploy retry=3 sleep=60
228diff --git a/charm-testing/memcached/deploy b/charm-testing/memcached/deploy
229index 07f5633..4bc9070 100644
230--- a/charm-testing/memcached/deploy
231+++ b/charm-testing/memcached/deploy
232@@ -6,8 +6,9 @@ memcached:
233 num_units: 3
234 nrpe:
235 charm: nrpe
236-{%- if series != "trusty" %}
237 options:
238+ nagios_master: nagios1.internal
239+{%- if series != "trusty" %}
240 procs: '-w 200 -c 250 -k'
241 swap: '-w 90% -c 75% -n ok'
242 {%- endif %}
243diff --git a/charm-testing/mongodb/deploy b/charm-testing/mongodb/deploy
244index 12b31e0..b9ea7f6 100644
245--- a/charm-testing/mongodb/deploy
246+++ b/charm-testing/mongodb/deploy
247@@ -6,8 +6,9 @@ mongodb:
248 num_units: 3
249 nrpe:
250 charm: nrpe
251-{%- if series != "trusty" %}
252 options:
253+ nagios_master: nagios1.internal
254+{%- if series != "trusty" %}
255 procs: '-w 200 -c 250 -k'
256 swap: '-w 90% -c 75% -n ok'
257 {%- endif %}
258diff --git a/charm-testing/nrpe/deploy b/charm-testing/nrpe/deploy
259index e320394..06d45b6 100644
260--- a/charm-testing/nrpe/deploy
261+++ b/charm-testing/nrpe/deploy
262@@ -5,8 +5,9 @@ ubuntu:
263 charm: ubuntu
264 nrpe:
265 charm: nrpe
266-{%- if series != "trusty" %}
267 options:
268+ nagios_master: nagios1.internal
269+{%- if series != "trusty" %}
270 procs: '-w 200 -c 250 -k'
271 swap: '-w 90% -c 75% -n ok'
272 {%- endif %}
273diff --git a/charm-testing/ntp/deploy b/charm-testing/ntp/deploy
274index be80519..4ba9b73 100644
275--- a/charm-testing/ntp/deploy
276+++ b/charm-testing/ntp/deploy
277@@ -6,8 +6,9 @@ ubuntu:
278 num_units: 3
279 nrpe:
280 charm: nrpe
281-{%- if series != "trusty" %}
282 options:
283+ nagios_master: nagios1.internal
284+{%- if series != "trusty" %}
285 procs: '-w 200 -c 250 -k'
286 swap: '-w 90% -c 75% -n ok'
287 {%- endif %}
288diff --git a/charm-testing/pgbouncer/deploy b/charm-testing/pgbouncer/deploy
289index b467a3a..92ae35c 100644
290--- a/charm-testing/pgbouncer/deploy
291+++ b/charm-testing/pgbouncer/deploy
292@@ -11,8 +11,9 @@ postgresql:
293 charm: pgbouncer
294 nrpe:
295 charm: nrpe
296-{%- if series != "trusty" %}
297 options:
298+ nagios_master: nagios1.internal
299+{%- if series != "trusty" %}
300 procs: '-w 200 -c 250 -k'
301 swap: '-w 90% -c 75% -n ok'
302 {%- endif %}
303diff --git a/charm-testing/postgresql/deploy b/charm-testing/postgresql/deploy
304index e15cb3f..936ef75 100644
305--- a/charm-testing/postgresql/deploy
306+++ b/charm-testing/postgresql/deploy
307@@ -5,8 +5,9 @@ postgresql:
308 charm: postgresql
309 nrpe:
310 charm: nrpe
311-{%- if series != "trusty" %}
312 options:
313+ nagios_master: nagios1.internal
314+{%- if series != "trusty" %}
315 procs: '-w 200 -c 250 -k'
316 swap: '-w 90% -c 75% -n ok'
317 {%- endif %}
318diff --git a/charm-testing/prometheus-openstack-exporter/deploy b/charm-testing/prometheus-openstack-exporter/deploy
319index 508b553..3ba5af8 100644
320--- a/charm-testing/prometheus-openstack-exporter/deploy
321+++ b/charm-testing/prometheus-openstack-exporter/deploy
322@@ -12,8 +12,9 @@ prometheus-openstack-exporter:
323 auth_url: "http://localhost" }
324 nrpe:
325 charm: nrpe
326-{%- if series != "trusty" %}
327 options:
328+ nagios_master: nagios1.internal
329+{%- if series != "trusty" %}
330 procs: '-w 200 -c 250 -k'
331 swap: '-w 90% -c 75% -n ok'
332 {%- endif %}
333diff --git a/charm-testing/prometheus/deploy b/charm-testing/prometheus/deploy
334index a3c2125..a551bb2 100644
335--- a/charm-testing/prometheus/deploy
336+++ b/charm-testing/prometheus/deploy
337@@ -9,7 +9,9 @@ prometheus:
338 external_url: "http://prometheus.testing.local/"
339 nrpe:
340 charm: nrpe
341- {% if series == "xenial" %}options:
342+ options:
343+ nagios_master: nagios1.internal
344+ {% if series == "xenial" %}
345 swap: '-w 90% -c 75% -n OK'{% endif %}
346
347 relations:
348diff --git a/charm-testing/prometheus2/deploy b/charm-testing/prometheus2/deploy
349index b9065fe..3e00dbc 100644
350--- a/charm-testing/prometheus2/deploy
351+++ b/charm-testing/prometheus2/deploy
352@@ -63,8 +63,9 @@ prometheus:
353 skip_serial_number: true
354 nrpe:
355 charm: nrpe
356-{%- if series != "trusty" %}
357 options:
358+ nagios_master: nagios1.internal
359+{%- if series != "trusty" %}
360 procs: '-w 200 -c 250 -k'
361 swap: '-w 90% -c 75% -n ok'
362 {%- endif %}
363diff --git a/charm-testing/rsyslog/deploy b/charm-testing/rsyslog/deploy
364index 7c966a8..f8a49f7 100644
365--- a/charm-testing/rsyslog/deploy
366+++ b/charm-testing/rsyslog/deploy
367@@ -11,6 +11,7 @@ rsyslog:
368 nrpe:
369 charm: nrpe
370 options:
371+ nagios_master: nagios1.internal
372 export_nagios_definitions: true
373 sub_postfix: ""
374 hostgroups: ci-rsyslog-testing
375diff --git a/charm-testing/squid-reverseproxy/deploy b/charm-testing/squid-reverseproxy/deploy
376index 0fb006a..571160b 100644
377--- a/charm-testing/squid-reverseproxy/deploy
378+++ b/charm-testing/squid-reverseproxy/deploy
379@@ -12,8 +12,9 @@ ubuntu:
380 vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"
381 nrpe:
382 charm: nrpe
383-{%- if series != "trusty" %}
384 options:
385+ nagios_master: nagios1.internal
386+{%- if series != "trusty" %}
387 procs: '-w 200 -c 250 -k'
388 swap: '-w 90% -c 75% -n ok'
389 {%- endif %}
390diff --git a/charm-testing/telegraf/deploy b/charm-testing/telegraf/deploy
391index fb42772..3c05bad 100644
392--- a/charm-testing/telegraf/deploy
393+++ b/charm-testing/telegraf/deploy
394@@ -8,8 +8,9 @@ prometheus:
395 expose: true
396 nrpe:
397 charm: nrpe
398-{%- if series != "trusty" %}
399 options:
400+ nagios_master: nagios1.internal
401+{%- if series != "trusty" %}
402 procs: '-w 200 -c 250 -k'
403 swap: '-w 90% -c 75% -n ok'
404 {%- endif %}
405diff --git a/charm-testing/ubuntu-repository-cache/collect b/charm-testing/ubuntu-repository-cache/collect
406index 582776a..ffde4a7 100644
407--- a/charm-testing/ubuntu-repository-cache/collect
408+++ b/charm-testing/ubuntu-repository-cache/collect
409@@ -1,3 +1,3 @@
410-ubuntu-repository-cache lp:ubuntu-repository-cache
411+ubuntu-repository-cache cs:~ubuntu-repository-cache-charmers/ubuntu-repository-cache
412 nrpe cs:nrpe
413-haproxy cs:haproxy
414\ No newline at end of file
415+haproxy cs:haproxy
416diff --git a/charm-testing/ubuntu-repository-cache/deploy b/charm-testing/ubuntu-repository-cache/deploy
417index 95a3148..c8cb53a 100644
418--- a/charm-testing/ubuntu-repository-cache/deploy
419+++ b/charm-testing/ubuntu-repository-cache/deploy
420@@ -5,6 +5,7 @@ ubuntu-repository-cache:
421 services:
422 ubuntu-repository-cache:
423 charm: ubuntu-repository-cache
424+ constraints: cores=1 mem=2G root-disk=30G
425 series: {{series}}
426 options:
427 mirror-series: {{series}}
428@@ -12,6 +13,8 @@ ubuntu-repository-cache:
429 sync-on-start: True
430 nrpe:
431 charm: nrpe
432+ options:
433+ nagios_master: nagios1.internal
434 haproxy:
435 charm: haproxy
436 num_units: 1
437diff --git a/charm-testing/vault/deploy b/charm-testing/vault/deploy
438index 7cc5c06..081cfa8 100644
439--- a/charm-testing/vault/deploy
440+++ b/charm-testing/vault/deploy
441@@ -19,6 +19,7 @@ vault:
442 nrpe:
443 charm: nrpe
444 options:
445+ nagios_master: nagios1.internal
446 export_nagios_definitions: true
447 sub_postfix: ""
448 hostgroups: nagios-vault
449diff --git a/mojo-how-to/devel/services b/mojo-how-to/devel/services
450index 87a7c98..7f569fc 100644
451--- a/mojo-how-to/devel/services
452+++ b/mojo-how-to/devel/services
453@@ -18,6 +18,8 @@ mojo-how-to:
454 dest_dir: /srv/mojo
455 nrpe:
456 charm: nrpe
457- {% if series == "xenial" %}options:
458+ options:
459+ nagios_master: nagios1.internal
460+ {% if series == "xenial" %}
461 procs: '-w 150 -c 200'
462 swap: '-w 90% -c 75% -n ok'{% endif %}
463diff --git a/mojo-how-to/production/services b/mojo-how-to/production/services
464index 393d1b7..ddf40d7 100644
465--- a/mojo-how-to/production/services
466+++ b/mojo-how-to/production/services
467@@ -25,7 +25,9 @@ mojo-how-to:
468 charm: landscape-client
469 nrpe:
470 charm: nrpe
471- {% if series == "xenial" %}options:
472+ options:
473+ nagios_master: nagios1.internal
474+ {% if series == "xenial" %}
475 procs: '-w 200 -c 250'
476 swap: '-w 90% -c 75% -n ok'{% endif %}
477 ksplice:

Subscribers

People subscribed via source and target branches

to all changes: