From 3dae915b23b55a74e7efc9f2fafcaf43aa065bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 15 Feb 2019 21:33:36 +0100
Subject: [PATCH] Bar gauge icon updated

---
 pkg/api/frontendsettings.go                   |  12 +-
 .../panel/bargauge/img/icon_bar_gauge.svg     | 148 +++++++++---------
 public/app/plugins/panel/bargauge/types.ts    |   6 +-
 public/app/plugins/panel/gauge/types.ts       |   2 +-
 4 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index d13f0a26ab0..f0821f75324 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -191,16 +191,18 @@ func getPanelSort(id string) int {
 		sort = 2
 	case "gauge":
 		sort = 3
-	case "table":
+	case "bargauge":
 		sort = 4
-	case "text":
+	case "table":
 		sort = 5
-	case "heatmap":
+	case "text":
 		sort = 6
-	case "alertlist":
+	case "heatmap":
 		sort = 7
-	case "dashlist":
+	case "alertlist":
 		sort = 8
+	case "dashlist":
+		sort = 9
 	}
 	return sort
 }
diff --git a/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg b/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg
index a305d2d912e..2da2cc78196 100644
--- a/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg
+++ b/public/app/plugins/panel/bargauge/img/icon_bar_gauge.svg
@@ -14,89 +14,83 @@
 	.st7{fill:url(#SVGID_8_);}
 	.st8{fill:url(#SVGID_9_);}
 </style>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="68.7753" y1="8.4663" x2="68.7753" y2="59.7143">
+	<stop  offset="0" style="stop-color:#FAA91F"/>
+	<stop  offset="1" style="stop-color:#F37324"/>
+</linearGradient>
+<path class="st0" d="M7.61,50.71V12.52c0-2.66,1.95-4.82,4.36-4.82h113.62c2.41,0,4.36,2.16,4.36,4.82v38.19
+	c0,2.66-1.95,4.82-4.36,4.82H11.97C9.56,55.53,7.61,53.37,7.61,50.71z"/>
 <g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="70.7769" y1="9.2763" x2="70.7769" y2="60.5244">
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="152.8987" y1="19.9183" x2="152.3315" y2="39.7688">
 		<stop  offset="0" style="stop-color:#FAA91F"/>
 		<stop  offset="1" style="stop-color:#F37324"/>
 	</linearGradient>
-	<path class="st0" d="M9.61,51.52V13.33c0-2.66,1.95-4.82,4.36-4.82h113.62c2.41,0,4.36,2.16,4.36,4.82v38.19
-		c0,2.66-1.95,4.82-4.36,4.82H13.97C11.56,56.34,9.61,54.18,9.61,51.52z"/>
-	<g>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="147.9986" y1="22.2026" x2="147.4979" y2="39.7287">
-			<stop  offset="0" style="stop-color:#FAA91F"/>
-			<stop  offset="1" style="stop-color:#F37324"/>
-		</linearGradient>
-		<path class="st1" d="M148.88,29.37c0.84,0,1.57,0.16,2.18,0.48c0.62,0.32,1.13,0.76,1.54,1.31c0.41,0.55,0.72,1.21,0.92,1.97
-			c0.21,0.76,0.31,1.58,0.31,2.45c0,1.09-0.15,2.06-0.46,2.91c-0.3,0.85-0.73,1.56-1.29,2.14c-0.55,0.58-1.21,1.02-1.96,1.33
-			c-0.75,0.3-1.57,0.46-2.47,0.46c-0.91,0-1.75-0.15-2.52-0.44c-0.77-0.29-1.43-0.73-1.98-1.31c-0.55-0.58-0.99-1.29-1.3-2.13
-			c-0.31-0.84-0.47-1.8-0.47-2.87c0-1.16,0.15-2.21,0.46-3.14c0.3-0.93,0.69-1.82,1.15-2.68l3.62-6.81h4.91l-3.67,6.49l0.03,0.03
-			c0.09-0.05,0.24-0.1,0.44-0.13C148.53,29.39,148.71,29.37,148.88,29.37z M149.71,35.54c0-0.93-0.18-1.68-0.55-2.27
-			c-0.37-0.58-0.87-0.87-1.51-0.87c-0.61,0-1.11,0.29-1.51,0.88c-0.4,0.59-0.6,1.34-0.6,2.25c0,0.91,0.2,1.66,0.59,2.25
-			c0.39,0.59,0.89,0.88,1.5,0.88c0.62,0,1.13-0.3,1.51-0.88C149.51,37.2,149.71,36.45,149.71,35.54z"/>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="160.6146" y1="22.563" x2="160.1138" y2="40.0891">
-			<stop  offset="0" style="stop-color:#FAA91F"/>
-			<stop  offset="1" style="stop-color:#F37324"/>
-		</linearGradient>
-		<path class="st2" d="M166.25,28.27c0,0.63-0.08,1.21-0.24,1.74c-0.16,0.54-0.38,1.05-0.64,1.53c-0.27,0.48-0.57,0.95-0.91,1.39
-			c-0.34,0.45-0.69,0.88-1.05,1.29l-3.54,4.1H166v3.7h-11.23v-3.81l5.76-6.62c0.46-0.54,0.83-1.09,1.1-1.65
-			c0.27-0.56,0.4-1.1,0.4-1.62c0-0.55-0.13-1.03-0.39-1.42c-0.26-0.39-0.67-0.59-1.22-0.59c-0.52,0-0.95,0.21-1.29,0.63
-			c-0.34,0.42-0.54,1.03-0.62,1.84l-4.02-0.38c0.21-1.93,0.87-3.37,1.97-4.33c1.1-0.96,2.46-1.43,4.09-1.43
-			c0.88,0,1.66,0.13,2.36,0.4c0.7,0.27,1.29,0.64,1.78,1.13c0.49,0.48,0.87,1.07,1.14,1.77C166.11,26.63,166.25,27.41,166.25,28.27z
-			"/>
-	</g>
-	<g>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="92.8488" y1="69.7917" x2="92.8488" y2="118.5398">
-			<stop  offset="0" style="stop-color:#E81E25"/>
-			<stop  offset="1" style="stop-color:#A91D39"/>
-		</linearGradient>
-		<path class="st3" d="M9.61,115.42V71.5c0-1.08,0.87-1.95,1.95-1.95h162.57c1.08,0,1.95,0.87,1.95,1.95v43.92
-			c0,1.08-0.87,1.95-1.95,1.95H11.56C10.48,117.37,9.61,116.5,9.61,115.42z"/>
-		<g>
-			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="191.2941" y1="82.9582" x2="192.2956" y2="99.9836">
-				<stop  offset="0" style="stop-color:#E81E25"/>
-				<stop  offset="1" style="stop-color:#A91D39"/>
-			</linearGradient>
-			<path class="st4" d="M191.45,102.87h-4.67l5.6-15.2h-6.52v-3.78h11.18v3.22L191.45,102.87z"/>
-			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="202.5566" y1="82.2957" x2="203.5581" y2="99.3211">
-				<stop  offset="0" style="stop-color:#E81E25"/>
-				<stop  offset="1" style="stop-color:#A91D39"/>
-			</linearGradient>
-			<path class="st5" d="M204.65,90.22c0.84,0,1.57,0.16,2.18,0.48c0.62,0.32,1.13,0.76,1.54,1.31s0.72,1.21,0.92,1.97
-				c0.21,0.76,0.31,1.58,0.31,2.45c0,1.09-0.15,2.06-0.46,2.91s-0.73,1.56-1.29,2.14c-0.55,0.58-1.21,1.02-1.96,1.33
-				s-1.57,0.46-2.47,0.46c-0.91,0-1.75-0.15-2.52-0.44c-0.77-0.29-1.43-0.73-1.98-1.31c-0.55-0.58-0.99-1.29-1.3-2.13
-				c-0.31-0.84-0.47-1.8-0.47-2.87c0-1.16,0.15-2.21,0.46-3.14c0.3-0.93,0.69-1.82,1.15-2.68l3.62-6.81h4.91l-3.67,6.49l0.03,0.03
-				c0.09-0.05,0.24-0.1,0.44-0.13C204.31,90.24,204.49,90.22,204.65,90.22z M205.48,96.39c0-0.93-0.18-1.68-0.55-2.27
-				c-0.37-0.58-0.87-0.87-1.51-0.87c-0.61,0-1.11,0.29-1.51,0.88c-0.4,0.59-0.6,1.34-0.6,2.25c0,0.91,0.2,1.66,0.59,2.25
-				c0.39,0.59,0.89,0.88,1.5,0.88c0.62,0,1.13-0.3,1.51-0.88C205.29,98.05,205.48,97.3,205.48,96.39z"/>
-		</g>
-	</g>
-	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="51.8909" y1="131.557" x2="51.8909" y2="177.8052">
+	<path class="st1" d="M153.89,28.04c0.95,0,1.78,0.18,2.47,0.55c0.7,0.36,1.28,0.86,1.75,1.49c0.47,0.63,0.81,1.37,1.05,2.23
+		c0.23,0.86,0.35,1.79,0.35,2.78c0,1.24-0.17,2.33-0.52,3.29c-0.34,0.96-0.83,1.77-1.46,2.43c-0.63,0.66-1.37,1.16-2.22,1.5
+		c-0.85,0.34-1.78,0.52-2.79,0.52c-1.03,0-1.98-0.17-2.85-0.5c-0.87-0.33-1.62-0.83-2.25-1.49c-0.63-0.66-1.12-1.46-1.47-2.41
+		c-0.35-0.95-0.53-2.03-0.53-3.25c0-1.32,0.17-2.5,0.52-3.55c0.34-1.05,0.78-2.07,1.31-3.04l4.1-7.71h5.56l-4.16,7.35l0.03,0.03
+		c0.1-0.06,0.27-0.11,0.5-0.15C153.5,28.06,153.71,28.04,153.89,28.04z M154.83,35.02c0-1.05-0.21-1.91-0.62-2.57
+		c-0.41-0.66-0.99-0.99-1.72-0.99c-0.69,0-1.26,0.33-1.72,1c-0.46,0.67-0.68,1.52-0.68,2.55c0,1.03,0.22,1.88,0.67,2.55
+		c0.44,0.67,1.01,1,1.7,1c0.71,0,1.28-0.33,1.72-1C154.62,36.9,154.83,36.05,154.83,35.02z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="167.1879" y1="20.3265" x2="166.6207" y2="40.1771">
+		<stop  offset="0" style="stop-color:#FAA91F"/>
+		<stop  offset="1" style="stop-color:#F37324"/>
+	</linearGradient>
+	<path class="st2" d="M173.57,26.79c0,0.71-0.09,1.37-0.27,1.97c-0.18,0.61-0.43,1.18-0.73,1.73c-0.3,0.55-0.65,1.07-1.03,1.58
+		c-0.38,0.51-0.78,0.99-1.18,1.46l-4.01,4.65h6.95v4.19h-12.72v-4.31l6.53-7.5c0.53-0.61,0.94-1.23,1.24-1.87
+		c0.3-0.64,0.46-1.25,0.46-1.84c0-0.63-0.15-1.16-0.44-1.61c-0.29-0.45-0.75-0.67-1.38-0.67c-0.59,0-1.07,0.24-1.46,0.71
+		c-0.38,0.48-0.62,1.17-0.7,2.08l-4.56-0.43c0.24-2.19,0.99-3.82,2.23-4.9c1.24-1.08,2.79-1.62,4.63-1.62
+		c0.99,0,1.88,0.15,2.67,0.46c0.79,0.3,1.46,0.73,2.02,1.28c0.56,0.55,0.99,1.21,1.29,2C173.41,24.94,173.57,25.82,173.57,26.79z"/>
+</g>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="90.8472" y1="69.5294" x2="90.8472" y2="118.2775">
+	<stop  offset="0" style="stop-color:#E81E25"/>
+	<stop  offset="1" style="stop-color:#A91D39"/>
+</linearGradient>
+<path class="st3" d="M7.61,115.16V71.24c0-1.08,0.87-1.95,1.95-1.95h162.57c1.08,0,1.95,0.87,1.95,1.95v43.92
+	c0,1.08-0.87,1.95-1.95,1.95H9.56C8.48,117.11,7.61,116.23,7.61,115.16z"/>
+<g>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="195.8516" y1="81.1631" x2="196.9859" y2="100.4465">
+		<stop  offset="0" style="stop-color:#E81E25"/>
+		<stop  offset="1" style="stop-color:#A91D39"/>
+	</linearGradient>
+	<path class="st4" d="M196.03,103.72h-5.28l6.35-17.22h-7.38v-4.28h12.66v3.64L196.03,103.72z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="208.6078" y1="80.4128" x2="209.7422" y2="99.6962">
+		<stop  offset="0" style="stop-color:#E81E25"/>
+		<stop  offset="1" style="stop-color:#A91D39"/>
+	</linearGradient>
+	<path class="st5" d="M210.98,89.39c0.95,0,1.78,0.18,2.47,0.55c0.7,0.36,1.28,0.86,1.75,1.49c0.47,0.63,0.81,1.37,1.05,2.23
+		c0.23,0.86,0.35,1.79,0.35,2.78c0,1.24-0.17,2.33-0.52,3.29c-0.34,0.96-0.83,1.77-1.46,2.43c-0.63,0.66-1.37,1.16-2.22,1.5
+		c-0.85,0.34-1.78,0.52-2.79,0.52c-1.03,0-1.99-0.17-2.85-0.5c-0.87-0.33-1.62-0.83-2.25-1.49c-0.63-0.66-1.12-1.46-1.47-2.41
+		c-0.35-0.95-0.53-2.03-0.53-3.25c0-1.32,0.17-2.5,0.52-3.55c0.34-1.05,0.78-2.07,1.31-3.04l4.1-7.71h5.56l-4.16,7.35l0.03,0.03
+		c0.1-0.06,0.27-0.11,0.5-0.15C210.59,89.41,210.8,89.39,210.98,89.39z M211.92,96.37c0-1.05-0.21-1.91-0.62-2.57
+		c-0.41-0.66-0.99-0.99-1.72-0.99c-0.69,0-1.26,0.33-1.72,1c-0.46,0.67-0.68,1.52-0.68,2.55s0.22,1.88,0.67,2.55
+		c0.44,0.67,1.01,1,1.7,1c0.71,0,1.28-0.33,1.72-1C211.7,98.25,211.92,97.4,211.92,96.37z"/>
+</g>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="49.8893" y1="131.8424" x2="49.8893" y2="178.0907">
+	<stop  offset="0" style="stop-color:#04A64D"/>
+	<stop  offset="1" style="stop-color:#007E39"/>
+</linearGradient>
+<path class="st6" d="M7.61,176.74v-43.92c0-1.08,0.87-1.95,1.95-1.95h80.66c1.08,0,1.95,0.87,1.95,1.95v43.92
+	c0,1.08-0.87,1.95-1.95,1.95H9.56C8.48,178.69,7.61,177.81,7.61,176.74z"/>
+<g>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="112.038" y1="145.9514" x2="118.2768" y2="172.6079">
 		<stop  offset="0" style="stop-color:#04A64D"/>
 		<stop  offset="1" style="stop-color:#007E39"/>
 	</linearGradient>
-	<path class="st6" d="M9.61,176.45v-43.92c0-1.08,0.87-1.95,1.95-1.95h80.66c1.08,0,1.95,0.87,1.95,1.95v43.92
-		c0,1.08-0.87,1.95-1.95,1.95H11.56C10.48,178.4,9.61,177.53,9.61,176.45z"/>
-	<g>
-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="107.5046" y1="148.5825" x2="113.0128" y2="172.1175">
-			<stop  offset="0" style="stop-color:#04A64D"/>
-			<stop  offset="1" style="stop-color:#007E39"/>
-		</linearGradient>
-		<path class="st7" d="M114.26,162.06v3.81h-3.81v-3.81h-6.94v-3.65l5.55-11.53h5.2v11.64h1.93v3.54H114.26z M110.53,151.07h-0.05
-			l-3.24,7.45h3.3V151.07z"/>
-		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="120.3674" y1="145.572" x2="125.8756" y2="169.1071">
-			<stop  offset="0" style="stop-color:#04A64D"/>
-			<stop  offset="1" style="stop-color:#007E39"/>
-		</linearGradient>
-		<path class="st8" d="M129.12,160.32c0,0.97-0.16,1.81-0.47,2.55c-0.31,0.73-0.74,1.35-1.27,1.86c-0.54,0.51-1.17,0.89-1.89,1.15
-			c-0.72,0.26-1.51,0.39-2.35,0.39c-1.56,0-2.89-0.4-3.99-1.19c-1.11-0.8-1.84-2.01-2.2-3.63l3.78-0.97
-			c0.14,0.63,0.39,1.14,0.75,1.53c0.36,0.39,0.85,0.59,1.47,0.59c0.34,0,0.63-0.07,0.89-0.21c0.25-0.14,0.46-0.33,0.63-0.56
-			c0.17-0.23,0.3-0.5,0.38-0.79c0.08-0.29,0.12-0.59,0.12-0.9c0-0.82-0.24-1.43-0.71-1.82c-0.47-0.39-1.1-0.59-1.89-0.59h-0.97
-			v-3.16h1.07c0.72,0,1.26-0.21,1.65-0.63c0.38-0.42,0.58-1.01,0.58-1.76c0-0.48-0.14-0.94-0.42-1.37
-			c-0.28-0.43-0.72-0.64-1.33-0.64c-0.52,0-0.92,0.17-1.21,0.51c-0.29,0.34-0.5,0.77-0.64,1.29l-3.67-0.91
-			c0.21-0.82,0.52-1.52,0.92-2.09c0.4-0.57,0.86-1.04,1.37-1.41c0.51-0.37,1.07-0.63,1.68-0.8c0.61-0.17,1.22-0.25,1.85-0.25
-			c0.7,0,1.37,0.11,2.02,0.32c0.65,0.21,1.24,0.54,1.76,0.97c0.52,0.43,0.93,0.97,1.25,1.61c0.31,0.64,0.47,1.39,0.47,2.25
-			c0,1.11-0.24,2.04-0.71,2.8c-0.47,0.76-1.1,1.26-1.89,1.51v0.08c0.91,0.25,1.64,0.77,2.17,1.56
-			C128.86,158.37,129.12,159.28,129.12,160.32z"/>
-	</g>
+	<path class="st7" d="M119.69,161.21v4.31h-4.31v-4.31h-7.87v-4.13l6.29-13.06h5.89v13.18h2.19v4.01H119.69z M115.47,148.77h-0.06
+		l-3.68,8.44h3.74V148.77z"/>
+	<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="126.6068" y1="142.5417" x2="132.8455" y2="169.1982">
+		<stop  offset="0" style="stop-color:#04A64D"/>
+		<stop  offset="1" style="stop-color:#007E39"/>
+	</linearGradient>
+	<path class="st8" d="M136.52,159.24c0,1.09-0.18,2.06-0.53,2.88c-0.35,0.83-0.84,1.53-1.44,2.11c-0.61,0.58-1.32,1.01-2.14,1.31
+		c-0.82,0.29-1.71,0.44-2.66,0.44c-1.76,0-3.27-0.45-4.52-1.35c-1.26-0.9-2.09-2.27-2.49-4.11l4.28-1.09
+		c0.16,0.71,0.45,1.29,0.85,1.73c0.4,0.45,0.96,0.67,1.67,0.67c0.38,0,0.72-0.08,1-0.24c0.28-0.16,0.52-0.37,0.71-0.64
+		s0.33-0.56,0.43-0.9c0.09-0.33,0.14-0.67,0.14-1.02c0-0.93-0.27-1.62-0.8-2.07c-0.54-0.45-1.25-0.67-2.14-0.67h-1.09v-3.58h1.21
+		c0.81,0,1.43-0.24,1.87-0.71c0.43-0.48,0.65-1.14,0.65-1.99c0-0.55-0.16-1.06-0.47-1.55c-0.31-0.49-0.82-0.73-1.5-0.73
+		c-0.59,0-1.04,0.19-1.37,0.58c-0.32,0.39-0.57,0.87-0.73,1.46l-4.16-1.03c0.24-0.93,0.59-1.72,1.05-2.37s0.97-1.18,1.55-1.59
+		c0.58-0.42,1.21-0.72,1.9-0.91c0.69-0.19,1.39-0.29,2.1-0.29c0.79,0,1.55,0.12,2.29,0.36c0.74,0.24,1.4,0.61,1.99,1.09
+		c0.59,0.49,1.06,1.09,1.41,1.82c0.35,0.73,0.53,1.58,0.53,2.55c0,1.26-0.27,2.31-0.8,3.17c-0.54,0.86-1.25,1.43-2.14,1.72v0.09
+		c1.03,0.28,1.85,0.87,2.46,1.76C136.22,157.04,136.52,158.07,136.52,159.24z"/>
 </g>
 </svg>
diff --git a/public/app/plugins/panel/bargauge/types.ts b/public/app/plugins/panel/bargauge/types.ts
index dcef36716a4..fd267e79d76 100644
--- a/public/app/plugins/panel/bargauge/types.ts
+++ b/public/app/plugins/panel/bargauge/types.ts
@@ -18,10 +18,6 @@ export const PanelDefaults: BarGaugeOptions = {
   suffix: '',
   stat: 'avg',
   unit: 'none',
-  thresholds: [
-    { index: 2, value: 80, color: 'red' },
-    { index: 1, value: 50, color: 'orange' },
-    { index: 0, value: -Infinity, color: 'green' },
-  ],
+  thresholds: [{ index: 2, value: 80, color: 'red' }, { index: 0, value: -Infinity, color: 'green' }],
   valueMappings: [],
 };
diff --git a/public/app/plugins/panel/gauge/types.ts b/public/app/plugins/panel/gauge/types.ts
index 4cdb4fcdd7b..053a4a15d04 100644
--- a/public/app/plugins/panel/gauge/types.ts
+++ b/public/app/plugins/panel/gauge/types.ts
@@ -25,5 +25,5 @@ export const PanelDefaults: GaugeOptions = {
   stat: 'avg',
   unit: 'none',
   valueMappings: [],
-  thresholds: [],
+  thresholds: [{ index: 1, value: 80, color: 'red' }, { index: 0, value: -Infinity, color: 'green' }],
 };