Mojo: Continuous Delivery for Juju

Merge lp:~tcuthbert/mojo/mojo-specs into lp:mojo/mojo-specs

  1. mojo-specs
  2. Merge into mojo-specs
Proposed by Thomas Cuthbert
Status: Merged
Approved by: Tom Haddon
Approved revision: no longer in the source branch.
Merged at revision: 109
Proposed branch: lp:~tcuthbert/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 155 lines (+110/-3)
5 files modified
charm-testing/graylog/collect (+7/-0)
charm-testing/graylog/deploy (+54/-0)
charm-testing/graylog/pre-deploy (+3/-0)
charm-testing/graylog/templates/vhost-http.tmpl (+43/-0)
charm-testing/manifest (+3/-3)
To merge this branch: bzr merge lp:~tcuthbert/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+348741@code.launchpad.net

Commit message

bionic graylog charm-testing
remove unnecessary checks from the main manifest

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 :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Tom Haddon (mthaddon) wrote :

The only differences between charm-testing/graylog/manifest and charm-testing/manifest are the excluded nagios checks. I think it'd be better to just update charm-testing/manifest to exclude the checks in question and use that.

Revision history for this message
Thomas Cuthbert (tcuthbert) wrote :

rationale behind deploying xenial mongodb inline

Revision history for this message
Thomas Cuthbert (tcuthbert) wrote :

comment inline

Revision history for this message
Tom Haddon (mthaddon) wrote :

Thanks, LGTM

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

Change successfully merged at revision 109

lp:~tcuthbert/mojo/mojo-specs updated
109. By Thomas Cuthbert

bionic graylog charm-testing
remove unnecessary checks from the main manifest

