Merge branch 'master' of github.com:grafana/grafana

CHANGELOG.md

@@ -798,7 +798,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

@@ -63,7 +63,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

@@ -23,7 +23,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.
 

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/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/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>