updated version

If the auth config variable, disable_login_form, is set to true then
the username and email fields are set to read-only on the profile page.

The reason for this is so that the user does not lock themselves out by
changing their email address or username. Or create a new user by
changing both.

ref #7810

CHANGELOG.md

@@ -786,7 +786,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 
 # 1.8.0 (2014-09-22)
 
-Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements.
+Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-released) for an overview of all improvements.
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource

README.md

@@ -66,7 +66,7 @@ There are no dependencies except an external time series data store. For dashboa
 database (sqlite3) or you can use an external SQL data base like MySQL or Postgres.
 
 ## Installation
-Head to [grafana.org](http://docs.grafana.org/installation/) and [download](http://grafana.org/download/)
+Head to [grafana.org](http://docs.grafana.org/installation/) and [download](https://grafana.com/get)
 the latest release.
 
 If you have any problems please read the [troubleshooting guide](http://docs.grafana.org/installation/troubleshooting/).

build.go

@@ -275,9 +275,9 @@ func createPackage(options linuxPackageOptions) {
 		"--description", "Grafana",
 		"-C", packageRoot,
 		"--vendor", "Grafana",
-		"--url", "http://grafana.org",
+		"--url", "https://grafana.com",
 		"--license", "\"Apache 2.0\"",
-		"--maintainer", "contact@grafana.org",
+		"--maintainer", "contact@grafana.com",
 		"--config-files", options.initdScriptFilePath,
 		"--config-files", options.etcDefaultFilePath,
 		"--config-files", options.systemdServiceFilePath,

docs/sources/guides/whats-new-in-v2-5.md

@@ -107,5 +107,5 @@ view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG
 
 - - -
 
-### <a href="http://grafana.org/download">Download Grafana 2.5 now</a>
+### <a href="https://grafana.com/get">Download Grafana 2.5 now</a>
 

docs/sources/index.md

@@ -22,7 +22,7 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing on Windows](installation/windows)
 - [Installing on Docker](installation/docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
 instructions for more information.

docs/sources/installation/debian.md

@@ -130,7 +130,7 @@ those options.
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.

docs/sources/installation/index.md

@@ -17,6 +17,6 @@ identifier = "installation"
 - [Installing on Windows](windows)
 - [Installing on Docker](docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 

docs/sources/installation/rpm.md

@@ -142,7 +142,7 @@ yum install urw-fonts
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.

docs/sources/plugins/developing/development.md

@@ -12,7 +12,7 @@ weight = 1
 
 From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
 
-There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](http://grafana.org/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](http://grafana.org/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
+There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](https://grafana.com/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](https://grafana.com/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
 
 ## Short version
 

docs/sources/reference/admin.md

@@ -27,7 +27,7 @@ modify Organization details and options.
 
 ## Grafana Administrators
 
-<img src="img/v2/admin_sidenav.png" class="right" style="margin-left: 15px">
+<img src="/img/v2/admin_sidenav.png" class="pull-right" style="margin-left: 15px">
 As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
 When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
 

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "4.2.0-beta1",
+  "version": "4.2.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

pkg/services/alerting/notifiers/hipchat.go

@@ -129,7 +129,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"title":       evalContext.GetNotificationTitle(),
 		"description": evalContext.GetNotificationTitle() + " in state " + evalContext.GetStateModel().Text,
 		"icon": map[string]interface{}{
-			"url": "http://grafana.org/assets/img/fav32.png",
+			"url": "https://grafana.com/assets/img/fav32.png",
 		},
 		"date": evalContext.EndTime.Unix(),
 	}

pkg/services/alerting/notifiers/slack.go

@@ -123,7 +123,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"fields":      fields,
 				"image_url":   evalContext.ImagePublicUrl,
 				"footer":      "Grafana v" + setting.BuildVersion,
-				"footer_icon": "http://grafana.org/assets/img/fav32.png",
+				"footer_icon": "https://grafana.com/assets/img/fav32.png",
 				"ts":          time.Now().Unix(),
 			},
 		},

public/app/core/components/search/search.html

@@ -68,8 +68,8 @@
 			Import
 		</a>
 
-		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.net/dashboards?utm_source=grafana_search">
+		<a class="pull-right search-button-row-explore-link" target="_blank" href="https://grafana.com/dashboards?utm_source=grafana_search">
-      Find dashboards on
+      Find <img src="public/img/icn-dashboard-tiny.svg" width="14" /> dashboards on Grafana.com
 		</a>
 
  		<div class="clearfix"></div>

public/app/features/org/partials/profile.html

@@ -9,17 +9,19 @@
 	<form name="ctrl.userForm" class="gf-form-group">
 		<h3 class="page-heading">Information</h3>
 
-		<div class="gf-form">
+		<div class="gf-form max-width-30">
-			<span class="gf-form-label width-9">Name</span>
+			<span class="gf-form-label width-8">Name</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.name" >
+			<input class="gf-form-input max-width-22" type="text" required ng-model="ctrl.user.name" >
 		</div>
-		<div class="gf-form">
+		<div class="gf-form max-width-30">
-			<span class="gf-form-label width-9">Email</span>
+			<span class="gf-form-label width-8">Email</span>
-			<input class="gf-form-input max-width-21" type="email" required ng-model="ctrl.user.email">
+			<input class="gf-form-input max-width-22" type="email" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.email">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
     </div>
-		<div class="gf-form">
+		<div class="gf-form max-width-30">
-			<span class="gf-form-label width-9">Username</span>
+			<span class="gf-form-label width-8">Username</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.login">
+      <input class="gf-form-input max-width-22" type="text" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.login">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
     </div>
 		<div class="gf-form-button-row">
 			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>

public/app/features/org/profile_ctrl.ts

@@ -10,6 +10,7 @@ export class ProfileCtrl {
   orgs: any = [];
   userForm: any;
   showOrgsList = false;
+  readonlyLoginFields = config.disableLoginForm;
 
   /** @ngInject **/
   constructor(private backendSrv, private contextSrv, private $location) {

public/app/features/plugins/partials/plugin_list.html

@@ -26,8 +26,8 @@
 				</li>
 			</ul>
 
-      <a class="get-more-plugins-link" href="https://grafana.net/plugins?utm_source=grafana_plugin_list" target="_blank">
+      <a class="get-more-plugins-link" href="https://grafana.com/plugins?utm_source=grafana_plugin_list" target="_blank">
-        Find more plugins on
+        Find more <img src="public/img/icn-plugins-tiny.svg" />plugins on Grafana.com
       </a>
     </div>
   </div>

public/app/plugins/app/testdata/datasource/plugin.json

@@ -10,7 +10,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "",

public/app/plugins/app/testdata/plugin.json

@@ -7,7 +7,7 @@
     "description": "Grafana test data app",
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "version": "1.0.17",
     "updated": "2016-09-26"

public/app/plugins/datasource/cloudwatch/plugin.json

@@ -9,7 +9,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/amazon-web-services.png",

public/app/plugins/datasource/elasticsearch/plugin.json

@@ -7,7 +7,7 @@
     "description": "Elasticsearch Data Source for Grafana",
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "keywords": ["elasticsearch"],
     "logos": {

public/app/plugins/datasource/graphite/plugin.json

@@ -14,7 +14,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/graphite_logo.png",

public/app/plugins/datasource/influxdb/plugin.json

@@ -11,7 +11,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/influxdb_logo.svg",

public/app/plugins/datasource/opentsdb/plugin.json

@@ -11,7 +11,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/opentsdb_logo.png",

public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json

@@ -167,7 +167,7 @@
           "valueName": "current"
         },
         {
-          "content": "<img src=\"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"http://www.grafana.org/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
+          "content": "<img src=\"public/app/plugins/datasource/prometheus/img/prometheus_logo.svg\" alt=\"Prometheus logo\" style=\"height: 40px;\">\n<span style=\"font-family: 'Open Sans', 'Helvetica Neue', Helvetica; font-size: 25px;vertical-align: text-top;color: #bbbfc2;margin-left: 10px;\">Prometheus</span>\n\n<p style=\"margin-top: 10px;\">You're using Prometheus, an open-source systems monitoring and alerting toolkit originally built at SoundCloud. For more information, check out the <a href=\"https://grafana.com/\">Grafana</a> and <a href=\"http://prometheus.io/\">Prometheus</a> projects.</p>",
           "editable": true,
           "error": false,
           "id": 9,
@@ -563,7 +563,7 @@
       "title": "Grafana Docs",
       "tooltip": "",
       "type": "link",
-      "url": "http://www.grafana.org/docs"
+      "url": "http://docs.grafana.org/"
     },
     {
       "icon": "info",

public/app/plugins/datasource/prometheus/plugin.json

@@ -14,7 +14,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/prometheus_logo.svg",

public/app/plugins/panel/alertlist/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-singlestat-panel.svg",

public/app/plugins/panel/dashlist/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",

public/app/plugins/panel/gettingstarted/plugin.json

@@ -8,7 +8,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",

public/app/plugins/panel/graph/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-graph-panel.svg",

public/app/plugins/panel/pluginlist/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
     },
     "logos": {
       "small": "img/icn-dashlist-panel.svg",

public/app/plugins/panel/singlestat/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-singlestat-panel.svg",

public/app/plugins/panel/table/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-table-panel.svg",

public/app/plugins/panel/text/plugin.json

@@ -6,7 +6,7 @@
   "info": {
     "author": {
       "name": "Grafana Project",
-      "url": "http://grafana.org"
+      "url": "https://grafana.com"
 },
     "logos": {
       "small": "img/icn-text-panel.svg",

public/img/icn-dashboard-tiny.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="17px" viewBox="0 0 16 17" style="enable-background:new 0 0 16 17;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+</style>
+<g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="3.9" y1="-5.2803" x2="3.9" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st0" d="M5.9,7H1.8C1,7,0.4,6.4,0.4,5.6V1.5c0-0.8,0.6-1.4,1.4-1.4H6c0.8,0,1.4,0.6,1.4,1.4v4.1C7.3,6.4,6.7,7,5.9,7z
+			"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.2" y1="-5.2803" x2="12.2" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st1" d="M14.2,7H10C9.3,7,8.7,6.4,8.7,5.6V1.5c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.1
+			C15.6,6.4,15,7,14.2,7z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="3.9" y1="-5.2803" x2="3.9" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st2" d="M5.9,15.1H1.8c-0.8,0-1.4-0.6-1.4-1.4V9.6c0-0.8,0.6-1.4,1.4-1.4H6c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C7.3,14.5,6.7,15.1,5.9,15.1z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.1" y1="-5.2803" x2="12.1" y2="19.213" gradientTransform="matrix(1 0 0 -1 0 18.289)">
+			<stop  offset="0" style="stop-color:#FFF200"/>
+			<stop  offset="1" style="stop-color:#F15A29"/>
+		</linearGradient>
+		<path class="st3" d="M14.2,15.1H10c-0.8,0-1.4-0.6-1.4-1.4V9.6c0-0.8,0.6-1.4,1.4-1.4h4.2c0.8,0,1.4,0.6,1.4,1.4v4.2
+			C15.6,14.5,15,15.1,14.2,15.1z"/>
+	</g>
+</g>
+</svg>

public/img/icn-plugins-tiny.svg

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="8" y1="22.9255" x2="8" y2="-0.8717">
+		<stop  offset="0" style="stop-color:#FFF200"/>
+		<stop  offset="1" style="stop-color:#F15A29"/>
+	</linearGradient>
+	<path class="st0" d="M14.2,7.1c-0.5,0-0.9,0.3-1.1,0.8h-3c0-0.3-0.1-0.5-0.2-0.7l2-1.1c0.2,0.2,0.6,0.4,0.9,0.4
+		c0.7,0,1.3-0.6,1.3-1.3c0-0.7-0.6-1.3-1.3-1.3s-1.3,0.6-1.3,1.3c0,0.1,0,0.2,0.1,0.4l-2,1.1C9.5,6.5,9.3,6.3,9.1,6.1l0.4-0.6
+		c0.1,0,0.2,0.1,0.4,0.1c0.7,0,1.3-0.6,1.3-1.3s-0.6-1.3-1.3-1.3S8.5,3.5,8.5,4.2c0,0.4,0.2,0.7,0.4,1L8.6,5.8
+		C8.3,5.7,8.1,5.7,7.8,5.6V1.9C8.2,1.8,8.5,1.4,8.5,1c0-0.5-0.4-1-1-1s-1,0.4-1,1c0,0.4,0.3,0.8,0.7,0.9v3.7C7,5.7,6.7,5.7,6.5,5.8
+		L5.2,3.5c0.2-0.2,0.3-0.5,0.3-0.7c0-0.6-0.5-1.1-1.1-1.1S3.3,2.2,3.3,2.8s0.5,1.1,1.1,1.1c0.1,0,0.2,0,0.2,0l1.3,2.3
+		C5.7,6.3,5.6,6.5,5.4,6.7L3.1,5.4c0-0.1,0-0.2,0-0.2C3.2,4.5,2.7,4,2.1,4S1,4.5,1,5.1c0,0.6,0.5,1.1,1.1,1.1c0.3,0,0.5-0.1,0.7-0.3
+		l2.3,1.3C5,7.5,4.9,7.7,4.9,7.9H4C3.9,7.3,3.3,6.8,2.6,6.8c-0.8,0-1.5,0.7-1.5,1.5s0.7,1.5,1.5,1.5c0.7,0,1.3-0.5,1.4-1.1h0.9
+		c0,0.3,0.1,0.5,0.2,0.7l-2.4,1.4c-0.2-0.2-0.5-0.3-0.8-0.3c-0.6,0-1.2,0.5-1.2,1.2c0,0.6,0.5,1.2,1.2,1.2S3,12.2,3,11.5
+		c0-0.1,0-0.2,0-0.3l2.4-1.4c0.2,0.2,0.3,0.4,0.5,0.5L4,13.7c-0.1,0-0.2,0-0.3,0c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1
+		s1.1-0.5,1.1-1.1c0-0.3-0.1-0.6-0.3-0.8l1.9-3.3c0.2,0.1,0.5,0.2,0.7,0.2v0.9c-0.6,0.1-1,0.7-1,1.3c0,0.7,0.6,1.3,1.3,1.3
+		s1.3-0.6,1.3-1.3c0-0.6-0.4-1.1-1-1.3v-0.9c0.3,0,0.5-0.1,0.7-0.2l1.6,2.7c-0.2,0.2-0.3,0.5-0.3,0.8c0,0.6,0.5,1.2,1.2,1.2
+		s1.2-0.5,1.2-1.2c0-0.6-0.5-1.2-1.2-1.2c-0.1,0-0.2,0-0.3,0l-1.6-2.7c0.2-0.2,0.4-0.3,0.5-0.5L9.9,10c0,0.1-0.1,0.3-0.1,0.5
+		c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5c-0.4,0-0.9,0.2-1.1,0.5L10,9.3c0.1-0.2,0.2-0.5,0.2-0.7h3
+		c0.1,0.5,0.6,0.8,1.1,0.8c0.6,0,1.1-0.5,1.1-1.1C15.3,7.6,14.8,7.1,14.2,7.1z M14.2,8.9c-0.3,0-0.6-0.3-0.6-0.6
+		c0-0.3,0.3-0.6,0.6-0.6c0.3,0,0.6,0.3,0.6,0.6C14.8,8.6,14.5,8.9,14.2,8.9z M7.5,10.3c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2
+		S8.6,10.3,7.5,10.3z M12.1,5.2c0-0.4,0.4-0.8,0.8-0.8c0.4,0,0.8,0.4,0.8,0.8c0,0.4-0.4,0.8-0.8,0.8C12.5,6,12.1,5.6,12.1,5.2z
+		 M10.7,4.2c0,0.5-0.4,0.8-0.8,0.8C9.4,5,9,4.7,9,4.2s0.4-0.8,0.8-0.8C10.3,3.4,10.7,3.7,10.7,4.2z M7,1c0-0.3,0.2-0.5,0.5-0.5
+		S8,0.7,8,1S7.8,1.5,7.5,1.5S7,1.3,7,1z M3.8,2.8c0-0.3,0.3-0.6,0.6-0.6C4.7,2.2,5,2.5,5,2.8S4.7,3.4,4.4,3.4
+		C4.1,3.4,3.8,3.1,3.8,2.8z M2.1,5.7c-0.3,0-0.6-0.3-0.6-0.6s0.3-0.6,0.6-0.6s0.6,0.3,0.6,0.6S2.4,5.7,2.1,5.7z M2.6,9.2
+		c-0.5,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S3.1,9.2,2.6,9.2z M2.5,11.5c0,0.4-0.3,0.7-0.7,0.7s-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7
+		S2.5,11.2,2.5,11.5z M4.4,14.8c0,0.3-0.3,0.6-0.6,0.6s-0.6-0.3-0.6-0.6c0-0.3,0.3-0.6,0.6-0.6S4.4,14.5,4.4,14.8z M7.5,13.9
+		c-0.4,0-0.8-0.4-0.8-0.8c0-0.4,0.4-0.8,0.8-0.8s0.8,0.4,0.8,0.8C8.3,13.5,8,13.9,7.5,13.9z M11.6,14.2c0,0.4-0.3,0.7-0.7,0.7
+		c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7C11.3,13.6,11.6,13.9,11.6,14.2z M11.4,9.5c0.6,0,1,0.5,1,1s-0.5,1-1,1s-1-0.5-1-1
+		S10.8,9.5,11.4,9.5z"/>
+</g>
+</svg>

public/sass/_grafana.scss

@@ -85,6 +85,5 @@
 @import "pages/signup";
 @import "pages/styleguide";
 
-
 @import "old_responsive";
 @import "components/view_states.scss";

public/sass/components/_gf-form.scss

@@ -286,3 +286,10 @@ $gf-form-margin: 0.25rem;
 select.gf-form-input ~ .gf-form-help-icon {
   right: 10px;
 }
+
+.gf-form-icon--right-absolute {
+  position: absolute;
+  right: $spacer;
+  top: 10px;
+  color: $text-muted;
+}

public/sass/components/_search.scss

@@ -107,18 +107,16 @@
   }
 
   .search-button-row-explore-link {
-    color: $text-muted;
+    color: $gray-3;
     font-size: $font-size-sm;
-    padding-right: 7rem;
-    background: url(../img/grafana_net_logo.svg);
-    background-size: 6.5rem;
-    background-repeat: no-repeat;
-    background-position: right;
     position: relative;
-    top: 0.8rem;
+    top: 1.0rem;
     &:hover {
       color: $link-hover-color;
     }
+    img {
+      vertical-align: text-bottom;
+    }
   }
 }
 

public/sass/pages/_plugins.scss

@@ -38,18 +38,16 @@
 }
 
 .get-more-plugins-link {
-  color: $text-muted;
+  color: $gray-3;
   font-size: $font-size-sm;
-  padding-right: 7rem;
-  background: url(../img/grafana_net_logo.svg);
-  background-size: 6.5rem 3rem;
-  background-repeat: no-repeat;
-  background-position: right;
   position: relative;
   top: 1.2rem;
   &:hover {
     color: $link-hover-color;
   }
+  img {
+    vertical-align: top;
+  }
 }
 
 @include media-breakpoint-down(sm) {

public/views/index.html

@@ -49,24 +49,24 @@
 							</a>
 						</li>
 						<li>
-							<a href="https://grafana.net/support/plans" target="_blank">
+							<a href="https://grafana.com/services/support" target="_blank">
 								<i class="fa fa-support"></i>
 								Support Plans
 							</a>
 						</li>
 						<li>
-							<a href="http://grafana.org/community" target="_blank">
+							<a href="https://community.grafana.com/" target="_blank">
 								<i class="fa fa-comments-o"></i>
 								Community
 							</a>
 						</li>
 						<li>
-							<a href="http://grafana.org" target="_blank">Grafana</a>
+							<a href="https://grafana.com" target="_blank">Grafana</a>
 							<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
 						</li>
 						[[if .NewGrafanaVersionExists]]
 							<li>
-								<a href="http://grafana.org/download" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
+								<a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
 									New version available!
 								</a>
 							</li>