Reviewed-on: https://code.launchpad.net/~tcuthbert/mojo/mojo-specs/+merge/348741
Reviewed-by: Tom Haddon <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'charm-testing/graylog'
2=== added file 'charm-testing/graylog/collect'
3--- charm-testing/graylog/collect 1970-01-01 00:00:00 +0000
4+++ charm-testing/graylog/collect 2018-07-04 08:50:33 +0000
5@@ -0,0 +1,7 @@
6+apache2 cs:apache2
7+elasticsearch cs:elasticsearch
8+filebeat cs:filebeat
9+graylog cs:graylog
10+mongodb cs:mongodb
11+nrpe cs:nrpe
12+nrpe-xenial cs:nrpe
13
14=== added file 'charm-testing/graylog/deploy'
15--- charm-testing/graylog/deploy 1970-01-01 00:00:00 +0000
16+++ charm-testing/graylog/deploy 2018-07-04 08:50:33 +0000
17@@ -0,0 +1,54 @@
18+# vim: set filetype=yaml sw=2:
19+centralized-logging:
20+ series: bionic
21+ services:
22+ apache2:
23+ charm: apache2
24+ expose: true
25+ options:
26+ servername: logs.ci.admin.canonical.com
27+ enable_modules: headers proxy proxy_http rewrite ssl
28+ vhost_http_template: include-base64://{{spec_dir}}/{{stage}}/templates/vhost-http.tmpl
29+ elasticsearch:
30+ charm: elasticsearch
31+ options:
32+ apt-key-url: http://archive.admin.canonical.com/other/artifacts.elastic.co/GPG-KEY-elasticsearch
33+ apt-repository: deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main
34+ firewall_enabled: false
35+ filebeat:
36+ charm: filebeat
37+ options:
38+ install_sources: deb http://archive.admin.canonical.com/other/apt-mirror/artifacts.elastic.co stable main
39+ logpath: "/var/log/*.log /var/log/syslog /var/log/*/*.log /var/snap/graylog/common/log/*.log"
40+ graylog:
41+ charm: graylog
42+ options:
43+ mongodb:
44+ charm: mongodb
45+ nrpe:
46+ charm: nrpe
47+ options:
48+ export_nagios_definitions: true
49+ sub_postfix: ""
50+ hostgroups: ci-graylog-testing
51+ nagios_host_context: ci-graylog-testing
52+ nagios_hostname_type: unit
53+ nrpe-xenial:
54+ charm: nrpe
55+ options:
56+ export_nagios_definitions: true
57+ sub_postfix: ""
58+ hostgroups: ci-graylog-testing
59+ nagios_host_context: ci-graylog-testing
60+ nagios_hostname_type: unit
61+ relations:
62+ - ['apache2:reverseproxy', 'graylog:website']
63+ - ['apache2', 'filebeat']
64+ - ['apache2:nrpe-external-master', 'nrpe']
65+ - ['graylog', 'filebeat']
66+ - ['graylog', 'nrpe']
67+ - ['graylog', 'elasticsearch']
68+ - ['graylog', 'mongodb:database']
69+ - ['mongodb', 'nrpe-xenial']
70+ - ['elasticsearch:juju-info', 'filebeat:beats-host']
71+ - ['elasticsearch', 'nrpe']
72
73=== added file 'charm-testing/graylog/pre-deploy'
74--- charm-testing/graylog/pre-deploy 1970-01-01 00:00:00 +0000
75+++ charm-testing/graylog/pre-deploy 2018-07-04 08:50:33 +0000
76@@ -0,0 +1,3 @@
77+# Mongodb can be deployed as bionic when lp bug https://bugs.launchpad.net/mongodb-charm/+bug/1748214 is resolved
78+juju deploy --series xenial cs:nrpe nrpe-xenial
79+juju deploy --series xenial cs:mongodb
80
81=== added directory 'charm-testing/graylog/templates'
82=== added file 'charm-testing/graylog/templates/vhost-http.tmpl'
83--- charm-testing/graylog/templates/vhost-http.tmpl 1970-01-01 00:00:00 +0000
84+++ charm-testing/graylog/templates/vhost-http.tmpl 2018-07-04 08:50:33 +0000
85@@ -0,0 +1,43 @@
86+ServerName {{ servername }}
87+
88+<VirtualHost *:80>
89+ ServerName {{ servername }}
90+ DocumentRoot /var/www/html
91+
92+ RewriteEngine On
93+ ProxyRequests off
94+ ProxyPreserveHost on
95+ <Proxy *>
96+ Allow from All
97+ </Proxy>
98+
99+ <Location "/">
100+ RequestHeader set X-Graylog-Server-URL "http://{{servername}}/api/"
101+ ProxyPass http://{{graylog_web}}/
102+ ProxyPassReverse http://{{graylog_web}}/
103+ </Location>
104+
105+ <Location "/api/">
106+ ProxyPass http://{{graylog_api}}/api/
107+ ProxyPassReverse http://{{graylog_api}}/api/
108+ </Location>
109+
110+</VirtualHost>
111+<VirtualHost *:80>
112+ ServerName search.{{ servername }}
113+ DocumentRoot /var/www/html
114+
115+ RequestHeader set X-Graylog-Server-URL "http://{{servername}}/api/"
116+ ProxyRequests Off
117+ ProxyPreserveHost On
118+
119+ <Location "/">
120+ ProxyPass http://{{graylog_api}}/api/search/ nocanon
121+ ProxyPassReverse http://{{graylog_api}}/api/search/
122+
123+ </Location>
124+
125+ ErrorLog /var/log/apache2/search_error.log
126+ CustomLog /var/log/apache2/search_access.log combined
127+
128+</VirtualHost>
129
130=== modified file 'charm-testing/manifest'
131--- charm-testing/manifest 2018-02-12 16:14:38 +0000
132+++ charm-testing/manifest 2018-07-04 08:50:33 +0000
133@@ -6,7 +6,7 @@
134 collect config=collect
135 script config=pre-deploy
136 deploy config=deploy wait=true
137-nagios-check retry=3 sleep=60
138+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
139 verify config=post-deploy retry=3 sleep=60
140 # Now test an upgrade to the new charm if UPGRADE_CHARM is set
141 stop-on return-code=99 config=check-upgrade-charm UPGRADE_CHARM=${UPGRADE_CHARM}
142@@ -14,11 +14,11 @@
143 collect config=collect-upgrade
144 script config=upgrade-charm
145 juju-check-wait
146-nagios-check retry=3 sleep=60
147+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
148 verify config=post-deploy retry=3 sleep=60
149 # Now redeploy the model, and test a deployment from scratch (with the updated charm in place)
150 script config=redeploy-model
151 script config=pre-deploy
152 deploy config=deploy wait=true
153-nagios-check retry=3 sleep=60
154+nagios-check skip-checks='check_swap,check_etc_bzr,check_log_archive_status,check_ksplice' retry=3 sleep=60
155 verify config=post-deploy retry=3 sleep=60

Subscribers

People subscribed via source and target branches

to all changes: