Merge lp:~niedbalski/charms/precise/rsyslog/fix-1355987 into lp:charms/rsyslog

Proposed by Jorge Niedbalski on 2014-09-03
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
Reviewer Review Type Date Requested Status
charmers 2014-09-03 Pending
Review via email: mp+233221@code.launchpad.net
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-This is a simple rsyslogd logging server. It is most interesting
6-when paired with the rsyslog-forwarder subordinate charm. See
7-rsyslog-forwarder's README for how to use them together.
8-
9-TODO:
10------
11--Tighter security
12--Forwarding
13
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+# General
19+
20+This charm provides support for setting up a simple rsyslogd logging server.
21+
22+# Usage method
23+
24+On this example we are going to deploy mysql
25+
26+ juju deploy mysql
27+
28+Then you must deploy this charm
29+
30+ juju deploy rsyslog primary-rsyslog
31+
32+Then you can deploy a rsyslog-forwarder-ha charm, which will forward all the syslog
33+messages from a specific service to this rsyslog server.
34+
35+ juju deploy rsyslog-forwarder-ha
36+
37+Then relate both services
38+
39+ juju add-relation rsyslog-forwarder-ha mysql
40+
41+Then you can deploy your rsyslog aggregators servers:
42+
43+ juju deploy rsyslog primary
44+
45+Once your rsyslog aggregators are ready, you can relate them with your forwarder.
46+
47+ juju add-relation rsyslog-forwarder-ha primary-rsyslog
48+
49+Once you have your rsyslog ports opened. You can change try this charm by running
50+
51+ juju ssh mysql/0
52+
53+Then create a logger entry
54+
55+ mysql/0$ logger "testing"
56+
57+Then see if the entry is being forwarded correctly:
58+
59+ juju ssh primary-rsyslog/0
60+ primary-rsyslog/0$ grep testing /var/log/syslog
61+
62+# Contact Information
63+
64+ Mantainer: jorge.niedbalski@canonical.com
65
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+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
71+<!-- Created with Inkscape (http://www.inkscape.org/) -->
72+
73+<svg
74+ xmlns:dc="http://purl.org/dc/elements/1.1/"
75+ xmlns:cc="http://creativecommons.org/ns#"
76+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
77+ xmlns:svg="http://www.w3.org/2000/svg"
78+ xmlns="http://www.w3.org/2000/svg"
79+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
80+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
81+ width="96"
82+ height="96"
83+ id="svg6517"
84+ version="1.1"
85+ inkscape:version="0.48.4 r9939"
86+ sodipodi:docname="icon.svg">
87+ <defs
88+ id="defs6519">
89+ <linearGradient
90+ id="Background">
91+ <stop
92+ id="stop4178"
93+ offset="0"
94+ style="stop-color:#b8b8b8;stop-opacity:1" />
95+ <stop
96+ id="stop4180"
97+ offset="1"
98+ style="stop-color:#c9c9c9;stop-opacity:1" />
99+ </linearGradient>
100+ <filter
101+ style="color-interpolation-filters:sRGB;"
102+ inkscape:label="Inner Shadow"
103+ id="filter1121">
104+ <feFlood
105+ flood-opacity="0.59999999999999998"
106+ flood-color="rgb(0,0,0)"
107+ result="flood"
108+ id="feFlood1123" />
109+ <feComposite
110+ in="flood"
111+ in2="SourceGraphic"
112+ operator="out"
113+ result="composite1"
114+ id="feComposite1125" />
115+ <feGaussianBlur
116+ in="composite1"
117+ stdDeviation="1"
118+ result="blur"
119+ id="feGaussianBlur1127" />
120+ <feOffset
121+ dx="0"
122+ dy="2"
123+ result="offset"
124+ id="feOffset1129" />
125+ <feComposite
126+ in="offset"
127+ in2="SourceGraphic"
128+ operator="atop"
129+ result="composite2"
130+ id="feComposite1131" />
131+ </filter>
132+ <filter
133+ style="color-interpolation-filters:sRGB;"
134+ inkscape:label="Drop Shadow"
135+ id="filter950">
136+ <feFlood
137+ flood-opacity="0.25"
138+ flood-color="rgb(0,0,0)"
139+ result="flood"
140+ id="feFlood952" />
141+ <feComposite
142+ in="flood"
143+ in2="SourceGraphic"
144+ operator="in"
145+ result="composite1"
146+ id="feComposite954" />
147+ <feGaussianBlur
148+ in="composite1"
149+ stdDeviation="1"
150+ result="blur"
151+ id="feGaussianBlur956" />
152+ <feOffset
153+ dx="0"
154+ dy="1"
155+ result="offset"
156+ id="feOffset958" />
157+ <feComposite
158+ in="SourceGraphic"
159+ in2="offset"
160+ operator="over"
161+ result="composite2"
162+ id="feComposite960" />
163+ </filter>
164+ <clipPath
165+ clipPathUnits="userSpaceOnUse"
166+ id="clipPath873">
167+ <g
168+ transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
169+ id="g875"
170+ inkscape:label="Layer 1"
171+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
172+ <path
173+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
174+ 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+ id="path877"
176+ inkscape:connector-curvature="0"
177+ sodipodi:nodetypes="sssssssss" />
178+ </g>
179+ </clipPath>
180+ <filter
181+ inkscape:collect="always"
182+ id="filter891"
183+ inkscape:label="Badge Shadow">
184+ <feGaussianBlur
185+ inkscape:collect="always"
186+ stdDeviation="0.71999962"
187+ id="feGaussianBlur893" />
188+ </filter>
189+ </defs>
190+ <sodipodi:namedview
191+ id="base"
192+ pagecolor="#ffffff"
193+ bordercolor="#666666"
194+ borderopacity="1.0"
195+ inkscape:pageopacity="0.0"
196+ inkscape:pageshadow="2"
197+ inkscape:zoom="4.0745362"
198+ inkscape:cx="22.12049"
199+ inkscape:cy="29.384032"
200+ inkscape:document-units="px"
201+ inkscape:current-layer="layer1"
202+ showgrid="true"
203+ fit-margin-top="0"
204+ fit-margin-left="0"
205+ fit-margin-right="0"
206+ fit-margin-bottom="0"
207+ inkscape:window-width="2556"
208+ inkscape:window-height="1058"
209+ inkscape:window-x="1440"
210+ inkscape:window-y="18"
211+ inkscape:window-maximized="1"
212+ showborder="true"
213+ showguides="true"
214+ inkscape:guide-bbox="true"
215+ inkscape:showpageshadow="false">
216+ <inkscape:grid
217+ type="xygrid"
218+ id="grid821" />
219+ <sodipodi:guide
220+ orientation="1,0"
221+ position="16,48"
222+ id="guide823" />
223+ <sodipodi:guide
224+ orientation="0,1"
225+ position="64,80"
226+ id="guide825" />
227+ <sodipodi:guide
228+ orientation="1,0"
229+ position="80,40"
230+ id="guide827" />
231+ <sodipodi:guide
232+ orientation="0,1"
233+ position="64,16"
234+ id="guide829" />
235+ </sodipodi:namedview>
236+ <metadata
237+ id="metadata6522">
238+ <rdf:RDF>
239+ <cc:Work
240+ rdf:about="">
241+ <dc:format>image/svg+xml</dc:format>
242+ <dc:type
243+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
244+ <dc:title />
245+ </cc:Work>
246+ </rdf:RDF>
247+ </metadata>
248+ <g
249+ inkscape:label="BACKGROUND"
250+ inkscape:groupmode="layer"
251+ id="layer1"
252+ transform="translate(268,-635.29076)"
253+ style="display:inline">
254+ <path
255+ style="fill:#aa4400;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
256+ 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+ id="path6455"
258+ inkscape:connector-curvature="0"
259+ sodipodi:nodetypes="sssssssss" />
260+ <text
261+ xml:space="preserve"
262+ 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+ x="-244.57175"
264+ y="732.38995"
265+ id="text3019"
266+ sodipodi:linespacing="125%"
267+ transform="scale(1.0671715,0.93705651)"><tspan
268+ sodipodi:role="line"
269+ id="tspan3021"
270+ x="-244.57175"
271+ y="732.38995"
272+ style="font-size:19.20908737px;font-weight:bold;fill:#f9f9f9;-inkscape-font-specification:Sans Bold">rsyslog</tspan><tspan
273+ sodipodi:role="line"
274+ x="-244.57175"
275+ y="753.20264"
276+ id="tspan3023"
277+ style="font-size:19.20908737px;fill:#ffb380"><tspan
278+ style="font-size:16px"
279+ id="tspan3024"> </tspan></tspan></text>
280+ <text
281+ xml:space="preserve"
282+ 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+ x="-203"
284+ y="710.29077"
285+ id="text3026"
286+ sodipodi:linespacing="125%"><tspan
287+ sodipodi:role="line"
288+ id="tspan3028"
289+ x="-203"
290+ y="710.29077"
291+ style="font-size:12px;font-weight:bold;fill:#ffb380;-inkscape-font-specification:Sans Bold" /></text>
292+ </g>
293+ <g
294+ inkscape:groupmode="layer"
295+ id="layer3"
296+ inkscape:label="PLACE YOUR PICTOGRAM HERE"
297+ style="display:inline" />
298+ <g
299+ inkscape:groupmode="layer"
300+ id="layer2"
301+ inkscape:label="BADGE"
302+ style="display:none"
303+ sodipodi:insensitive="true">
304+ <g
305+ style="display:inline"
306+ transform="translate(-340.00001,-581)"
307+ id="g4394"
308+ clip-path="none">
309+ <g
310+ id="g855">
311+ <g
312+ inkscape:groupmode="maskhelper"
313+ id="g870"
314+ clip-path="url(#clipPath873)"
315+ style="opacity:0.6;filter:url(#filter891)">
316+ <path
317+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
318+ 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+ sodipodi:ry="12"
320+ sodipodi:rx="12"
321+ sodipodi:cy="552.36218"
322+ sodipodi:cx="252"
323+ id="path844"
324+ 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+ sodipodi:type="arc" />
326+ </g>
327+ <g
328+ id="g862">
329+ <path
330+ sodipodi:type="arc"
331+ 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+ id="path4398"
333+ sodipodi:cx="252"
334+ sodipodi:cy="552.36218"
335+ sodipodi:rx="12"
336+ sodipodi:ry="12"
337+ 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+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
339+ <path
340+ transform="matrix(1.25,0,0,1.25,33,-100.45273)"
341+ 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+ sodipodi:ry="12"
343+ sodipodi:rx="12"
344+ sodipodi:cy="552.36218"
345+ sodipodi:cx="252"
346+ id="path4400"
347+ 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+ sodipodi:type="arc" />
349+ <path
350+ sodipodi:type="star"
351+ 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+ id="path4459"
353+ sodipodi:sides="5"
354+ sodipodi:cx="666.19574"
355+ sodipodi:cy="589.50385"
356+ sodipodi:r1="7.2431178"
357+ sodipodi:r2="4.3458705"
358+ sodipodi:arg1="1.0471976"
359+ sodipodi:arg2="1.6755161"
360+ inkscape:flatsided="false"
361+ inkscape:rounded="0.1"
362+ inkscape:randomized="0"
363+ 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+ transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
365+ </g>
366+ </g>
367+ </g>
368+ </g>
369+</svg>
370
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 coverage
376 mock==1.0.1
377 nose==1.3.1
378-https://launchpad.net/python-apt/main/0.7.8/+download/python-apt-0.8.5.tar.gz
379+python_apt

Subscribers

People subscribed via source and target branches