Merge lp:~niedbalski/charms/precise/rsyslog/fix-1355987 into lp:charms/rsyslog
- Precise Pangolin (12.04)
- fix-1355987
- Merge into trunk
Proposed by
Jorge Niedbalski
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 12 | ||||
Proposed branch: | lp:~niedbalski/charms/precise/rsyslog/fix-1355987 | ||||
Merge into: | lp:charms/rsyslog | ||||
Diff against target: |
379 lines (+348/-9) 4 files modified
README (+0/-8) README.md (+47/-0) icon.svg (+300/-0) test_requirements.txt (+1/-1) |
||||
To merge this branch: | bzr merge lp:~niedbalski/charms/precise/rsyslog/fix-1355987 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+233221@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'README' | |||
2 | --- README 2014-04-21 21:03:13 +0000 | |||
3 | +++ README 1970-01-01 00:00:00 +0000 | |||
4 | @@ -1,8 +0,0 @@ | |||
5 | 1 | This is a simple rsyslogd logging server. It is most interesting | ||
6 | 2 | when paired with the rsyslog-forwarder subordinate charm. See | ||
7 | 3 | rsyslog-forwarder's README for how to use them together. | ||
8 | 4 | |||
9 | 5 | TODO: | ||
10 | 6 | ----- | ||
11 | 7 | -Tighter security | ||
12 | 8 | -Forwarding | ||
13 | 9 | 0 | ||
14 | === added file 'README.md' | |||
15 | --- README.md 1970-01-01 00:00:00 +0000 | |||
16 | +++ README.md 2014-09-03 14:06:14 +0000 | |||
17 | @@ -0,0 +1,47 @@ | |||
18 | 1 | # General | ||
19 | 2 | |||
20 | 3 | This charm provides support for setting up a simple rsyslogd logging server. | ||
21 | 4 | |||
22 | 5 | # Usage method | ||
23 | 6 | |||
24 | 7 | On this example we are going to deploy mysql | ||
25 | 8 | |||
26 | 9 | juju deploy mysql | ||
27 | 10 | |||
28 | 11 | Then you must deploy this charm | ||
29 | 12 | |||
30 | 13 | juju deploy rsyslog primary-rsyslog | ||
31 | 14 | |||
32 | 15 | Then you can deploy a rsyslog-forwarder-ha charm, which will forward all the syslog | ||
33 | 16 | messages from a specific service to this rsyslog server. | ||
34 | 17 | |||
35 | 18 | juju deploy rsyslog-forwarder-ha | ||
36 | 19 | |||
37 | 20 | Then relate both services | ||
38 | 21 | |||
39 | 22 | juju add-relation rsyslog-forwarder-ha mysql | ||
40 | 23 | |||
41 | 24 | Then you can deploy your rsyslog aggregators servers: | ||
42 | 25 | |||
43 | 26 | juju deploy rsyslog primary | ||
44 | 27 | |||
45 | 28 | Once your rsyslog aggregators are ready, you can relate them with your forwarder. | ||
46 | 29 | |||
47 | 30 | juju add-relation rsyslog-forwarder-ha primary-rsyslog | ||
48 | 31 | |||
49 | 32 | Once you have your rsyslog ports opened. You can change try this charm by running | ||
50 | 33 | |||
51 | 34 | juju ssh mysql/0 | ||
52 | 35 | |||
53 | 36 | Then create a logger entry | ||
54 | 37 | |||
55 | 38 | mysql/0$ logger "testing" | ||
56 | 39 | |||
57 | 40 | Then see if the entry is being forwarded correctly: | ||
58 | 41 | |||
59 | 42 | juju ssh primary-rsyslog/0 | ||
60 | 43 | primary-rsyslog/0$ grep testing /var/log/syslog | ||
61 | 44 | |||
62 | 45 | # Contact Information | ||
63 | 46 | |||
64 | 47 | Mantainer: jorge.niedbalski@canonical.com | ||
65 | 0 | 48 | ||
66 | === added file 'icon.svg' | |||
67 | --- icon.svg 1970-01-01 00:00:00 +0000 | |||
68 | +++ icon.svg 2014-09-03 14:06:14 +0000 | |||
69 | @@ -0,0 +1,300 @@ | |||
70 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
71 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
72 | 3 | |||
73 | 4 | <svg | ||
74 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
75 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
76 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
77 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
78 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
79 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
80 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
81 | 12 | width="96" | ||
82 | 13 | height="96" | ||
83 | 14 | id="svg6517" | ||
84 | 15 | version="1.1" | ||
85 | 16 | inkscape:version="0.48.4 r9939" | ||
86 | 17 | sodipodi:docname="icon.svg"> | ||
87 | 18 | <defs | ||
88 | 19 | id="defs6519"> | ||
89 | 20 | <linearGradient | ||
90 | 21 | id="Background"> | ||
91 | 22 | <stop | ||
92 | 23 | id="stop4178" | ||
93 | 24 | offset="0" | ||
94 | 25 | style="stop-color:#b8b8b8;stop-opacity:1" /> | ||
95 | 26 | <stop | ||
96 | 27 | id="stop4180" | ||
97 | 28 | offset="1" | ||
98 | 29 | style="stop-color:#c9c9c9;stop-opacity:1" /> | ||
99 | 30 | </linearGradient> | ||
100 | 31 | <filter | ||
101 | 32 | style="color-interpolation-filters:sRGB;" | ||
102 | 33 | inkscape:label="Inner Shadow" | ||
103 | 34 | id="filter1121"> | ||
104 | 35 | <feFlood | ||
105 | 36 | flood-opacity="0.59999999999999998" | ||
106 | 37 | flood-color="rgb(0,0,0)" | ||
107 | 38 | result="flood" | ||
108 | 39 | id="feFlood1123" /> | ||
109 | 40 | <feComposite | ||
110 | 41 | in="flood" | ||
111 | 42 | in2="SourceGraphic" | ||
112 | 43 | operator="out" | ||
113 | 44 | result="composite1" | ||
114 | 45 | id="feComposite1125" /> | ||
115 | 46 | <feGaussianBlur | ||
116 | 47 | in="composite1" | ||
117 | 48 | stdDeviation="1" | ||
118 | 49 | result="blur" | ||
119 | 50 | id="feGaussianBlur1127" /> | ||
120 | 51 | <feOffset | ||
121 | 52 | dx="0" | ||
122 | 53 | dy="2" | ||
123 | 54 | result="offset" | ||
124 | 55 | id="feOffset1129" /> | ||
125 | 56 | <feComposite | ||
126 | 57 | in="offset" | ||
127 | 58 | in2="SourceGraphic" | ||
128 | 59 | operator="atop" | ||
129 | 60 | result="composite2" | ||
130 | 61 | id="feComposite1131" /> | ||
131 | 62 | </filter> | ||
132 | 63 | <filter | ||
133 | 64 | style="color-interpolation-filters:sRGB;" | ||
134 | 65 | inkscape:label="Drop Shadow" | ||
135 | 66 | id="filter950"> | ||
136 | 67 | <feFlood | ||
137 | 68 | flood-opacity="0.25" | ||
138 | 69 | flood-color="rgb(0,0,0)" | ||
139 | 70 | result="flood" | ||
140 | 71 | id="feFlood952" /> | ||
141 | 72 | <feComposite | ||
142 | 73 | in="flood" | ||
143 | 74 | in2="SourceGraphic" | ||
144 | 75 | operator="in" | ||
145 | 76 | result="composite1" | ||
146 | 77 | id="feComposite954" /> | ||
147 | 78 | <feGaussianBlur | ||
148 | 79 | in="composite1" | ||
149 | 80 | stdDeviation="1" | ||
150 | 81 | result="blur" | ||
151 | 82 | id="feGaussianBlur956" /> | ||
152 | 83 | <feOffset | ||
153 | 84 | dx="0" | ||
154 | 85 | dy="1" | ||
155 | 86 | result="offset" | ||
156 | 87 | id="feOffset958" /> | ||
157 | 88 | <feComposite | ||
158 | 89 | in="SourceGraphic" | ||
159 | 90 | in2="offset" | ||
160 | 91 | operator="over" | ||
161 | 92 | result="composite2" | ||
162 | 93 | id="feComposite960" /> | ||
163 | 94 | </filter> | ||
164 | 95 | <clipPath | ||
165 | 96 | clipPathUnits="userSpaceOnUse" | ||
166 | 97 | id="clipPath873"> | ||
167 | 98 | <g | ||
168 | 99 | transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" | ||
169 | 100 | id="g875" | ||
170 | 101 | inkscape:label="Layer 1" | ||
171 | 102 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> | ||
172 | 103 | <path | ||
173 | 104 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" | ||
174 | 105 | d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" | ||
175 | 106 | id="path877" | ||
176 | 107 | inkscape:connector-curvature="0" | ||
177 | 108 | sodipodi:nodetypes="sssssssss" /> | ||
178 | 109 | </g> | ||
179 | 110 | </clipPath> | ||
180 | 111 | <filter | ||
181 | 112 | inkscape:collect="always" | ||
182 | 113 | id="filter891" | ||
183 | 114 | inkscape:label="Badge Shadow"> | ||
184 | 115 | <feGaussianBlur | ||
185 | 116 | inkscape:collect="always" | ||
186 | 117 | stdDeviation="0.71999962" | ||
187 | 118 | id="feGaussianBlur893" /> | ||
188 | 119 | </filter> | ||
189 | 120 | </defs> | ||
190 | 121 | <sodipodi:namedview | ||
191 | 122 | id="base" | ||
192 | 123 | pagecolor="#ffffff" | ||
193 | 124 | bordercolor="#666666" | ||
194 | 125 | borderopacity="1.0" | ||
195 | 126 | inkscape:pageopacity="0.0" | ||
196 | 127 | inkscape:pageshadow="2" | ||
197 | 128 | inkscape:zoom="4.0745362" | ||
198 | 129 | inkscape:cx="22.12049" | ||
199 | 130 | inkscape:cy="29.384032" | ||
200 | 131 | inkscape:document-units="px" | ||
201 | 132 | inkscape:current-layer="layer1" | ||
202 | 133 | showgrid="true" | ||
203 | 134 | fit-margin-top="0" | ||
204 | 135 | fit-margin-left="0" | ||
205 | 136 | fit-margin-right="0" | ||
206 | 137 | fit-margin-bottom="0" | ||
207 | 138 | inkscape:window-width="2556" | ||
208 | 139 | inkscape:window-height="1058" | ||
209 | 140 | inkscape:window-x="1440" | ||
210 | 141 | inkscape:window-y="18" | ||
211 | 142 | inkscape:window-maximized="1" | ||
212 | 143 | showborder="true" | ||
213 | 144 | showguides="true" | ||
214 | 145 | inkscape:guide-bbox="true" | ||
215 | 146 | inkscape:showpageshadow="false"> | ||
216 | 147 | <inkscape:grid | ||
217 | 148 | type="xygrid" | ||
218 | 149 | id="grid821" /> | ||
219 | 150 | <sodipodi:guide | ||
220 | 151 | orientation="1,0" | ||
221 | 152 | position="16,48" | ||
222 | 153 | id="guide823" /> | ||
223 | 154 | <sodipodi:guide | ||
224 | 155 | orientation="0,1" | ||
225 | 156 | position="64,80" | ||
226 | 157 | id="guide825" /> | ||
227 | 158 | <sodipodi:guide | ||
228 | 159 | orientation="1,0" | ||
229 | 160 | position="80,40" | ||
230 | 161 | id="guide827" /> | ||
231 | 162 | <sodipodi:guide | ||
232 | 163 | orientation="0,1" | ||
233 | 164 | position="64,16" | ||
234 | 165 | id="guide829" /> | ||
235 | 166 | </sodipodi:namedview> | ||
236 | 167 | <metadata | ||
237 | 168 | id="metadata6522"> | ||
238 | 169 | <rdf:RDF> | ||
239 | 170 | <cc:Work | ||
240 | 171 | rdf:about=""> | ||
241 | 172 | <dc:format>image/svg+xml</dc:format> | ||
242 | 173 | <dc:type | ||
243 | 174 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
244 | 175 | <dc:title /> | ||
245 | 176 | </cc:Work> | ||
246 | 177 | </rdf:RDF> | ||
247 | 178 | </metadata> | ||
248 | 179 | <g | ||
249 | 180 | inkscape:label="BACKGROUND" | ||
250 | 181 | inkscape:groupmode="layer" | ||
251 | 182 | id="layer1" | ||
252 | 183 | transform="translate(268,-635.29076)" | ||
253 | 184 | style="display:inline"> | ||
254 | 185 | <path | ||
255 | 186 | style="fill:#aa4400;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)" | ||
256 | 187 | d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" | ||
257 | 188 | id="path6455" | ||
258 | 189 | inkscape:connector-curvature="0" | ||
259 | 190 | sodipodi:nodetypes="sssssssss" /> | ||
260 | 191 | <text | ||
261 | 192 | xml:space="preserve" | ||
262 | 193 | style="font-size:42.68685913px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" | ||
263 | 194 | x="-244.57175" | ||
264 | 195 | y="732.38995" | ||
265 | 196 | id="text3019" | ||
266 | 197 | sodipodi:linespacing="125%" | ||
267 | 198 | transform="scale(1.0671715,0.93705651)"><tspan | ||
268 | 199 | sodipodi:role="line" | ||
269 | 200 | id="tspan3021" | ||
270 | 201 | x="-244.57175" | ||
271 | 202 | y="732.38995" | ||
272 | 203 | style="font-size:19.20908737px;font-weight:bold;fill:#f9f9f9;-inkscape-font-specification:Sans Bold">rsyslog</tspan><tspan | ||
273 | 204 | sodipodi:role="line" | ||
274 | 205 | x="-244.57175" | ||
275 | 206 | y="753.20264" | ||
276 | 207 | id="tspan3023" | ||
277 | 208 | style="font-size:19.20908737px;fill:#ffb380"><tspan | ||
278 | 209 | style="font-size:16px" | ||
279 | 210 | id="tspan3024"> </tspan></tspan></text> | ||
280 | 211 | <text | ||
281 | 212 | xml:space="preserve" | ||
282 | 213 | style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" | ||
283 | 214 | x="-203" | ||
284 | 215 | y="710.29077" | ||
285 | 216 | id="text3026" | ||
286 | 217 | sodipodi:linespacing="125%"><tspan | ||
287 | 218 | sodipodi:role="line" | ||
288 | 219 | id="tspan3028" | ||
289 | 220 | x="-203" | ||
290 | 221 | y="710.29077" | ||
291 | 222 | style="font-size:12px;font-weight:bold;fill:#ffb380;-inkscape-font-specification:Sans Bold" /></text> | ||
292 | 223 | </g> | ||
293 | 224 | <g | ||
294 | 225 | inkscape:groupmode="layer" | ||
295 | 226 | id="layer3" | ||
296 | 227 | inkscape:label="PLACE YOUR PICTOGRAM HERE" | ||
297 | 228 | style="display:inline" /> | ||
298 | 229 | <g | ||
299 | 230 | inkscape:groupmode="layer" | ||
300 | 231 | id="layer2" | ||
301 | 232 | inkscape:label="BADGE" | ||
302 | 233 | style="display:none" | ||
303 | 234 | sodipodi:insensitive="true"> | ||
304 | 235 | <g | ||
305 | 236 | style="display:inline" | ||
306 | 237 | transform="translate(-340.00001,-581)" | ||
307 | 238 | id="g4394" | ||
308 | 239 | clip-path="none"> | ||
309 | 240 | <g | ||
310 | 241 | id="g855"> | ||
311 | 242 | <g | ||
312 | 243 | inkscape:groupmode="maskhelper" | ||
313 | 244 | id="g870" | ||
314 | 245 | clip-path="url(#clipPath873)" | ||
315 | 246 | style="opacity:0.6;filter:url(#filter891)"> | ||
316 | 247 | <path | ||
317 | 248 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" | ||
318 | 249 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
319 | 250 | sodipodi:ry="12" | ||
320 | 251 | sodipodi:rx="12" | ||
321 | 252 | sodipodi:cy="552.36218" | ||
322 | 253 | sodipodi:cx="252" | ||
323 | 254 | id="path844" | ||
324 | 255 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
325 | 256 | sodipodi:type="arc" /> | ||
326 | 257 | </g> | ||
327 | 258 | <g | ||
328 | 259 | id="g862"> | ||
329 | 260 | <path | ||
330 | 261 | sodipodi:type="arc" | ||
331 | 262 | style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
332 | 263 | id="path4398" | ||
333 | 264 | sodipodi:cx="252" | ||
334 | 265 | sodipodi:cy="552.36218" | ||
335 | 266 | sodipodi:rx="12" | ||
336 | 267 | sodipodi:ry="12" | ||
337 | 268 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
338 | 269 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> | ||
339 | 270 | <path | ||
340 | 271 | transform="matrix(1.25,0,0,1.25,33,-100.45273)" | ||
341 | 272 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
342 | 273 | sodipodi:ry="12" | ||
343 | 274 | sodipodi:rx="12" | ||
344 | 275 | sodipodi:cy="552.36218" | ||
345 | 276 | sodipodi:cx="252" | ||
346 | 277 | id="path4400" | ||
347 | 278 | style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
348 | 279 | sodipodi:type="arc" /> | ||
349 | 280 | <path | ||
350 | 281 | sodipodi:type="star" | ||
351 | 282 | style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
352 | 283 | id="path4459" | ||
353 | 284 | sodipodi:sides="5" | ||
354 | 285 | sodipodi:cx="666.19574" | ||
355 | 286 | sodipodi:cy="589.50385" | ||
356 | 287 | sodipodi:r1="7.2431178" | ||
357 | 288 | sodipodi:r2="4.3458705" | ||
358 | 289 | sodipodi:arg1="1.0471976" | ||
359 | 290 | sodipodi:arg2="1.6755161" | ||
360 | 291 | inkscape:flatsided="false" | ||
361 | 292 | inkscape:rounded="0.1" | ||
362 | 293 | inkscape:randomized="0" | ||
363 | 294 | d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" | ||
364 | 295 | transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> | ||
365 | 296 | </g> | ||
366 | 297 | </g> | ||
367 | 298 | </g> | ||
368 | 299 | </g> | ||
369 | 300 | </svg> | ||
370 | 0 | 301 | ||
371 | === modified file 'test_requirements.txt' | |||
372 | --- test_requirements.txt 2014-05-01 15:57:47 +0000 | |||
373 | +++ test_requirements.txt 2014-09-03 14:06:14 +0000 | |||
374 | @@ -3,4 +3,4 @@ | |||
375 | 3 | coverage | 3 | coverage |
376 | 4 | mock==1.0.1 | 4 | mock==1.0.1 |
377 | 5 | nose==1.3.1 | 5 | nose==1.3.1 |
379 | 6 | https://launchpad.net/python-apt/main/0.7.8/+download/python-apt-0.8.5.tar.gz | 6 | python_apt |