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
=== modified file 'charm-testing/apache-openid/deploy'
--- charm-testing/apache-openid/deploy 2018-07-23 16:29:22 +0000
+++ charm-testing/apache-openid/deploy 2020-10-01 23:10:22 +0000
@@ -20,6 +20,8 @@
20 authorized_teams: "apache-openid-charmers"20 authorized_teams: "apache-openid-charmers"
21 nrpe:21 nrpe:
22 charm: nrpe22 charm: nrpe
23 options:
24 nagios_master: nagios1.internal
23 relations:25 relations:
24 - ["apache2", "apache-openid"]26 - ["apache2", "apache-openid"]
25 - ["nrpe:local-monitors", "apache2:local-monitors"]27 - ["nrpe:local-monitors", "apache2:local-monitors"]
2628
=== modified file 'charm-testing/apache2/deploy'
--- charm-testing/apache2/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/apache2/deploy 2020-10-01 23:10:22 +0000
@@ -17,8 +17,9 @@
17 ssl_certlocation: ssl-cert-snakeoil.crt17 ssl_certlocation: ssl-cert-snakeoil.crt
18 nrpe:18 nrpe:
19 charm: nrpe19 charm: nrpe
20 options:
21 nagios_master: nagios1.internal
20{%- if series != "trusty" %}22{%- if series != "trusty" %}
21 options:
22 procs: '-w 200 -c 250 -k'23 procs: '-w 200 -c 250 -k'
23 swap: '-w 90% -c 75% -n ok'24 swap: '-w 90% -c 75% -n ok'
24{%- endif %}25{%- endif %}
2526
=== modified file 'charm-testing/canonical-livepatch/deploy'
--- charm-testing/canonical-livepatch/deploy 2020-02-21 16:48:43 +0000
+++ charm-testing/canonical-livepatch/deploy 2020-10-01 23:10:22 +0000
@@ -9,8 +9,9 @@
9 livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key9 livepatch_key: include-file://{{local_dir}}/canonical-is-livepatch.key
10 nrpe:10 nrpe:
11 charm: nrpe11 charm: nrpe
12 options:
13 nagios_master: nagios1.internal
12{%- if series != "trusty" %}14{%- if series != "trusty" %}
13 options:
14 procs: '-w 200 -c 250 -k'15 procs: '-w 200 -c 250 -k'
15 swap: '-w 90% -c 75% -n ok'16 swap: '-w 90% -c 75% -n ok'
16{%- endif %}17{%- endif %}
1718
=== modified file 'charm-testing/cassandra/deploy'
--- charm-testing/cassandra/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/cassandra/deploy 2020-10-01 23:10:22 +0000
@@ -6,8 +6,9 @@
6 num_units: 36 num_units: 3
7 nrpe:7 nrpe:
8 charm: nrpe8 charm: nrpe
9 options:
10 nagios_master: nagios1.internal
9{%- if series != "trusty" %}11{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'12 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'13 swap: '-w 90% -c 75% -n ok'
13{%- endif %}14{%- endif %}
1415
=== modified file 'charm-testing/content-cache/deploy'
--- charm-testing/content-cache/deploy 2020-03-25 02:38:02 +0000
+++ charm-testing/content-cache/deploy 2020-10-01 23:10:22 +0000
@@ -25,6 +25,7 @@
25 nrpe:25 nrpe:
26 charm: nrpe26 charm: nrpe
27 options:27 options:
28 nagios_master: nagios1.internal
28 export_nagios_definitions: true29 export_nagios_definitions: true
29 sub_postfix: ""30 sub_postfix: ""
30 swap: "-w 90% -c 75% -n ok"31 swap: "-w 90% -c 75% -n ok"
3132
=== modified file 'charm-testing/elasticsearch/deploy'
--- charm-testing/elasticsearch/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/elasticsearch/deploy 2020-10-01 23:10:22 +0000
@@ -6,8 +6,9 @@
6 num_units: 36 num_units: 3
7 nrpe:7 nrpe:
8 charm: nrpe8 charm: nrpe
9 options:
10 nagios_master: nagios1.internal
9{%- if series != "trusty" %}11{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'12 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'13 swap: '-w 90% -c 75% -n ok'
13{%- endif %}14{%- endif %}
1415
=== modified file 'charm-testing/filebeat/deploy'
--- charm-testing/filebeat/deploy 2020-02-21 08:48:20 +0000
+++ charm-testing/filebeat/deploy 2020-10-01 23:10:22 +0000
@@ -15,8 +15,9 @@
15 apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'15 apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
16 nrpe:16 nrpe:
17 charm: nrpe17 charm: nrpe
18 options:
19 nagios_master: nagios1.internal
18{%- if series != "trusty" %}20{%- if series != "trusty" %}
19 options:
20 procs: '-w 200 -c 250 -k'21 procs: '-w 200 -c 250 -k'
21 swap: '-w 90% -c 75% -n ok'22 swap: '-w 90% -c 75% -n ok'
22{%- endif %}23{%- endif %}
2324
=== modified file 'charm-testing/grafana/deploy'
--- charm-testing/grafana/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/grafana/deploy 2020-10-01 23:10:22 +0000
@@ -18,6 +18,7 @@
18 apache2-nrpe:18 apache2-nrpe:
19 charm: nrpe19 charm: nrpe
20 options:20 options:
21 nagios_master: nagios1.internal
21 swap: '-w 90% -c 75% -n OK'22 swap: '-w 90% -c 75% -n OK'
22 load: '-w 10,10,10 -c 20,20,20'23 load: '-w 10,10,10 -c 20,20,20'
23 prometheus:24 prometheus:
@@ -60,8 +61,9 @@
60 skip_serial_number: true61 skip_serial_number: true
61 nrpe:62 nrpe:
62 charm: nrpe63 charm: nrpe
64 options:
65 nagios_master: nagios1.internal
63{%- if series != "trusty" %}66{%- if series != "trusty" %}
64 options:
65 procs: '-w 200 -c 250 -k'67 procs: '-w 200 -c 250 -k'
66 swap: '-w 90% -c 75% -n ok'68 swap: '-w 90% -c 75% -n ok'
67{%- endif %}69{%- endif %}
6870
=== modified file 'charm-testing/graylog/deploy'
--- charm-testing/graylog/deploy 2020-02-21 10:06:37 +0000
+++ charm-testing/graylog/deploy 2020-10-01 23:10:22 +0000
@@ -27,6 +27,7 @@
27 elasticsearch-nrpe:27 elasticsearch-nrpe:
28 charm: nrpe28 charm: nrpe
29 options:29 options:
30 nagios_master: nagios1.internal
30 export_nagios_definitions: true31 export_nagios_definitions: true
31 load: "-w 10,10,10 -c 25,25,25"32 load: "-w 10,10,10 -c 25,25,25"
32 sub_postfix: ""33 sub_postfix: ""
@@ -36,6 +37,7 @@
36 nrpe:37 nrpe:
37 charm: nrpe38 charm: nrpe
38 options:39 options:
40 nagios_master: nagios1.internal
39 export_nagios_definitions: true41 export_nagios_definitions: true
40 load: "-w 10,10,6 -c 25,25,20"42 load: "-w 10,10,6 -c 25,25,20"
41 sub_postfix: ""43 sub_postfix: ""
4244
=== modified file 'charm-testing/haproxy/deploy'
--- charm-testing/haproxy/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/haproxy/deploy 2020-10-01 23:10:22 +0000
@@ -15,8 +15,9 @@
15 services: "include-file://{{spec_dir}}/{{stage}}/haproxy.yaml"15 services: "include-file://{{spec_dir}}/{{stage}}/haproxy.yaml"
16 nrpe:16 nrpe:
17 charm: nrpe17 charm: nrpe
18 options:
19 nagios_master: nagios1.internal
18{%- if series != "trusty" %}20{%- if series != "trusty" %}
19 options:
20 procs: '-w 200 -c 250 -k'21 procs: '-w 200 -c 250 -k'
21 swap: '-w 90% -c 75% -n ok'22 swap: '-w 90% -c 75% -n ok'
22{%- endif %}23{%- endif %}
2324
=== modified file 'charm-testing/influxdb/deploy'
--- charm-testing/influxdb/deploy 2018-07-11 09:12:30 +0000
+++ charm-testing/influxdb/deploy 2020-10-01 23:10:22 +0000
@@ -7,7 +7,9 @@
7 install_sources: ppa:canonical-is-sa/influxdb7 install_sources: ppa:canonical-is-sa/influxdb
8 nrpe:8 nrpe:
9 charm: nrpe9 charm: nrpe
10 {% if series == "bionic" or series == "xenial" %}options:10 options:
11 nagios_master: nagios1.internal
12 {% if series == "bionic" or series == "xenial" %}
11 procs: '-w 200 -c 250'13 procs: '-w 200 -c 250'
12 swap: '-w 90% -c 75% -n ok'{% endif %}14 swap: '-w 90% -c 75% -n ok'{% endif %}
13 relations:15 relations:
1416
=== modified file 'charm-testing/jenkins/deploy'
--- charm-testing/jenkins/deploy 2020-01-30 21:53:26 +0000
+++ charm-testing/jenkins/deploy 2020-10-01 23:10:22 +0000
@@ -163,6 +163,7 @@
163 nrpe:163 nrpe:
164 charm: nrpe164 charm: nrpe
165 options:165 options:
166 nagios_master: nagios1.internal
166 # We think Jenkins is a bit more intensive at idle than most.167 # We think Jenkins is a bit more intensive at idle than most.
167 load: "-w 8,4,2 -c 15,10,5"168 load: "-w 8,4,2 -c 15,10,5"
168 procs: "300"169 procs: "300"
169170
=== modified file 'charm-testing/juju-introspection-proxy/deploy'
--- charm-testing/juju-introspection-proxy/deploy 2018-07-19 16:43:27 +0000
+++ charm-testing/juju-introspection-proxy/deploy 2020-10-01 23:10:22 +0000
@@ -10,8 +10,9 @@
10 port: 1909110 port: 19091
11 nrpe:11 nrpe:
12 charm: nrpe12 charm: nrpe
13 options:
14 nagios_master: nagios1.internal
13{%- if series != "trusty" %}15{%- if series != "trusty" %}
14 options:
15 procs: '-w 200 -c 250 -k'16 procs: '-w 200 -c 250 -k'
16 swap: '-w 90% -c 75% -n ok'17 swap: '-w 90% -c 75% -n ok'
17{%- endif %}18{%- endif %}
1819
=== modified file 'charm-testing/memcached/deploy'
--- charm-testing/memcached/deploy 2018-07-16 12:27:28 +0000
+++ charm-testing/memcached/deploy 2020-10-01 23:10:22 +0000
@@ -6,8 +6,9 @@
6 num_units: 36 num_units: 3
7 nrpe:7 nrpe:
8 charm: nrpe8 charm: nrpe
9 options:
10 nagios_master: nagios1.internal
9{%- if series != "trusty" %}11{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'12 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'13 swap: '-w 90% -c 75% -n ok'
13{%- endif %}14{%- endif %}
1415
=== modified file 'charm-testing/mongodb/deploy'
--- charm-testing/mongodb/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/mongodb/deploy 2020-10-01 23:10:22 +0000
@@ -6,8 +6,9 @@
6 num_units: 36 num_units: 3
7 nrpe:7 nrpe:
8 charm: nrpe8 charm: nrpe
9 options:
10 nagios_master: nagios1.internal
9{%- if series != "trusty" %}11{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'12 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'13 swap: '-w 90% -c 75% -n ok'
13{%- endif %}14{%- endif %}
1415
=== modified file 'charm-testing/nrpe/deploy'
--- charm-testing/nrpe/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/nrpe/deploy 2020-10-01 23:10:22 +0000
@@ -5,8 +5,9 @@
5 charm: ubuntu5 charm: ubuntu
6 nrpe:6 nrpe:
7 charm: nrpe7 charm: nrpe
8 options:
9 nagios_master: nagios1.internal
8{%- if series != "trusty" %}10{%- if series != "trusty" %}
9 options:
10 procs: '-w 200 -c 250 -k'11 procs: '-w 200 -c 250 -k'
11 swap: '-w 90% -c 75% -n ok'12 swap: '-w 90% -c 75% -n ok'
12{%- endif %}13{%- endif %}
1314
=== modified file 'charm-testing/ntp/deploy'
--- charm-testing/ntp/deploy 2019-03-15 04:14:14 +0000
+++ charm-testing/ntp/deploy 2020-10-01 23:10:22 +0000
@@ -6,8 +6,9 @@
6 num_units: 36 num_units: 3
7 nrpe:7 nrpe:
8 charm: nrpe8 charm: nrpe
9 options:
10 nagios_master: nagios1.internal
9{%- if series != "trusty" %}11{%- if series != "trusty" %}
10 options:
11 procs: '-w 200 -c 250 -k'12 procs: '-w 200 -c 250 -k'
12 swap: '-w 90% -c 75% -n ok'13 swap: '-w 90% -c 75% -n ok'
13{%- endif %}14{%- endif %}
1415
=== modified file 'charm-testing/pgbouncer/deploy'
--- charm-testing/pgbouncer/deploy 2018-07-09 04:24:22 +0000
+++ charm-testing/pgbouncer/deploy 2020-10-01 23:10:22 +0000
@@ -11,8 +11,9 @@
11 charm: pgbouncer11 charm: pgbouncer
12 nrpe:12 nrpe:
13 charm: nrpe13 charm: nrpe
14 options:
15 nagios_master: nagios1.internal
14{%- if series != "trusty" %}16{%- if series != "trusty" %}
15 options:
16 procs: '-w 200 -c 250 -k'17 procs: '-w 200 -c 250 -k'
17 swap: '-w 90% -c 75% -n ok'18 swap: '-w 90% -c 75% -n ok'
18{%- endif %}19{%- endif %}
1920
=== modified file 'charm-testing/postgresql/deploy'
--- charm-testing/postgresql/deploy 2018-07-16 12:27:28 +0000
+++ charm-testing/postgresql/deploy 2020-10-01 23:10:22 +0000
@@ -5,8 +5,9 @@
5 charm: postgresql5 charm: postgresql
6 nrpe:6 nrpe:
7 charm: nrpe7 charm: nrpe
8 options:
9 nagios_master: nagios1.internal
8{%- if series != "trusty" %}10{%- if series != "trusty" %}
9 options:
10 procs: '-w 200 -c 250 -k'11 procs: '-w 200 -c 250 -k'
11 swap: '-w 90% -c 75% -n ok'12 swap: '-w 90% -c 75% -n ok'
12{%- endif %}13{%- endif %}
1314
=== modified file 'charm-testing/prometheus-openstack-exporter/deploy'
--- charm-testing/prometheus-openstack-exporter/deploy 2018-07-19 11:40:59 +0000
+++ charm-testing/prometheus-openstack-exporter/deploy 2020-10-01 23:10:22 +0000
@@ -12,8 +12,9 @@
12 auth_url: "http://localhost" }12 auth_url: "http://localhost" }
13 nrpe:13 nrpe:
14 charm: nrpe14 charm: nrpe
15 options:
16 nagios_master: nagios1.internal
15{%- if series != "trusty" %}17{%- if series != "trusty" %}
16 options:
17 procs: '-w 200 -c 250 -k'18 procs: '-w 200 -c 250 -k'
18 swap: '-w 90% -c 75% -n ok'19 swap: '-w 90% -c 75% -n ok'
19{%- endif %}20{%- endif %}
2021
=== modified file 'charm-testing/prometheus2/deploy'
--- charm-testing/prometheus2/deploy 2018-07-16 12:27:28 +0000
+++ charm-testing/prometheus2/deploy 2020-10-01 23:10:22 +0000
@@ -63,8 +63,9 @@
63 skip_serial_number: true63 skip_serial_number: true
64 nrpe:64 nrpe:
65 charm: nrpe65 charm: nrpe
66 options:
67 nagios_master: nagios1.internal
66{%- if series != "trusty" %}68{%- if series != "trusty" %}
67 options:
68 procs: '-w 200 -c 250 -k'69 procs: '-w 200 -c 250 -k'
69 swap: '-w 90% -c 75% -n ok'70 swap: '-w 90% -c 75% -n ok'
70{%- endif %}71{%- endif %}
7172
=== modified file 'charm-testing/rsyslog/deploy'
--- charm-testing/rsyslog/deploy 2019-03-06 05:58:33 +0000
+++ charm-testing/rsyslog/deploy 2020-10-01 23:10:22 +0000
@@ -11,6 +11,7 @@
11 nrpe:11 nrpe:
12 charm: nrpe12 charm: nrpe
13 options:13 options:
14 nagios_master: nagios1.internal
14 export_nagios_definitions: true15 export_nagios_definitions: true
15 sub_postfix: ""16 sub_postfix: ""
16 hostgroups: ci-rsyslog-testing17 hostgroups: ci-rsyslog-testing
1718
=== modified file 'charm-testing/squid-reverseproxy/deploy'
--- charm-testing/squid-reverseproxy/deploy 2018-08-09 14:16:48 +0000
+++ charm-testing/squid-reverseproxy/deploy 2020-10-01 23:10:22 +0000
@@ -12,8 +12,9 @@
12 vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"12 vhost_http_template: "include-base64://{{spec_dir}}/{{stage}}/vhost-http.template"
13 nrpe:13 nrpe:
14 charm: nrpe14 charm: nrpe
15 options:
16 nagios_master: nagios1.internal
15{%- if series != "trusty" %}17{%- if series != "trusty" %}
16 options:
17 procs: '-w 200 -c 250 -k'18 procs: '-w 200 -c 250 -k'
18 swap: '-w 90% -c 75% -n ok'19 swap: '-w 90% -c 75% -n ok'
19{%- endif %}20{%- endif %}
2021
=== modified file 'charm-testing/telegraf/deploy'
--- charm-testing/telegraf/deploy 2018-07-16 12:27:28 +0000
+++ charm-testing/telegraf/deploy 2020-10-01 23:10:22 +0000
@@ -8,8 +8,9 @@
8 expose: true8 expose: true
9 nrpe:9 nrpe:
10 charm: nrpe10 charm: nrpe
11 options:
12 nagios_master: nagios1.internal
11{%- if series != "trusty" %}13{%- if series != "trusty" %}
12 options:
13 procs: '-w 200 -c 250 -k'14 procs: '-w 200 -c 250 -k'
14 swap: '-w 90% -c 75% -n ok'15 swap: '-w 90% -c 75% -n ok'
15{%- endif %}16{%- endif %}
1617
=== modified file 'charm-testing/ubuntu-repository-cache/deploy'
--- charm-testing/ubuntu-repository-cache/deploy 2020-04-15 01:43:18 +0000
+++ charm-testing/ubuntu-repository-cache/deploy 2020-10-01 23:10:22 +0000
@@ -13,6 +13,8 @@
13 sync-on-start: True13 sync-on-start: True
14 nrpe:14 nrpe:
15 charm: nrpe15 charm: nrpe
16 options:
17 nagios_master: nagios1.internal
16 haproxy:18 haproxy:
17 charm: haproxy19 charm: haproxy
18 num_units: 120 num_units: 1
1921
=== modified file 'charm-testing/vault/deploy'
--- charm-testing/vault/deploy 2018-02-16 16:26:32 +0000
+++ charm-testing/vault/deploy 2020-10-01 23:10:22 +0000
@@ -19,6 +19,7 @@
19 nrpe:19 nrpe:
20 charm: nrpe20 charm: nrpe
21 options:21 options:
22 nagios_master: nagios1.internal
22 export_nagios_definitions: true23 export_nagios_definitions: true
23 sub_postfix: ""24 sub_postfix: ""
24 hostgroups: nagios-vault25 hostgroups: nagios-vault
2526
=== modified file 'mojo-how-to/devel/services'
--- mojo-how-to/devel/services 2016-03-30 10:00:49 +0000
+++ mojo-how-to/devel/services 2020-10-01 23:10:22 +0000
@@ -18,6 +18,8 @@
18 dest_dir: /srv/mojo18 dest_dir: /srv/mojo
19 nrpe:19 nrpe:
20 charm: nrpe20 charm: nrpe
21 {% if series == "xenial" %}options:21 options:
22 nagios_master: nagios1.internal
23 {% if series == "xenial" %}
22 procs: '-w 150 -c 200'24 procs: '-w 150 -c 200'
23 swap: '-w 90% -c 75% -n ok'{% endif %}25 swap: '-w 90% -c 75% -n ok'{% endif %}
2426
=== modified file 'mojo-how-to/production/services'
--- mojo-how-to/production/services 2019-02-04 04:28:17 +0000
+++ mojo-how-to/production/services 2020-10-01 23:10:22 +0000
@@ -25,7 +25,9 @@
25 charm: landscape-client25 charm: landscape-client
26 nrpe:26 nrpe:
27 charm: nrpe27 charm: nrpe
28 {% if series == "xenial" %}options:28 options:
29 nagios_master: nagios1.internal
30 {% if series == "xenial" %}
29 procs: '-w 200 -c 250'31 procs: '-w 200 -c 250'
30 swap: '-w 90% -c 75% -n ok'{% endif %}32 swap: '-w 90% -c 75% -n ok'{% endif %}
31 ksplice:33 ksplice:

Subscribers

People subscribed via source and target branches

to all changes: