Merge lp:~wesmason/charms/precise/serverdensity/trunk into lp:charms/serverdensity

[Wes Mason]

This provides a better icon and description, as provided by <email address hidden>

[Charles Butler (lazypower)]

Greetings Wes,

Thanks for the updated eye candy on the Server Density charm. This looks great!

I've merged your changes and they should be live in the charm store in about 30 minutes at the latest.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

Thanks again!

review: Approve

=== modified file 'README.md'
--- README.md	2014-03-03 23:20:00 +0000
+++ README.md	2014-04-08 12:53:32 +0000
@@ -91,6 +91,8 @@
 
 This charm is released under a 3-clause BSD license, see the [copyright file](copyright).
 
+The only exception to this is [the icon](./icon.svg), which is (C) Server Density 2014. All rights reserved.
+
 ## sd-agent
 
  * [Project page](https://github.com/serverdensity/sd-agent)

=== added file 'icon.copyright'
--- icon.copyright	1970-01-01 00:00:00 +0000
+++ icon.copyright	2014-04-08 12:53:32 +0000
@@ -0,0 +1,1 @@
+(C) Server Density 2014. All rights reserved.

=== modified file 'icon.svg'
--- icon.svg	2014-01-26 00:46:27 +0000
+++ icon.svg	2014-04-08 12:53:32 +0000
@@ -1,294 +1,80 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg6517"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon.svg">
-  <defs
-     id="defs6519">
-    <linearGradient
-       id="Background">
-      <stop
-         id="stop4178"
-         offset="0"
-         style="stop-color:#b8b8b8;stop-opacity:1" />
-      <stop
-         id="stop4180"
-         offset="1"
-         style="stop-color:#c9c9c9;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Inner Shadow"
-       id="filter1121">
-      <feFlood
-         flood-opacity="0.59999999999999998"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1123" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite1125" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur1127" />
-      <feOffset
-         dx="0"
-         dy="2"
-         result="offset"
-         id="feOffset1129" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite1131" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter950">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood952" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite954" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur956" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset958" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite960" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath873">
-      <g
-         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
-         id="g875"
-         inkscape:label="Layer 1"
-         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
-        <path
-           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
-           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"
-           id="path877"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssssssss" />
-      </g>
-    </clipPath>
-    <filter
-       inkscape:collect="always"
-       id="filter891"
-       inkscape:label="Badge Shadow">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.71999962"
-         id="feGaussianBlur893" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0745362"
-     inkscape:cx="73.244827"
-     inkscape:cy="43.864208"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1215"
-     inkscape:window-height="776"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     showborder="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid821" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,48"
-       id="guide823" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64,80"
-       id="guide825" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="80,40"
-       id="guide827" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="64,16"
-       id="guide829" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6522">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="BACKGROUND"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(268,-635.29076)"
-     style="display:inline">
-    <path
-       style="fill:#f1e2e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
-       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"
-       id="path6455"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssssss" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="PLACE YOUR PICTOGRAM HERE"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:32.54790497px;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"
-       x="34.375298"
-       y="66.829094"
-       id="text3875"
-       sodipodi:linespacing="125%"
-       transform="scale(1.2432263,0.80435878)"><tspan
-         sodipodi:role="line"
-         id="tspan3877"
-         x="34.375298"
-         y="66.829094"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Umpush;-inkscape-font-specification:Umpush Bold">ϱ</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:14px;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"
-       x="23.733217"
-       y="58.951244"
-       id="text3907"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3909"
-         x="23.733217"
-         y="58.951244"
-         style="font-size:36px;font-weight:bold;-inkscape-font-specification:Sans Bold">s</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="BADGE"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <g
-       style="display:inline"
-       transform="translate(-340.00001,-581)"
-       id="g4394"
-       clip-path="none">
-      <g
-         id="g855">
-        <g
-           inkscape:groupmode="maskhelper"
-           id="g870"
-           clip-path="url(#clipPath873)"
-           style="opacity:0.6;filter:url(#filter891)">
-          <path
-             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
-             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"
-             sodipodi:ry="12"
-             sodipodi:rx="12"
-             sodipodi:cy="552.36218"
-             sodipodi:cx="252"
-             id="path844"
-             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"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g862">
-          <path
-             sodipodi:type="arc"
-             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"
-             id="path4398"
-             sodipodi:cx="252"
-             sodipodi:cy="552.36218"
-             sodipodi:rx="12"
-             sodipodi:ry="12"
-             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"
-             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
-          <path
-             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
-             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"
-             sodipodi:ry="12"
-             sodipodi:rx="12"
-             sodipodi:cy="552.36218"
-             sodipodi:cx="252"
-             id="path4400"
-             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"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="star"
-             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"
-             id="path4459"
-             sodipodi:sides="5"
-             sodipodi:cx="666.19574"
-             sodipodi:cy="589.50385"
-             sodipodi:r1="7.2431178"
-             sodipodi:r2="4.3458705"
-             sodipodi:arg1="1.0471976"
-             sodipodi:arg2="1.6755161"
-             inkscape:flatsided="false"
-             inkscape:rounded="0.1"
-             inkscape:randomized="0"
-             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"
-             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- (C) Server Density 2014. All rights reserved. -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg6517" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="Juju_charm_icon_template.svg" inkscape:version="0.48+devel r12274"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="96px" height="96px"
+	 viewBox="0 0 96 96" enable-background="new 0 0 96 96" xml:space="preserve">
+<filter  id="filter891" inkscape:label="Badge Shadow" inkscape:collect="always">
+	<feGaussianBlur  stdDeviation="0.71999962" id="feGaussianBlur893" inkscape:collect="always"></feGaussianBlur>
+</filter>
+<filter  id="filter1121" inkscape:label="Inner Shadow" style="color-interpolation-filters:sRGB;">
+	<feFlood  result="flood" flood-color="rgb(0,0,0)" flood-opacity="0.59999999999999998" id="feFlood1123"></feFlood>
+	<feComposite  operator="out" in2="SourceGraphic" in="flood" result="composite1" id="feComposite1125"></feComposite>
+	<feGaussianBlur  in="composite1" stdDeviation="1" result="blur" id="feGaussianBlur1127"></feGaussianBlur>
+	<feOffset  dy="2" dx="0" result="offset" id="feOffset1129"></feOffset>
+	<feComposite  operator="atop" in2="SourceGraphic" in="offset" result="composite2" id="feComposite1131"></feComposite>
+</filter>
+<sodipodi:namedview  showguides="true" showborder="true" fit-margin-left="0" fit-margin-top="0" showgrid="true" inkscape:cy="49.018169" inkscape:cx="18.514671" inkscape:zoom="4.0745362" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:showpageshadow="false" inkscape:guide-bbox="true" inkscape:window-maximized="1" inkscape:window-y="24" inkscape:window-x="0" inkscape:window-height="1029" inkscape:window-width="1920" fit-margin-bottom="0" fit-margin-right="0" inkscape:current-layer="layer1" inkscape:document-units="px" inkscape:pageshadow="2" inkscape:pageopacity="0.0">
+	<inkscape:grid  type="xygrid" id="grid821"></inkscape:grid>
+	<sodipodi:guide  position="16,48" orientation="1,0" id="guide823"></sodipodi:guide>
+	<sodipodi:guide  position="64,80" orientation="0,1" id="guide825"></sodipodi:guide>
+	<sodipodi:guide  position="80,40" orientation="1,0" id="guide827"></sodipodi:guide>
+	<sodipodi:guide  position="64,16" orientation="0,1" id="guide829"></sodipodi:guide>
+</sodipodi:namedview>
+<g id="layer3" inkscape:label="PLACE YOUR PICTOGRAM HERE" inkscape:groupmode="layer">
+</g>
+<g id="layer2" inkscape:label="BADGE" sodipodi:insensitive="true" inkscape:groupmode="layer" display="none">
+	<g id="g4394" transform="translate(-340.00001,-581)" display="inline">
+		<g id="g855">
+			<g id="g870" inkscape:groupmode="maskhelper" opacity="0.6" filter="url(#filter891)">
+				<path id="path844_1_" sodipodi:type="arc" sodipodi:cx="252" sodipodi:cy="552.36218" sodipodi:rx="12" sodipodi:ry="12" d="
+					M366,591c0,9.941-8.059,18-18,18s-18-8.059-18-18c0-9.941,8.059-18,18-18S366,581.059,366,591z"/>
+			</g>
+			<g id="g862">
+				
+					<path id="path4398" sodipodi:type="arc" sodipodi:cx="252" sodipodi:cy="552.36218" sodipodi:rx="12" sodipodi:ry="12" fill="#F5F5F5" d="
+					M366,590c0,9.941-8.059,18-18,18s-18-8.059-18-18c0-9.941,8.059-18,18-18S366,580.059,366,590z"/>
+				
+					<path id="path4400" sodipodi:type="arc" sodipodi:cx="252" sodipodi:cy="552.36218" sodipodi:rx="12" sodipodi:ry="12" fill="#DD4814" d="
+					M363,590c0,8.284-6.716,15-15,15s-15-6.716-15-15s6.716-15,15-15S363,581.716,363,590z"/>
+				
+					<path id="path4459" sodipodi:arg2="1.6755161" sodipodi:arg1="1.0471976" sodipodi:r2="4.3458705" sodipodi:r1="7.2431178" sodipodi:sides="5" sodipodi:type="star" sodipodi:cx="666.19574" sodipodi:cy="589.50385" inkscape:randomized="0" inkscape:rounded="0.1" inkscape:flatsided="false" fill="#F5F5F5" d="
+					M354.511,598.909c-0.554,0.405-5.792-2.284-6.479-2.281c-0.687,0.002-5.908,2.724-6.465,2.322s0.381-6.215,0.167-6.868
+					c-0.214-0.652-4.416-4.777-4.206-5.431c0.21-0.654,6.028-1.558,6.583-1.963c0.554-0.405,3.179-5.676,3.866-5.678
+					c0.687-0.002,3.344,5.252,3.901,5.654c0.557,0.402,6.381,1.269,6.595,1.922c0.214,0.652-3.961,4.803-4.172,5.458
+					C354.09,592.697,355.065,598.503,354.511,598.909z"/>
+			</g>
+		</g>
+	</g>
+</g>
+<g>
+	<g id="layer1" transform="translate(268,-635.29076)" inkscape:label="BACKGROUND" inkscape:groupmode="layer">
+		<g id="path6455" sodipodi:nodetypes="sssssssss" inkscape:connector-curvature="0" filter="url(#filter1121)">
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-268" y1="684.2908" x2="-172" y2="684.2908" gradientTransform="matrix(4.489659e-11 -1 1 4.489659e-11 -904.2908 463.2908)">
+				<stop  offset="0" style="stop-color:#2E7489"/>
+				<stop  offset="1" style="stop-color:#55ABC7"/>
+			</linearGradient>
+			<path fill="url(#SVGID_1_)" d="M-268,700.156v-33.73c0-27.242,3.888-31.135,31.103-31.135h33.794
+				c27.216,0,31.104,3.893,31.104,31.135v33.73c0,27.242-3.888,31.135-31.104,31.135h-33.794
+				C-264.112,731.291-268,727.398-268,700.156z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M46.107,38.575c-1.544,0-2.625,0.536-3.406,1.687c-0.854,1.259-1.286,3.143-1.286,5.599
+					c0,2.324,0.43,4.097,1.276,5.269c0.775,1.073,1.893,1.595,3.416,1.595c1.487,0,2.662-0.542,3.592-1.657
+					c0.97-1.16,1.461-2.965,1.461-5.367c0-2.44-0.526-4.267-1.566-5.429C48.573,39.129,47.434,38.575,46.107,38.575z M36.773,16.341
+					c-14.05,4.041-25.505,49.14-15.979,59.629c9.527,10.49,55.974-1.158,59.63-15.977C84.081,45.174,50.823,12.3,36.773,16.341z
+					 M54.197,54.61c-0.979,1.093-2.103,1.931-3.339,2.492c-1.283,0.583-2.713,0.879-4.248,0.879c-1.997,0-3.749-0.438-5.235-1.31
+					c0.002,1.236-0.07,3.328,6.265,3.726c1.818,0.114,2.866,0.18,4.81,0.463c0,0,0.74,0.146,1.119,0.31
+					c-0.626,2.709-1.579,4.896-4.112,4.645c-0.971-0.087-1.785-0.072-2.019-0.072c-9.896,0-11.973-4.915-11.973-9.039V45.941
+					c0-10.419,5.786-12.606,10.643-12.606c3.254,0,5.948,1.157,8.007,3.439c2.029,2.249,3.059,5.251,3.059,8.924
+					C57.173,49.41,56.172,52.408,54.197,54.61z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-03-25 13:26:14 +0000
+++ metadata.yaml	2014-04-08 12:53:32 +0000
@@ -1,9 +1,9 @@
 name: serverdensity
-summary: This charm installs and configures the Server Density monitoring agent
+summary: This charm installs and configures the Server Density monitoring agent (sd-agent).
 maintainer: Wes Mason <[e-mail]>
 description: |
-  Server Density is a hosted server monitoring service.
-  
+  Server Density is a SaaS tool which helps you run your infrastructure. It syncs with the major cloud providers and and allows you to monitor your websites and servers from a single console, API and mobile app so you can diagnose problems, maintain uptime and maximise performance.
+
   This charm installs and configures the Server Density monitoring agent (sd-agent).
 categories:
   - misc